|
@@ -1006,9 +1006,11 @@
|
|
|
|
|
|
|
|
const item = tender.list.find(v => v.yearmonth === month);
|
|
const item = tender.list.find(v => v.yearmonth === month);
|
|
|
|
|
|
|
|
- const value = item ? ZhCalc.round(ZhCalc.div(item.tp, 10000), 0) : 0;
|
|
|
|
|
|
|
+ // const value = item ? ZhCalc.round(ZhCalc.div(item.tp, 10000), 0) : 0;
|
|
|
|
|
|
|
|
- total = ZhCalc.add(total, value); // 累计
|
|
|
|
|
|
|
+ const endtp = item ? ZhCalc.round(ZhCalc.div(item.end_tp, 10000), 0) : 0;
|
|
|
|
|
+
|
|
|
|
|
+ total = endtp ? endtp : total; // 累计
|
|
|
|
|
|
|
|
data.push(total);
|
|
data.push(total);
|
|
|
option4_data.totalMap[month] = ZhCalc.add((option4_data.totalMap[month] || 0), total);
|
|
option4_data.totalMap[month] = ZhCalc.add((option4_data.totalMap[month] || 0), total);
|