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

src/views/riskProject/add/addCurrent.vue

@@ -1363,7 +1363,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/resultPage.vue

@@ -37,15 +37,16 @@ import LHeader from "@/components/header.vue";
                 result:null,
                 backgroundColor:'',
                 possibleValue:'',
-                severityValue:''
+                severityValue:'',
+                level:''
             }
         },
         created(){
             // this.score = this.$route.query.score-'';
             const route = this.$route.params;
-            console.log(route);
             this.possibleValue = route.possibleValue;
-            this.severityValue = route.severityValue
+            this.severityValue = route.severityValue;
+            this.score = route.score;
             this.getResult()
         },
         methods:{
@@ -85,16 +86,15 @@ import LHeader from "@/components/header.vue";
                         case "较小风险":
                             return "#0091EA";
                         case "较大风险":
-                            return "FF9800";
+                            return "#FF9800";
                         case "重大风险":
-                            return "FF4433";
+                            return "#FF4433";
                         default:
                         return "orange"
                     }
                 }
                 getFun(`/risk/plan/matrix/score/${this.$route.params.score}`).then(res=>{
                     this.level = res.data.level
-                    this.score  = res.data.max
                    this.backgroundColor=bgColor()
                 })
             },
@@ -103,7 +103,7 @@ import LHeader from "@/components/header.vue";
                 history.go(-1)
             },
             sureClose(){
-                 sessionStorage.setItem('level',this.level)
+                sessionStorage.setItem('level',this.level)
                 history.go(-1)
                 // sessionStorage.setItem('level',this.result.level)
                 // history.go(-3)