修改了重大隐患审批

src/App.vue

@@ -42,7 +42,7 @@ export default {
                 "risk-affirm",
                 "manager-survey",
                 "super-survey",
-                "major-survey",
+                // "major-survey",
                 "risk-add",
                 "noticeList",
                 "confirmNote",

src/views/danger/addDanger/addDanger.vue

@@ -128,9 +128,9 @@
         v-model="dangerNum"
         readonly
         name="hdProjectId"
-        label="隐患清单库表"
+        label="隐患清单编号"
         placeholder="请选择"
-        :rules="[{ required: true, message: '隐患清单库表不能为空' }]"
+        :rules="[{ required: true, message: '隐患清单编号不能为空' }]"
       />
       <van-field
         required

src/views/danger/majorDanger/majorSurvey.vue

@@ -42,11 +42,11 @@
                         direction="horizontal"
                         @change="selectResult"
                     >
-                        <!-- <van-radio name="1">同意</van-radio>
-                        <van-radio name="0">退回</van-radio> -->
                         <van-radio name="1" style="margin-bottom:0.3rem">{{name=='项目经理二次认定'?'退回到发起人':'同意'}}</van-radio>
                         <van-radio name="0" style="margin-bottom:0.3rem">{{name=='项目经理二次认定'?'重新发起重大隐患审批':'退回'}}</van-radio>
-                         
+                        <!-- 退回到发起人  -->
+                        <!-- <van-radio name="1" style="margin-bottom:0.3rem">{{name=='项目经理二次认定'?'退回到发起人':'同意'}}</van-radio>
+                        <van-radio name="0" style="margin-bottom:0.3rem">{{name=='项目经理二次认定'?'重新发起重大隐患审批':'退回'}}</van-radio> -->
                     </van-radio-group>
                 </template>
             </van-field>
@@ -54,12 +54,12 @@
             <div class="disagree">
                 <van-field
                     readonly
-                    v-if="radio == 1"
+                    v-if="radio == 1?(name=='项目经理二次认定'?true:false):(name=='项目经理二次认定'?false:true)"
                     clickable
                     required
                     name="thinkHdLev"
                     :value="thinkLevel"
-                    label="认定的隐患级别"
+                    label="认定隐患级别"
                     placeholder="请选择认定隐患级别"
                     @click="showThinkLevel = true"
                     :rules="[
@@ -145,6 +145,7 @@ export default {
             }
         });
     },
+    
     mounted() {
       this.getName()
       console.log(1)

src/views/danger/standBook/normalDetail.vue

@@ -217,7 +217,7 @@
                                 </van-row>
                                 <van-row
                                     gutter=""
-                                    v-if="item.rectificationUser&&item.confirmResult != 0"
+                                    v-if="item.rectificationUser"
                                 >
                                     <van-col span="7"
                                         ><span class="field-title"
@@ -230,7 +230,7 @@
                                 </van-row>
                                 <van-row
                                     gutter=""
-                                    v-if="item.rectificationReview&&item.confirmResult != 0"
+                                    v-if="item.rectificationReview"
                                 >
                                     <van-col span="7"
                                         ><span class="field-title"
@@ -241,7 +241,7 @@
                                         item.rectificationReview
                                     }}</van-col>
                                 </van-row>
-                                <van-row gutter="" v-if="item.endTime&&item.confirmResult != 0">
+                                <van-row gutter="" v-if="item.endTime">
                                     <van-col span="9"
                                         ><span class="field-title"
                                             >整改截止时间：</span

src/views/risk/riskAccount/riskBigDetail.vue

@@ -78,7 +78,7 @@
                 ><span class="field-title">定级方式(附件)：</span></van-col
               >
               <van-col span="17">
-                <div class="enclosure" v-for="(item, index) in riskMain.riskFileList1" :key="index">
+                <div class="enclosure" v-for="(item, index) in riskMain.riskFileList4" :key="index">
                   {{index+1}}. <a :href="item.filePath" target="_blank" style="color:skyblue">{{item.fileName}}</a>
                 </div>
               </van-col>
@@ -94,7 +94,7 @@
                 ><span class="field-title">技术措施(附件)：</span></van-col
               >
               <van-col span="17">
-                <div class="enclosure" v-for="(item, index) in riskMain.riskFileList2" :key="index">
+                <div class="enclosure" v-for="(item, index) in riskMain.riskFileList1" :key="index">
                   {{index+1}}. <a :href="item.filePath" target="_blank" style="color:skyblue">{{item.fileName}}</a>
                 </div>
               </van-col>
@@ -110,7 +110,7 @@
                 ><span class="field-title">管理措施(附件)：</span></van-col
               >
               <van-col span="17">
-                   <div class="enclosure" v-for="(item, index) in riskMain.riskFileList3" :key="index">
+                   <div class="enclosure" v-for="(item, index) in riskMain.riskFileList2" :key="index">
                   {{index+1}}. <a :href="item.filePath" target="_blank" style="color:skyblue">{{item.fileName}}</a>
                 </div>
               </van-col>
@@ -126,7 +126,7 @@
                 ><span class="field-title">应急措施(附件)：</span></van-col
               >
               <van-col span="17">
-                  <div class="enclosure" v-for="(item, index) in riskMain.riskFileList4" :key="index">
+                  <div class="enclosure" v-for="(item, index) in riskMain.riskFileList3" :key="index">
                   {{index+1}}. <a :href="item.filePath"  target="_blank" style="color:skyblue">{{item.fileName}}</a>
                 </div>
               </van-col>

src/views/risk/riskAdd/index.vue

@@ -614,9 +614,10 @@ export default {
       formdata.append("emergencyMeasure", this.urgent);
 
       // 放图片路径 因为formdat存数组会自动变成字符串所以次用这种追加字段的方式
+      console.log(values)
       values.setRankModeFile.forEach((item) => {
         // 定级方式
-        formdata.append("risk2[]", item.file);
+        formdata.append("risk4[]", item.file);
       });
       // values.setRankModeFile.file
       values.technologyFile.forEach((item) => {
@@ -625,11 +626,11 @@ export default {
       });
       values.administrationFile.forEach((item) => {
         // 管理措施
-        formdata.append("risk3[]", item.file);
+        formdata.append("risk2[]", item.file);
       });
       values.urgentFile.forEach((item) => {
         // 应急措施
-        formdata.append("risk4[]", item.file);
+        formdata.append("risk3[]", item.file);
       });
 
       this.$toast.loading({
@@ -712,16 +713,11 @@ export default {
           //  urgentImg administrationImg technologyImg setRankModeImg
 
           // 定级方式
-          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.urgentImg = (res.data.imgsysFiles2 || []).map(item=>{return {...item,url:item.filePath}});
+          this.administrationImg = (res.data.imgsysFiles1 || []).map(item=>{return {...item,url:item.filePath}});
+          this.technologyImg = (res.data.imgsysFiles0 || []).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,