修改了风险上报退回不可修改的bug

src/utils/axios.js

@@ -8,9 +8,7 @@
  */
 import axios from 'axios'
 import router from '../router'
-import { Toast } from 'vant'; 
-import { Notify } from 'vant';
-import { Dialog } from 'vant';
+import { Toast ,Dialog} from 'vant'; 
 import { getToken ,removeToken} from '@/utils/auth' // get token from cookie
 const service = axios.create({
 	baseURL: '/hse/app-api', //前缀路径
@@ -46,7 +44,10 @@ service.interceptors.response.use(response => {
                 theme: 'round-button',
             }).then(() => {
                 removeToken()
-                location.reload()
+                // location.reload()
+                router.push({
+                    name:'login2'
+                })
             });
         }else{
             Toast.fail({
@@ -55,7 +56,6 @@ service.interceptors.response.use(response => {
             })
         }
     }else{
-        console.log('11111111')
         Promise.reject(new Error('Error'))
     }
  },err=>{

src/views/risk/riskAccount/riskBigDetail.vue

@@ -6,6 +6,12 @@
       <div class="cell-wrap">
         <p>风险上报</p>
         <van-cell-group inset >
+          <van-row gutter="">
+            <van-col span="7"
+              ><span class="field-title">风险编号：</span></van-col
+            >
+            <van-col span="17">{{ riskMain.id}}</van-col>
+          </van-row>
           <van-row gutter="">
             <van-col span="7"
               ><span class="field-title">所属项目：</span></van-col
@@ -18,6 +24,12 @@
             >
             <van-col span="17">{{ riskMain.riskFactor }}</van-col>
           </van-row>
+          <van-row gutter="">
+              <van-col span="7"
+                ><span class="field-title">风险级别：</span></van-col
+              >
+              <van-col span="17">{{ riskMain.riskLevel }}</van-col>
+            </van-row>
           <van-row gutter="">
             <van-col span="7"><span class="field-title">风险源：</span></van-col>
             <van-col span="17">{{ riskMain.riskSource }}</van-col>
@@ -31,12 +43,6 @@
 
           <!-- 隐藏的字段 -->
           <div v-show="riskOpen">
-            <van-row gutter="">
-              <van-col span="7"
-                ><span class="field-title">风险等级：</span></van-col
-              >
-              <van-col span="17">{{ riskMain.riskLevel }}</van-col>
-            </van-row>
             <van-row gutter="">
               <van-col span="7"
                 ><span class="field-title">风险部位：</span></van-col
@@ -73,7 +79,7 @@
               >
               <van-col span="17">
                 <div class="enclosure" v-for="(item, index) in riskMain.riskFileList1" :key="index">
-                  <a :href="item.filePath" target="_blank">{{item.fileName}}</a>
+                  {{index+1}}. <a :href="item.filePath" target="_blank" style="color:skyblue">{{item.fileName}}</a>
                 </div>
               </van-col>
             </van-row>
@@ -89,7 +95,7 @@
               >
               <van-col span="17">
                 <div class="enclosure" v-for="(item, index) in riskMain.riskFileList2" :key="index">
-                  <a :href="item.filePath" target="_blank">{{item.fileName}}</a>
+                  {{index+1}}. <a :href="item.filePath" target="_blank" style="color:skyblue">{{item.fileName}}</a>
                 </div>
               </van-col>
             </van-row>
@@ -105,7 +111,7 @@
               >
               <van-col span="17">
                    <div class="enclosure" v-for="(item, index) in riskMain.riskFileList3" :key="index">
-                  <a :href="item.filePath" target="_blank">{{item.fileName}}</a>
+                  {{index+1}}. <a :href="item.filePath" target="_blank" style="color:skyblue">{{item.fileName}}</a>
                 </div>
               </van-col>
             </van-row>
@@ -121,7 +127,7 @@
               >
               <van-col span="17">
                   <div class="enclosure" v-for="(item, index) in riskMain.riskFileList4" :key="index">
-                  <a :href="item.filePath"  target="_blank">{{item.fileName}}</a>
+                  {{index+1}}. <a :href="item.filePath"  target="_blank" style="color:skyblue">{{item.fileName}}</a>
                 </div>
               </van-col>
             </van-row>

src/views/risk/riskAdd/index.vue

@@ -154,7 +154,7 @@
       /> -->
 
       <van-field
-        v-show="showSetRankMode"
+        v-show="setRank=='其他定级方式'"
         v-model="setRankMode"
         name="setRankMode"
         label="定级方式"
@@ -164,7 +164,7 @@
         placeholder="请输入"
       />
 
-      <van-field name="setRankModeFile" label=" " v-show="showSetRankMode">
+      <van-field name="setRankModeFile" label=" "  v-show="setRank=='其他定级方式'">
         <template #input>
           <van-uploader
             multiple
@@ -172,7 +172,8 @@
             upload-text="最多上传五个"
             v-model="setRankModeImg"
             accept="file"
-             @delete="deleteFile(...arguments,'setRankModeImg')"
+            result-type="file"
+            @delete="deleteFile(...arguments, 'setRankModeImg')"
           >
             <template slot="default">
               <!-- 11111111111 -->
@@ -234,9 +235,11 @@
       <van-field
         readonly
         clickable
+        required
         name="mainDutyDept"
         :value="mainDutyDept"
         label="主责部门"
+        :rules="[{ required: true, message: '主责部门不能为空' }]"
         placeholder="请选择"
         @click="showMainDutyDept = true"
       />
@@ -253,9 +256,11 @@
       <van-field
         readonly
         clickable
+        required
         name="mainDutyPeopLe"
         :value="mainDutyPeopLe"
         label="主责人员"
+        :rules="[{ required: true, message: '主责人员不能为空' }]"
         placeholder="请选择"
         @click="showMainDutyPeopLe = true"
       />
@@ -286,7 +291,8 @@
             upload-text="最多上传五个"
             v-model="technologyImg"
             accept="file"
-            @delete="deleteFile(...arguments,'technologyImg')"
+            result-type="file"
+            @delete="deleteFile(...arguments, 'technologyImg')"
           >
             <template slot="default">
               <!-- 11111111111 -->
@@ -330,7 +336,8 @@
             upload-text="最多上传五个"
             v-model="administrationImg"
             accept="file"
-            @delete="deleteFile(...arguments,'administrationImg')"
+            result-type="file"
+            @delete="deleteFile(...arguments, 'administrationImg')"
           >
             <template slot="default">
               <!-- 11111111111 -->
@@ -375,7 +382,8 @@
             upload-text="最多上传五个"
             v-model="urgentImg"
             accept="file"
-            @delete="deleteFile(...arguments,'urgentImg')"
+            result-type="file"
+            @delete="deleteFile(...arguments, 'urgentImg')"
           >
             <template slot="default">
               <!-- 11111111111 -->
@@ -442,7 +450,7 @@ export default {
       this.postReturnEcho();
     }
     this.getList();
-    
+
     this.$bus.$on("riskLevelBus", (res) => {
       this.showSetRank = false; // 再次关闭弹出层 以防万一
       console.log(Boolean(res));
@@ -568,31 +576,33 @@ export default {
     this.getList();
   },
   methods: {
-    async deleteFile(val,detail,key){
+    async deleteFile(val, detail, key) {
       // console.log(val,detail)
-      if(val.fileId){
-        let formdata= new FormData();
-        formdata.append('key',val['fileId'])
-        let res = await postFun('/mobile/remove',formdata);
-        if(res){
+      if (val.fileId) {
+        let formdata = new FormData();
+        formdata.append("key", val["fileId"]);
+        let res = await postFun("/mobile/remove", formdata);
+        if (res) {
           console.log(res);
           this.$toast({
-            title:'提示',
-            message:'删除成功!'
-          })
+            title: "提示",
+            message: "删除成功!",
+          });
         } else {
-          console.log('删除失败');
-          this[key].splice(detail.index,0,val)
+          console.log("删除失败");
+          this[key].splice(detail.index, 0, val);
         }
       }
     },
     onSubmit(values) {
+    
       let formdata = new FormData();
+      formdata.append('id',this.id);
       formdata.append("pId", this.projectId);
       formdata.append("riskFactor", this.factor);
       formdata.append("riskSource", this.source);
       formdata.append("accidentType", this.trouble);
-      formdata.append("level", this.setRank);
+      formdata.append("level", values.setRank);
       formdata.append("riskLevel", this.riskRank);
       formdata.append("gradingMethod", this.setRankMode);
       formdata.append("riskPosition", this.location);
@@ -608,6 +618,7 @@ export default {
         // 定级方式
         formdata.append("risk1[]", item.file);
       });
+      // values.setRankModeFile.file
       values.technologyFile.forEach((item) => {
         // 技术措施
         formdata.append("risk2[]", item.file);
@@ -681,6 +692,7 @@ export default {
         .then((res) => {
           let data = res.data.riskMain;
           let data1 = res.data.ResponsibilityMember;
+          this.id=data.id;
           this.projectId = data.pId;
           this.riskRank = data.riskLevel;
           this.factor = data.riskFactor;
@@ -700,11 +712,16 @@ export default {
           //  urgentImg administrationImg technologyImg setRankModeImg
 
           // 定级方式
-          this.urgentImg = res.data.imgsysFiles3 || [];
-          this.administrationImg = res.data.imgsysFiles2 || [];
-          this.administrationImg = res.data.imgsysFiles1 || [];
-          this.technologyImg = res.data.imgsysFiles0 || [];
-          console.log(data.riskFileList4, data.riskFileList3, data.riskFileList2, data.riskFileList1,'测试测试测试')
+          this.urgentImg = (res.data.imgsysFiles3 || []).map(item=>{return {...item,url:item.filePath}});
+          this.administrationImg = (res.data.imgsysFiles2 || []).map(item=>{return {...item,url:item.filePath}});
+          this.technologyImg = (res.data.imgsysFiles1 || []).map(item=>{return {...item,url:item.filePath}});
+          this.tecsetRankModeImg = (res.data.imgsysFiles0 || []).map(item=>{return {...item,url:item.filePath}});
+          console.log(
+            data.riskFileList4,
+            data.riskFileList3,
+            data.riskFileList2,
+            data.riskFileList1,
+          );
           // this.technologyFile = res.data.riskFileList1.map(() => {
           //   return {
           //     ...item,
@@ -730,7 +747,7 @@ export default {
           //     url: item.filePath,
           //   };
           // });
-          console.log('结果')
+          console.log("结果");
           // 请求人员列表
           let formdata = new FormData();
           formdata.append("organizationId", data.responsibilityDept);