From 3da8dc91a8a255138a413123b4f98b3d6e7c7958 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Wed, 5 Jun 2024 15:35:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E7=BB=88=E7=AB=AF=E9=80=80?=
 =?UTF-8?q?=E8=BF=90=E9=80=89=E6=8B=A9=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pqs/supervise/retire/monitor.vue  | 20 ++++++++++----------
 src/views/pqs/supervise/retire/terminal.vue | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/views/pqs/supervise/retire/monitor.vue b/src/views/pqs/supervise/retire/monitor.vue
index 0e49459a..396a78cd 100644
--- a/src/views/pqs/supervise/retire/monitor.vue
+++ b/src/views/pqs/supervise/retire/monitor.vue
@@ -2,7 +2,7 @@
 <template>
   <div class='default-main'>
     <TableHeader date-picker>
-      <template v-slot:select>
+      <template #select>
           <el-form-item label="审核状态">
               <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
                   <el-option
@@ -155,19 +155,15 @@ const tableStore = new TableStore({
     }
   ],
   beforeSearchFun: () => {
-    for (let key in tableStore.table.params) {
-      if (tableStore.table.params[key] === '') {
-        delete tableStore.table.params[key]
-      }
+    // for (let key in tableStore.table.params) {
+    //   if (tableStore.table.params[key] === '') {
+    //     delete tableStore.table.params[key]
+    //   }
 
-    }
+    // }
     tableStore.table.params.deviceType = 2
   }
 })
-onMounted(() => {
-  // 加载数据
-  tableStore.index()
-})
 tableStore.table.params.searchValue = ''
 tableStore.table.params.status = ''
 provide('tableStore', tableStore)
@@ -209,6 +205,10 @@ const cancelLeave = async (row: any) => {
   tableStore.index()
 }
 
+onMounted(() => {
+  // 加载数据
+  tableStore.index()
+})
 watch(
     () => currentRoute.value.path,
     () => {
diff --git a/src/views/pqs/supervise/retire/terminal.vue b/src/views/pqs/supervise/retire/terminal.vue
index 9cc181e8..d80ef0a8 100644
--- a/src/views/pqs/supervise/retire/terminal.vue
+++ b/src/views/pqs/supervise/retire/terminal.vue
@@ -179,18 +179,14 @@ const tableStore = new TableStore({
         }
     ],
     beforeSearchFun: () => {
-        for (let key in tableStore.table.params) {
-            if (tableStore.table.params[key] === '') {
-                delete tableStore.table.params[key]
-            }
-        }
+        // for (let key in tableStore.table.params) {
+        //     if (tableStore.table.params[key] === '') {
+        //         delete tableStore.table.params[key]
+        //     }
+        // }
         tableStore.table.params.deviceType = 1
     }
 })
-onMounted(() => {
-    // 加载数据
-    tableStore.index()
-})
 tableStore.table.params.status = ''
 tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
@@ -231,6 +227,11 @@ const cancelLeave = async (row: any) => {
     // 加载数据
     tableStore.index()
 }
+
+onMounted(() => {
+    // 加载数据
+    tableStore.index()
+})
 watch(
     () => currentRoute.value.path,
     () => {