fix:多仿真评价判断&&标准测试字段补齐

src/api/workManagement.js

@@ -29,6 +29,9 @@ const deleteAutomaticProjectByids = basePart + '/simulationProject/deleteAutomat
 const deleteAutomaticSubProjectByIds = basePart + '/simulationProject/deleteAutomaticSubProjectByIds'; // 删除自动化测试子任务
 const updateAutoProjectNowRunState = basePart + '/simulationProject/updateAutoProjectNowRunState'; // 修改自动化测试子任务状态
 
+const getEvaluationRuleDetail = basePart +'/simulationProject/getEvaluationRuleDetail'; // 标准化测试详情展示规则
+
+
 const carList = basePart + '/simulationProject/selectDropDownByTypeNew'; //多模式仿真获取车辆列表
 const mapList = basePart + '/simulationMap/selectAllSimulationMapList'; //多模式仿真获取地图列表
 const algorithmList = basePart + '/simulationProject/selectDropDownByTypeNew';//多模式仿真获取算法列表
@@ -77,5 +80,6 @@ export default {
     createAutomaticSubProject,
     deleteAutomaticProjectByids,
     deleteAutomaticSubProjectByIds,
-    updateAutoProjectNowRunState
+    updateAutoProjectNowRunState,
+    getEvaluationRuleDetail
 }

src/views/multimodeSimulation/evaluationResults.vue

@@ -112,10 +112,10 @@ export default {
           value: 0,
           label: '总视角',
         },
-        {
-          value: 1,
-          label: '多仿真视角',
-        },
+        // {
+        //   value: 1,
+        //   label: '多仿真视角',
+        // },
       ],
       playUrl:'', // 当前播放地址
       videoList: [], // 视频地址列表
@@ -166,7 +166,10 @@ export default {
               status: res.info.outOfPavementDetail[0].abnormalTimeDescription,
             },
           ]
-          this.playUrl = res.info.projectResultOverallUrl,
+          this.playUrl = res.info.projectResultOverallUrl
+          if(res.info.projectResultSimulationUrl){
+            this.viewOptions = [...this.viewOptions, {value: 1,label: '多仿真视角',}]
+          }
           this.videoList = [
             res.info.projectResultOverallUrl,
             res.info.projectResultSimulationUrl,

src/views/multimodeSimulation/simulationEdit.vue

@@ -100,9 +100,10 @@
     >
       <el-table-column label="操作" slot="cgInfos" align="center" width="180">
         <template v-slot="scope">
-          <span v-if="!isEdit" @click="toEvaluate(scope.row)" class="elIcon">
+          <span v-if="!isEdit && ![2,4,6,null].includes(scope.row.taskStatus)" @click="toEvaluate(scope.row)" class="elIcon">
             评价结果
           </span>
+          <span v-else>-</span>
           <span
             v-if="isEdit"
             @click="navigatorEdit(scope.row.id)"

src/views/workManagement/projectInfo.vue

@@ -71,30 +71,30 @@
                 </div>
                 <div class="boxContent">
                     <div class="info">
-                        <span>危险度规则:XXX</span>
-                        <b>{{ info.projectId }}</b>
+                        <span>危险度规则:</span>
+                        <b>{{ ruleDetailInfo.riskEvaluationRuleName || '-' }}</b>
                     </div>
                     <div class="info">
-                        <span>覆盖率规则:XXX</span>
-                        <b>{{ info.projectName }}</b>
+                        <span>覆盖率规则:</span>
+                        <b>{{ ruleDetailInfo.coverageRateEvaluationRuleName || '-' }}</b>
                     </div>
                     <div class="info">
-                        <span>暴露率规则:XXX</span>
-                        <b>{{ info.projectName }}</b>
+                        <span>暴露率规则:</span>
+                        <b>{{ ruleDetailInfo.exposureRateEvaluationRuleName || '-' }}</b>
                     </div>
                     <div class="info">
-                        <span>场景数量:10</span>
-                        <b>{{ info.projectName }}</b>
+                        <span>场景数量:</span>
+                        <b>{{ ruleDetailInfo.sceneNum || 0 }}</b>
                     </div>
                     <div class="info">
-                        <span>场景测试包覆盖率:10</span>
-                        <b>{{ info.projectName }}</b>
+                        <span>场景测试包覆盖率:</span>
+                        <b>{{ ruleDetailInfo.testPackageCoverageRate || '-'}}</b>
                     </div>
                     <div class="info">
-                        <span>场景测试包暴露率:20</span>
-                        <b>{{ info.projectName }}</b>
-                    </div>
+                        <span>场景测试包暴露率:</span>
+                        <b>{{ ruleDetailInfo.testPackageExposureRate || '-' }}</b>
                     </div>
+                </div>
             </div>
 
             <div class="flexBox topPanel">
@@ -162,8 +162,8 @@
                                 <span v-show="isOpen" class="view close" @click="showAll(false)" title="关闭全部"></span>
                             </div>
 
-                            <three-show v-loading="loading" @loadingDone="loadingDone" ref="threeShow" :carModel="carModel"
-                                :allSensor="allSensor"></three-show>
+                            <three-show v-loading="loading" @loadingDone="loadingDone" ref="threeShow"
+                                :carModel="carModel" :allSensor="allSensor"></three-show>
 
                             <div v-show="configBox" class="conditions">
                                 <el-form ref="formA" :model="formA" :rules="rulesA" label-width="99px" disabled>
@@ -238,15 +238,15 @@
                         <div class="chart">
                             <div class="pieTitle">任务运行状态统计:</div>
                             <div class="pie">
-                                <pie-chart-project-info id="projectInfoPieA" :stateList="stateList" stateName="stateName"
-                                    seriesName="任务运行状态统计"></pie-chart-project-info>
+                                <pie-chart-project-info id="projectInfoPieA" :stateList="stateList"
+                                    stateName="stateName" seriesName="任务运行状态统计"></pie-chart-project-info>
                             </div>
                         </div>
                         <div class="chart">
                             <div class="pieTitle">得分统计:</div>
                             <div class="pie">
-                                <pie-chart-project-info id="projectInfoPieB" :stateList="resultList" stateName="resultName"
-                                    seriesName="得分统计"></pie-chart-project-info>
+                                <pie-chart-project-info id="projectInfoPieB" :stateList="resultList"
+                                    stateName="resultName" seriesName="得分统计"></pie-chart-project-info>
                             </div>
                         </div>
                     </div>
@@ -262,7 +262,8 @@
                 </div>
             </div>
         </div>
-        <router-view v-show="$route.path.includes('taskInfo') || $route.path.includes('evaluationReport')"></router-view>
+        <router-view
+            v-show="$route.path.includes('taskInfo') || $route.path.includes('evaluationReport')"></router-view>
         <!-- <router-view v-else></router-view> -->
     </div>
 </template>
@@ -290,6 +291,7 @@ export default {
             projectType: "", // 1手动 2自动
             info: {},
             evaluationLevel: "",
+            ruleDetailInfo:{}, // 规则详情列表
             columns: [
                 {
                     label: "ID",
@@ -634,6 +636,16 @@ export default {
                     this.$message.error(res.message || "获取信息失败");
                 }
             });
+            this.$axios({
+                method: "post",
+                url: this.$api.workManagement.getEvaluationRuleDetail,
+                data: {
+                    id: this.id,
+                    projectType: this.projectType,
+                },
+            }).then(res=>{
+                this.ruleDetailInfo = res.info
+            })
         }
     },
 };