2222

src/views/danger/addDanger/addDanger.vue

@@ -27,7 +27,11 @@
         @click="showProjectName = true"
         :rules="[{ required: true, message: '所属项目不能为空' }]"
       />
-      <van-popup v-model="showProjectName" position="bottom">
+      <van-popup
+        v-model="showProjectName"
+        position="bottom"
+        v-if="!isShowreturnCause"
+      >
         <van-picker
           show-toolbar
           value-key="projectName"
@@ -47,7 +51,11 @@
         @click="showRange = true"
         :rules="[{ required: true, message: '适用范围不能为空' }]"
       />
-      <van-popup v-model="showRange" position="bottom">
+      <van-popup
+        v-model="showRange"
+        position="bottom"
+        v-if="!isShowreturnCause"
+      >
         <van-picker
           show-toolbar
           value-key="hdRange"
@@ -66,8 +74,9 @@
         placeholder="请选择"
         @click="showType = true"
         :rules="[{ required: true, message: '隐患类型不能为空' }]"
+        :class="{'gray':isShowreturnCause}"
       />
-      <van-popup v-model="showType" position="bottom">
+      <van-popup v-model="showType" position="bottom" v-if="!isShowreturnCause">
         <van-picker
           show-toolbar
           value-key="hdType"
@@ -87,7 +96,11 @@
         @click="showDangerName = true"
         :rules="[{ required: true, message: '隐患项目名称不能为空' }]"
       />
-      <van-popup v-model="showDangerName" position="bottom">
+      <van-popup
+        v-model="showDangerName"
+        position="bottom"
+        v-if="!isShowreturnCause"
+      >
         <van-picker
           show-toolbar
           value-key="hdName"
@@ -216,7 +229,29 @@
             :max-count="5"
             upload-text="最多上传五个"
             v-model="uploaderImg"
-          />
+          >
+            <template slot="default">
+              <!-- 11111111111 -->
+              <div
+                style="
+                  width: 2.13333rem;
+                  height: 2.13333rem;
+                  background: #f7f8fa;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  flex-direction: column;
+                "
+              >
+                <img
+                  src="@/assets/upload/pic.png"
+                  alt=""
+                  style="width: 0.64rem; height: 0.64rem"
+                />
+                <span class="van-uploader__upload-text">最多上传五个</span>
+              </div>
+            </template>
+          </van-uploader>
         </template>
       </van-field>
 
@@ -228,7 +263,29 @@
             upload-text="最多上传五个"
             v-model="uploaderVideo"
             accept="video/*"
-          />
+          >
+            <template slot="default">
+              <!-- 11111111111 -->
+              <div
+                style="
+                  width: 2.13333rem;
+                  height: 2.13333rem;
+                  background: #f7f8fa;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  flex-direction: column;
+                "
+              >
+                <img
+                  src="@/assets/upload/video.png"
+                  alt=""
+                  style="width: 0.64rem; height: 0.64rem"
+                />
+                <span class="van-uploader__upload-text">最多上传五个</span>
+              </div>
+            </template>
+          </van-uploader>
         </template>
       </van-field>
       <van-field
