From 41aaef05863da6bbe2d708d3052290b88c21bdf8 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Wed, 11 Sep 2024 09:33:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=B7=A5=E9=99=A2=E5=A4=A7=E9=93=81?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BA=BF=E5=AE=9E=E8=AE=AD=E6=B5=8B=E9=AA=8C?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=BB=93=E6=9D=9F=E5=90=8E=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E7=BB=93=E6=9E=9C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/display/trainingList/testResult.vue      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/newMap/display/trainingList/testResult.vue b/src/views/newMap/display/trainingList/testResult.vue
index edb0be58c..a07a2d289 100644
--- a/src/views/newMap/display/trainingList/testResult.vue
+++ b/src/views/newMap/display/trainingList/testResult.vue
@@ -15,6 +15,7 @@
       style="width: 100%"
     >
       <el-table-column prop="desc" label="步骤" />
+	  <el-table-column prop="role" label="操作人员" />
       <el-table-column prop="success" label="操作结果" width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.success?'正确':'错误' }}</span>
@@ -22,7 +23,7 @@
       </el-table-column>
       <el-table-column prop="score" label="得分" width="100">
         <template slot-scope="scope">
-          <span>{{ scope.row.score || 0 }}</span>
+          <span>{{ scope.row.score }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -54,7 +55,11 @@ export default {
             if (scoreList && scoreList.length) {
                 scoreList.forEach(score => {
                     const step = this.stepList.find(step => step.id == score.stepId);
-                    this.tableData.push({ ...score, desc: step.description });
+                    const role = this.$store.state.training.memberData[parseInt(step.memberId)];
+                    if (!score.hasOwnProperty('score')) {
+                        score.score = '/';
+                    }
+                    this.tableData.push({ ...score, role: role.labelName, desc: step.description });
                 });
             }
             this.dialogVisible = true;
@@ -66,7 +71,7 @@ export default {
                 if (index === 0) {
                     sums[index] = '合计';
                     return;
-                } else if (index === 1) {
+                } else if (index === 2) {
                     const MyMemberId = this.$store.state.training.myMemberId;
                     const scoringRuleList = this.$store.state.trainingNew.scoringRules.find(rule => rule.memberId == MyMemberId );
                     let total = 0;
@@ -76,7 +81,7 @@ export default {
                         });
                     }
                     sums[index] = total;
-                } else if (index === 2) {
+                } else if (index === 3) {
                     const values = data.map(item => Number(item[column.property]));
                     sums[index] = values.reduce((prev, curr) => {
                         const value = Number(curr);