From c27bea784a6223fac6081569065cd39a8f6f2780 Mon Sep 17 00:00:00 2001
From: liukewei <huamar123>
Date: Fri, 22 Dec 2023 10:22:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=B4=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=E5=92=8C=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ehs/EhsNoticeMessageController.java       | 11 +++-
 .../domain/EhsNoticeMessage.java              |  2 +
 .../src/views/ehs/ehsHiddenDanger/index.vue   | 13 +++--
 .../views/ehs/ehsHiddenDanger/indexAssist.vue | 12 ++--
 .../src/views/ehs/ehsNoticeMessage/index.vue  | 57 ++++++++++++-------
 .../views/ehs/ehsNoticeMessage/indexDept.vue  |  8 ++-
 ruoyi-ui/src/views/index.vue                  | 14 ++---
 7 files changed, 76 insertions(+), 41 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsNoticeMessageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsNoticeMessageController.java
index 0c67714..7329f35 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsNoticeMessageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsNoticeMessageController.java
@@ -89,7 +89,16 @@ public class EhsNoticeMessageController extends BaseController
 	@GetMapping(value = "/{noticeMessageId}")
 	public AjaxResult getInfo(@PathVariable("noticeMessageId") Long noticeMessageId)
 	{
-		return success(ehsNoticeMessageService.selectEhsNoticeMessageByNoticeMessageId(noticeMessageId));
+		EhsNoticeMessage ehsNoticeMessage = ehsNoticeMessageService.selectEhsNoticeMessageByNoticeMessageId(noticeMessageId);
+		if(StringUtils.isNotEmpty(ehsNoticeMessage.getDeptList())){
+			String[] s =ehsNoticeMessage.getDeptList().split(",");
+			Long[] l = new Long[s.length];
+			for (int i =0;i<s.length;i++ ) {
+				l[i] = Long.parseLong(s[i]);
+			}
+			ehsNoticeMessage.setDeptListArray(l);
+		}
+		return success(ehsNoticeMessage);
 	}
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsNoticeMessage/domain/EhsNoticeMessage.java b/ruoyi-system/src/main/java/com/ruoyi/ehsNoticeMessage/domain/EhsNoticeMessage.java
index 8328459..3587d6b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsNoticeMessage/domain/EhsNoticeMessage.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsNoticeMessage/domain/EhsNoticeMessage.java
@@ -90,4 +90,6 @@ public class EhsNoticeMessage extends BaseEntity
 
     @TableField(exist = false)
     private String messageFileId;
+    @TableField(exist = false)
+    private Long[] deptListArray;
 }
diff --git a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
index df74517..8ff5087 100644
--- a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
@@ -266,6 +266,11 @@
           <el-link type="primary" @click="val => {assistDeptClick(val, scope.row);}" > {{(scope.row.assistDept=='' ||scope.row.assistDept==null)?"无协办单位": "显示协办单位" }} </el-link>
         </template>
       </el-table-column>
+      <el-table-column label="整改情况" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.hidden_danger_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="整改资金" align="center" prop="rectifyMoney" />
       <el-table-column label="标签" align="center" prop="hiddenDangerLabel">
         <template slot-scope="scope">
