Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 11m22s

This commit is contained in:
joylink_fanyuhong 2024-09-19 09:10:22 +08:00
commit 8fbaa85b99

View File

@ -72,15 +72,15 @@ export default {
sums[index] = '合计'; sums[index] = '合计';
return; return;
} else if (index === 2) { } 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; 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;
sums[index] = total;
} else if (index === 3) { } else if (index === 3) {
const values = data.map(item => Number(item[column.property])); const values = data.map(item => Number(item[column.property]));
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {