|
@@ -323,7 +323,7 @@ $(document).ready(() => {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
if (other.show) result.push(other);
|
|
if (other.show) result.push(other);
|
|
|
- result.push(sum);
|
|
|
|
|
|
|
+ // result.push(sum);
|
|
|
result.forEach(x => { x.tp = ZhCalc.add(x.positive_tp, x.negative_tp); });
|
|
result.forEach(x => { x.tp = ZhCalc.add(x.positive_tp, x.negative_tp); });
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
@@ -341,7 +341,8 @@ $(document).ready(() => {
|
|
|
const sum = bonusObj.sum();
|
|
const sum = bonusObj.sum();
|
|
|
const html = [];
|
|
const html = [];
|
|
|
for (const s of sum) {
|
|
for (const s of sum) {
|
|
|
- html.push(`<tr><td>${s.name}</td><td class="text-right">${s.positive_tp || ''}</td><td class="text-right">${s.negative_tp || ''}</td><td class="text-right">${s.tp || ''}</td></tr>`);
|
|
|
|
|
|
|
+ //html.push(`<tr><td>${s.name}</td><td class="text-right">${s.positive_tp || ''}</td><td class="text-right">${s.negative_tp || ''}</td><td class="text-right">${s.tp || ''}</td></tr>`);
|
|
|
|
|
+ html.push(`<tr><td>${s.name}</td><td class="text-right">${s.tp || ''}</td></tr>`);
|
|
|
}
|
|
}
|
|
|
$('#sum').html(html.join(' '));
|
|
$('#sum').html(html.join(' '));
|
|
|
};
|
|
};
|