From b7b6b216fb9dbfd9ebe5b2b51781526757b28ba5 Mon Sep 17 00:00:00 2001
From: yangsy <ysy@ittc.sh.cn>
Date: Fri, 16 Jan 2026 14:36:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E6=81=A2=E5=A4=8D=E7=8A=B6=E6=80=81=E5=92=8C=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E7=8A=B6=E6=80=81=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 | 33 +++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/pages/alarm/alarm-log-page.vue b/src/pages/alarm/alarm-log-page.vue
index a49f0f0..27b8a2a 100644
--- a/src/pages/alarm/alarm-log-page.vue
+++ b/src/pages/alarm/alarm-log-page.vue
@@ -37,6 +37,8 @@ interface SearchFields extends PageQueryExtra<NdmDeviceAlarmLog> {
   alarmType_in: string[];
   faultLevel_in: string[];
   alarmDate: [number, number];
+  alarmCategory: string;
+  alarmConfirm: string;
 }
 
 const route = useRoute();
@@ -105,6 +107,8 @@ const searchFields = ref<SearchFields>({
   alarmType_in: [],
   faultLevel_in: [],
   alarmDate: [dayjs().startOf('date').valueOf(), dayjs().endOf('date').valueOf()],
+  alarmCategory: '',
+  alarmConfirm: '',
 });
 const resetSearchFields = () => {
   searchFields.value = {
@@ -114,6 +118,8 @@ const resetSearchFields = () => {
     alarmType_in: [],
     faultLevel_in: [],
     alarmDate: [dayjs().startOf('date').valueOf(), dayjs().endOf('date').valueOf()],
+    alarmCategory: '',
+    alarmConfirm: '',
   };
 };
 const getExtraFields = (): PageQueryExtra<NdmDeviceAlarmLog> => {
@@ -225,7 +231,10 @@ const { mutate: getTableData, isPending: tableLoading } = useMutation({
 
     const res = await pageDeviceAlarmLogApi(
       {
-        model: {},
+        model: {
+          alarmCategory: searchFields.value.alarmCategory || undefined,
+          alarmConfirm: searchFields.value.alarmConfirm || undefined,
+        },
         extra: getExtraFields(),
         current: pagination.page ?? 1,
         size: pagination.pageSize ?? DEFAULT_PAGE_SIZE,
@@ -333,6 +342,28 @@ onBeforeUnmount(() => {
         <NFormItemGi span="1" label="告警级别" label-placement="left">
           <NSelect multiple clearable placeholder="请选择告警级别" v-model:value="searchFields.faultLevel_in" :options="faultLevelSelectOptions" />
         </NFormItemGi>
+        <NFormItemGi span="1" label="恢复状态" label-placement="left">
+          <NSelect
+            clearable
+            placeholder="请选择恢复状态"
+            v-model:value="searchFields.alarmCategory"
+            :options="[
+              { label: '未恢复', value: '1' },
+              { label: '已恢复', value: '2' },
+            ]"
+          />
+        </NFormItemGi>
+        <NFormItemGi span="1" label="确认状态" label-placement="left">
+          <NSelect
+            clearable
+            placeholder="请选择确认状态"
+            v-model:value="searchFields.alarmConfirm"
+            :options="[
+              { label: '未确认', value: '2' },
+              { label: '已确认', value: '1' },
+            ]"
+          />
+        </NFormItemGi>
         <NFormItemGi span="1" label="告警时间" label-placement="left">
           <NDatePicker v-model:value="searchFields.alarmDate" type="datetimerange" />
         </NFormItemGi>