@@ -551,7 +556,7 @@ import {listAllDept } from "@/api/system/dept";
 import enterpriseSelect from "./enterpriseSelect"
 export default {
   name: "EhsHiddenDanger",
-  dicts: ['hidden_danger_type', 'hidden_danger_grade', 'hidden_danger_label', 'enterprise_type','enterprise_scale','economic_type','area_id'],
+  dicts: ['hidden_danger_type', 'hidden_danger_grade', 'hidden_danger_label', 'enterprise_type','enterprise_scale','economic_type','area_id', "hidden_danger_status"],
   components:{ enterpriseSelect  },
   data() {
     return {
@@ -774,6 +779,7 @@ export default {
         this.form = response.data;
   /*      this.form.hiddenDangerLabelArray.push("0");
         this.form.hiddenDangerLabelArray.push("1");*/
+      console.log(this.form.hiddenDangerLabelArray);
         this.open = true;
         this.title = "修改隐患信息";
       });
@@ -878,10 +884,7 @@ export default {
         this.$alert(row.assistDeptName, '协办单位', {
           confirmButtonText: '确定',
           callback: action => {
-            this.$message({
-              type: 'info',
-              message: `action: ${ action }`
-            });
+
           }
         });
       }
diff --git a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/indexAssist.vue b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/indexAssist.vue
index 542b086..3789955 100644
--- a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/indexAssist.vue
+++ b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/indexAssist.vue
@@ -185,6 +185,11 @@
           <el-link type="primary" @click="val => {assistDeptClick(val, scope.row);}" > {{(scope.row.assistDept=='' ||scope.row.assistDept==null)?"无协办单位": "显示协办单位" }} </el-link>
         </template>
       </el-table-column>
+      <el-table-column label="整改情况" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.hidden_danger_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="整改资金" align="center" prop="rectifyMoney" />
       <el-table-column label="标签" align="center" prop="hiddenDangerLabel">
         <template slot-scope="scope">
@@ -212,7 +217,7 @@ import {listAllDept } from "@/api/system/dept";
 import enterpriseSelect from "./enterpriseSelect"
 export default {
   name: "EhsHiddenDanger",
-  dicts: ['hidden_danger_type', 'hidden_danger_grade', 'hidden_danger_label', 'enterprise_type'],
+  dicts: ['hidden_danger_type', 'hidden_danger_grade', 'hidden_danger_label', 'enterprise_type', "hidden_danger_status"],
   components:{ enterpriseSelect  },
   data() {
     return {
@@ -473,10 +478,7 @@ export default {
         this.$alert(row.assistDeptName, '协办单位', {
           confirmButtonText: '确定',
           callback: action => {
-            this.$message({
-              type: 'info',
-              message: `action: ${ action }`
-            });
+
           }
         });
       }
diff --git a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue
index 507cb7b..a4272d6 100644
--- a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue
@@ -69,7 +69,9 @@
       </el-table-column>
       <el-table-column label="任务模板" align="center" prop="fileTempOriginalName" v-if ="taskShow" >
         <template slot-scope="scope">
-          <el-link type="primary" @click="downloadFile(scope.row)" > {{(scope.row.fileTempOriginalName=='' ||scope.row.fileTempOriginalName==null)?"": scope.row.fileTempOriginalName }} </el-link>
+          <span v-for="(item, index) in (scope.row.fileTempName==null?'':scope.row.fileTempName).split(',')" :key="index" >
+            <el-link type="primary" @click="downloadFile(scope.row,index)" > {{(scope.row.fileTempOriginalName=='' ||scope.row.fileTempOriginalName==null)?"": scope.row.fileTempOriginalName.split(",")[index] }} </el-link>
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="发布状态" align="center" prop="status" >
@@ -145,10 +147,10 @@
           <el-select  v-model="form.deptList" multiple collapse-tags v-if = "deptShow"
             style="margin-left: 20px;" placeholder="请选择">
             <el-option
-              v-for="dict in allDeptList"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict.deptId"
+              v-for="de in allDeptList"
+              :key="de.deptId"
+              :label="de.deptName"
+              :value="de.deptId"
             />
           </el-select>
         </el-form-item>
@@ -397,6 +399,14 @@ export default {
       const noticeMessageId = row.noticeMessageId || this.ids
       getEhsNoticeMessage(noticeMessageId).then(response => {
         this.form = response.data;
+        if(this.form.allDept == 1){
+          this.allDeptCheck = true;
+          this.deptShow = false;
+          this.form.deptList = ""
+        }else{
+          this.form.deptList = this.form.deptList.split(",").map(Number);
+          console.log(this.form.deptList);
+        }
         this.open = true;
         this.title = "修改";
       });
@@ -404,10 +414,8 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
-        if(this.form.fileTempName==null ||this.form.fileTempName==''){
-          this.$modal.alert("请选择模板文件");
-          return;
-        }
+
+
         if (valid) {
           let ad = this.allDeptCheck ==true ? 1:0;
           this.form.allDept = ad;
@@ -416,15 +424,26 @@ export default {
           else
             this.form.deptList = "";
           //文件
-          let fileTemp = this.form.fileTempName.split(",");
-          let oFile = [];
-          for(let i=0;i<fileTemp.length ;i++){
-            let f = fileTemp[i].split("/");
-            let f1 = f[f.length-1].split("_")[0];
-            let f2 = f[f.length-1].split(".")[1];
-            oFile.push(f1+"."+f2);
+          if(this.taskShow == 1){
+            if(this.form.fileTempName==null ||this.form.fileTempName==''){
+              this.$modal.alert("请选择模板文件");
+              return;
+            }
+            let fileTemp = this.form.fileTempName.split(",");
+            let oFile = [];
+            for(let i=0;i<fileTemp.length ;i++){
+              let f = fileTemp[i].split("/");
+              let f1 = f[f.length-1].split("_");
+              let fName = [];
+              for(let j = 0 ;j< f1.length-1;j++){
+                fName.push(f1[j]);
+              }
+              let fLast = f1[f1.length-1].split(".")
+              let f2 =fName.join("_")+"."+ fLast[fLast.length-1];
+              oFile.push(f2);
+            }
+            this.form.fileTempOriginalName =  oFile.join(",");
           }
-          this.form.fileTempOriginalName =  oFile.join(",");
           if (this.form.noticeMessageId != null) {
             updateEhsNoticeMessage(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -495,8 +514,8 @@ export default {
         this.loading = false;
       })
     },
-    downloadFile(row){
-      this.$download.saveAs(`${process.env.VUE_APP_BASE_API}${row.fileTempName}`,`${row.fileTempOriginalName}`);
+    downloadFile(row,index){
+      this.$download.saveAs(`${process.env.VUE_APP_BASE_API}${row.fileTempName.split(",")[index]}`,`${row.fileTempOriginalName.split(",")[index]}`);
     },
     downAllFile(){
       let p =  "/ehsNoticeMessageFile/ehsNoticeMessageFile/downloadlist/" + this.downaAllnoticeMessageId
diff --git a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue
index 519eb27..659d1bb 100644
--- a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue
+++ b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue
@@ -77,7 +77,9 @@
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="任务模板" align="center" prop="fileTempOriginalName" v-if ="taskShow" >
         <template slot-scope="scope">
-          <el-link type="primary" @click="downloadFile(scope.row)" > {{(scope.row.fileTempOriginalName=='' ||scope.row.fileTempOriginalName==null)?"": scope.row.fileTempOriginalName }} </el-link>
+          <span v-for="(item, index) in scope.row.fileTempName.split(',')" :key="index" >
+            <el-link type="primary" @click="downloadFile(scope.row,index)" > {{(scope.row.fileTempOriginalName=='' ||scope.row.fileTempOriginalName==null)?"": scope.row.fileTempOriginalName.split(",")[index] }} </el-link>
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="提交状态" align="center" prop="status" >
@@ -463,8 +465,8 @@ export default {
         this.getList();
       });
     },
-    downloadFile(row){
-      this.$download.saveAs(`${process.env.VUE_APP_BASE_API}${row.fileTempName}`,`${row.fileTempOriginalName}`);
+    downloadFile(row,index){
+      this.$download.saveAs(`${process.env.VUE_APP_BASE_API}${row.fileTempName.split(",")[index]}`,`${row.fileTempOriginalName.split(",")[index]}`);
     },
     downloadDeptFile(row){
       this.$download.saveAs(`${process.env.VUE_APP_BASE_API}${row.fileName}`,`${row.originalName}`);
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index f7d980a..44c3d94 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -177,11 +177,9 @@
           prop="principalName"
         />
         <el-table-column label="整改情况" align="center" prop="status" >
-        <template slot-scope="scope">
-            <span>
-              {{statusToStr(scope.row.status)}}
-             </span>
-        </template>
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.hidden_danger_status" :value="scope.row.status"/>
+          </template>
         </el-table-column>
 
       </el-table>
@@ -211,7 +209,7 @@
 
   export default {
     name: "Index",
-    dicts: ["hidden_danger_grade", "hidden_danger_status","hidden_danger_type"],
+    dicts: ["hidden_danger_grade", "hidden_danger_status","hidden_danger_type" ],
     data() {
       return {
         showSearch: true,
@@ -344,14 +342,14 @@
       cancel() {
         this.open = false;
       },
-      statusToStr(value) {
+      /*statusToStr(value) {
         if(value=="0")
           return "未整改"
         else if(value=="10")
           return "已整改"
         else
           return "未知"
-      },
+      },*/
     },
   };
 </script>