fix:标准化场景报告图表问题修改

src/router/index.js

@@ -25,15 +25,6 @@ const routes = [{
   component: () => import('../views/index'),
   redirect: '/mainPage',
   children: [
-    {
-      path: "/demo",
-      name: "demo",
-      meta: {
-        tabname: "报告",
-        login: true
-      },
-      component: () => import("@/views/demo.vue")
-    },
     {
       path: "/mainPage",
       name: "mainPage",

src/router/workManagement.js

@@ -38,6 +38,15 @@ export default [
                     },
                     component: () => import("@/views/workManagement/evaluationReport")
                 },
+                {
+                    path: "sceneReport",
+                    name: "sceneReport",
+                    meta: {
+                      tabname: "评价报告",
+                      login: true
+                    },
+                    component: () => import("@/views/workManagement/sceneReport")
+                  },
                 ]
             },]
     },

src/views/workManagement/projectInfo.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="projectInfoPanel">
         <div v-show="!$route.path.includes('taskInfo') &&
-            !$route.path.includes('evaluationReport')
+            !$route.path.includes('evaluationReport') && !$route.path.includes('sceneReport')
             ">
             <div class="headPanel panel">
                 <div class="titlePanel">
@@ -515,7 +515,7 @@ export default {
         jumpReport(){
             if(this.info.nowRunState === '30'){
                 this.$router.push({
-                    path: "/demo",
+                    name: "sceneReport",
                     query: { id: this.id,projectType:this.projectType },
                 });
             }

src/views/demo.vue → src/views/workManagement/sceneReport.vue

@@ -192,6 +192,7 @@ import html2canvas from 'html2canvas'
 import jsPDF from 'jspdf'
 import * as echarts from 'echarts'
 export default {
+  name:'sceneReport',
   data() {
     return {
       tableColumnA: [
@@ -487,6 +488,31 @@ export default {
                 : null,
             ],
           },
+          {
+            name: '通过',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true,
+            },
+            emphasis: {
+              focus: 'series',
+            },
+            data: [
+              info.compLevelForPassNum['A']
+                ? info.compLevelForPassNum['A'].passNum
+                : null,
+              info.compLevelForPassNum['B']
+                ? info.compLevelForPassNum['B'].passNum
+                : null,
+              info.compLevelForPassNum['C']
+                ? info.compLevelForPassNum['C'].passNum
+                : null,
+              info.compLevelForPassNum['D']
+                ? info.compLevelForPassNum['D'].passNum
+                : null,
+            ],
+          },
         ],
       })
       chart_risk_scale.setOption({
@@ -537,6 +563,31 @@ export default {
                 : null,
             ],
           },
+          {
+            name: '通过',
+            type: 'bar',
+            stack: 'total',
+            label: {
+              show: true,
+            },
+            emphasis: {
+              focus: 'series',
+            },
+            data: [
+              info.riskLevelForPassNum['A']
+                ? info.riskLevelForPassNum['A'].passNum
+                : null,
+              info.riskLevelForPassNum['B']
+                ? info.riskLevelForPassNum['B'].passNum
+                : null,
+              info.riskLevelForPassNum['C']
+                ? info.riskLevelForPassNum['C'].passNum
+                : null,
+              info.riskLevelForPassNum['D']
+                ? info.riskLevelForPassNum['D'].passNum
+                : null,
+            ],
+          },
         ],
       })
       /** */
