diff --git a/Model/RuYuanZaiYuanCountModel.py b/Model/RuYuanZaiYuanCountModel.py index 72daa1e..ba81b67 100644 --- a/Model/RuYuanZaiYuanCountModel.py +++ b/Model/RuYuanZaiYuanCountModel.py @@ -130,13 +130,12 @@ class RuYuanZaiYuanModel: base_2022_line.append(None) # 2022年之前不显示 data = { - "data1": ["城区", "镇区", "乡村", "总在园数", "2022年基数"], - "data2": years, - "data3": urban_data, - "data4": town_data, - "data5": rural_data, - "data6": total_in_school, - "data7": base_2022_line + "xAxis_data": years, + "series_data_0": urban_data, + "series_data_1": town_data, + "series_data_2": rural_data, + "series_data_3": total_in_school, + "series_data_4": base_2022_line } return data