0817问题清单修复

src/views/drawCanvas/riskView.vue

@@ -474,8 +474,11 @@ export default {
         return;
       }
       if(this.editItem){
-        console.log(this.editItem)
-          const editItem = this.layout.find(x=>x.i==this.editItem.i)
+          const editItem = this.layout.find(x=>x.i==this.editItem.i);
+          const layoutData = this.layoutData.find(x=>x.position.id==editItem.i);
+          if(layoutData){
+            layoutData.name = this.roomName
+          }
           if(editItem){
             editItem.name = this.roomName;
             editItem.type = this.roomType;

src/views/riskProject/add/addCurrent.vue

@@ -1372,7 +1372,9 @@ export default {
       this.$router.push({
         name: "resultPage",
         params: {
-          score: this.severityScore * this.possibleScore
+          score: this.severityScore * this.possibleScore,
+          possibleValue:this.possibleValue,
+          severityValue:this.severityValue,
         }
       });
     },

src/views/riskProject/add/addInherent.vue

@@ -1121,7 +1121,9 @@ export default {
       this.$router.push({
         name: "resultPage",
         params: {
-          score: this.severityScore * this.possibleScore
+          score: this.severityScore * this.possibleScore,
+          possibleValue:this.possibleValue,
+          severityValue:this.severityValue,
         }
       });
     },

src/views/riskProject/add/addPresent.vue

@@ -433,6 +433,7 @@
                   size="small"
                   type="info"
                   native-type="button"
+                  @click="goResultPage"
                   >开始测评</van-button
                 ></van-col
               >
@@ -705,6 +706,35 @@ export default {
     }
   },
   methods: {
+
+    // 开始评测
+    goResultPage() {
+      sessionStorage.setItem("presentForm", JSON.stringify(this.form));
+      /* measuresAdministrationFile: [], //管理措施图片
+      measuresProjectFile: [], //管理措施图片
+      measuresEmergencyFile: [], //管理措施图片 */
+      this.$store.commit('SET_PRESENT_IMG',[{
+        key:'uploaderImg',
+        value:this.uploaderImg
+      },{
+        key:'measuresAdministrationFile',
+        value:this.measuresAdministrationFile
+      },{
+        key:'measuresProjectFile',
+        value:this.measuresProjectFile
+      },{
+        key:'measuresEmergencyFile',
+        value:this.measuresEmergencyFile
+      },])
+      this.$router.push({
+        name: "resultPage",
+        params: {
+          score: this.severityScore * this.possibleScore,
+          possibleValue:this.possibleValue,
+          severityValue:this.severityValue,
+        }
+      });
+    },
     measuresUserNameChange(e) {
       getFun(
         `/risk/plan/inherent/getResponsibilityPersons?personName=${e}&projectId=${this.form.projectId}`
@@ -926,10 +956,10 @@ export default {
     //开始测评 
     seletGrade(name) {
       this.saveFormData()
-      // this.getGradeList("possibility");
-      // this.getGradeList("severity");
-      // this.showGradeDialog = true;
-      this.$router.push('/assess/model/step1')
+      this.getGradeList("possibility");
+      this.getGradeList("severity");
+      this.showGradeDialog = true;
+      // this.$router.push('/assess/model/step1')
     },
     //风险模型配置
     getGradeList(type) {

src/views/riskProject/add/resultPage.vue

@@ -3,14 +3,14 @@
         <LHeader :text="text"></LHeader>
         <div class="section">
             <p>该次测评风险值为：</p>
-            <div class="resultScore" :style="{ background: result.color}" >
-                <p style="font-weight: bold;font-size: 20px;color: white;">{{ this.score }}</p>
+            <div class="resultScore" :style="{ background: backgroundColor}" >
+                <p style="font-weight: bold;font-size: 20px;color: white;">{{ score }}</p>
             </div>
-            <p>本次评估结果评定为：{{ result.level }}</p>
+            <p>本次评估结果评定为：{{ level }}</p>
             <van-divider></van-divider>
             <van-field readonly label="所属模型：" placeholder="ls风险矩阵评估模型" />
-            <van-field readonly label="风险发生可能性:" placeholder="一般情况不会发生" />
-            <van-field readonly label="后果严重程度" placeholder="轻微影响" />
+            <van-field readonly label="风险发生可能性:" placeholder="一般情况不会发生" :value="possibleValue"/>
+            <van-field readonly label="后果严重程度" placeholder="轻微影响" :value="severityValue"/>
             <van-field readonly label="判定标准：" placeholder="见下图" />
             <van-image width="90vw" height="auto" :src="require('@/assets/workbench/sst.jpg')" />
         </div>
@@ -34,14 +34,19 @@ import LHeader from "@/components/header.vue";
             return{
                 text:'测评结果',
                 score:0,
-                result:{
-                    level:'',
-                    color:''
-                }
+                result:null,
+                backgroundColor:'',
+                possibleValue:'',
+                severityValue:'',
+                level:''
             }
         },
         created(){
-            this.score = this.$route.params.score-'';
+            // this.score = this.$route.query.score-'';
+            const route = this.$route.params;
+            this.possibleValue = route.possibleValue;
+            this.severityValue = route.severityValue;
+            this.score = route.score;
             this.getResult()
         },
         methods:{
@@ -74,15 +79,8 @@ import LHeader from "@/components/header.vue";
                 history.go(-1)
             },
             sureClose(){
-                // this.$emit('',)
                 sessionStorage.setItem('level',this.result.level)
                 history.go(-1)
-                // this.$router.push({
-                //     name:'addInherent',
-                //     params:{
-                //         level:this.level
-                //     }
-                // })
             }
         }
     }

src/views/riskProject/assess/model/result.vue

@@ -28,7 +28,7 @@
 import { getFun, postFun } from "@/service/table.js";
 import LHeader from "@/components/header.vue";
     export default {
-        name:'resultPage',
+        name:'modelResult',
         components:{
             LHeader
         },

src/views/riskProject/taskLedger/presentDetail.vue

@@ -830,7 +830,9 @@ export default {
       this.$router.push({
         name: "resultPage",
         params: {
-          score: this.severityScore * this.possibleScore
+          score: this.severityScore * this.possibleScore,
+            possibleValue:this.possibleValue,
+          severityValue:this.severityValue,
         }
       });
     },

src/views/riskProject/taskLedger/tabDetail.vue

@@ -797,7 +797,9 @@ export default {
       this.$router.push({
         name: "resultPage",
         params: {
-          score: this.severityScore * this.possibleScore
+          score: this.severityScore * this.possibleScore,
+            possibleValue:this.possibleValue,
+          severityValue:this.severityValue,
         }
       });
     },