Merge branch 'main' of http://10.10.14.176:3000/huanghai/YunNanProject

static/js/data/index.js

@@ -41,38 +41,26 @@ option_1_1 = {
     {
       name: "镇区",
       type: "bar",
-      data: [      ],
+      data: [],
       itemStyle: { borderRadius: [6, 6, 0, 0] },
     },
     {
       name: "乡村",
       type: "bar",
-      data: [      ],
+      data: [],
       itemStyle: { borderRadius: [6, 6, 0, 0] },
     },
     {
       name: "总入园数",
       type: "line",
       yAxisIndex: 1,
-      data: [
+      data: [],
-      ],
     },
     {
       name: "2022年基数",
       type: "line",
       yAxisIndex: 1,
-      data: [
+      data: [],
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        105.6714,
-        105.6714,
-        105.6714,
-      ],
     },
   ],
 };

static/js/index.js

@@ -33,10 +33,12 @@ $(function () {
           seriesItem.tooltip = { valueFormatter: (v) => v + " 万人" };
         });
         option_1_1.xAxis[0].data = res.xAxis_data;
-        option_1_1.series[0].data = res.series_data_1;
+        option_1_1.series[0].data = res.series_data_0;
-        option_1_1.series[1].data = res.series_data_2;
+        option_1_1.series[1].data = res.series_data_1;
-        option_1_1.series[2].data = res.series_data_3;
+        option_1_1.series[2].data = res.series_data_2;
-        option_1_1.series[3].data = res.series_data_4;
+        option_1_1.series[3].data = res.series_data_3;
+        option_1_1.series[4].data = res.series_data_4;
+        option_1_1.series[5].data = res.series_data_5;
         myChart.setOption(option_1_1);
         window.addEventListener("resize", function () {
           myChart.resize();