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

static/js/index.js

@@ -28,22 +28,11 @@ $(function () {
       async: false,
       dataType: "json",
       url: "/RuYuanZaiYuan/school/preschool/chart",
-      success: function (option) {
+      success: function (res) {        
         option_1_1.series.forEach((seriesItem, index) => {
           seriesItem.tooltip = { valueFormatter: (v) => v + " 万人" };
         });
-        option_1_1.xAxis[0].data = [
+        option_1_1.xAxis[0].data = res.xAxis_data;
-          "2013",
-          "2016",
-          "2017",
-          "2018",
-          "2019",
-          "2020",
-          "2021",
-          "2022",
-          "2023",
-          "2024",
-        ];
         myChart.setOption(option_1_1);
         window.addEventListener("resize", function () {
           myChart.resize();