From ab19e7a9ba291e92fa1e2ef3478a5f02ce2b3693 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Wed, 10 Sep 2025 19:49:14 +0800
Subject: [PATCH] 'commit'

---
 Model/RuYuanZaiYuanCount.py                   |  29 +++++++-----------
 .../RuYuanZaiYuanCount.cpython-310.pyc        | Bin 3661 -> 3638 bytes
 Start.py                                      |   4 +--
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/Model/RuYuanZaiYuanCount.py b/Model/RuYuanZaiYuanCount.py
index b377cca..325460b 100644
--- a/Model/RuYuanZaiYuanCount.py
+++ b/Model/RuYuanZaiYuanCount.py
@@ -51,6 +51,10 @@ class RuYuanZaiYuanModel:
             # 计算总和作为总入园数，而非使用文件中的total字段
             calculated_total = enroll_data.get("urban", 0) + enroll_data.get("town", 0) + enroll_data.get("rural", 0)
             total_enroll.append(calculated_total / 10000)  # 转换为万人
+            # print(f"{year}年城区入园数: {enroll_data.get('urban', 0)}")
+            # print(f"{year}年镇区入园数: {enroll_data.get('town', 0)}")
+            # print(f"{year}年乡村入园数: {enroll_data.get('rural', 0)}")
+            # print(f"{year}年入园数: {calculated_total}")
         
         # 构建ECharts配置
         option = {
@@ -105,28 +109,17 @@ class RuYuanZaiYuanModel:
                     "type": "value",
                     "name": "总入园数",
                     "min": 0,
-                    "max": "auto",
-                    "interval": "auto",  # 自动计算间隔
-                    "position": "right",  # 显示在右侧
+                    "max": 140,  # 增加最大值以留出更多空间
+                    "interval": 20,
+                    "position": "right",
+                    "nameLocation": "end",  # 将名称放在轴末端
+                    "nameGap": 30,  # 增加名称与轴的间距
                     "axisLabel": {
-                        "formatter": "{value} 万人",  # 确保数值格式正确
+                        "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} 万人",
-                        "color": "#333"
-                    },
-                    "axisLine": {"lineStyle": {"color": "#333"}},
                     "splitLine": {"show": False}
                 }
             ],
@@ -177,7 +170,7 @@ class RuYuanZaiYuanModel:
             ],
             "grid": {
                 "left": "3%",
-                "right": "4%",
+                "right": "8%",  # 增加右侧边距
                 "bottom": "3%",
                 "containLabel": True
             }
diff --git a/Model/__pycache__/RuYuanZaiYuanCount.cpython-310.pyc b/Model/__pycache__/RuYuanZaiYuanCount.cpython-310.pyc
index 31e6b2a7e620b9d75eafcf3e8f2c1cbbfac4a92e..38cf5daa0a6f99ad4df48e88843096c4db4be74d 100644
GIT binary patch
delta 342
zcmX>rvrUFKpO=@50SKH@4`y_2<n>|Z5(M&`fw)*=b24)lqpoU-PKs`dWQtmfUW)o0
zrWE}YffT(=#uNh}+b~5R$TCbZ0+Pmac+#0BOR$FP>!moRI00pyQ(T~GUFUG5v!uAC
zxC60%ipLz56wf(qwcIt_!3>&So9D4UU^aN!1GMuNYf)x;M#(Ma)V!1`cIDJmGav}j
zWV*#toRME%WC~PL<N_qzG<hbk<Wx4e#gmtqo9dIFoLG{XpLdHL#B)z9C^7>nGzS^T
zkyw#g9Fm!wUE~1dPJYcP&FD3moofc`OAZi!K9@PS50FvCWUN}nWU=`nmmwqLoyo#H
zDvW%SEqMGz8JQTFn3xz@{_(J|F|skTd}R8>q%`>ekLKj-JX)+1S<0%+CckGhn{3Bx
L&6qa1iuW=AC=^}#

delta 365
zcmdlcb5@2opO=@50SJt24raXG$m_$*B>?0(197q0=49q9MsMvDofNec-4yjXOeuOP
z0x7zgj4Ap+wn2&>kR_aAIEO1mDMc%VD@8lS2&hsRtWp7}QaF<lsKOw{7)WZ);Yeqm
z{EH=AUpK`u#R;h28K@d!nhQ{lCB-$x4T$wp+~=^Qc+6p|<*wllX3+H9+`#&PnfDe;
zVrfbKE!LvU^o)|pg`5&>ASY^aO`gE1Y+YmqWEYtOiCY|r6`92$naSBjazO4&4j|!H
zqz;l{PD(7QVpldbF*isy(`0$c1{5svnEan}#^gC%=G<ODZWWWUY88{o=6hU*jEo;9
z3-G8ga!oen@mFVJVr2Qp!@|Z0q(3tWFac>W1dDS4#aX^GJ!aCKyq8CO@&+Co);5NE
V7Us$Cd5Rg6C;#IWpIpVe2LL@-UUL8d

diff --git a/Start.py b/Start.py
index d1b05ce..441ccbf 100644
--- a/Start.py
+++ b/Start.py
@@ -16,5 +16,5 @@ app.include_router(bigscreen_router)
 
 # 主程序入口
 if __name__ == "__main__":
-    # 启动 FastAPI 应用，监听 8100 端口
-    uvicorn.run(app, host="0.0.0.0", port=8100)
\ No newline at end of file
+    # 启动 FastAPI 应用，监听 8200 端口
+    uvicorn.run(app, host="0.0.0.0", port=8200)
\ No newline at end of file