From 8cc3d8131d8f513cdbf03b2d5537117df4525127 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Wed, 10 Sep 2025 20:23:42 +0800
Subject: [PATCH] 'commit'

---
 Model/RuYuanZaiYuanCount.py                   |  38 ++++++++++++------
 .../RuYuanZaiYuanCount.cpython-310.pyc        | Bin 5349 -> 5461 bytes
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/Model/RuYuanZaiYuanCount.py b/Model/RuYuanZaiYuanCount.py
index 11f6de3..beafa19 100644
--- a/Model/RuYuanZaiYuanCount.py
+++ b/Model/RuYuanZaiYuanCount.py
@@ -196,13 +196,21 @@ class RuYuanZaiYuanModel:
         for year in years:
             # 将education_data改为student_data
             in_school_year_data = yunnan_in_school["student_data"]["preschool"].get(year, {})
-            urban_data.append(in_school_year_data.get("urban", 0) / 10000)  # 转换为万人
-            town_data.append(in_school_year_data.get("town", 0) / 10000)    # 转换为万人
-            rural_data.append(in_school_year_data.get("rural", 0) / 10000)  # 转换为万人
-            # 计算总和作为总在园数
-            calculated_total = in_school_year_data.get("urban", 0) + in_school_year_data.get("town", 0) + in_school_year_data.get("rural", 0)
-            total_in_school.append(calculated_total / 10000)  # 转换为万人
-
+            
+            # 先获取原始数据
+            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)    # 转换为万人
+            rural_data.append(rural_val / 10000)  # 转换为万人
+            
+            # 计算总和并转换为万人
+            calculated_total = (urban_val + town_val + rural_val) / 10000  # 先计算总和再转换为万人
+            total_in_school.append(calculated_total)
+        
         # 构建ECharts配置
         option = {
             "tooltip": {
@@ -238,8 +246,8 @@ class RuYuanZaiYuanModel:
                     "type": "value",
                     "name": "人数",
                     "min": 0,
-                    "max": 100,
-                    "interval": 20,
+                    "max": 200,  # 将左侧Y轴最大值从100修改为200万
+                    "interval": 40,  # 调整间隔为40万，确保坐标轴上有5个主要刻度(0,40,80,120,160,200)
                     "axisLabel": {
                         "formatter": "{value} 万人",
                         "color": "#333"
@@ -251,8 +259,8 @@ class RuYuanZaiYuanModel:
                     "type": "value",
                     "name": "总在园数",
                     "min": 0,
-                    "max": 140,
-                    "interval": 20,
+                    "max": 320,  # 将右侧Y轴最大值从160扩大一倍到320万
+                    "interval": 60,  # 调整间隔为60万
                     "position": "right",
                     "nameLocation": "end",
                     "nameGap": 30,
@@ -307,12 +315,16 @@ class RuYuanZaiYuanModel:
                     "lineStyle": {"color": "#ee6666", "width": 3},
                     "symbol": "circle",
                     "symbolSize": 8,
-                    "itemStyle": {"color": "#ee6666"}
+                    "itemStyle": {"color": "#ee6666"},
+                    "emphasis": {
+                        "focus": "series"
+                    },
+                    "z": 10  # 确保折线图显示在最上层
                 }
             ],
             "grid": {
                 "left": "3%",
-                "right": "8%",
+                "right": "15%",  # 稍微增加右侧边距，确保Y轴标签不被截断
                 "bottom": "3%",
                 "containLabel": True
             }
diff --git a/Model/__pycache__/RuYuanZaiYuanCount.cpython-310.pyc b/Model/__pycache__/RuYuanZaiYuanCount.cpython-310.pyc
index 9ec1255734179741f00c06c0af010ce6b9adb72d..6400e734157a08ead758c6f1f44d06792236c7f5 100644
GIT binary patch
delta 710
zcmZvZyKmD_6o-9pY$vfD$4MiSlr9KCaey{SX@NGBJ}A%9g$1%ip@$}s(gfWQ3Xx4<
z=mHfIy}X1xq->R7K>Z6~;xV&iU_)wmMkF{lpiZ@QKY!=^j_;N1pZ52ZSr3IY39om{
zAIo1xKA3MbV)IRHlC-wAwd>RjV;03Vi>ndibzg!ng>vmFH{ek4CnX3ZrH<?bD$)jZ
zgHEs`Ll87{t>=2r^`09&HypX6I2wfZOB;kpj)IlGTd7zXyOrkXamg{_lIXZ0$B$`9
zyu}yfC+%Z!9EKnXhhZ27Jql^CV7NjcgPw&nS{6o-Cp@D>VHCz38BUfYIQ5pmX`C5{
z3CMXWoWVqa$vu*@n5ZzdN0Nf+9PD%ac=Qa+;%4Vy?*H-U;Q}6d5iWUJNruaC1y>s8
zJsGZgs%tvtHOXG!YfAstYIvOJDg3bPsDRDCT2K8upV4=Y@IoY^zecT05v+6EjofQ@
zm8JS(v%wyV5%Jq>jorWp%Lupva{}`M4+Po*4ABkTTE1N_HY$xSX|adcY56jvhu9-A
zuqv>Iu*1v}9zo=-`^{RdSSwU&g~npJUav;jGZC%}aDnH1COR~j4>s9NoV#1B<^y-?
zEB`FWnygqAP4+^}zT_*>9NFdrMxu`zK7$y<^qIsY7CKe<w6U3_^bhsPzvvH|r9|BF
hZ*^U6w#N7Yb%0l_e*Ud*LVYE+>+tunI6oNs^cU&cx9|V}

delta 238
zcmcbr^;DBDpO=@50SHub4rW9cZseQA#kg|vN-jIbUz=ZWMKDcHWLBG;#%r_rF!N)^
z&5it4jNF<))kRt$LVNNtfj-ruAP_qkM1+8dP!JIgA|gP<ED#YlxlXV`p{N$bZUhlc
zAfg#Ww1bE~Afd@KIZ{YgU^0k51w>2*5z{8O3F)yHO$V`OOuj8-Gg+EPl8Z@<5d>A3
u1SUHOubKRchmUm{OJSASWJNZa$rt#gCR>YGv&{tQnLSxnRDAMekwXAzt2@5{