From ca944e8d8deb6becfb4b2b78f91345e36a2ea102 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Wed, 10 Sep 2025 15:48:45 +0800
Subject: [PATCH] 'commit'

---
 Config/Config.py                              |   6 +++++-
 Config/__pycache__/Config.cpython-310.pyc     | Bin 206 -> 277 bytes
 Model/RenkouModel.py                          |  12 ++++--------
 Model/__pycache__/RenkouModel.cpython-310.pyc | Bin 4448 -> 4299 bytes
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Config/Config.py b/Config/Config.py
index 5f28244..8b43921 100644
--- a/Config/Config.py
+++ b/Config/Config.py
@@ -1 +1,5 @@
-EXCEL_PATH=r'D:\dsWork\YunNanProject\Doc\数据库-2015-2024-v2.xlsx'
\ No newline at end of file
+# 数据库
+EXCEL_PATH = r'D:\dsWork\YunNanProject\Doc\数据库-2015-2024-v2.xlsx'
+
+# Echarts的静态资源路径
+ONLINE_HOST = "https://gcore.jsdelivr.net/npm/echarts@6.0.0/dist/"
diff --git a/Config/__pycache__/Config.cpython-310.pyc b/Config/__pycache__/Config.cpython-310.pyc
index 205bedf12400c727e5a9310032167d9d7afb606d..de93dd91105ba19e41930885f3efbb0d2de4f705 100644
GIT binary patch
delta 144
zcmX@dIF*SvpO=@50SG?m9L(4=kylon2gpfbh+;@#jABe-3TDt`E;R=VO`Iq(F;qUF
z$|$3xq@dVJUq3xLzbI8Nt2iY!C$p?bFE6!3Kd&HHKQ%ccv8bfj!A#FU&p<yVv$#ax
rPm?K%%QeE;)h9l{F~s8*x4)l{r=M%QhktO$#Aa6x7NGGgj2z4W5jZD)

delta 65
zcmbQrbdHfXpO=@50SNZqJ&@r#kyn<F1IS5Xh+;@#3}(<|nrLIg@2AOli_0~_+0`dL
Rz%j&Q;t5waCZHk?1_1J}4xa!3

diff --git a/Model/RenkouModel.py b/Model/RenkouModel.py
index 7c54d12..6fc2a16 100644
--- a/Model/RenkouModel.py
+++ b/Model/RenkouModel.py
@@ -1,20 +1,18 @@
 import json
-import os
+
 from pyecharts import options as opts
 from pyecharts.charts import Bar, Line
 from pyecharts.globals import CurrentConfig
 
-# 配置使用自定义的ECharts路径
-CurrentConfig.ONLINE_HOST = "https://gcore.jsdelivr.net/npm/echarts@6.0.0/dist/"
+from Config.Config import ONLINE_HOST
+CurrentConfig.ONLINE_HOST = ONLINE_HOST
 
 class RenkouModel:
     @staticmethod
     def load_population_data():
         try:
             # 获取当前文件所在目录的父目录，然后找到Data文件夹
-            current_dir = os.path.dirname(os.path.abspath(__file__))
-            project_root = os.path.dirname(current_dir)  # 修正路径计算，只需要上一级目录
-            data_path = os.path.join(project_root, "Data", "RenKou.json")
+            data_path = "./Data/RenKou.json"
 
             with open(data_path, "r", encoding="utf-8") as f:
                 data = json.load(f)
@@ -27,10 +25,8 @@ class RenkouModel:
     def generate_population_chart_config(year="2024"):
         # 加载人口数据
         population_data = RenkouModel.load_population_data()
-
         # 筛选出州市级数据
         cities = [item for item in population_data if len(item["area_code"]) == 9 and item["area_code"].endswith("000") and item["area_code"][4:6] == "00" and item["area_code"][2:8] != "000000"]
-
         # 提取城市名称和人口数据
         city_names = [city["area_name"] for city in cities]
         total_populations = [city["total_population"].get(year, 0) for city in cities]
