竞赛场景结束页面代码调整

src/views/newMap/displayNew/dispatherContest/testResult.vue

@@ -12,12 +12,12 @@
       <div class="OSTcompleted">
         <span v-if="completed" style="font-size:16px;color:green">完成</span>
         <span v-else style="font-size:16px;color:red">未完成</span>
-        <span style="margin-left:20px;font-size:16px;">满分：{{ totalScore }} 分</span>
+        <span style="margin-left:20px;font-size:16px;">满分：{{ fullScore }} 分</span>
         <span style="margin-left:20px;font-size:16px;">得分：{{ userScore }} 分</span>
       </div>
-      <div class="OSTitle">关键步骤信息</div>
+      <div class="OSTitle"><span>关键步骤信息</span><span style="margin-left:10px;">{{ '(得分: '+userScoreOfCommand+' / 满分: '+ fullScoreOfCommand+')' }}</span></div>
       <el-table :data="commandPublishStatisticVO" border class="OSTTable3" height="400">
-        <el-table-column prop="actionId" label="步骤描述" width="200">
+        <el-table-column prop="actionId" label="步骤描述" width="230">
           <template slot-scope="scope">
             {{ covert(scope.row.actionId) }}
           </template>
@@ -36,9 +36,12 @@
         <el-table-column prop="score" label="步骤总分" width="100" />
         <el-table-column prop="finalPointsDeducted" label="用户扣分" width="100" />
       </el-table>
-      <div class="OSTitle">运营统计信息</div>
+      <div class="OSTitle">
+        <span>运营统计信息</span>
+        <span style="margin-left:10px;">{{ '(得分: '+userScoreOfOperationStatistic+' / 满分: '+ fullScoreOfOperationStatistic+')' }}</span>
+      </div>
       <el-table :data="operationStaticItemVOs" border class="OSTTable">
-        <el-table-column prop="description" label="数据名称" width="200" />
+        <el-table-column prop="description" label="数据名称" width="300" />
         <el-table-column label="正确答案" width="150">
           <template slot-scope="scope">
             <div v-if="scope.row.type=='Time'">{{ scope.row.time }}</div>
@@ -53,31 +56,33 @@
         </el-table-column>
         <el-table-column prop="finalPointsDeducted" label="扣分" />
       </el-table>
-      <div class="OSTSignInfo">运营指标信息</div>
+      <div class="OSTSignInfo">
+        <span>运营指标信息</span>
+        <span style="margin-left:10px;">{{ '(得分: '+userScoreOfOperationStatistic+' / 满分: '+ fullScoreOfOperationStatistic+')' }}</span>
+      </div>
       <div class="OSTSignInfoTips">
         <span class="el-icon-info" style="font-size: 16px;" /> 若竞赛未完成，运营指标不得分
       </div>
       <div class="OSTSignInfoTips">晚点列车信息</div>
       <el-table :data="finalLateStatistics" border class="OSTTable1">
-        <el-table-column prop="groupNumber" label="车组号" width="299" />
+        <el-table-column prop="groupNumber" label="车组号" width="300" />
         <el-table-column prop="dt" label="晚点时间" width="300">
           <template slot-scope="scope">
             {{ scope.row.dt }} s
           </template>
         </el-table-column>
+        <el-table-column prop="finalPointsDeducted" label="扣分" width="230" />
       </el-table>
       <div class="OSTSignInfoTips">区间停车信息</div>
       <el-table :data="finalStopInSectionStatistics" border class="OSTTable2">
-        <el-table-column prop="groupNumber" label="车组号" width="299" />
+        <el-table-column prop="groupNumber" label="车组号" width="300" />
         <el-table-column prop="duration" label="停车时长" width="300">
           <template slot-scope="scope">
             {{ scope.row.duration }} s
           </template>
         </el-table-column>
+        <el-table-column prop="finalPointsDeducted" label="扣分" width="230" />
       </el-table>
-      <div class="OSTSignInfoTips">
-        运营指标总扣分：{{ finalPointsDeducted4OperationIndex }}
-      </div>
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="doClose">{{ $t('global.confirm') }}</el-button>
@@ -96,10 +101,15 @@ export default {
             finalStopInSectionStatistics:[],
             commandPublishStatisticVO:[],
             completed:false,
-            totalScore:'',
+            fullScore:'',
             userScore:'',
             actionList:[],
-            finalPointsDeducted4OperationIndex:0
+            fullScoreOfCommand:0, // 指令发布部分总分
+            userScoreOfCommand:0, // 关键步骤部分用户得分
+            fullScoreOfOperationStatistic:0, // 运营统计满分
+            userScoreOfOperationStatistic:0, // 运营统计用户得分
+            fullScoreOfOperationIndex:0, // 运营指标满分
+            userScoreOfOperationIndex:0 // 运营指标用户得分
         };
     },
     methods:{
@@ -111,9 +121,14 @@ export default {
             this.finalStopInSectionStatistics = data.operationIndexStatisticVO.finalStopInSectionStatistics;
             this.commandPublishStatisticVO = data.commandPublishStatisticVO;
             this.actionList = actionList;
-            this.totalScore = data.totalScore;
+            this.fullScore = data.fullScore;
             this.userScore = data.userScore;
-            this.finalPointsDeducted4OperationIndex = data.finalPointsDeducted4OperationIndex;
+            this.fullScoreOfCommand = data.fullScoreOfCommand;
+            this.userScoreOfCommand = data.userScoreOfCommand;
+            this.fullScoreOfOperationStatistic = data.fullScoreOfOperationStatistic;
+            this.userScoreOfOperationStatistic = data.userScoreOfOperationStatistic;
+            this.fullScoreOfOperationIndex = data.fullScoreOfOperationIndex;
+            this.userScoreOfOperationIndex = data.userScoreOfOperationIndex;
         },
         doClose() {
             this.dialogShow = false;
@@ -216,13 +231,13 @@ export default {
     font-weight: bold;
 }
 .OSTTable{
-    width:600px;
+    width:832px;
 }
 .OSTTable1,.OSTTable2{
-    width:600px;
+    width:832px;
 }
 .OSTTable3{
-    width:802px;
+    width:832px;
 }
 .OSTcompleted{
     padding: 5px 5px;