Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-swp

src/views/riskProject/add/addPresent.vue

@@ -956,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,10 +3,10 @@
         <LHeader :text="text"></LHeader>
         <div class="section">
             <p>该次测评风险值为：</p>
-            <div class="resultScore" :style="{ background: backgroundColor}" >
+            <div class="resultScore" :style="{ background: result.color}" >
                 <p style="font-weight: bold;font-size: 20px;color: white;">{{ score }}</p>
             </div>
-            <p>本次评估结果评定为：{{ level }}</p>
+            <p>本次评估结果评定为：{{ result.level }}</p>
             <van-divider></van-divider>
             <van-field readonly label="所属模型：" placeholder="ls风险矩阵评估模型" />
             <van-field readonly label="风险发生可能性:" placeholder="一般情况不会发生" :value="possibleValue"/>
@@ -34,8 +34,9 @@ import LHeader from "@/components/header.vue";
             return{
                 text:'测评结果',
                 score:0,
-                result:null,
-                backgroundColor:'',
+                result:{
+
+                },
                 possibleValue:'',
                 severityValue:'',
                 level:''

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

@@ -59,7 +59,7 @@ import LHeader from "@/components/header.vue";
                     }
                 })()
                 
-                getFun(`/risk/plan/matrix/score/${this.score}`).then(res=>{
+                getFun(`/risk/plan/matrix/score1/${this.score}`).then(res=>{
                     if(res.data.score){
                         this.score = res.data.score;
                     }