From 9d0b5abd31ca72450224aa13f1c4f26bad648399 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Wed, 10 Sep 2025 16:51:41 +0800
Subject: [PATCH] 'commit'

---
 Model/RuYuanZaiYuanCount.py                   |  21 ++++++++++++++++--
 .../RuYuanZaiYuanCount.cpython-310.pyc        | Bin 3561 -> 3754 bytes
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Model/RuYuanZaiYuanCount.py b/Model/RuYuanZaiYuanCount.py
index ef2c2ad..58a5931 100644
--- a/Model/RuYuanZaiYuanCount.py
+++ b/Model/RuYuanZaiYuanCount.py
@@ -48,7 +48,9 @@ class RuYuanZaiYuanModel:
             urban_data.append(enroll_data.get("urban", 0) / 10000)  # 转换为万人
             town_data.append(enroll_data.get("town", 0) / 10000)    # 转换为万人
             rural_data.append(enroll_data.get("rural", 0) / 10000)  # 转换为万人
-            total_enroll.append(enroll_data.get("total", 0) / 10000)  # 转换为万人
+            # 计算总和作为总入园数，而非使用文件中的total字段
+            calculated_total = enroll_data.get("urban", 0) + enroll_data.get("town", 0) + enroll_data.get("rural", 0)
+            total_enroll.append(calculated_total / 10000)  # 转换为万人
         
         # 构建ECharts配置
         option = {
@@ -103,7 +105,22 @@ class RuYuanZaiYuanModel:
                     "type": "value",
                     "name": "总入园数",
                     "min": 0,
-                    "max": 40,
+                    "max": "auto",
+                    "interval": "auto",  # 自动计算间隔
+                    "position": "right",  # 显示在右侧
+                    "axisLabel": {
+                        "formatter": "{value} 万人",  # 确保数值格式正确
+                        "color": "#ee6666"
+                    },
+                    "axisLine": {"show": True, "lineStyle": {"color": "#ee6666"}},
+                    "axisTick": {"show": True},
+                    "color": "#333"
+                },
+                {
+                    "type": "value",
+                    "name": "总入园数",
+                    "min": 0,
+                    "max": "auto",  # 修改为自动适应数据最大值
                     "interval": 8,
                     "axisLabel": {
                         "formatter": "{value} 万人",
diff --git a/Model/__pycache__/RuYuanZaiYuanCount.cpython-310.pyc b/Model/__pycache__/RuYuanZaiYuanCount.cpython-310.pyc
index 8bbcb82445f2ebebc86b80252fce60bb0a49fcdb..bbf56ebbc0476894f21714f6d0b16ae9abd2092c 100644
GIT binary patch
delta 1013
zcmZuuOHUI~6z-jww$o_~ZGBV(3J66CRH@KXK!oxrBDg9h>c)(7hIV3UaXJVzC0!W(
z19#zO62YZ$W8AoK<HDHu6J}vzj8WEVq8sD69Yhw~oBN&DcfNb(&VK9j_NKDmFFA01
z8-H8))b_Gzfp7L<7{oJ+r!vP;;BzEPU-P%>o?QVvAnkEA=J}Wxb~Jpy?e9o6_pY-h
zfw$GMM~LHoA2dNT1R$sp2$?*bfRh-V!sxWg9puAs23p{(>B>8x^%;S-gM2$gaCew4
z=&bS31?TG6W=nP37ULe%nI{m1UXb8C^g#@Q(2vsp8O$5d2yzEa5t(shUch}3xkC+Z
z0vSVCzl43mkU%d8Bc^o7O&+M$kID{1%9hOYFbe6K0Ao1+IL<$TGM8ZzuHfWTSaHJi
zF_jEfTrhJ?B@VODQgh>Qb1;uuSxDLgMqt4d^8#FjMLY?(W(u%mx_7)aZ_W{0eg)2t
zgf6<@lP($*A0a*w2cq5h7cEz%AVYc6@)Wg_nlrYGYRsv#ik@K5OTUUYNQ6#$!u1AU
zD9LN8#jj~41bNF6wUVLg59Fdg#`xn*(^FY5YQ{1O>Twne@`h2ioVu1T7*%(-s-|$Q
z#5hZ+6v~@=nl)w-Vv>FH6iZAq$S{~eu*CJgaz!(=a_PuLqP(S5Ry5_F9zo8&h>+F$
z=~GWjXo+=_e-PvJ2>syc@HV9F&!ay)UG)KE;7DT$MHx-%gLbqkE9qp~64;aM^O$4p
zXe{TZ21dbhDVna}Ly7vKoF#2%aF)dqs9W~Sv9H3{-Cny}E?Sapb6Qo^ud_?I;b@f`
ziTYxK-ifh3k3e5Y72>0vUL|xppvXmKqbM6H+%d|AT%-@Z8S;z1^LFq(T!4P@-i#5B
z<B0IbC%6dO?_7XG+t`h~gn8j7_nC{+bzhin_(FL4-H#o0fv=|MZ)b{Hz6r8QU;4u|
H?tk+a+4c#v

delta 767
zcmZuuJ8aWX6wPyNC${UBgik-A32Boy=_jSXG-+CzP-rPI5sF}}azbLMYQT<^HVSk?
zLTu;>7Cf|!h^1m-Wn^Xmd0@|q#D);pO%YPXv+jL9_ndd$vHWhZ9qO*>y6T~o%6_We
z>p$vV_x5N615~S2)-T54EwT*%=zXy7JCIt+frxIXhXS;a=a4ba;{<we1_1;OhO@R8
z=Ww3T1wy^Ha5C>hKL!x8<%$Ov-!crI%)^M#bIFzwZFw<-VLH`uigk9vaa*b|j9_#h
zDiTOy3_*;O^*@RGHeoOlPuhNxrbs!3%l}bMW2U332$;oOOT;`yN>ii-a?Bu$MGBK6
zM#9o5X49pXiIQ>U6y-80tYDz!LmmZOC9_ou5I~-;yJq_<BCcbNY8^Lh5gWGeiP}<&
zp5)CB@1^fda-@2#&Y$}}vmt)R|BU)K|9Ct`zrc~L>K1AZN7*)Z%EkKLb~!1TE@RHP
zZImaJO%~x#m0lL(ua)q`qC3vHM-}VQwo$)L=gbu0cEW9bml3UMt+8f~^Ch)ExIq(>
z{cTCXjPQyY(em!3a}j^3MlnIS=^M^Ymr4us=41yw+$v?}GmhwnBeGmh(`tK(bbV-Z
zq=tcd)sahvS)%NIGf&fFUq{_5>>Ad_4$8ZokI8af>kHi?K~tEGH-)+Q-K1znk8Mn&
zQmyl4&0-oq(n@@!tH2yy?TWBI{-W!Ck03Ddw<^j^{3-kp!hA~a<#T$FYD{`1TFo>s
P$Z7sY&#^N9s(<+dPb<b9