diff --git a/src/views/mes/deviceledger/detail/index.vue b/src/views/mes/deviceledger/detail/index.vue index 30fc9042..1c1f160d 100644 --- a/src/views/mes/deviceledger/detail/index.vue +++ b/src/views/mes/deviceledger/detail/index.vue @@ -2,68 +2,104 @@
设备基本信息
- - - {{ detailData?.deviceCode ?? '' }} - - - {{ detailData?.deviceName ?? '' }} - - - - - - {{ detailData?.deviceModel ?? '' }} - - - {{ detailData?.deviceSpec ?? '' }} - - - {{ getDeviceTypeName(detailData?.deviceTypeName ?? detailData?.deviceType) }} - - - {{ detailData?.deviceLocation ?? '' }} - - - {{ detailData?.deviceManagerName ?? '' }} - - - {{ formatDetailDate(detailData?.productionDate) }} - - - {{ formatDetailDate(detailData?.factoryEntryDate) }} - - - {{ detailData?.remark ?? detailData?.deviceRemark ?? '' }} - - - {{ detailData?.creatorName ?? '' }} - - - {{ formatDetailDate(detailData?.createTime) }} - - - {{ formatDetailDate(detailData?.updateTime) }} - - - -
-
设备二维码
- -
扫码查看设备详情
-
支持点检 / 报修 / 维保
+
+
+ + + + + + + + + + +
+ + + {{ detailData?.deviceCode ?? '' }} + + + {{ detailData?.deviceName ?? '' }} + + + + + + {{ detailData?.deviceModel ?? '' }} + + + {{ detailData?.deviceSpec ?? '' }} + + + {{ getDeviceTypeName(detailData?.deviceTypeName ?? detailData?.deviceType) }} + + + {{ detailData?.deviceLocation ?? '' }} + + + {{ deviceManagerName }} + + + {{ formatDetailDate(detailData?.productionDate) }} + + + {{ formatDetailDate(detailData?.factoryEntryDate) }} + + + {{ detailData?.remark ?? detailData?.deviceRemark ?? '' }} + + + {{ detailData?.creatorName ?? '' }} + + + {{ formatDetailDate(detailData?.createTime) }} + + + {{ formatDetailDate(detailData?.updateTime) }} + + + +
+
设备二维码
+ +
扫码查看设备详情
+
支持点检 / 报修 / 维保
+
@@ -602,6 +638,10 @@ const parseImages = (value: any): string[] => { .filter(Boolean) } +const deviceImageList = computed(() => parseImages(detailData.value?.images)) +const firstDeviceImage = computed(() => deviceImageList.value[0] ?? '') +const deviceManagerName = computed(() => (detailData.value as any)?.deviceManagerName ?? detailData.value?.deviceManager ?? '') + type HistoryStepItem = { key: string name: string @@ -905,24 +945,87 @@ onMounted(async () => { .device-ledger-detail-body { position: relative; max-height: 85vh; + padding-top: 2px; } .device-ledger-detail-title { - position: absolute; - top: 10px; - left: 0px; + position: relative; + display: flex; + align-items: center; + height: 28px; color: var(--el-text-color-primary); font-size: 16px; font-weight: 600; line-height: 22px; } +.device-ledger-detail-title::before { + width: 3px; + height: 16px; + margin-right: 8px; + content: ''; + border-radius: 2px; + background: var(--el-color-primary); +} + +.device-ledger-detail-main { + display: flex; + min-height: 224px; + padding: 18px 260px 18px 0; + margin-bottom: 10px; + gap: 28px; + box-sizing: border-box; + align-items: center; +} + + +.device-ledger-detail-images { + display: flex; + width: 260px; + height: 188px; + padding: 12px; + box-sizing: border-box; + flex: 0 0 260px; + align-items: center; + justify-content: center; + overflow: hidden; + border: 1px solid var(--el-border-color-lighter); + border-radius: 8px; + background: linear-gradient(180deg, var(--el-fill-color-blank) 0%, var(--el-fill-color-lighter) 100%); +} + +.device-ledger-detail-carousel, +.device-ledger-detail-image { + width: 100%; +} + +.device-ledger-detail-image { + height: 164px; + overflow: hidden; + border-radius: 6px; + background: transparent; +} + +.device-ledger-detail-image :deep(.el-image__inner) { + object-fit: contain; +} + +.device-ledger-detail-image-error { + display: flex; + width: 100%; + height: 100%; + color: var(--el-text-color-secondary); + background: var(--el-fill-color); + align-items: center; + justify-content: center; +} + .device-ledger-detail-desc { display: flex; align-items: center; - min-height: 286px; - padding-right: 260px; - margin-bottom: 16px; + min-width: 0; + flex: 1; + min-height: 188px; } .device-ledger-detail-desc :deep(.el-descriptions__body) { @@ -936,6 +1039,20 @@ onMounted(async () => { .device-ledger-detail-desc :deep(.el-descriptions__cell) { width: 33.3333%; + padding-bottom: 14px; + color: var(--el-text-color-primary); + font-size: 14px; + line-height: 22px; +} + + +.device-ledger-detail-desc :deep(.el-descriptions__label) { + color: var(--el-text-color-primary); + font-weight: 500; +} + +.device-ledger-detail-desc :deep(.el-descriptions__content) { + color: var(--el-text-color-regular); } .device-ledger-detail-tabs { @@ -949,19 +1066,20 @@ onMounted(async () => { .device-ledger-detail-qrcode { position: absolute; - top: 30px; - right: 100px; + top: 48px; + right: 36px; display: flex; width: 184px; - min-height: 226px; + min-height: 214px; padding: 16px 14px; box-sizing: border-box; align-items: center; justify-content: center; flex-direction: column; - border: 1px solid var(--el-border-color); - border-radius: 6px; + border: 1px solid var(--el-border-color-lighter); + border-radius: 8px; background: var(--el-bg-color); + box-shadow: 0 8px 24px rgb(31 45 61 / 6%); } .device-ledger-detail-qrcode-title { @@ -977,7 +1095,7 @@ onMounted(async () => { min-width: 128px; height: 128px; border-color: var(--el-border-color-lighter); - border-radius: 4px; + border-radius: 6px; } .device-ledger-detail-qrcode :deep(.qrcode-action-card__img) {