From 40a7a8fb7a0a8fc3ffc2f362b46acfceda2a1602 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Thu, 11 Sep 2025 14:07:47 +0800
Subject: [PATCH] 'commit'

---
 Model/RuYuanZaiYuanCountModel.py              |  24 +++++-------------
 .../RuYuanZaiYuanCountModel.cpython-312.pyc   | Bin 8638 -> 8367 bytes
 static/js/index.js                            |   2 ++
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/Model/RuYuanZaiYuanCountModel.py b/Model/RuYuanZaiYuanCountModel.py
index 722fe11..ed45136 100644
--- a/Model/RuYuanZaiYuanCountModel.py
+++ b/Model/RuYuanZaiYuanCountModel.py
@@ -93,7 +93,7 @@ class RuYuanZaiYuanModel:
                 "borderWidth": 1
             },
             "legend": {
-                "data": ["城区", "镇区", "乡村", "总入园数", "2022年基数(万人)"],
+                "data": ["城区", "镇区", "乡村", "总入园数", "2022年基数"],
                 "top": 0,
                 "textStyle": {"color": "#fff"},
                 "icon": "roundRect",
@@ -104,7 +104,7 @@ class RuYuanZaiYuanModel:
                 {
                     "type": "category",
                     "data": years,
-                    "axisPointer": {type: "shadow"},
+                    "axisPointer": {"type": "shadow"},
                     "axisLine": {"lineStyle": {"color": "#fff"}},
                     "axisLabel": {"color": "#fff"},
                     "nameTextStyle": {"color": "#fff"}
@@ -113,9 +113,7 @@ class RuYuanZaiYuanModel:
             "yAxis": [
                 {
                     "type": "value",
-                    "min": 0,
-                    "max": 25,
-                    "interval": 5,
+
                     "axisLabel": {
                         "formatter": "{value}"
                         , "color": "#fff"
@@ -123,9 +121,7 @@ class RuYuanZaiYuanModel:
                 },
                 {
                     "type": "value",
-                    "min": 0,
-                    "max": 25,
-                    "interval": 5,
+
                     "axisLabel": {"formatter": "{value}", "color": "#fff"},
                 },
 
@@ -134,7 +130,6 @@ class RuYuanZaiYuanModel:
                 {
                     "name": "城区",
                     "type": "bar",
-                    "tooltip": "{valueFormatter: (v) = > v 万人}",
                     "data": urban_data,
                     "itemStyle": {
                         "borderRadius": [6, 6, 0, 0],
@@ -144,7 +139,6 @@ class RuYuanZaiYuanModel:
                     "name": "镇区",
                     "type": "bar",
                     "data": town_data,
-                    "tooltip": "{valueFormatter: (v) = > v 万人}",
                     "itemStyle": {
                         "borderRadius": [6, 6, 0, 0],
                     },
@@ -153,7 +147,6 @@ class RuYuanZaiYuanModel:
                     "name": "乡村",
                     "type": "bar",
                     "data": rural_data,
-                    "tooltip": "{valueFormatter: (v) = > v  万人}",
                     "itemStyle": {
                         "borderRadius": [6, 6, 0, 0]
                     },
@@ -162,17 +155,14 @@ class RuYuanZaiYuanModel:
                     "name": "总入园数",
                     "type": "line",
                     "yAxisIndex": 1,
-                    "data": total_enroll,
-                    "tooltip": "{valueFormatter: (v) = > v 万人}",
+                    "data": total_enroll
                 },
                 # 添加2022年基数的粉色折线
                 {
-                    "name": "2022年基数(万人)",
+                    "name": "2022年基数",
                     "type": "line",
                     "yAxisIndex": 1,
-                    "data": base_2022_line,
-                    "lineStyle": {"color": "#ff9e9e", "width": 2, "type": "solid"},
-                    "tooltip": "{valueFormatter: (v) = > v 万人}",
+                    "data": base_2022_line
                 }
             ]
         }
diff --git a/Model/__pycache__/RuYuanZaiYuanCountModel.cpython-312.pyc b/Model/__pycache__/RuYuanZaiYuanCountModel.cpython-312.pyc
index e1643decedea97a7e92242337c499121f345dfba..65367fd63cb097eecee79faa49d91d0847928c41 100644
GIT binary patch
delta 2127
zcmZuyS!^3s6rHhW#<3eaTbtOaLmWF!Gp*w|cAdr*h=f48sFW@dT_}`^-`E*&Jn6Hu
zxhXCZr3ESkjF9+<1Qb3J5K9##+Oh~CR3RaxRN}*$uY9zX{Aag9ED{p;&NMAl^>~i&
zJ9mA{eg1y<iy_x9PN#!`&&KqR<2T|LU0++-TJ5U!A4eUKR(NlRmw)9F)*`XNQ%ju0
zMd}uKQcoHbmNb$kkk*5=VZm~TYbGtkO*{)injx(hSnx7!Hxe&AZ3_Z<Xr3eO#0Op-
zrVb?2#za5(vLrw{NdpN&+%9;F{~M+)WE1J0=ZOeOHeX;Nz?KD$gn$$7<9dLz-N%JV
zFLBS;kO=tn8L|uIG*6-nwo~=<^#_@xg@yN&b%qgRdy_1qHMn<am+j|Szc%8SZ!dSl
z(v)%KMnzudGIA=f^HfQX=XGmdoz(Wbnu|K0R5L0qaDh}RrE}7(k^_pWx!m7eAdyHc
zS#&NxH!155gFKj@%gBW$njVw76aAsYK&USg4MoBOVqt?pM&t3&+8YVS#4-!%mjvCG
zhs0@_>gzDYK2^!)VPLoC<=MOuRQuS|qy6NF#hl;}jYOk2E`N37{VO-${ZhA6bt+2^
z$jN-U){MpxDKF7p7|=%mwB74A73nsRbRjn`5p_nlXOygL1QrEDLwBL|!)Q~3CF}vc
zZZ{-pOwQ=etTZ8yu2rM+(^6(iF4#^Qzo%ds>?xH_NO>rmMj?u5F~jc1utN+}WOVD8
zMD^M+l@ggAkccvsTjI(B>W?5;)<EQR4zt~>OSda|dBP}{K89w)2#*86wn3pHM~@<7
zOwlnn1oiLA5_#5~)Dxf*<2Id3Q-v4{0?VzcnY=Qo3mG{rXNk_wqLa=WzOYI%Rpi`~
zLp$#pT)yTCvw|0b<m$CIy=}|>`nTD`mGz9LwFKW5PpQ>g@^x0%2^(CMdZxksUUS82
zX?0a<7_WcT8z==fFOIDEV^!YjYXq{r>x1c)ws0vhP-^clwfm|~4!7%;oADfGOD%5g
z+lEcWj?m)FC1EA}=!$Q!<QEtFS307luAar|m0*9>X=`Y#SnbWOikoTctO!h3Zz&)`
zbboWzhPp<eS9=G3=)cynyK3WrX{rP3PNpqb@^+NGU90Y{Pimn?aIoKTFf~C_Q+$Bx
zK~7srUVq6SD0#c9b{^8yGi{+YYO_fVv0W{$>IwEZ+vqqaR0gd~ee*fzU$=%ireS-I
zheiFaac3i!1mW(dX?dy1%d;1?tL{`gjR8-$BH*#2afE&VXvtVCrXBP21{26_2M~EY
zYRtVe@;f%f&C}o9SXk65j$o0Fpn3<wPJ|~B@YK+~2u}e(41>7a57aoq`%r%nU<yy{
z^()wU<)4w<f}{)JPA~YbUpfnVIto;w&gl9`$auoVK2fYO!{d3?trJQXK$_KSjE0A1
zx|dD2=O!~s9vhLK25V&y?us&YC=DCVaBd5>KqMj!#1o?;TtvBXb;g(jeH{!&#M*nQ
z=qu<aoI!k5d!sg3ygMti-$#|?i}Wn2jTL+vBnTegx-F9Ir-xw#4Q*_|A=Fr-@nC`L
z>5By6`ncPAX1hHD26_$j`XPnn$8`au9nz$+ClE2wmrQPp)8SS#K}t#v#0Tgx7?ts#
z3bSacvjr~Rl$xB%Q9Kzmgc`?x5<QEou|v3J(64h7V`@fsn7;>=f=taa<cY~~DF>a+
z7U;`h3KgVM2{|E`@w(CZoSIRHXf>zy4n{RL{|Lq|<MAw5V!?v7FCK(DrU&)7_B4Xf
z2LRJQj`H&e62cgQQT1~u5$%PI{ta0aRfI`|69`oMaO3XwDHNv>W)Nl(<`4=9CpCxn
zCHB+h*Sstz%p>!W_Lk4fuG2pA1-kcG_~zSIMrf>9P^=u|K(1Qm)@W0ti`t*QS$0u7
h(b2?yuAS-dc~-rfPCI{NJbwsBdA9i$gGd)4{J&wqKN|o5

delta 2034
zcmZvdTWlLe6o$RtUB~Oh&ZUV{r@7I@B&JR3G<6&Ik|w>UEznD#NEI}jowc*n_PVp{
zCUH|7B%mpjOS4ph))WL1!bk{EBtR`xfJB7^yzvm`iHEk5-;$OJ5ro7!YgKt^oc;38
zoHKLg>^b9nK6qoN?-#Gv<A9%!qCbvF+rIRD&2t{>CjXzO1}1rU?p>byO^EWjxPw%D
z$Pq8`kxGptRiqj|HF+0VF(r^%QU`M-i@)?2#`SqI&XJWQK*~r1Sw$L2C27h#$+8Ek
zW{m^imb@E0Tfy@Y@LWyWAW|b~xBY|Qm1_s5M`3XX34-b%oxo7OBJL!Qku_5ySqlg3
zf&+Gg&pHw&J#e)3U~!S&hgdd%rHn)#VreBC$)+hcgzh6z*lRP{0^!?tLAb4O#%;FQ
zNBYTjGC&6NJUHwChkmf{B<Qu9?8$rLBH2s!!4o7yd4cTDi)X9MI_q$4ZPirOQHSE>
z;5o~WJ3<F$r9Ze<i%C;fe|f~p*EdI)sOSluE(vYDy}eALdL~7VsES#vfO-^MOdzr;
zGv3tGOfuC8^QbwQP_2*4J911gC(|l(8Dlch$C;GSQmSn&h;$n)rW*mQT%OR3L%NnS
zRmvnB9F#}Z1asRGmN4<OoXDv6UEqD|+O<2Ez9<rq#ah69AK;8_Kihiin{!|<IGGgF
zX;RLaup{jOhowpyAC)`9Ywb^WPpIIw55R<!oKzW~)KUO>g1PNez;<*8ETcOCOfu35
z%{&MPq1`YpUcgC_YVk3X@oI`Jm9>S#a$h7m43Pz6OdqG)aq+Q6;GRN7Db>eu>IuY?
zh(p$mmBHL{5IfmnO*u&qqj?R0@uM<@%_AE&g_Vs3p@{j@5rp#r3QjveRxzqmqS7NW
z(K5yozdjON61sZA!Geq0ftTO5q?u~cE&_AsAiyz=m}ATZYOkE8Yhhyu8SPP&O%d8v
z8pUL#FVe>ZEMJj>xgy@g2cgCB(hiD7m4sS!gDK=*j><ffgHY0;6j3MadfP7tdSWs;
zYW)<b%*9{<T?c@;u~<}%szpqXiH4rgNP)K#q&j-pS&Z1mn66|D*hQt9Y7|A7D|nWJ
zQi|@_U8PbOs7wS#V{SE>9+M5tU|hCq$=MssI{ShJ0Wwr$COwKSu2J1I^(3oM^pq)U
zDZ3>@qV;Em-%GRTA;hUhLglmG0g+b2#N2?ln{zdQGR|AMRZVjjeHS_DuHO+D;pXcD
zR<^2RZn~+3<2tPmn*C*q)lzlM!b<Dc=IG#YZcDvyA<H=eP4n>E&^+JTz9@-xzQq%K
zhO6<+xc*A;4#_tYyWpL#tef%vbN7_ssNQT~-rv;>x#!-hUL$fht#AFYFca|JFj1kp
zVc0J(E3`$U(U7y$@*dk@cK}@v>#f21b%6wkkc*X>(AIIdG=ngveP~@#-j%c4(e4eq
zCGO+JzcYRPcK(ywS3ZO5XqS(MaZN8`10sUhim=PpkIKFm1E_W(b_0q(BRX-o4>5!|
zfH;Ww6p+&fpzDhEURWGDjCcw#OrJ)146uhjgAy+eeHQT?;sioQC<y%8peh0zooWbd
za{4^tBqE7OA<~FbfE=AfiB&J+e<wPHz?P*M#A(DhVgfOOID^OmvV2b@NT)&B?^o9o
zrk18Jq4{ORD+t`0o&$tDR6<>km_eL(I2s-FRg|wGE+Ae<yn%SrI^M9l?jp)rgoSt;
zamku(*x&LF%6Ac$5myj-#CwRV*1rueaNo~mS8;;teVqBqda<REldP*PZJml!^xxwh
zu9^iW%7y(R=tbw`gXxl_*R5j9MBQ~<?FTUT)}&4{3ALa8V4ZGl4a_%oOnZNK1pXFI
MiJbqg14+^Sf5fOFSO5S3

diff --git a/static/js/index.js b/static/js/index.js
index ebfb844..67300c0 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -60,6 +60,8 @@ $(function () {
           seriesItem.tooltip = { valueFormatter: (v) => v + " 万人" };
         });
 
+
+
         myChart.setOption(option);
         window.addEventListener("resize", function () {
           myChart.resize();