Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 11m22s
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 11m22s
This commit is contained in:
commit
8fbaa85b99
@ -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.find(rule => rule.memberId == MyMemberId );
|
||||
const scoringRuleList = this.$store.state.trainingNew.scoringRules;
|
||||
let total = 0;
|
||||
if (scoringRuleList && scoringRuleList.details && scoringRuleList.details.length) {
|
||||
scoringRuleList.details.forEach(item => {
|
||||
total += item.score;
|
||||
if (scoringRuleList && scoringRuleList.length) {
|
||||
scoringRuleList.forEach(item => {
|
||||
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) => {
|
||||
|
Loading…
Reference in New Issue
Block a user