diff --git a/src/views/mes/deviceledger/detail/editIndex.vue b/src/views/mes/deviceledger/detail/editIndex.vue index d2041ac6..8b0dbb26 100644 --- a/src/views/mes/deviceledger/detail/editIndex.vue +++ b/src/views/mes/deviceledger/detail/editIndex.vue @@ -824,10 +824,21 @@ const formatSelectedSummary = (ids: number[], options: SelectionOption[]) => { } const criticalComponentDisplay = computed(() => - formatSelectedSummary( + /* formatSelectedSummary( formData.value.componentIds ?? [], mergeSelectionOptions(criticalComponentOptions.value, savedCriticalComponentOptions.value) - ) + )*/ + { + if (!ids.value.length)return '' + if (!list.value.length) { + return formData.value.machineId ? String(formData.value.machineId) : '' + } + const map = new Map(list.value.map((item) => [item.id, item.name])) + const names = ids.value + .map((id) => map.get(id)) + .filter((name) => name) + return names.join(',') + } ) const beijianDisplay = computed(() => formatSelectedSummary(formData.value.beijianIds ?? [], mergeSelectionOptions(beijianOptions.value, savedBeijianOptions.value)) @@ -1164,7 +1175,7 @@ const handleCriticalComponentSelectConfirm = (payload: { ids: (number | string)[ }) .filter((item): item is { id: number; name: string } => Boolean(item)) selectedDeviceRows.value = payload.rows - formData.value.machineId = payload.ids.join(',') + formData.value.componentIds = payload.ids.join(',') ids.value = payload.ids.map((id) => Number(id)) appendSelectedCriticalComponentRows(ids.value) } @@ -1259,7 +1270,7 @@ onBeforeUnmount(() => { .device-ledger-detail-body { position: relative; - max-height: 100vh; + min-height: 100vh; padding: 2px 0 72px; }