From 6c7897198cae45f4da00a4624b6e32225dcfdd53 Mon Sep 17 00:00:00 2001 From: yangsy Date: Thu, 11 Dec 2025 01:30:11 +0800 Subject: [PATCH] fix: alarm-query and secutiryBox switch states --- .../current-diag-card/security-box-info-card.vue | 14 ++++++++------ src/composables/query/use-line-alarms-query.ts | 2 +- src/pages/alarm-page.vue | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/device-page/device-card/current-diag-card/security-box-info-card.vue b/src/components/device-page/device-card/current-diag-card/security-box-info-card.vue index 6e04c6e..4d7487c 100644 --- a/src/components/device-page/device-card/current-diag-card/security-box-info-card.vue +++ b/src/components/device-page/device-card/current-diag-card/security-box-info-card.vue @@ -17,22 +17,24 @@ const cardShow = computed(() => { return Object.values(props).some((value) => !!value); }); -// 门禁状态 (switches[0]: 0=打开/生效, 1=关闭/失效) +// 门禁状态 const accessControlStatus = computed(() => { if (!switches?.value || switches.value.length === 0) return null; - return switches.value[0] === 0 ? '打开' : '关闭'; + const status = switches.value.at(0)!; + return status === 0 ? '开门' : status === 1 ? '关门' : '-'; }); -// 防雷状态 (switches[1]: 0=关闭/失效, 1=打开/生效) +// 防雷状态 const lightningProtectionStatus = computed(() => { if (!switches?.value || switches.value.length < 2) return null; - return switches.value[1] === 1 ? '生效' : '失效'; + const status = switches.value.at(1)!; + return status === 0 ? '正常' : status === 1 ? '失效' : '-'; }); // 获取状态标签类型 const getStatusTagType = (status: string | null) => { - if (['打开', '生效'].includes(status ?? '')) return 'success'; - if (['关闭', '失效'].includes(status ?? '')) return 'error'; + if (['正常'].includes(status ?? '')) return 'success'; + if (['失效'].includes(status ?? '')) return 'error'; return 'default'; }; diff --git a/src/composables/query/use-line-alarms-query.ts b/src/composables/query/use-line-alarms-query.ts index 404eb1f..dcc5fd3 100644 --- a/src/composables/query/use-line-alarms-query.ts +++ b/src/composables/query/use-line-alarms-query.ts @@ -78,7 +78,7 @@ function useStationAlarmCountsMutation() { }, size: 50000, current: 1, - sort: 'id', + sort: 'alarmDate', order: 'descending', }, { diff --git a/src/pages/alarm-page.vue b/src/pages/alarm-page.vue index c0b6cf6..5a79e92 100644 --- a/src/pages/alarm-page.vue +++ b/src/pages/alarm-page.vue @@ -342,6 +342,7 @@ const onClickQuery = () => { tablePagination.pageSize = 10; searchFieldsChanged.value = false; } + realtimeRefresh.value = false; getTableData(); };