Merge remote-tracking branch 'origin/develop' into develop

src/views/echartHome/useCaseRisk.vue

@@ -47,6 +47,8 @@ export default {
           var b = heightObj[0].count / total
           this.height = Math.round(b * 100)
         }
+      } else {
+        console.log('323248888')
       }
     },
     init() {

src/views/index.vue

@@ -116,7 +116,7 @@
           <StandardClassification></StandardClassification>
         </div>
       </el-col>
-      <el-col :span="5">
+      <el-col :span="10">
         <div class="cardThree">
           <div class="cardTitle">任务完成情况占比</div>
           <div style="display: flex; justify-content: space-between">
@@ -196,11 +196,6 @@
           </div>
         </div>
       </el-col>
-      <el-col :span="5">
-        <div class="cardStyle">
-          <ConfidentialityTasks></ConfidentialityTasks>
-        </div>
-      </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span="14">
@@ -348,7 +343,6 @@ export default {
     AverageTest,
     UseCaseTest,
     UseCaseRisk,
-    ConfidentialityTasks,
     StandardClassification
   },
   data() {
@@ -360,33 +354,42 @@ export default {
       averageInspectionRate: [],
       taskCompleted: [],
       taskCompletedGroup: [],
-      userCaseMsg: {
-        riskLevel: []
-      }
+      userCaseMsg: {}
     }
   },
   created() {
-    this.getTestHome()
     this.getQuantityStatistics()
     this.getTaskCompleted()
+    this.getTestHome()
   },
   mounted() {
     this.getAverageInspectionRate()
   },
   methods: {
     getTestHome() {
-      selectTest({ name: '汽车整车信息安全技术要求' }).then(res => {
-        this.userCaseMsg = res.data
-        this.$nextTick(() => {
-          this.useCaseTestShow = true
-          this.UseCaseRiskShow = true
+      selectTest({ name: '汽车整车信息安全技术要求' })
+        .then(res => {
+          this.userCaseMsg = res.data
+          this.$nextTick(() => {
+            this.useCaseTestShow = true
+            this.UseCaseRiskShow = true
+          })
+        })
+        .catch(r => {
+          this.$nextTick(() => {
+            this.useCaseTestShow = true
+            this.UseCaseRiskShow = true
+          })
         })
-      })
     },
     riskLevelFilter(value) {
-      var obj = this.userCaseMsg.riskLevel.filter(obj => obj.value === value)
-      if (obj.length > 0) {
-        return obj[0].count
+      if (this.userCaseMsg.riskLevel) {
+        var obj = this.userCaseMsg.riskLevel.filter(obj => obj.value === value)
+        if (obj.length > 0) {
+          return obj[0].count
+        } else {
+          return 0
+        }
       } else {
         return 0
       }

src/views/processing/carTest/execution-test-plan/index.vue

@@ -57,7 +57,9 @@ export default {
   methods: {
     goBack() {
       testConfirm({ taskId: this.$route.query.taskid }).then(res => {
-        this.$router.back()
+        this.$router.push({
+          path: '/processing/unprocessed-review'
+        })
       })
     },
     handlePreview() {