1 巡检任务-任务下发 导出 功能优化，隐患反馈 删除报错修复。

2 测试 巡检任务-任务下发 详情页 地图应显示什么数据跟同事了解。
3 隐患管理优化项： 所属单位必选； 添加隐患信息 和 处理隐患信息的 上传图片混淆使用处理；

zh-baseversion-system/src/main/java/com/zehong/system/domain/TWorkOrder.java

@@ -27,7 +27,7 @@ public class TWorkOrder extends BaseEntity
     private String workTitle;
 
     /** 任务类型：1.入户安检 2.巡检 3.报警巡查 4.其他 */
-    @Excel(name = "任务类型：1.入户安检 2.巡检 3.报警巡查 4.其他")
+    @Excel(name = "任务类型", readConverterExp = "1=入户安检,2=巡检,3=报警巡查,4=其他")
     private String workType;
 
     /** 任务内容 */
@@ -39,7 +39,7 @@ public class TWorkOrder extends BaseEntity
     private String workCreateEnterpriseName;
 
     /** 创建单位id */
-    @Excel(name = "创建单位id")
+//    @Excel(name = "创建单位id")
     private String workCreateEnterpriseId;
 
     /** 指派单位名称 */
@@ -47,19 +47,19 @@ public class TWorkOrder extends BaseEntity
     private String workAssignEnterproseName;
 
     /** 指派单位id */
-    @Excel(name = "指派单位id")
+//    @Excel(name = "指派单位id")
     private String workAssignEnterproseId;
 
     /** 指派人 */
-    @Excel(name = "指派人")
+//    @Excel(name = "指派人")
     private Long workAssignManId;
 
     /** 指派人id */
-    @Excel(name = "指派人id")
+    @Excel(name = "指派人")
     private String workAssignMan;
 
     /** 任务状态：1.派发中 2.反馈 3.归档 */
-    @Excel(name = "任务状态：1.派发中 2.反馈 3.归档")
+    @Excel(name = "任务状态", readConverterExp = "1=派发中,2=反馈,3=归档")
     private String workStatus;
 
     /** 巡检时间 */
@@ -103,7 +103,7 @@ public class TWorkOrder extends BaseEntity
     private Date expiryDate;
 
     /** 是否删除(0正常，1删除) */
-    @Excel(name = "是否删除(0正常，1删除)")
+    @Excel(name = "是否删除", readConverterExp = "0=否,1=是")
     private String isDel;
 
     /** 备注 */

zh-baseversion-web/src/views/inspectionWork/workOrder/components/HiddenFeedTrouble.vue

@@ -299,13 +299,14 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const hiddenTroubleId = row.hiddenTroubleId;
+      const hiddenTroubleDealStatus = row.hiddenTroubleDealStatus;
       this.$confirm('是否确认删除隐患名称为"' + row.hiddenTroubleName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
           //return delHiddenInfo(hiddenTroubleId);
-           return updateHiddenInfo({hiddenTroubleId: hiddenTroubleId,isDel: '1'})
+           return updateHiddenInfo({hiddenTroubleId: hiddenTroubleId,isDel: '1',hiddenTroubleDealStatus: hiddenTroubleDealStatus})
         }).then(() => {
         this.getHiddenInfoList({workId:this.workId});
         this.msgSuccess("删除成功");

zh-baseversion-web/src/views/inspectionWork/workOrder/index.vue

@@ -1006,6 +1006,7 @@ export default {
         this.getEnterpriseLists();
         this.getInspectionUserList(response.data.workAssignEnterproseId);
         this.supervisorData(this.form.workId);
+        console.log("response.data = " + response.data)
         this.init(response.data.locationList);
         //[[117.979221,39.805144],[117.979221,39.825144]]
       });
@@ -1226,7 +1227,7 @@ export default {
     init(pipePath) {
       this.$nextTick(() => {
         const path = eval(this.$store.state.user.systemSetting.map_center);
-      console.log("path",path);
+      console.log("path111111",path);
       this.map = new EditorMap("getposmap", {center:path}, this);
         console.log(pipePath)
         if (pipePath!=null && pipePath.length > 0) {

zh-baseversion-web/src/views/system/info/index.vue

@@ -440,7 +440,7 @@
 
 
     <!-- 添加或修改燃气隐患对话框 -->
-    <el-dialog :title="title" :visible.sync="open"  width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" v-if="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
 
         <el-row>
@@ -640,6 +640,7 @@
         url: 'http://192.168.2.16:8905/gassafety/profile/upload/2023/09/08/c55c2d49-2839-46a0-b3cd-7ec1e344efba.jpg',
         srcList: [],
         pictureUrlList:[],
+        pictureUrlListn:[],
         //头像
         fileList: [],
         fileListn:[],
@@ -701,6 +702,9 @@
           hiddenTroubleType: [
             { required: true, message: "请选择隐患类型", trigger: "blur" },
           ],
+          beyondEnterpriseId: [
+            { required: true, message: "所属单位必选", trigger: "blur" },
+          ],
         },
         //隐患处理表单效验
         hiddenDangerRules: {
@@ -720,11 +724,17 @@
       this.getEnterpriseLists();
     },
     methods: {
-      /**上传头像*/
+      // 处理隐患时上传图片组合
+      // pictureUrlListn
+      // fileListn
+
+      // 隐患信息 上传图片组合
+      // pictureUrlList
+      // fileList
+      /**上传图片*/
       getFileInfo(res){
         this.form.dealPlan = res.fileName;
         this.pictureUrlList.push(res.url)
-        console.log(this.pictureUrlList)
         this.form.pictureUrl=this.pictureUrlList.join(",");
         this.form.burl=res.burl;
         this.fileList.push({
@@ -733,6 +743,19 @@
           burl:res.burl,
         });
       },
+      
+      /**处理隐患 上传图片*/
+      getFileInfon(res){
+        this.form.dealPlan = res.fileName;
+        this.pictureUrlListn.push(res.url)
+        this.form.dealUrl=this.pictureUrlListn.join(",");
+        this.form.burl=res.burl;
+        this.fileListn.push({
+          name: res.fileName,
+          url: uploadfile,
+          burl:res.burl,
+        });
+      },
       listRemove(e) {
         this.form.dealPlan = "";
         this.fileList.delete(e.uid)
@@ -883,6 +906,17 @@
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();
+
+        // 隐患信息 上传照片清空
+        this.filelist = [];
+        this.pictureUrlList = [];
+        
+        // 隐患处理 上传照片清空
+        this.fileListn = [];
+        this.pictureUrlListn = [];
+
+        // 上传视频 清空
+        this.fileListVideo = [];
         this.open = true;
         this.title = "添加隐患信息";
         this.getEnterpriseLists();
@@ -997,18 +1031,6 @@
           }
         });
       },
-      /**上传头像*/
-      getFileInfon(res){
-        this.form.dealPlan = res.fileName;
-        this.pictureUrlList.push(res.url)
-        this.form.dealUrl=this.pictureUrlList.join(",");
-        this.form.burl=res.burl;
-        this.fileListn.push({
-          name: res.fileName,
-          url: uploadfile,
-          burl:res.burl,
-        });
-      },
       /**处理隐患提交按钮*/
       submitFormHiddenDanger(){
         this.$refs["form"].validate(valid => {