From c3cc0f86e07515512131e5694d19d57b41d09cef Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 18 Dec 2024 13:45:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/deviceSystem.vue | 9 ++++++++-
 src/views/workbench/index.vue     | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/device/deviceSystem.vue b/src/views/device/deviceSystem.vue
index ef2ab9e..322edc8 100644
--- a/src/views/device/deviceSystem.vue
+++ b/src/views/device/deviceSystem.vue
@@ -3,7 +3,7 @@
     <avue-crud :option="option" :table-loading="loading" :data="data" :search.sync="searchForm" :page.sync="page"
       ref="crud" v-model="form" :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose"
       @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
-      @size-change="sizeChange" @refresh-change="refreshChange" @selection-change="selectionChange" @on-load="onLoad">
+      @size-change="sizeChange" @refresh-change="refreshChange" @selection-change="selectionChange" >
       <template slot-scope="{row}" slot="produceTime">
         {{ row.produceTime.substring(0, 10) }}
       </template>
@@ -463,6 +463,12 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
   },
   mounted() {
+    if(this.$route.query.type){
+      this.searchForm = {
+        ...this.searchForm,
+        runStatus:this.$route.query.type
+      }
+    }
     this.role_id = this.userInfo.role_id
     getChildList(1, 100, '1846792623628001282').then(res => {
       this.treeOptions = res.data.data
@@ -473,6 +479,7 @@ export default {
     getChildList(1, 100, '1858710780677984257').then(res => {
       this.periodArr = res.data.data
     })
+    this.onLoad()
   },
   methods: {
     // 巡检内容修改
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index b835ca6..1826ad1 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -505,7 +505,7 @@ export default {
         current:1,
         size:10,
         dataType: 1,//数据权限
-        statusSearch: '1,2,3,4,6,20,7',//状态5报错
+        statusSearch: '201,401,402,301,403,202,104',//状态5报错
       }).then(res =>{
         this.requirementList = res.data.data.records
       })
@@ -639,6 +639,13 @@ export default {
           this.$router.push('/operation/hand')
         }else if(item.name == '实验室巡检'){
           this.$router.push("/labManagement/inspectionManagement")
+        }else if(item.name == '设备报警'){
+          this.$router.push({
+            path:'/device/deviceSystem',
+            query:{
+              type:'2'
+            }
+          })
         }
       }