成本管理大屏bug修复

app/view/datacollect/index_cost.ejs

@@ -879,7 +879,6 @@
             // } else {
             //     option1_is_tender = true;
             // }
-            const chart_option4_data = [];
 
             for(const t of tenderList) {
                 const stage_tp = t.cost_analysis ? t.cost_analysis.stage_tp : null;
@@ -947,12 +946,13 @@
             $('[data-toggle="tooltip"]').tooltip();
 
             // 图表数据赋值
+            const analysis_num = _.filter(tenderList, t => t.cost_analysis).length;
             const option2 = myChart2_1.getOption();
             option2.dataZoom[0].start = 0;
-            option2.dataZoom[0].end = computedPosition(tenderList.length);
+            option2.dataZoom[0].end = computedPosition(analysis_num);
             option2.xAxis[0].data = chart_option_name;
             option2.series[0].data = chart_option2_data;
-            if (tenderList.length >= 8) {
+            if (analysis_num >= 8) {
                 option2.dataZoom[0].show = true;
             } else {
                 option2.dataZoom[0].show = false;
@@ -961,10 +961,10 @@
 
             const option3 = myChart3_1.getOption();
             option3.dataZoom[0].start = 0;
-            option3.dataZoom[0].end = computedPosition(tenderList.length);
+            option3.dataZoom[0].end = computedPosition(analysis_num);
             option3.xAxis[0].data = chart_option_name;
             option3.series[0].data = chart_option3_data;
-            if (tenderList.length >= 8) {
+            if (analysis_num >= 8) {
                 option3.dataZoom[0].show = true;
             } else {
                 option3.dataZoom[0].show = false;
@@ -976,25 +976,6 @@
                 return item.value !== 0;
             });
             myChart1_1.setOption(option1);
-
-            const option4_data = {
-                yearmonth: [],
-                tp: [],
-                end_tp: [],
-            }
-            if (chart_option4_data.length > 0) {
-                // chart_option4_data 排序
-                const new_chart_option4_data = _.sortBy(chart_option4_data, 'yearmonth');
-                for (const [i,c4] of new_chart_option4_data.entries()) {
-                    option4_data.yearmonth.push(c4.yearmonth);
-                    option4_data.tp.push(c4.tp);
-                    if(i !== 0) {
-                        option4_data.end_tp.push(ZhCalc.add(c4.tp, option4_data.end_tp[i-1]));
-                    } else {
-                        option4_data.end_tp.push(c4.tp);
-                    }
-                }
-            }
             $('#profit_tableId').css({'margin-top': 0});
         }
         // 第一层分类选择