diff --git a/Model/__pycache__/RenkouModel.cpython-310.pyc b/Model/__pycache__/RenkouModel.cpython-310.pyc
index f63dc9df9f79d97f328d444c4e0d8cc4d896a4b8..7346ab34e1aebcae3b867e3cf5706a044ab01a0c 100644
GIT binary patch
delta 1202
zcmaiz&rcIU6vyYyZny2yZfo%e(SrO`*GT;dq9Ta=Ml1>_x*ExbErMx*OxGYt@xW31
zLFQs&O!VM^GamHd!NePXfJqN(G#<QpGx6kmTLQrt-OYUFJ8!--Z{}_GbLDD<F&Pf)
z44*5t@5WvhFB$Q+K^!^Efi$zI=V{1rO99eKTFv+@Uq-VuZ>*;MnSd4Wv@adZ=#~yF
zrKbW*x7s5n<cs=}z1_+7;jX@c!KJV1dn#^C*;=t>=Ml424&<22<}i<=IO+rCQ6vX0
zJm+)p0&;u^v#R(mVE#EA4Y0#38=nSX^j^hQh^ow0W}1NI&^H@#RmV4{JY~=L0y=N9
zA*P|%Vey<YuMD7|ej28ksU>G)iGyvnYaf)`cnkRC0<VdyR?xxF@RaS2<zY0h(kKt9
zWhP?s6YmY|#G`Yr@|ELC2j3OLk?>HADz7)D$FuIpWM-<VR6g-7?xCq=E-J9I)RA#_
zreI!QA*yg@x9rhU@x5e)ygHMz#m1JNp<J$N)nLjWT4~jOv<dQx1BA^xQ67<yhy11J
zPWu1jt}M78`ai%iIU4vGID>&@5K);5R%w2k-6|gj-$#m2=6&f&+sT?iQ7dg-6nTlg
zBNWSzdQGGRJ=q(GfMRfiuf&R$;mCH{V+Wy>P)_g`Za(%UidQ3MJLQ(>QCS{N)YedJ
z&-w!I#(!CQg&h0j-EbLfTf6t`a9QI&t29Du5{TOh;@g{7c_m}tF+sG^M7xX`?RAGp
z9wr<i)FIGNPx?5afpCIwl5mP}S}q##{w9*m1VDUu5T;L@p+F1aEW%PV;}gS3`_8bS
zKf;WOLcPgBzl!J}bP~GdFQc-#i)0Vs9HEzRo{%K;5iStuTZxMZ(=Yl-4-f|BwMb3$
zGD)w9Yai}$<N)-^w~_l;yzXej^{r$WB3xUy{!w%~rj9LZAOeho4m=bBUT=VR1vBIw
z!3s{zq(;VU;bsM=y}IR>XoDGUotzjQznLg>LZcb);u~2!RV*8~l!QV&3Lyw_4PyK^
DsT0^W

delta 1396
zcmaKsO>7%Q6vt;~KfL~kZIz(XB(2gUt}t!v*eN9~X&OqCwqP8J10f5-EZ%M6XxAIf
zZb*|l^w2{=v_;VfE(nnv(<22Tq+US10216l@(B(R>Zu0~5jWl&N3DubcQn6w^X5Nq
z-@e)1pAY`gm-IV2Vg#;l4u3y?t8+csGyW>fY+_TFnC+386z0rjo?@yLeTu7jx~Y2+
zGa~1zYj{yJ3by7%*BcW@SBvvuxEP$s=jUoZcXA7X?YQ;#d9LAv`NpD`cWUz%4}<Yz
zxuM)p-mV8>e*FjciVpY2bY6rW+ybl~56J@EV3JCxZqiM<M%un60h>x&Yf_uqY*Sfd
zq26S+Vym`xL-{1Nri76Vqp5&Woq^O<Xjc_VnlP)70tt%CloD*S(9gErDhZ=2)0C`f
zl&q%0n5{Rp&&e0;DoE$Z4ADVs!|DfGWp`Yr%Oo2qo9Y=Wv{vKdNBY8Gyv6*Wr7l|G
zd@EwtdBgIYR>XQQkRGF2y;yghYPF><`1OW}vrLa}#%oKQJB_dkdNZ-e{RO8MR=Mwo
zqQJW7UQuGD!~v)aW1TEP)AaTRn`GU4!NVn<0;?4pb)ld&-&-8(6;!*P$E7XC55Zun
zwR*VH7C+d*pN5rw=zlXnr#Pv1iQlx-Jx5@+MO*5MWATUarFuXd)dy%!%<B6yd603`
z@&e+~uo-j>69PfILI173zyGm%Op*_a9sPHDT>Ki@F($yVMfsEB7o%Ut7liK<JI38q
z8qAjF`j#DJqr517it@C)wM;@5qF4MG>rHimFn9-GC`o9yFUPj%U^fQpLG&SHmU8!_
z+0Wu)R$NG2EI)(hVT6>(=l!1@Z=+%mkkw4JI8+>xEJzk5hdE@lTaJSr2Sy)TjyVhm
z<s(Z9VEenTTZ(60%2IwF7hV#VJ0`9?i{>%JbBGfF5Im3eDB>hy3~>rEjyMfidIGTh
z<;{DaUfaI@*<UxW-M{l;=Kh_JIDUTo41xmg*?_FZ@gVpl;w->ay?Ubxv<5C!`8kyA
z;qBu=iHdj`Q9_hOE!lVK6*Q+1_><um5U(LBh-t*@2s~Q;1|S>ZGibkwm=$-Ene<y|
z%DT7DS^SecLM!4>>SNj^zDkXh_Mt$Y!n+To|2Zd26Mr*75?~NUW0WNml#L{*e1vSG
zokCO;(w(#{CetI6@u_m@e0idJZmKffe$IzMr6u1uW7PBQCD$3l!tI7PD1NC4sw;cg
Ezc*VMjQ{`u