@@ -578,20 +629,6 @@ export default {
           data: Object.keys(info.otherBehaviorForCompLevelNum),
         },
         series: [
-          {
-            name: 'AA',
-            type: 'bar',
-            stack: 'total',
-            label: {
-              show: true,
-            },
-            emphasis: {
-              focus: 'series',
-            },
-            data: Object.keys(info.otherBehaviorForCompLevelNum).map(
-              (item) => info.otherBehaviorForCompLevelNum[item].AA
-            ),
-          },
           {
             name: 'A',
             type: 'bar',
@@ -666,21 +703,6 @@ export default {
           data: Object.keys(info.otherBehaviorForRiskLevelNum),
         },
         series: [
-          {
-            name: 'AA',
-            type: 'bar',
-            stack: 'total',
-            label: {
-              show: true,
-            },
-            barWidth: 15,
-            emphasis: {
-              focus: 'series',
-            },
-            data: Object.keys(info.otherBehaviorForRiskLevelNum).map(
-              (item) => info.otherBehaviorForRiskLevelNum[item].AA
-            ),
-          },
           {
             name: 'A',
             type: 'bar',
@@ -688,7 +710,6 @@ export default {
             label: {
               show: true,
             },
-            barWidth: 15,
             emphasis: {
               focus: 'series',
             },
@@ -703,7 +724,6 @@ export default {
             label: {
               show: true,
             },
-            barWidth: 15,
             emphasis: {
               focus: 'series',
             },
@@ -718,7 +738,6 @@ export default {
             label: {
               show: true,
             },
-            barWidth: 15,
             emphasis: {
               focus: 'series',
             },
@@ -733,7 +752,6 @@ export default {
             label: {
               show: true,
             },
-            barWidth: 15,
             emphasis: {
               focus: 'series',
             },
@@ -798,21 +816,6 @@ export default {
           data: Object.keys(info.weatherForCompLevelNum),
         },
         series: [
-          {
-            name: 'AA',
-            type: 'bar',
-            stack: 'total',
-            label: {
-              show: true,
-            },
-            barWidth: 30,
-            emphasis: {
-              focus: 'series',
-            },
-            data: Object.keys(info.weatherForCompLevelNum).map(
-              (item) => info.weatherForCompLevelNum[item].AA
-            ),
-          },
           {
             name: 'A',
             type: 'bar',
@@ -820,7 +823,6 @@ export default {
             label: {
               show: true,
             },
-            barWidth: 30,
             emphasis: {
               focus: 'series',
             },
@@ -835,7 +837,6 @@ export default {
             label: {
               show: true,
             },
-            barWidth: 30,
             emphasis: {
               focus: 'series',
             },
@@ -850,7 +851,6 @@ export default {
             label: {
               show: true,
             },
-            barWidth: 30,
             emphasis: {
               focus: 'series',
             },
@@ -865,7 +865,6 @@ export default {
             label: {
               show: true,
             },
-            barWidth: 30,
             emphasis: {
               focus: 'series',
             },
@@ -892,21 +891,6 @@ export default {
           data: Object.keys(info.weatherForRiskLevelNum),
         },
         series: [
-          {
-            name: 'AA',
-            type: 'bar',
-            stack: 'total',
-            label: {
-              show: true,
-            },
-            barWidth: 30,
-            emphasis: {
-              focus: 'series',
-            },
-            data: Object.keys(info.weatherForRiskLevelNum).map(
-              (item) => info.weatherForRiskLevelNum[item].AA
-            ),
-          },
           {
             name: 'A',
             type: 'bar',
@@ -914,7 +898,6 @@ export default {
             label: {
               show: true,
             },
-            barWidth: 30,
             emphasis: {
               focus: 'series',
             },
@@ -929,7 +912,6 @@ export default {
             label: {
               show: true,
             },
-            barWidth: 30,
             emphasis: {
               focus: 'series',
             },
@@ -944,7 +926,6 @@ export default {
             label: {
               show: true,
             },
-            barWidth: 30,
             emphasis: {
               focus: 'series',
             },
@@ -959,7 +940,6 @@ export default {
             label: {
               show: true,
             },
-            barWidth: 30,
             emphasis: {
               focus: 'series',
             },
@@ -1076,20 +1056,6 @@ export default {
           data: Object.keys(info.operationAreaForRiskLevelNum),
         },
         series: [
-          {
-            name: 'AA',
-            type: 'bar',
-            stack: 'total',
-            label: {
-              show: true,
-            },
-            emphasis: {
-              focus: 'series',
-            },
-            data: Object.keys(info.operationAreaForRiskLevelNum).map(
-              (item) => info.operationAreaForRiskLevelNum[item].AA
-            ),
-          },
           {
             name: 'A',
             type: 'bar',
@@ -1165,20 +1131,6 @@ export default {
           data: Object.keys(info.operationAreaForCompLevelNum),
         },
         series: [
-          {
-            name: 'AA',
-            type: 'bar',
-            stack: 'total',
-            label: {
-              show: true,
-            },
-            emphasis: {
-              focus: 'series',
-            },
-            data: Object.keys(info.operationAreaForCompLevelNum).map(
-              (item) => info.operationAreaForCompLevelNum[item].AA
-            ),
-          },
           {
             name: 'A',
             type: 'bar',
@@ -1254,20 +1206,6 @@ export default {
           data: Object.keys(info.roadGeometryPlaneForRiskLevelNum),
         },
         series: [
-          {
-            name: 'AA',
-            type: 'bar',
-            stack: 'total',
-            label: {
-              show: true,
-            },
-            emphasis: {
-              focus: 'series',
-            },
-            data: Object.keys(info.roadGeometryPlaneForRiskLevelNum).map(
-              (item) => info.roadGeometryPlaneForRiskLevelNum[item].AA
-            ),
-          },
           {
             name: 'A',
             type: 'bar',
@@ -1343,20 +1281,6 @@ export default {
           data: Object.keys(info.roadGeometryPlaneForCompLevelNum),
         },
         series: [
-          {
-            name: 'AA',
-            type: 'bar',
-            stack: 'total',
-            label: {
-              show: true,
-            },
-            emphasis: {
-              focus: 'series',
-            },
-            data: Object.keys(info.roadGeometryPlaneForCompLevelNum).map(
-              (item) => info.roadGeometryPlaneForCompLevelNum[item].AA
-            ),
-          },
           {
             name: 'A',
             type: 'bar',
@@ -1432,20 +1356,6 @@ export default {
           data: Object.keys(info.roadGeometryVerticalForRiskLevelNum),
         },
         series: [
-          {
-            name: 'AA',
-            type: 'bar',
-            stack: 'total',
-            label: {
-              show: true,
-            },
-            emphasis: {
-              focus: 'series',
-            },
-            data: Object.keys(info.roadGeometryVerticalForRiskLevelNum).map(
-              (item) => info.roadGeometryVerticalForRiskLevelNum[item].AA
-            ),
-          },
           {
             name: 'A',
             type: 'bar',
@@ -1518,23 +1428,8 @@ export default {
         yAxis: {
           type: 'category',
           data: Object.keys(info.roadGeometryVerticalForCompLevelNum),
-          barWidth: 30,
         },
         series: [
-          {
-            name: 'AA',
-            type: 'bar',
-            stack: 'total',
-            label: {
-              show: true,
-            },
-            emphasis: {
-              focus: 'series',
-            },
-            data: Object.keys(info.roadGeometryVerticalForCompLevelNum).map(
-              (item) => info.roadGeometryVerticalForCompLevelNum[item].AA
-            ),
-          },
           {
             name: 'A',
             type: 'bar',
@@ -1869,7 +1764,7 @@ export default {
     .report_banner {
       width: 100%;
       height: 2000px;
-      background-image: url('../assets/common/image/report_banner.png');
+      background-image: url('../../assets/common/image/report_banner.png');
       background-repeat: no-repeat;
       background-position: center;
       display: flex;

src/views/workManagement/simulationEdit.vue

@@ -101,22 +101,6 @@ export default {
           label: '车辆数量',
           prop: 'carNums',
         },
-        {
-          label: '运行开始时间',
-          prop: 'createTime',
-        },
-        {
-          label: '运行结束时间',
-          prop: 'createTime',
-        },
-        {
-          label: '运行状态',
-          prop: 'createTime',
-        },
-        {
-          label: '运行结果',
-          prop: 'createTime',
-        },
         {
           label: '操作',
           prop: 'cgInfos',