From 3d9825f58a2bbe5e1fd27d33a3d068d36e83f259 Mon Sep 17 00:00:00 2001
From: yangsy <ysy@ittc.sh.cn>
Date: Wed, 4 Feb 2026 15:28:21 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E5=A4=8D=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA=E6=9C=AA=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/alarm/alarm-log-page.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/alarm/alarm-log-page.vue b/src/pages/alarm/alarm-log-page.vue
index 92c64bd..986a1e4 100644
--- a/src/pages/alarm/alarm-log-page.vue
+++ b/src/pages/alarm/alarm-log-page.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { exportDeviceAlarmLogApi, pageDeviceAlarmLogApi, type NdmDeviceAlarmLog, type NdmDeviceAlarmLogResultVO, type PageQueryExtra, type Station } from '@/apis';
+import { exportDeviceAlarmLogApi, pageDeviceAlarmLogApi, type NdmDeviceAlarmLog, type NdmDeviceAlarmLogPageQuery, type NdmDeviceAlarmLogResultVO, type PageQueryExtra, type Station } from '@/apis';
 import { useAlarmActionColumn, useCameraSnapColumn } from '@/composables';
 import { ALARM_TYPES, DEVICE_TYPE_CODES, DEVICE_TYPE_LITERALS, DEVICE_TYPE_NAMES, FAULT_LEVELS, tryGetDeviceType, type DeviceType } from '@/enums';
 import { renderAlarmDateCell, renderAlarmTypeCell, renderDeviceTypeCell, renderFaultLevelCell } from '@/helpers';
@@ -132,6 +132,12 @@ const resetSearchFields = () => {
     alarmConfirm: '',
   };
 };
+const getModelFields = (): NdmDeviceAlarmLogPageQuery => {
+  return {
+    alarmCategory: searchFields.value.alarmCategory || undefined,
+    alarmConfirm: searchFields.value.alarmConfirm || undefined,
+  };
+};
 const getExtraFields = (): PageQueryExtra<NdmDeviceAlarmLog> => {
   const stationCodeIn = searchFields.value.stationCode_in;
   const deviceTypeIn = searchFields.value.deviceType_in.flatMap((deviceType) => DEVICE_TYPE_CODES[deviceType as DeviceType]);
@@ -244,10 +250,7 @@ const { mutate: getTableData, isPending: tableLoading } = useMutation({
 
     const res = await pageDeviceAlarmLogApi(
       {
-        model: {
-          alarmCategory: searchFields.value.alarmCategory || undefined,
-          alarmConfirm: searchFields.value.alarmConfirm || undefined,
-        },
+        model: getModelFields(),
         extra: getExtraFields(),
         current: pagination.page ?? 1,
         size: pagination.pageSize ?? DEFAULT_PAGE_SIZE,
@@ -302,7 +305,7 @@ const { mutate: exportTableData, isPending: exporting } = useMutation({
 
     const data = await exportDeviceAlarmLogApi(
       {
-        model: {},
+        model: getModelFields(),
         extra: getExtraFields(),
         current: pagination.page ?? 1,
         size: pagination.pageSize ?? 10,