diff --git a/src/components/station/alarm-detail-modal/alarm-detail-modal.vue b/src/components/station/alarm-detail-modal/alarm-detail-modal.vue index 247be78..a45c47f 100644 --- a/src/components/station/alarm-detail-modal/alarm-detail-modal.vue +++ b/src/components/station/alarm-detail-modal/alarm-detail-modal.vue @@ -59,7 +59,7 @@ const tableColumns = ref[]>([ const stationDevices = lineDevices.value[stationCode]; if (!stationDevices) return; const classified = stationDevices[deviceType]; - const device = classified.find((device) => device.deviceId === rowData.deviceId); + const device = classified.find((device) => !!device.deviceId && device.deviceId === rowData.deviceId); if (!device) return; const deviceDbId = device.id; router.push({ diff --git a/src/pages/alarm-page.vue b/src/pages/alarm-page.vue index b155c34..4f8482a 100644 --- a/src/pages/alarm-page.vue +++ b/src/pages/alarm-page.vue @@ -162,7 +162,7 @@ const tableColumns: DataTableColumns device.deviceId === rowData.deviceId); + const device = classified.find((device) => !!device.deviceId && device.deviceId === rowData.deviceId); if (!device) return; const deviceDbId = device.id; router.push({