Merge remote-tracking branch 'origin/develop'

src/views/newMap/display/trainingList/testResult.vue

@@ -72,15 +72,15 @@ export default {
                     sums[index] = '合计';
                     return;
                 } else if (index === 2) {
-                    const MyMemberId = this.$store.state.training.myMemberId;
+                    const scoringRuleList = this.$store.state.trainingNew.scoringRules;
-                    const scoringRuleList = this.$store.state.trainingNew.scoringRules.find(rule => rule.memberId == MyMemberId );
                     let total = 0;
-                    if (scoringRuleList && scoringRuleList.details && scoringRuleList.details.length) {
+                    if (scoringRuleList && scoringRuleList.length) {
-                        scoringRuleList.details.forEach(item => {
+                        scoringRuleList.forEach(item => {
-                            total += item.score;
+                            total += item.fullMarks;
                         });
                     }
                     sums[index] = total;
+                    sums[index] = total;
                 } else if (index === 3) {
                     const values = data.map(item => Number(item[column.property]));
                     sums[index] = values.reduce((prev, curr) => {