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

Model/RuYuanZaiYuanCountModel.py

@@ -55,17 +55,19 @@ class RuYuanZaiYuanModel:
         #     total_enroll.append(calculated_total / 10000)  # 转换为万人
 
         xAxis = ["2019", "2020", "2021", "2022", "2023", "2024", "2025", "2026"]
-        series_data_1 = [2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6]
+        series_data_0 = [2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6]
-        series_data_2 = [2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6]
+        series_data_1 = [2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6]
-        series_data_3 = [2.4, 5.2, 8.0, 25.4, 27.7, 73.7, 155.6]
+        series_data_2 = [2.4, 5.2, 8.0, 25.4, 27.7, 73.7, 155.6]
+        series_data_3 = [2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3]
         series_data_4 = [2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3]
-        line_data = [2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3]
+        series_data_5 = [None, None, None, None, None, None, None, 105.6714, 105.6714, 105.6714],
         data = {"xAxis_data": xAxis,
+                "series_data_0": series_data_0,
                 "series_data_1": series_data_1,
                 "series_data_2": series_data_2,
                 "series_data_3": series_data_3,
                 "series_data_4": series_data_4,
-                "line_data": line_data
+                "series_data_5": series_data_5,
                 }
         return data