@@ -370,6 +427,7 @@ export default {
 
   data() {
     return {
+      id: 0,
       text: "新增隐患",
       taskId: "",
       projectId: "", // 所属工程
@@ -443,6 +501,7 @@ export default {
 
     onSubmit(values) {
       let formdata = new FormData();
+      formdata.append("id", this.id);
       formdata.append("proId", this.projectId);
       // formdata.append("projectName", this.projectName);
       formdata.append("hdRange", values.hdRange);
@@ -526,8 +585,9 @@ export default {
           // 对数据进行赋值
           this.returnCause = res.data.reason;
           let msg = res.data.hdReport;
-          msg.hdPictureList=msg.hdPictureList||[];
-          msg.hdVideoList=msg.hdVideoList||[];
+          // msg.hdPictureList=msg.hdPictureList||[];
+          // msg.hdVideoList=msg.hdVideoList||[];
+          this.id = msg.id;
           this.projectId = msg.proId;
           this.projectName = res.data.projectInformations.filter(
             (item) => item.id == msg.proId
@@ -544,20 +604,28 @@ export default {
           this.describe = msg.hdDescribe;
           this.expireTime = msg.hdExpirationTime;
           this.recPeople = msg.rectificationUser;
-          this.uploaderImg = msg.hdPictureList.map(item=>{
+          this.uploaderImg = (res.data.imgsysFiles || []).map((item) => {
             return {
               ...item,
-              url:item.filePath
-            }
-          })
-          this.uploaderVideo =  msg.hdVideoList.map(item=>{
+              url: item.filePath,
+            };
+          });
+          console.log(this.uploaderImg);
+          this.uploaderVideo = (res.data.videosysFiles || []).map((item) => {
             return {
               ...item,
-              url:item.filePath
+              url: item.filePath,
+            };
+          });
+
+          postHdShowPeople(`/hdreport/showPeople/${msg.proId}`).then(
+            (res) => {
+              this.columnsRecPeople = res.data;
             }
-          })
+          );
         })
-        .catch(() => {
+        .catch((err) => {
+          console.log(err);
           this.$toast.clear();
           this.$toast.fail("加载失败,请稍后再试");
         });

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -23,6 +23,10 @@
         <van-col span="6">隐患类型：</van-col>
         <van-col span="18">{{ item.hdType }}</van-col>
       </van-row>
+      <van-row gutter="">
+        <van-col span="6">工单状态：</van-col>
+        <van-col span="18">{{ item.taskName }}</van-col>
+      </van-row>
       <!-- <van-row gutter="">
         <van-col span="6">发现时间：</van-col>
         <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
@@ -59,7 +63,10 @@
           :value="value"
           label="整改截止时间"
           placeholder="点击选择日期"
-          @click="showCalendar = true;currentDate = new Date()"
+          @click="
+            showCalendar = true;
+            currentDate = new Date();
+          "
           :rules="[{ required: true, message: '请选择日期' }]"
         />
         <van-popup v-model="showCalendar" position="bottom">
@@ -135,13 +142,13 @@
         />
       </div>
 
-      <div style="margin: 16px;">
+      <div style="margin: 16px">
         <van-button round block type="info" native-type="submit"
           >保存</van-button
         >
       </div>
     </van-form>
-    <div style="margin:10px 16px 0px;padding-bottom:16px">
+    <div style="margin: 10px 16px 0px; padding-bottom: 16px">
       <van-button round block type="warning" @click.native="cancel"
         >取消</van-button
       >
@@ -151,13 +158,13 @@
 
 <script>
 import LHeader from "@/components/header.vue";
-import {getFun,postFun} from "@/service/table.js";
+import { getFun, postFun } from "@/service/table.js";
 import { timestampToTime } from "@/utils/format";
 import { getConfirmFormList, dangerConSub } from "@/service/danger";
 export default {
   name: "affirm-danger",
   components: {
-    LHeader
+    LHeader,
   },
   data() {
     return {
@@ -177,19 +184,18 @@ export default {
       showPickerReview: false,
       valueIdea: "",
       returnReason: "",
-      currentDate: new Date()
+      currentDate: new Date(),
     };
   },
 
   beforeRouteEnter(to, from, next) {
-    next(vm => {
+    next((vm) => {
       if (from.name === "confirme-danger") {
         vm.messageList = [];
         let paramsData = to.params.data;
         vm.taskId = paramsData.taskId;
         vm.messageList.push(paramsData);
-        vm.radio= "1",
-        vm.value = "";
+        (vm.radio = "1"), (vm.value = "");
         vm.rectId = ""; // 隐患整改人
         vm.valueRect = "";
         vm.reviewId = ""; // 隐患复查人
@@ -198,7 +204,7 @@ export default {
         vm.returnReason = "";
         vm.getFormList();
         // 清空数据
-        vm.currentDate = new Date()
+        vm.currentDate = new Date();
       }
     });
   },
@@ -213,10 +219,10 @@ export default {
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
       getConfirmFormList(`confirm/add/${this.taskId}`)
-        .then(res => {
+        .then((res) => {
           this.$toast.clear();
           this.columnsRect = res.data.rectificationUser;
           this.columnsReview = res.data.rectificationReview;
@@ -234,22 +240,31 @@ export default {
       }
       let formdata = new FormData();
       formdata.append("confirmResult", this.radio);
-      formdata.append("endTime", values.endTime?values.endTime:'');
-      formdata.append("rectificationUser", values.rectificationUser?values.rectificationUser:'');
-      formdata.append("rectificationReview", values.rectificationReview?values.rectificationReview:'');
-      formdata.append("confirmOpinion", values.confirmOpinion?values.confirmOpinion:'');
+      formdata.append("endTime", values.endTime ? values.endTime : "");
+      formdata.append(
+        "rectificationUser",
+        values.rectificationUser ? values.rectificationUser : ""
+      );
+      formdata.append(
+        "rectificationReview",
+        values.rectificationReview ? values.rectificationReview : ""
+      );
+      formdata.append(
+        "confirmOpinion",
+        values.confirmOpinion ? values.confirmOpinion : ""
+      );
       this.$toast.loading({
         message: "提交中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
       dangerConSub(`/confirm/add1/${this.taskId}`, formdata)
-        .then(res => {
+        .then((res) => {
           this.$toast.clear();
           this.$toast.success({
             message: "提交成功",
-            duration: 2000
+            duration: 2000,
           });
           history.go(-1);
         })
@@ -270,18 +285,18 @@ export default {
     },
 
     onConRect(value) {
-      if(!value){
+      if (!value) {
         this.showPickerRect = false;
-        return
+        return;
       }
       this.valueRect = value.userName;
       this.rectId = value.userId;
       this.showPickerRect = false;
     },
     onConReview(value) {
-      if(!value){
+      if (!value) {
         this.showPickerReview = false;
-        return
+        return;
       }
       this.valueReview = value.userName;
       this.reviewId = value.userId;
@@ -292,15 +307,15 @@ export default {
       this.$router.push({
         name: "normal-detail",
         params: {
-          id: taskId
-        }
+          id: taskId,
+        },
       });
     },
 
     cancel() {
       this.$router.go(-1);
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>

src/views/danger/confirmeDanger/index.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-     <van-sticky offset-top="1.5rem">
+    <van-sticky offset-top="1.5rem">
       <van-search
         v-model="searchValue"
         show-action
@@ -45,9 +45,13 @@
           <van-col span="6">隐患类型：</van-col>
           <van-col span="18">{{ item.hdType }}</van-col>
         </van-row>
+        <van-row gutter="">
+          <van-col span="6">工单状态：</van-col>
+          <van-col span="18">{{ item.taskName }}</van-col>
+        </van-row>
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop ="showIndex = null">
+          <div class="wrapper" @click.stop="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -61,24 +65,30 @@
 
     <!-- 暂无数据 -->
     <div
-      style="width: 100%;text-align: center; font-size: .48rem;position: fixed; top: 30%;"
+      style="
+        width: 100%;
+        text-align: center;
+        font-size: 0.48rem;
+        position: fixed;
+        top: 30%;
+      "
       v-if="isHaveNews"
     >
       暂无数据
     </div>
-     <tab-bar :index="1"></tab-bar>
+    <tab-bar :index="1"></tab-bar>
   </div>
 </template>
 
 <script>
 import LHeader from "@/components/header.vue";
-import {getFun,postFun} from "@/service/table.js";
+import { getFun, postFun } from "@/service/table.js";
 import tabBar from "@/components/TabBar";
 import { dangerConfirm } from "@/service/danger";
 export default {
   components: {
     LHeader,
-    tabBar
+    tabBar,
   },
   data() {
     return {
@@ -87,7 +97,7 @@ export default {
       searchValue: "",
       messageList: [],
       Loop: "", // 定时器
-      showIndex: null // 是否显示遮罩层
+      showIndex: null, // 是否显示遮罩层
     };
   },
   created() {
@@ -95,19 +105,19 @@ export default {
   },
   methods: {
     onSearch(val) {
-      this.postList(this.searchValue)
+      this.postList(this.searchValue);
     },
-    postList(select='') {
+    postList(select = "") {
       this.$toast.loading({
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
-      let formdata=new FormData();
-      formdata.append('select',select);
-      dangerConfirm("/confirm/list",formdata)
-        .then(res => {
+      let formdata = new FormData();
+      formdata.append("select", select);
+      dangerConfirm("/confirm/list", formdata)
+        .then((res) => {
           this.$toast.clear();
           this.messageList = res.rows;
           // 判断有无数据返回
@@ -123,19 +133,18 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
-        return
+        return;
       }
       this.showIndex = index;
     },
- 
 
     // 详情
     goDetail(data) {
       this.$router.push({
         name: "normal-detail",
         params: {
-          id: data.taskId
-        }
+          id: data.taskId,
+        },
       });
       this.showIndex = null;
     },
@@ -145,11 +154,11 @@ export default {
         name: "affirm-danger",
         params: {
           data: data,
-        }
+        },
       });
       this.showIndex = null;
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>
@@ -163,14 +172,14 @@ export default {
   background-color: #f0f1f5;
   .van-cell-group--inset {
     margin: 0;
-  margin-bottom: 0.26667rem;
-  padding: 0.25rem;
-  font-size: 0.4rem;
-  position: relative;
-  border-radius: 4%;
-  box-shadow: 0px 0px 10px 2px #f3f3f3;
-  width: 90%;
-  margin: 0.4rem auto;
+    margin-bottom: 0.26667rem;
+    padding: 0.25rem;
+    font-size: 0.4rem;
+    position: relative;
+    border-radius: 4%;
+    box-shadow: 0px 0px 10px 2px #f3f3f3;
+    width: 90%;
+    margin: 0.4rem auto;
     .van-row {
       font-size: 0.4rem;
       line-height: 0.8rem;

src/views/danger/insertDanger/list.vue

@@ -38,6 +38,10 @@
           <van-col span="6">隐患类型：</van-col>
           <van-col span="18">{{ item.hdType }}</van-col>
         </van-row>
+        <!-- <van-row gutter="">
+          <van-col span="6">工单状态：</van-col>
+          <van-col span="18">{{ item.taskName }}</van-col>
+        </van-row> -->
         <!-- <van-row gutter="">
           <van-col span="6">发现时间：</van-col>
           <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>

src/views/danger/majorDanger/majorSurvey.vue

@@ -34,7 +34,7 @@
       :scroll-to-error="true"
       validate-trigger="onSubmit"
     >
-      <van-field name="isResult" label="隐患复查结果">
+      <van-field name="isResult" label="审批结果">
         <template #input>
           <van-radio-group
             v-model="radio"
@@ -42,7 +42,7 @@
             @change="selectResult"
           >
             <van-radio name="1">同意</van-radio>
-            <van-radio name="0">重新认定隐患级别</van-radio>
+            <van-radio name="0">退回</van-radio>
           </van-radio-group>
         </template>
       </van-field>

src/views/danger/reportReturn/index.vue

@@ -45,6 +45,11 @@
           <van-col span="6">隐患类型：</van-col>
           <van-col span="18">{{ item.hdType }}</van-col>
         </van-row>
+        <van-row gutter="">
+          <van-col span="6">工单状态：</van-col>
+          <van-col span="18">{{ item.taskName }}</van-col>
+        </van-row>
+        <!-- {{ item.taskName }} -->
 
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">

src/views/danger/reviewDanger/index.vue

@@ -21,7 +21,7 @@
         :key="index"
         @click="touchstart(index, item)"
       >
-       <van-row gutter="">
+        <van-row gutter="">
           <van-col span="6">隐患编号：</van-col>
           <van-col span="18">{{ item.businessId }}</van-col>
         </van-row>
@@ -49,10 +49,13 @@
           <van-col span="6">超期标识：</van-col>
           <van-col span="18">{{ item | formatTime }}</van-col>
         </van-row>
-
+        <van-row gutter="">
+          <van-col span="6">工单状态：</van-col>
+          <van-col span="18">{{ item.taskName }}</van-col>
+        </van-row>
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop ="showIndex = null">
+          <div class="wrapper" @click.stop="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -65,7 +68,13 @@
     </div>
     <!-- 暂无数据 -->
     <div
-      style="width: 100%;text-align: center; font-size: .48rem;position: fixed; top: 30%;"
+      style="
+        width: 100%;
+        text-align: center;
+        font-size: 0.48rem;
+        position: fixed;
+        top: 30%;
+      "
       v-if="isHaveNews"
     >
       暂无数据
@@ -77,12 +86,12 @@
 <script>
 import tabBar from "@/components/TabBar";
 import LHeader from "@/components/header.vue";
-import {getFun,postFun} from "@/service/table.js";
+import { getFun, postFun } from "@/service/table.js";
 import { dangerReview } from "@/service/danger";
 export default {
   components: {
     LHeader,
-    tabBar
+    tabBar,
   },
   data() {
     return {
@@ -91,7 +100,7 @@ export default {
       searchValue: "",
       messageList: [],
       Loop: "", // 定时器
-      showIndex: null // 是否显示遮罩层
+      showIndex: null, // 是否显示遮罩层
     };
   },
   created() {
@@ -99,23 +108,23 @@ export default {
   },
   methods: {
     onSearch(val) {
-      this.postList(this.searchValue)
+      this.postList(this.searchValue);
     },
-    
-    postList(select='') {
+
+    postList(select = "") {
       this.$toast.loading({
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
-      let formdata=new FormData();
-      formdata.append('select',select);
-      dangerReview("/review/list",formdata)
-        .then(res => {
+      let formdata = new FormData();
+      formdata.append("select", select);
+      dangerReview("/review/list", formdata)
+        .then((res) => {
           this.$toast.clear();
           this.messageList = res.rows;
-           // 判断有无数据返回
+          // 判断有无数据返回
           if (this.messageList.length == 0) {
             this.isHaveNews = true;
           }
@@ -129,36 +138,35 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
-        return
+        return;
       }
       this.showIndex = index;
     },
-   
 
     // 详情
     goDetail(data) {
       this.$router.push({
         name: "normal-detail",
         params: {
-          id: data.taskId
-        }
+          id: data.taskId,
+        },
       });
       this.showIndex = null;
     },
     // 确认
     goConfirm(data) {
-      localStorage.setItem('reviewdanger_params',JSON.stringify(data))
+      localStorage.setItem("reviewdanger_params", JSON.stringify(data));
       this.$router.push({
         name: "review-add",
         params: {
           data,
-        }
+        },
       });
       this.showIndex = null;
-    }
+    },
   },
   filters: {
-    formatTime: function(row) {
+    formatTime: function (row) {
       if (new Date(row.dueDate).getTime() <= row.rectificationTime) {
         return "超期";
       } else if (
@@ -170,8 +178,8 @@ export default {
       } else {
         return "正常";
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>

src/views/danger/standBook/normalDetail.vue

@@ -210,7 +210,7 @@
                   >
                   <van-col span="18">{{ item.createTime }}</van-col>
                 </van-row>
-                <van-row>
+                <van-row v-if="item.thinkHdLev">
                   <van-col span="9"
                     ><span class="field-title">认定隐患级别：</span></van-col
                   >
@@ -300,7 +300,7 @@
           v-for="(item, index) in hdReviewList"
           :key="index"
         >
-          <van-row gutter="">
+          <van-row gutter="" v-if="item.hdPictureList['length']">
             <van-col span="7"
               ><span class="field-title">隐患照片：</span></van-col
             >
@@ -315,7 +315,7 @@
             </van-col>
           </van-row>
 
-          <van-row gutter="">
+          <van-row gutter="" v-if="item.reviewDetails">
             <van-col span="7"
               ><span class="field-title">详情描述：</span></van-col
             >

src/views/risk/riskAdd/index.vue

@@ -108,12 +108,12 @@
         readonly
         clickable
         required
+        label="事故定级"
         name="setRank"
         :value="setRank"
-        label="风险定级"
         placeholder="请选择"
         @click="showSetRank = true"
-        :rules="[{ required: true, message: '风险定级不能为空' }]"
+        v-if="!isShowreturnCause"
       />
       <van-popup v-model="showSetRank" position="bottom">
         <van-picker
@@ -163,15 +163,44 @@
         autosize
         placeholder="请输入"
       />
+
       <van-field name="setRankModeFile" label=" " v-show="showSetRankMode">
         <template #input>
-          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="setRankModeImg" accept="file" />
+          <van-uploader
+            multiple
+            :max-count="5"
+            upload-text="最多上传五个"
+            v-model="setRankModeImg"
+            accept="file"
+          >
+            <template slot="default">
+              <!-- 11111111111 -->
+              <div
+                style="
+                  width: 2.13333rem;
+                  height: 2.13333rem;
+                  background: #f7f8fa;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  flex-direction: column;
+                "
+              >
+                <img
+                  src="@/assets/upload/file.png"
+                  alt=""
+                  style="width: 0.64rem; height: 0.64rem"
+                />
+                <span class="van-uploader__upload-text">最多上传五个</span>
+              </div>
+            </template>
+          </van-uploader>
         </template>
       </van-field>
 
       <van-field
         v-model="location"
-         required
+        required
         name="location"
         label="风险部位"
         type="textarea"
@@ -184,7 +213,7 @@
       <van-field
         readonly
         clickable
-         required
+        required
         name="control"
         :value="control"
         label="管控层级"
@@ -250,7 +279,35 @@
       />
       <van-field name="technologyFile" label=" ">
         <template #input>
-          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="technologyImg" accept="file" />
+          <van-uploader
+            multiple
+            :max-count="5"
+            upload-text="最多上传五个"
+            v-model="technologyImg"
+            accept="file"
+          >
+            <template slot="default">
+              <!-- 11111111111 -->
+              <div
+                style="
+                  width: 2.13333rem;
+                  height: 2.13333rem;
+                  background: #f7f8fa;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  flex-direction: column;
+                "
+              >
+                <img
+                  src="@/assets/upload/file.png"
+                  alt=""
+                  style="width: 0.64rem; height: 0.64rem"
+                />
+                <span class="van-uploader__upload-text">最多上传五个</span>
+              </div>
+            </template>
+          </van-uploader>
         </template>
       </van-field>
 
@@ -265,7 +322,35 @@
       />
       <van-field name="administrationFile" label=" ">
         <template #input>
-          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="administrationImg" accept="file" />
+          <van-uploader
+            multiple
+            :max-count="5"
+            upload-text="最多上传五个"
+            v-model="administrationImg"
+            accept="file"
+          >
+            <template slot="default">
+              <!-- 11111111111 -->
+              <div
+                style="
+                  width: 2.13333rem;
+                  height: 2.13333rem;
+                  background: #f7f8fa;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  flex-direction: column;
+                "
+              >
+                <img
+                  src="@/assets/upload/file.png"
+                  alt=""
+                  style="width: 0.64rem; height: 0.64rem"
+                />
+                <span class="van-uploader__upload-text">最多上传五个</span>
+              </div>
+            </template>
+          </van-uploader>
         </template>
       </van-field>
 
@@ -278,9 +363,38 @@
         autosize
         placeholder="请输入"
       />
+
       <van-field name="urgentFile" label=" ">
         <template #input>
-          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="urgentImg" accept="file" />
+          <van-uploader
+            multiple
+            :max-count="5"
+            upload-text="最多上传五个"
+            v-model="urgentImg"
+            accept="file"
+          >
+            <template slot="default">
+              <!-- 11111111111 -->
+              <div
+                style="
+                  width: 88px;
+                  height: 88px;
+                  background: #f7f8fa;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  flex-direction: column;
+                "
+              >
+                <img
+                  src="@/assets/upload/file.png"
+                  alt=""
+                  style="width: 0.64rem; height: 0.64rem"
+                />
+                <span class="van-uploader__upload-text">最多上传五个</span>
+              </div>
+            </template>
+          </van-uploader>
         </template>
       </van-field>
 
@@ -290,7 +404,7 @@
         >
       </div>
     </van-form>
-    <div style="margin:10px 16px 0px;padding-bottom:16px">
+    <div style="margin: 10px 16px 0px; padding-bottom: 16px">
       <van-button round block type="warning" @click.native="cancel"
         >取消</van-button
       >
@@ -300,7 +414,7 @@
 
 <script>
 import LHeader from "@/components/header.vue";
-import {getFun,postFun} from "@/service/table.js";
+import { getFun, postFun } from "@/service/table.js";
 import {
   getFormList,
   postHdSource,
@@ -308,15 +422,15 @@ import {
   postHdPeople,
   postReAdd,
   postriskConiCause,
-  postRiskShowMeasures
+  postRiskShowMeasures,
 } from "@/service/risk";
 export default {
-  name:"risk-add",
+  name: "risk-add",
   components: {
-    LHeader
+    LHeader,
   },
   activated() {
-     this.showSetRank = false // 再次关闭弹出层 以防万一
+    this.showSetRank = false; // 再次关闭弹出层 以防万一
     if (this.$route.params.status) {
       this.isShowreturnCause = true;
       this.text = "风险上报退回";
@@ -325,64 +439,69 @@ export default {
     }
     this.getList();
 
-    this.$bus.$on("riskLevelBus", res => {
-      this.showSetRank = false // 再次关闭弹出层 以防万一
-      console.log(Boolean(res))
-      if(res){
-        this.riskRank = res
-      }else{
-        this.setRank = ""
+    this.$bus.$on("riskLevelBus", (res) => {
+      this.showSetRank = false; // 再次关闭弹出层 以防万一
+      console.log(Boolean(res));
+      if (res) {
+        this.riskRank = res;
+      } else {
+        this.setRank = "";
       }
       // 销毁一下监听事件 不然会越加越多
-      this.$bus.$off('riskLevelBus')
+      this.$bus.$off("riskLevelBus");
     });
   },
   beforeRouteLeave(to, from, next) {
     if (to.name != "matrix-grad") {
-      this.text = "新增风险",
-      this.taskId = "",
-      this.id = "",
-      this.projectId = "", // 所属工程
-      this.projectName = "", // 所属工程
-      this.showProjectName = false,
-      this.columnsProjectName = [],
-      this.factor = "", //风险因素
-      this.showFactor = false,
-      this.columnsFactor = [],
-      this.source = "", //风险源
-      this.showSource = false,
-      this.columnsSource = [],
-      this.trouble = "", //事故类型
-      this.showTrouble = false,
-      this.columnsTrouble = [],
-      this.setRank = "", //风险定级
-      this.showSetRank = false,
-      this.columnsSetRank = ["矩阵式定级", "其他定级方式"],
-      this.riskRank = "", // 风险等级
-      this.showRiskRank = false,
-      this.columnsRiskRank = ["一般风险", "较小风险", "较大风险", "重大风险"],
-      this.setRankMode = "", // 定级方式文字
-      this.setRankModeImg = [], // 定级方式图片
-      this.location = "", //风险部位
-      this.control = "", //管控层级
-      this.showControl = false,
-      this.columnsControl = ["项目级", "企业级"],
-      this.mainDutyDept = "", // 主责部门
-      this.mainDutyDeptId = "",
-      this.showMainDutyDept = false,
-      this.columnsMainDutyDept = [],
-      this.mainDutyPeopLe = "", // 主责人员
-      this.mainDutyPeopLeId = "",
-      this.showMainDutyPeopLe = false,
-      this.columnsMainDutyPeopLe = [],
-      this.technology = "", //技术措施文字
-      this.technologyImg = [], //技术措施图片
-      this.administration = "", //管理措施文字
-      this.administrationImg = [], //管理措施图片
-      this.urgent = "", //应急措施文字
-      this.urgentImg = [], //应急措施图片
-      this.returnCause = "", // 退回原因
-      this.isShowreturnCause = false
+      (this.text = "新增风险"),
+        (this.taskId = ""),
+        (this.id = ""),
+        (this.projectId = ""), // 所属工程
+        (this.projectName = ""), // 所属工程
+        (this.showProjectName = false),
+        (this.columnsProjectName = []),
+        (this.factor = ""), //风险因素
+        (this.showFactor = false),
+        (this.columnsFactor = []),
+        (this.source = ""), //风险源
+        (this.showSource = false),
+        (this.columnsSource = []),
+        (this.trouble = ""), //事故类型
+        (this.showTrouble = false),
+        (this.columnsTrouble = []),
+        (this.setRank = ""), //风险定级
+        (this.showSetRank = false),
+        (this.columnsSetRank = ["矩阵式定级", "其他定级方式"]),
+        (this.riskRank = ""), // 风险等级
+        (this.showRiskRank = false),
+        (this.columnsRiskRank = [
+          "一般风险",
+          "较小风险",
+          "较大风险",
+          "重大风险",
+        ]),
+        (this.setRankMode = ""), // 定级方式文字
+        (this.setRankModeImg = []), // 定级方式图片
+        (this.location = ""), //风险部位
+        (this.control = ""), //管控层级
+        (this.showControl = false),
+        (this.columnsControl = ["项目级", "企业级"]),
+        (this.mainDutyDept = ""), // 主责部门
+        (this.mainDutyDeptId = ""),
+        (this.showMainDutyDept = false),
+        (this.columnsMainDutyDept = []),
+        (this.mainDutyPeopLe = ""), // 主责人员
+        (this.mainDutyPeopLeId = ""),
+        (this.showMainDutyPeopLe = false),
+        (this.columnsMainDutyPeopLe = []),
+        (this.technology = ""), //技术措施文字
+        (this.technologyImg = []), //技术措施图片
+        (this.administration = ""), //管理措施文字
+        (this.administrationImg = []), //管理措施图片
+        (this.urgent = ""), //应急措施文字
+        (this.urgentImg = []), //应急措施图片
+        (this.returnCause = ""), // 退回原因
+        (this.isShowreturnCause = false);
     }
     next();
   },
@@ -432,7 +551,7 @@ export default {
       urgent: "", //应急措施文字
       urgentImg: [], //应急措施图片
       returnCause: "", // 退回原因
-      isShowreturnCause: false
+      isShowreturnCause: false,
     };
   },
   created() {
@@ -463,19 +582,19 @@ export default {
       formdata.append("emergencyMeasure", this.urgent);
 
       // 放图片路径 因为formdat存数组会自动变成字符串所以次用这种追加字段的方式
-      values.setRankModeFile.forEach(item => {
+      values.setRankModeFile.forEach((item) => {
         // 定级方式
         formdata.append("risk1[]", item.file);
       });
-      values.technologyFile.forEach(item => {
+      values.technologyFile.forEach((item) => {
         // 技术措施
         formdata.append("risk2[]", item.file);
       });
-      values.administrationFile.forEach(item => {
+      values.administrationFile.forEach((item) => {
         // 管理措施
         formdata.append("risk3[]", item.file);
       });
-      values.urgentFile.forEach(item => {
+      values.urgentFile.forEach((item) => {
         // 应急措施
         formdata.append("risk4[]", item.file);
       });
@@ -484,7 +603,7 @@ export default {
         message: "提交中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
       let url = "/riskMain/add";
       if (this.taskId) {
@@ -492,11 +611,11 @@ export default {
         url = `/riskMain/editSave/${this.taskId}`;
       }
       postReAdd(url, formdata)
-        .then(res => {
+        .then((res) => {
           this.$toast.clear();
           this.$toast.success({
             message: "提交成功",
-            duration: 2000
+            duration: 2000,
           });
           history.go(-1);
         })
@@ -504,7 +623,7 @@ export default {
           this.$toast.clear();
           this.$toast.fail("提交失败,请稍后再试");
         });
-           this.$toast.clear();
+      this.$toast.clear();
     },
 
     // 请求表单数据
@@ -513,10 +632,10 @@ export default {
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
       getFormList("/riskMain/add")
-        .then(res => {
+        .then((res) => {
           this.$toast.clear();
           this.columnsProjectName = res.data.projectInformations;
           this.columnsFactor = res.data.riskInventories;
@@ -534,10 +653,67 @@ export default {
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
       postriskConiCause(`/riskMain/edit/${this.taskId}`)
-        .then(res => {
+        .then((res) => {
+          let data = res.data.riskMain;
+          let data1 = res.data.ResponsibilityMember;
+          this.projectId = data.pId;
+          this.riskRank = data.riskLevel;
+          this.factor = data.riskFactor;
+          this.source = data.riskSource;
+          this.trouble = data.accidentType;
+          this.setRank = data.level;
+          this.setRankMode = data.grapingMethod;
+          this.location = data.riskPosition;
+          this.control = data.controlLevel;
+          this.mainDutyDeptId = data.responsibilityDept;
+          this.mainDutyPeopLeId = data.responsibilityMember;
+          this.administration = data.managementMeasures;
+          this.urgent = data.emergencyMeasure;
+          this.mainDutyPeopLe = data.mainDutyPeopLe;
+          this.mainDutyDept = data1.dept.deptName;
+          this.technology = data.technicalMeasures;
+          //  urgentImg administrationImg technologyImg
+          data.riskFileList4 = data.riskFileList4 || [];
+          data.riskFileList3 = data.riskFileList3 || [];
+          data.riskFileList2 = data.riskFileList2 || [];
+          data.riskFileList1 = data.riskFileList1 || [];
+          this.technologyFile = data.riskFileList1.map(() => {
+            return {
+              ...item,
+              url: item.filePath,
+            };
+          });
+          this.urgentImg = data.riskFileList4.map(() => {
+            return {
+              ...item,
+              url: item.filePath,
+            };
+          });
+          this.administrationImg = data.riskFileList3.map(() => {
+            return {
+              ...item,
+              url: item.filePath,
+            };
+          });
+          this.technologyImg = data.riskFileList2.map(() => {
+            return {
+              ...item,
+              url: item.filePath,
+            };
+          });
+          // 请求人员列表
+          let formdata = new FormData();
+          formdata.append("organizationId", data.responsibilityDept);
+          postHdPeople(`/riskMain/getUserList`, formdata).then((res) => {
+            this.columnsMainDutyPeopLe = res.data;
+            this.mainDutyPeopLe = this.columnsMainDutyPeopLe.filter((item) => {
+              return item["userId"] == data.responsibilityMember;
+            })[0]["userName"];
+          });
+          // console.log(data)
           this.$toast.clear();
           this.returnCause = res.data.reason;
         })
@@ -567,7 +743,7 @@ export default {
       this.source = "";
       this.trouble = "";
       // 请求风险源
-      postHdSource(`/riskMain/showSourceName/${this.factor}`).then(res => {
+      postHdSource(`/riskMain/showSourceName/${this.factor}`).then((res) => {
         this.columnsSource = res.data;
       });
     },
@@ -583,7 +759,7 @@ export default {
       // 请求事故类型
       postHdType(
         `/riskMain/showaccidentType/${this.factor}/${this.source}`
-      ).then(res => {
+      ).then((res) => {
         this.columnsTrouble = res.data;
       });
     },
@@ -598,7 +774,7 @@ export default {
       // 请求三个措施
       postRiskShowMeasures(
         `/riskMain/showmeasures/${this.factor}/${this.source}/${this.trouble}`
-      ).then(res => {
+      ).then((res) => {
         this.technology = res.data[0].measuresProject;
         this.administration = res.data[0].measuresAdministration;
         this.urgent = res.data[0].measuresEmergency;
@@ -612,7 +788,7 @@ export default {
       if (this.setRank == "矩阵式定级") {
         this.showSetRank = false;
         this.$router.push({
-          name: "matrix-grad"
+          name: "matrix-grad",
         });
       }
     },
@@ -644,7 +820,7 @@ export default {
       // 请求主责人员
       let formdata = new FormData();
       formdata.append("organizationId", this.mainDutyDeptId);
-      postHdPeople(`/riskMain/getUserList`, formdata).then(res => {
+      postHdPeople(`/riskMain/getUserList`, formdata).then((res) => {
         this.columnsMainDutyPeopLe = res.data;
       });
     },
@@ -657,16 +833,16 @@ export default {
 
     cancel() {
       this.$router.go(-1);
-    }
+    },
   },
-  watch:{
-    setRank(newVal, oldVal){
-      if(newVal == '其他定级方式'){
-        this.showSetRankMode = true
-      }else{
-        this.showSetRankMode = false
+  watch: {
+    setRank(newVal, oldVal) {
+      if (newVal == "其他定级方式") {
+        this.showSetRankMode = true;
+      } else {
+        this.showSetRankMode = false;
       }
-    }
+    },
   },
 };
 </script>

src/views/risk/riskReturn/index.vue

@@ -61,7 +61,7 @@
           <van-col span="6">工单状态：</van-col>
           <van-col span="18">{{ item.taskName }}</van-col>
         </van-row>
-
+        
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
           <div class="wrapper" @click.stop="showIndex = null">

src/views/saveWorkbench/index.vue

@@ -2,9 +2,7 @@
   <div>
     <!-- 头部标签 -->
     <van-sticky>
-      <header class="header-wrap">
-        首开集团安全隐患排查治理体系
-      </header>
+      <header class="header-wrap">首开集团安全隐患排查治理体系</header>
     </van-sticky>
 
     <!-- 搜索 -->
@@ -94,7 +92,7 @@ import tabBar from "@/components/TabBar";
 import { postWork } from "@/service/workbench";
 export default {
   components: {
-    tabBar
+    tabBar,
   },
   data() {
     return {
@@ -104,23 +102,23 @@ export default {
         {
           key: "1",
           imgUrl: require("@/assets/workbench/notice.png"),
-          text: "通知公告"
+          text: "通知公告",
         },
         {
           key: "2",
           imgUrl: require("@/assets/workbench/wait-do.png"),
-          text: "待办事项"
+          text: "待办事项",
         },
         {
           key: "3",
           imgUrl: require("@/assets/workbench/news.png"),
-          text: "消息提醒"
+          text: "消息提醒",
         },
         {
           key: "4",
           imgUrl: require("@/assets/workbench/set-up.png"),
-          text: "我的设置"
-        }
+          text: "我的设置",
+        },
       ],
       riskList: [
         // 风控分级管控
@@ -128,84 +126,84 @@ export default {
           key: "1",
           path: "/risk-add",
           imgUrl: require("@/assets/workbench/risk-report.png"),
-          text: "风险上报"
+          text: "风险上报",
         },
         {
           key: "3",
           path: "/risk-confirme",
           imgUrl: require("@/assets/workbench/risk-confirm.png"),
-          text: "风险确认"
+          text: "风险确认",
         },
         {
           key: "4",
           path: "/risk-account",
           imgUrl: require("@/assets/workbench/risk-account.png"),
-          text: "风险台账"
-        }
+          text: "风险台账",
+        },
       ],
       dangerList: [
-        {
-          key: "11",
-          // path: "/danger",
-          path: "/insert-danger",
-          imgUrl: require("@/assets/workbench/risk-confirm.png"),
-          text: "我的上报"
-        },
         // 隐患排查治理
         {
           key: "1",
           // path: "/danger",
           path: "/add-danger",
           imgUrl: require("@/assets/workbench/danger-report.png"),
-          text: "隐患上报"
+          text: "隐患上报",
+        },
+        {
+          key: "11",
+          // path: "/danger",
+          path: "/insert-danger",
+          imgUrl: require("@/assets/workbench/risk-confirm.png"),
+          text: "我的上报",
         },
         {
           key: "3",
           path: "/confirme-danger",
           imgUrl: require("@/assets/workbench/danger-confirm.png"),
-          text: "隐患确认"
+          text: "隐患确认",
         },
         {
           key: "4",
           path: "/change-danger",
           imgUrl: require("@/assets/workbench/danger-rectification.png"),
-          text: "隐患整改"
+          text: "隐患整改",
         },
         {
           key: "5",
           path: "/review-danger",
           imgUrl: require("@/assets/workbench/danger-acceptance.png"),
-          text: "隐患复查"
+          text: "隐患复查",
         },
         {
           key: "6",
           path: "/stand-book",
           imgUrl: require("@/assets/workbench/danger-account.png"),
-          text: "隐患台账"
+          text: "隐患台账",
         },
         {
           key: "7",
           path: "/major-danger",
           imgUrl: require("@/assets/workbench/retification-acceptance.png"),
-          text: "重大隐患"
+          text: "重大隐患",
         },
         {
           key: "8",
           path: "/delay-approval",
           imgUrl: require("@/assets/workbench/inspect-plane.png"),
-          text: "延期审批"
+          text: "延期审批",
         },
         {
           key: "9",
           path: "/supervise-danger",
           imgUrl: require("@/assets/workbench/retification-acceptance.png"),
-          text: "隐患督办"
+          text: "隐患督办",
         },
         {
           key: "10",
           path: "/manager-danger",
           imgUrl: require("@/assets/workbench/inspect-plane.png"),
-          text: "经理督办"
+          text: "经理督办",
         },
       ],
       safetyCheckList: [
@@ -214,37 +212,37 @@ export default {
           key: "1",
           path: "",
           imgUrl: require("@/assets/workbench/inspect-plane.png"),
-          text: "检查计划"
+          text: "检查计划",
         },
         {
           key: "2",
           path: "",
           imgUrl: require("@/assets/workbench/plane-approval.png"),
-          text: "计划审批"
+          text: "计划审批",
         },
         {
           key: "3",
           path: "/checked",
           imgUrl: require("@/assets/workbench/check-implement.png"),
-          text: "检查执行"
+          text: "检查执行",
         },
         {
           key: "4",
           path: "/notice",
           imgUrl: require("@/assets/workbench/rectification-notice.png"),
-          text: "整改通知"
+          text: "整改通知",
         },
         {
           key: "5",
           path: "",
           imgUrl: require("@/assets/workbench/issue-rectification.png"),
-          text: "问题整改"
+          text: "问题整改",
         },
         {
           key: "6",
           path: "/correct",
           imgUrl: require("@/assets/workbench/retification-acceptance.png"),
-          text: "整改验收"
+          text: "整改验收",
         },
         {
           key: "7",
@@ -266,7 +264,7 @@ export default {
       finalNewsCenterList: [],
       finalRiskList: [],
       finalDangerList: [],
-      finalSafetyCheckList: []
+      finalSafetyCheckList: [],
     };
   },
   created() {
@@ -274,8 +272,7 @@ export default {
     this.getWorkList();
   },
   methods: {
-    myClick(data) {
-    },
+    myClick(data) {},
     jump(path) {
       if (path) {
         this.$router.push(path);
@@ -293,27 +290,27 @@ export default {
     },
     // 搜索事件
     onSearch(val) {
-      this.postList(this.searchValue)
+      this.postList(this.searchValue);
     },
     // 请求工作台列表
     getWorkList() {
-      postWork("/mobile/menu").then(res => {
+      postWork("/mobile/menu").then((res) => {
         if (res.code == 0) {
           this.powerObj = res.data;
           if (this.powerObj.风险分级管控) {
             // 对两个数组进行比较 拿到需要的数据 赋值给新数组 （赋值给新数组是为了解决页面闪屏问题）
-            this.finalRiskList = [...this.riskList].filter(x =>
-              [...this.powerObj.风险分级管控].some(y => y.menuName === x.text)
+            this.finalRiskList = [...this.riskList].filter((x) =>
+              [...this.powerObj.风险分级管控].some((y) => y.menuName === x.text)
             );
 
             // 如果有隐患上报权限 则在添加一个 上报退回的权限
-            this.powerObj.风险分级管控.map(item => {
+            this.powerObj.风险分级管控.map((item) => {
               if (item.menuName == "风险上报") {
                 let obj = {
                   key: "2",
                   path: "/risk-return",
                   imgUrl: require("@/assets/workbench/plane-approval.png"),
-                  text: "上报退回"
+                  text: "上报退回",
                 };
                 this.finalRiskList.splice(1, 0, obj);
               }
@@ -323,17 +320,17 @@ export default {
           }
           // 隐患排查治理
           if (this.powerObj.隐患排查治理) {
-            this.finalDangerList = [...this.dangerList].filter(x =>
-              [...this.powerObj.隐患排查治理].some(y => y.menuName === x.text)
+            this.finalDangerList = [...this.dangerList].filter((x) =>
+              [...this.powerObj.隐患排查治理].some((y) => y.menuName === x.text)
             );
             // 如果有隐患上报权限 则在添加一个 上报退回的权限
-            this.powerObj.隐患排查治理.map(item => {
+            this.powerObj.隐患排查治理.map((item) => {
               if (item.menuName == "隐患上报") {
                 let obj = {
                   key: "2",
                   path: "/report-return",
                   imgUrl: require("@/assets/workbench/rectification-notice.png"),
-                  text: "上报退回"
+                  text: "上报退回",
                 };
                 this.finalDangerList.splice(1, 0, obj);
               }
@@ -344,8 +341,8 @@ export default {
           // this.finalDangerList  = this.dangerList
           // 安全监督检查
           if (this.powerObj.安全监督检查) {
-            this.finalSafetyCheckList = [...this.safetyCheckList].filter(x =>
-              [...this.powerObj.安全监督检查].some(y => y.menuName === x.text)
+            this.finalSafetyCheckList = [...this.safetyCheckList].filter((x) =>
+              [...this.powerObj.安全监督检查].some((y) => y.menuName === x.text)
             );
           } else {
             this.finalSafetyCheckList = [];
@@ -356,8 +353,8 @@ export default {
           this.powerObj = [];
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>