Browse Source

计量对比数据bug调整

laiguoran 3 năm trước cách đây
mục cha
commit
76d359a8dc
1 tập tin đã thay đổi với 13 bổ sung13 xóa
  1. 13 13
      app/view/datacollect/index.ejs

+ 13 - 13
app/view/datacollect/index.ejs

@@ -1367,14 +1367,14 @@
             option1.series[0].data = chart_option1_data;
             myChart1.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');
-                const option4_data = {
-                    yearmonth: [],
-                    tp: [],
-                    end_tp: [],
-                }
                 for (const [i,c4] of new_chart_option4_data.entries()) {
                     console.log(c4);
                     option4_data.yearmonth.push(c4.yearmonth);
@@ -1385,15 +1385,15 @@
                         option4_data.end_tp.push(c4.end_tp);
                     }
                 }
-                const option4 = myChart4_1.getOption();
-                option4.dataZoom[0].end = computedPosition(option4_data.yearmonth.length);
-                option4.dataZoom[1].end = computedPosition(option4_data.yearmonth.length);
-                option4.xAxis[0].data = option4_data.yearmonth;
-                option4.series[0].data = option4_data.tp;
-                option4.series[1].data = option4_data.end_tp;
-                myChart4_1.setOption(option4);
-                myChart4_2.setOption(option4);
             }
+            const option4 = myChart4_1.getOption();
+            option4.dataZoom[0].end = computedPosition(option4_data.yearmonth.length);
+            option4.dataZoom[1].end = computedPosition(option4_data.yearmonth.length);
+            option4.xAxis[0].data = option4_data.yearmonth;
+            option4.series[0].data = option4_data.tp;
+            option4.series[1].data = option4_data.end_tp;
+            myChart4_1.setOption(option4);
+            myChart4_2.setOption(option4);
         }
 
         $('.change-collect').on('click', function () {