|
@@ -829,7 +829,6 @@
|
|
|
return item.name.indexOf('回收金额') === -1 &&
|
|
return item.name.indexOf('回收金额') === -1 &&
|
|
|
(item.gu_tp || item.gai_tp || (item.final_tp !== undefined && item.final_tp) || item.yu_tp || (item.ctrl_tp !== undefined && item.ctrl_tp))
|
|
(item.gu_tp || item.gai_tp || (item.final_tp !== undefined && item.final_tp) || item.yu_tp || (item.ctrl_tp !== undefined && item.ctrl_tp))
|
|
|
});
|
|
});
|
|
|
- console.log(level1List);
|
|
|
|
|
if (level1List.length > 0) {
|
|
if (level1List.length > 0) {
|
|
|
for (const t of level1List) {
|
|
for (const t of level1List) {
|
|
|
html += '<tr class="text-center">\n' +
|
|
html += '<tr class="text-center">\n' +
|
|
@@ -886,7 +885,7 @@
|
|
|
const stage_tp = t.cost_analysis ? t.cost_analysis.stage_tp : null;
|
|
const stage_tp = t.cost_analysis ? t.cost_analysis.stage_tp : null;
|
|
|
if (stage_tp) {
|
|
if (stage_tp) {
|
|
|
total_in_tp = ZhCalc.add(total_in_tp, stage_tp.in_tp);
|
|
total_in_tp = ZhCalc.add(total_in_tp, stage_tp.in_tp);
|
|
|
- total_out_tp = ZhCalc.add(total_in_tp, stage_tp.out_tp);
|
|
|
|
|
|
|
+ total_out_tp = ZhCalc.add(total_out_tp, stage_tp.out_tp);
|
|
|
total_profit = ZhCalc.add(total_profit, stage_tp.profit);
|
|
total_profit = ZhCalc.add(total_profit, stage_tp.profit);
|
|
|
chart_option2_data.push(stage_tp.profit ? stage_tp.profit : 0);
|
|
chart_option2_data.push(stage_tp.profit ? stage_tp.profit : 0);
|
|
|
chart_option3_data.push(stage_tp.profit_percent ? stage_tp.profit_percent : 0);
|
|
chart_option3_data.push(stage_tp.profit_percent ? stage_tp.profit_percent : 0);
|