diff --git a/Model/RuYuanZaiYuanCountModel.py b/Model/RuYuanZaiYuanCountModel.py index 6fa92af..722fe11 100644 --- a/Model/RuYuanZaiYuanCountModel.py +++ b/Model/RuYuanZaiYuanCountModel.py @@ -4,8 +4,10 @@ from pyecharts.charts import Bar, Line from pyecharts.globals import CurrentConfig from Config.Config import ONLINE_HOST + CurrentConfig.ONLINE_HOST = ONLINE_HOST + class RuYuanZaiYuanModel: @staticmethod def load_student_data(): @@ -13,40 +15,40 @@ class RuYuanZaiYuanModel: # 加载招生数据(入园人数) with open("./Data/ZhaoShengCount.json", "r", encoding="utf-8") as f: enrollment_data = json.load(f) - + # 加载在校生数据(在园人数) with open("./Data/ZaiXiaoShengCount.json", "r", encoding="utf-8") as f: in_school_data = json.load(f) - + return enrollment_data, in_school_data except Exception as e: print(f"读取学生数据出错: {e}") return [], [] - + @staticmethod def generate_preschool_education_config(): # 获取学前教育相关数据 enrollment_data, in_school_data = RuYuanZaiYuanModel.load_student_data() - + # 提取云南省级数据 yunnan_enroll = next((item for item in enrollment_data if item["area_name"] == "云南省"), None) - + if not yunnan_enroll: return {} - + # 提取年份数据(2015-2024) years = [str(year) for year in range(2015, 2025)] - + # 构建学前教育数据 - urban_data = [] # 城区数据 - town_data = [] # 镇区数据 - rural_data = [] # 乡村数据 + urban_data = [] # 城区数据 + town_data = [] # 镇区数据 + rural_data = [] # 乡村数据 total_enroll = [] # 总入园数 - + for year in years: enroll_data = yunnan_enroll["education_data"]["preschool"].get(year, {}) urban_data.append(enroll_data.get("urban", 0) / 10000) # 转换为万人 - town_data.append(enroll_data.get("town", 0) / 10000) # 转换为万人 + town_data.append(enroll_data.get("town", 0) / 10000) # 转换为万人 rural_data.append(enroll_data.get("rural", 0) / 10000) # 转换为万人 # 计算总和作为总入园数，而非使用文件中的total字段 calculated_total = enroll_data.get("urban", 0) + enroll_data.get("town", 0) + enroll_data.get("rural", 0) @@ -66,24 +68,34 @@ class RuYuanZaiYuanModel: base_2022_line.append(base_value) else: base_2022_line.append(None) # 2022年之前不显示 - + # 构建ECharts配置 option = { + "grid": { + "left": 0, + "right": 0, + "top": 40, + "bottom": 10, + "containLabel": True, + }, + "textStyle": { + "color": "#fff", + }, "tooltip": { "trigger": "axis", "axisPointer": { "type": "cross", "crossStyle": {"color": "#999"} }, - "textStyle": {"color": "#333"}, - "backgroundColor": "rgba(255, 255, 255, 0.8)", - "borderColor": "rgba(0, 0, 0, 0.2)", + "textStyle": {"color": "#fff"}, + "backgroundColor": "rgba(96,98,102,0.8)", + "borderColor": "rgba(255,255,255,0.3)", "borderWidth": 1 }, "legend": { "data": ["城区", "镇区", "乡村", "总入园数", "2022年基数(万人)"], - "top": 30, - "textStyle": {"color": "#333"}, + "top": 0, + "textStyle": {"color": "#fff"}, "icon": "roundRect", "itemWidth": 12, "itemHeight": 12 @@ -92,86 +104,66 @@ class RuYuanZaiYuanModel: { "type": "category", "data": years, - "axisPointer": {"type": "shadow"}, - "axisLabel": {"color": "#333"}, - "axisLine": {"lineStyle": {"color": "#333"}} + "axisPointer": {type: "shadow"}, + "axisLine": {"lineStyle": {"color": "#fff"}}, + "axisLabel": {"color": "#fff"}, + "nameTextStyle": {"color": "#fff"} } ], "yAxis": [ { "type": "value", - "name": "人数", "min": 0, - "max": 100, - "interval": 20, + "max": 25, + "interval": 5, "axisLabel": { - "formatter": "{value} 万人", - "color": "#333" - }, - "axisLine": {"lineStyle": {"color": "#333"}}, - "splitLine": {"lineStyle": {"color": "rgba(0,0,0,0.1)"}} + "formatter": "{value}" + , "color": "#fff" + } }, { "type": "value", - "name": "总入园数", "min": 0, - "max": 140, - "interval": 20, - "position": "right", - "nameLocation": "end", # 将名称放在轴末端 - "nameGap": 30, # 增加名称与轴的间距 - "axisLabel": { - "formatter": "{value} 万人", - "color": "#00a859" - }, - "axisLine": {"show": True, "lineStyle": {"color": "#00a859"}}, # 改为绿色 - "axisTick": {"show": True}, - "splitLine": {"show": False} - } + "max": 25, + "interval": 5, + "axisLabel": {"formatter": "{value}", "color": "#fff"}, + }, + ], "series": [ { "name": "城区", "type": "bar", + "tooltip": "{valueFormatter: (v) = > v 万人}", "data": urban_data, "itemStyle": { - "color": "#5470c6", - "borderRadius": [6, 6, 0, 0] - }, - "barWidth": "25%", # 增加柱子宽度 - "barGap": "-10%" # 设置负数让柱子重叠以减少空隙 + "borderRadius": [6, 6, 0, 0], + } }, { "name": "镇区", "type": "bar", "data": town_data, + "tooltip": "{valueFormatter: (v) = > v 万人}", "itemStyle": { - "color": "#91cc75", - "borderRadius": [6, 6, 0, 0] + "borderRadius": [6, 6, 0, 0], }, - "barWidth": "25%", # 增加柱子宽度 - "barGap": "-10%" # 设置负数让柱子重叠以减少空隙 }, { "name": "乡村", "type": "bar", "data": rural_data, + "tooltip": "{valueFormatter: (v) = > v 万人}", "itemStyle": { - "color": "#fac858", "borderRadius": [6, 6, 0, 0] }, - "barWidth": "25%", # 增加柱子宽度 - "barGap": "-10%" # 设置负数让柱子重叠以减少空隙 }, { "name": "总入园数", "type": "line", "yAxisIndex": 1, "data": total_enroll, - "lineStyle": {"color": "#00a859", "width": 3}, # 改为绿色 - "symbol": "circle", - "symbolSize": 8, - "itemStyle": {"color": "#00a859"} # 改为绿色 + "tooltip": "{valueFormatter: (v) = > v 万人}", }, # 添加2022年基数的粉色折线 { @@ -180,62 +172,50 @@ class RuYuanZaiYuanModel: "yAxisIndex": 1, "data": base_2022_line, "lineStyle": {"color": "#ff9e9e", "width": 2, "type": "solid"}, - "symbol": "circle", - "symbolSize": 6, - "itemStyle": {"color": "#ff9e9e"}, - "emphasis": { - "focus": "series" - }, - "z": 5 # 确保折线图显示在柱状图之上，但在总入园数折线之下 + "tooltip": "{valueFormatter: (v) = > v 万人}", } - ], - "grid": { - "left": "3%", - "right": "8%", # 增加右侧边距 - "bottom": "3%", - "containLabel": True - } - } + ] + } return option - + @staticmethod def generate_in_school_education_config(): # 获取学前教育相关数据 enrollment_data, in_school_data = RuYuanZaiYuanModel.load_student_data() - + # 提取云南省级数据 yunnan_in_school = next((item for item in in_school_data if item["area_name"] == "云南省"), None) - + if not yunnan_in_school: return {} - + # 提取年份数据(2015-2024) years = [str(year) for year in range(2015, 2025)] - + # 构建学前教育数据 - urban_data = [] # 城区数据 - town_data = [] # 镇区数据 - rural_data = [] # 乡村数据 + urban_data = [] # 城区数据 + town_data = [] # 镇区数据 + rural_data = [] # 乡村数据 total_in_school = [] # 总在园数 - + for year in years: # 将education_data改为student_data in_school_year_data = yunnan_in_school["student_data"]["preschool"].get(year, {}) - + # 先获取原始数据 urban_val = in_school_year_data.get("urban", 0) town_val = in_school_year_data.get("town", 0) rural_val = in_school_year_data.get("rural", 0) - + # 转换为万人并添加到各自列表 urban_data.append(urban_val / 10000) # 转换为万人 - town_data.append(town_val / 10000) # 转换为万人 + town_data.append(town_val / 10000) # 转换为万人 rural_data.append(rural_val / 10000) # 转换为万人 - + # 计算总和并转换为万人 calculated_total = (urban_val + town_val + rural_val) / 10000 # 先计算总和再转换为万人 total_in_school.append(calculated_total) - + # 添加2022年基数的粉色折线 base_year = "2022" # 找到2022年在years中的索引位置 @@ -250,7 +230,7 @@ class RuYuanZaiYuanModel: base_2022_line.append(base_value) else: base_2022_line.append(None) # 2022年之前不显示 - + # 构建ECharts配置 option = { "tooltip": { @@ -383,5 +363,5 @@ class RuYuanZaiYuanModel: "bottom": "3%", "containLabel": True } - } - return option \ No newline at end of file + } + return option