From add705dc085a92238eb5297159cdaeb9c8b01c04 Mon Sep 17 00:00:00 2001
From: 15036302109 <zhp5211314>
Date: Wed, 13 Mar 2024 09:35:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E5=8A=9E=E5=9B=BE=E6=A0=87=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=8D=8F=E5=8A=9E=E6=8A=A5=E9=94=99Bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
index 436be2f..3a3c88b 100644
--- a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
@@ -374,7 +374,7 @@
           <!--<el-button v-if="scope.row.isSupervise==0"
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            icon="el-icon-s-tools"
             @click="handleIsSupervise(scope.row)"
             v-hasPermi="['ehsHiddenDanger:ehsHiddenDanger:supervise']"
           >督办</el-button>-->
@@ -382,21 +382,21 @@
           <el-button
              size="mini"
              type="text"
-             icon="el-icon-delete"
+             icon="el-icon-setting"
              @click="handleAssist(scope.row)"
              v-hasPermi="['ehsHiddenDanger:ehsHiddenDanger:assist']"
           >协办</el-button>
           <el-button v-if="scope.row.isSupervise==1 && ( scope.row.superviseResult=='' || scope.row.superviseResult==null)"
              size="mini"
              type="text"
-             icon="el-icon-delete"
+             icon="el-icon-s-comment"
              @click="handleAssistResult(scope.row)"
              v-hasPermi="['ehsHiddenDanger:ehsHiddenDanger:assistResult']"
           >录入反馈</el-button>
           <el-button v-if="scope.row.superviseResult!=null && scope.row.superviseResult!=''  "
                      size="mini"
                      type="text"
-                     icon="el-icon-delete"
+                     icon="el-icon-document"
                      @click="handleShowAssistResult(scope.row)"
                      v-hasPermi="['ehsHiddenDanger:ehsHiddenDanger:showAssistResult']"
           >显示反馈</el-button>
@@ -1041,13 +1041,16 @@ export default {
     handleAssist(row) {
       this.reset();
       this.openAssist = true;
-      this.assistDeptList = row.assistDept.split(",").map(Number);
+      if (row.assistDept) {
+        this.assistDeptList = row.assistDept.split(",").map(Number);
+      } else {
+        this.assistDeptList = [];
+      }
       this.currAssistHiddenDangerId = row.hiddenDangerId;
     },
     /** 协办提交*/
     assistForm() {
       let deptIds = this.assistDeptList.join();
-      console.log(this.currAssistHiddenDangerId)
       if (this.currAssistHiddenDangerId != null) {
         assistEhsHiddenDanger({"hiddenDangerId":this.currAssistHiddenDangerId,"assistDept":deptIds}).then(response => {
           this.$modal.msgSuccess("协办成功");