From ca488a079383aee5b9b4dcf4bad69e30a9911c4f Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Wed, 9 Oct 2024 14:06:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=B1=95=E7=A4=BA-=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=91=8A=E8=AD=A6=E7=A8=B3=E6=80=81=E8=B6=8A=E9=99=90?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=9A=82=E6=80=81=E4=BA=8B=E4=BB=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8-=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90deviceId=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BC=A0=E9=80=92=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/govern/alarm/Device.vue    | 16 ++++++++++------
 src/views/govern/alarm/Steady.vue    |  7 ++++++-
 src/views/govern/alarm/Transient.vue |  5 +++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/views/govern/alarm/Device.vue b/src/views/govern/alarm/Device.vue
index 290f89f..22dd70c 100644
--- a/src/views/govern/alarm/Device.vue
+++ b/src/views/govern/alarm/Device.vue
@@ -3,7 +3,7 @@
         <template v-slot:select>
             <el-form-item label="数据来源">
                 <el-cascader
-                            v-model="tableStore.table.params.cascader"
+                    v-model="tableStore.table.params.cascader"
                     placeholder="请选择数据来源"
                     @change="sourceChange"
                     :options="props.deviceTree"
@@ -26,7 +26,7 @@
         </template>
     </TableHeader>
     <!-- <div style="height: 300px;"> -->
-    <Table ref="tableRef"  :isGroup="true"/>
+    <Table ref="tableRef" :isGroup="true" />
     <!-- </div> -->
 </template>
 <script setup lang="ts">
@@ -72,7 +72,7 @@ const rankOptions = ref([
 const tableStore = new TableStore({
     url: '/cs-harmonic-boot/eventUser/queryEventpage',
     method: 'POST',
-    publicHeight:65,
+    publicHeight: 65,
     column: [
         { title: '工程名称', field: 'engineeringName', align: 'center' },
         { title: '项目名称', field: 'projectName', align: 'center' },
@@ -80,7 +80,12 @@ const tableStore = new TableStore({
         { title: '告警代码', field: 'code', align: 'center' },
         { title: '事件描述', field: 'showName', align: 'center' },
         { title: '发生时刻', field: 'startTime', align: 'center' }
-    ]
+    ],
+    beforeSearchFun: () => {
+        if (!tableStore.table.params.deviceId) {
+            delete tableStore.table.params.deviceId
+        }
+    }
 })
 
 provide('tableStore', tableStore)
@@ -88,7 +93,7 @@ provide('tableStore', tableStore)
 //   "type": "",
 //   "userId": ""
 tableStore.table.params.cascader = ''
-tableStore.table.params.level=''
+tableStore.table.params.level = ''
 tableStore.table.params.engineeringid = ''
 tableStore.table.params.projectId = ''
 tableStore.table.params.deviceId = ''
@@ -98,7 +103,6 @@ tableStore.table.params.status = ''
 tableStore.table.params.target = []
 tableStore.table.params.userId = ''
 
-
 const sourceChange = (e: any) => {
     tableStore.table.params.engineeringid = e[1] || ''
     tableStore.table.params.projectId = e[2] || ''
diff --git a/src/views/govern/alarm/Steady.vue b/src/views/govern/alarm/Steady.vue
index 18b913c..1f1a5f0 100644
--- a/src/views/govern/alarm/Steady.vue
+++ b/src/views/govern/alarm/Steady.vue
@@ -79,7 +79,12 @@ const tableStore = new TableStore({
         { title: '设备名称', field: 'equipmentName', align: 'center' },
         { title: '事件描述', field: 'showName', align: 'center' },
         { title: '发生时刻', field: 'startTime', align: 'center' }
-    ]
+    ],
+    beforeSearchFun: () => {
+        if (!tableStore.table.params.deviceId) {
+            delete tableStore.table.params.deviceId
+        }
+    }
 })
 
 provide('tableStore', tableStore)
diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue
index d2b7baa..aa8c8df 100644
--- a/src/views/govern/alarm/Transient.vue
+++ b/src/views/govern/alarm/Transient.vue
@@ -158,6 +158,11 @@ const tableStore = new TableStore({
             ]
         }
     ],
+    beforeSearchFun: () => {
+        if (!tableStore.table.params.deviceId) {
+            delete tableStore.table.params.deviceId
+        }
+    },
     loadCallback: () => {
         tableStore.table.data.forEach((item: any) => {
             item.loading = false