diff --git a/Controller/__pycache__/BigScreenController.cpython-310.pyc b/Controller/__pycache__/BigScreenController.cpython-310.pyc index 3ce00b2..3331c11 100644 Binary files a/Controller/__pycache__/BigScreenController.cpython-310.pyc and b/Controller/__pycache__/BigScreenController.cpython-310.pyc differ diff --git a/Data/ZaiXiaoShengCount.json b/Data/ZaiXiaoShengCount.json index d3c0931..abc587b 100644 --- a/Data/ZaiXiaoShengCount.json +++ b/Data/ZaiXiaoShengCount.json @@ -1,4 +1,291 @@ [ + { + "area_name": "云南省", + "area_code": "530000000", + "raw_name": "云南省", + "student_data": { + "preschool": { + "2015": { + "urban": 1293978, + "town": 309682, + "rural": 468257, + "total": 516039 + }, + "2016": { + "urban": 1315060, + "town": 332615, + "rural": 471634, + "total": 510811 + }, + "2017": { + "urban": 1394298, + "town": 370444, + "rural": 495074, + "total": 528780 + }, + "2018": { + "urban": 1431044, + "town": 386136, + "rural": 505451, + "total": 539457 + }, + "2019": { + "urban": 1498668, + "town": 423831, + "rural": 513793, + "total": 561044 + }, + "2020": { + "urban": 1672689, + "town": 468061, + "rural": 567865, + "total": 636763 + }, + "2021": { + "urban": 1769656, + "town": 517611, + "rural": 612372, + "total": 639673 + }, + "2022": { + "urban": 1808274, + "town": 556317, + "rural": 627771, + "total": 624186 + }, + "2023": { + "urban": 1680159, + "town": 523048, + "rural": 587407, + "total": 569704 + }, + "2024": { + "urban": 1519222, + "town": 482144, + "rural": 548387, + "total": 488691 + } + }, + "primary": { + "2015": { + "urban": 3777774, + "town": 620638, + "rural": 1031339, + "total": 2125797 + }, + "2016": { + "urban": 3766145, + "town": 654426, + "rural": 1035042, + "total": 2076677 + }, + "2017": { + "urban": 3752041, + "town": 693101, + "rural": 1043503, + "total": 2015437 + }, + "2018": { + "urban": 3795120, + "town": 736005, + "rural": 1078688, + "total": 1980427 + }, + "2019": { + "urban": 3851042, + "town": 803245, + "rural": 1109884, + "total": 1937913 + }, + "2020": { + "urban": 3892241, + "town": 843655, + "rural": 1149907, + "total": 1898679 + }, + "2021": { + "urban": 3852272, + "town": 887934, + "rural": 1174936, + "total": 1789402 + }, + "2022": { + "urban": 3797273, + "town": 945351, + "rural": 1195978, + "total": 1655944 + }, + "2023": { + "urban": 3864564, + "town": 1038408, + "rural": 1265290, + "total": 1560866 + }, + "2024": { + "urban": 3835076, + "town": 1085249, + "rural": 1310799, + "total": 1439028 + } + }, + "junior": { + "2015": { + "urban": 1894282, + "town": 312094, + "rural": 1006844, + "total": 575344 + }, + "2016": { + "urban": 1873150, + "town": 321663, + "rural": 992245, + "total": 559242 + }, + "2017": { + "urban": 1872808, + "town": 344907, + "rural": 987425, + "total": 540476 + }, + "2018": { + "urban": 1861533, + "town": 356093, + "rural": 984105, + "total": 521335 + }, + "2019": { + "urban": 1845363, + "town": 387312, + "rural": 953535, + "total": 504516 + }, + "2020": { + "urban": 1823665, + "town": 402564, + "rural": 929390, + "total": 491711 + }, + "2021": { + "urban": 1835147, + "town": 426162, + "rural": 942751, + "total": 466234 + }, + "2022": { + "urban": 1863347, + "town": 449234, + "rural": 949533, + "total": 464580 + }, + "2023": { + "urban": 1886645, + "town": 463760, + "rural": 964634, + "total": 458251 + }, + "2024": { + "urban": 1918151, + "town": 497761, + "rural": 978588, + "total": 441802 + } + }, + "senior": { + "2015": { + "urban": 782813, + "town": 251989, + "rural": 502078, + "total": 28746 + }, + "2016": { + "urban": 805829, + "town": 269922, + "rural": 500979, + "total": 34928 + }, + "2017": { + "urban": 834140, + "town": 298160, + "rural": 497231, + "total": 38749 + }, + "2018": { + "urban": 864850, + "town": 308661, + "rural": 507902, + "total": 48287 + }, + "2019": { + "urban": 909138, + "town": 339064, + "rural": 520785, + "total": 49289 + }, + "2020": { + "urban": 971639, + "town": 363578, + "rural": 557100, + "total": 50961 + }, + "2021": { + "urban": 1015711, + "town": 380067, + "rural": 591645, + "total": 43999 + }, + "2022": { + "urban": 1052863, + "town": 402044, + "rural": 599526, + "total": 51293 + }, + "2023": { + "urban": 1063293, + "town": 408374, + "rural": 601306, + "total": 53613 + }, + "2024": { + "urban": 1060575, + "town": 425573, + "rural": 587090, + "total": 47912 + } + }, + "vocational": { + "2015": { + "total": 484189 + }, + "2016": { + "total": 0 + }, + "2017": { + "total": 0 + }, + "2018": { + "total": 0 + }, + "2019": { + "total": 0 + }, + "2020": { + "total": 0 + }, + "2021": { + "total": 550892 + }, + "2022": { + "total": 485528 + }, + "2023": { + "total": 392245 + }, + "2024": { + "total": 365016 + } + } + } + }, { "area_name": "昆明市", "area_code": "530100000", diff --git a/Data/ZhaoShengCount.json b/Data/ZhaoShengCount.json index ec70639..84e68bd 100644 --- a/Data/ZhaoShengCount.json +++ b/Data/ZhaoShengCount.json @@ -1,4 +1,291 @@ [ + { + "area_name": "云南省", + "area_code": "530000000", + "raw_name": "云南省", + "education_data": { + "preschool": { + "2015": { + "urban": 747516, + "town": 133020, + "rural": 255360, + "total": 359136 + }, + "2016": { + "urban": 733111, + "town": 139083, + "rural": 246128, + "total": 347900 + }, + "2017": { + "urban": 747406, + "town": 154038, + "rural": 248226, + "total": 345142 + }, + "2018": { + "urban": 762088, + "town": 163225, + "rural": 252409, + "total": 346454 + }, + "2019": { + "urban": 714245, + "town": 163852, + "rural": 221658, + "total": 328735 + }, + "2020": { + "urban": 832045, + "town": 192568, + "rural": 264498, + "total": 374979 + }, + "2021": { + "urban": 714945, + "town": 178375, + "rural": 235793, + "total": 300777 + }, + "2022": { + "urban": 660990, + "town": 174047, + "rural": 221677, + "total": 265266 + }, + "2023": { + "urban": 602360, + "town": 160644, + "rural": 205735, + "total": 235981 + }, + "2024": { + "urban": 501589, + "town": 135613, + "rural": 177902, + "total": 188074 + } + }, + "primary": { + "2015": { + "urban": 634079, + "town": 111481, + "rural": 169510, + "total": 353088 + }, + "2016": { + "urban": 644648, + "town": 116197, + "rural": 173642, + "total": 354809 + }, + "2017": { + "urban": 634773, + "town": 124622, + "rural": 170793, + "total": 339358 + }, + "2018": { + "urban": 664394, + "town": 141718, + "rural": 183712, + "total": 338964 + }, + "2019": { + "urban": 669748, + "town": 154500, + "rural": 186630, + "total": 328618 + }, + "2020": { + "urban": 649064, + "town": 156886, + "rural": 184714, + "total": 307464 + }, + "2021": { + "urban": 602770, + "town": 156806, + "rural": 180938, + "total": 265026 + }, + "2022": { + "urban": 592486, + "town": 169933, + "rural": 184406, + "total": 238147 + }, + "2023": { + "urban": 701812, + "town": 219819, + "rural": 233187, + "total": 248806 + }, + "2024": { + "urban": 635242, + "town": 200997, + "rural": 219537, + "total": 214708 + } + }, + "junior": { + "2015": { + "urban": 653430, + "town": 104108, + "rural": 349157, + "total": 200165 + }, + "2016": { + "urban": 636809, + "town": 110293, + "rural": 336317, + "total": 190199 + }, + "2017": { + "urban": 633890, + "town": 121636, + "rural": 330021, + "total": 182233 + }, + "2018": { + "urban": 612524, + "town": 120735, + "rural": 322575, + "total": 169214 + }, + "2019": { + "urban": 607343, + "town": 133383, + "rural": 310430, + "total": 163530 + }, + "2020": { + "urban": 603950, + "town": 140744, + "rural": 302899, + "total": 160307 + }, + "2021": { + "urban": 626601, + "town": 147535, + "rural": 322023, + "total": 157043 + }, + "2022": { + "urban": 637172, + "town": 154251, + "rural": 325488, + "total": 157433 + }, + "2023": { + "urban": 625952, + "town": 158870, + "rural": 318153, + "total": 148929 + }, + "2024": { + "urban": 656600, + "town": 181565, + "rural": 331115, + "total": 143920 + } + }, + "senior": { + "2015": { + "urban": 274510, + "town": 86301, + "rural": 177848, + "total": 10361 + }, + "2016": { + "urban": 288237, + "town": 94891, + "rural": 180297, + "total": 13049 + }, + "2017": { + "urban": 297919, + "town": 104074, + "rural": 178538, + "total": 15307 + }, + "2018": { + "urban": 302529, + "town": 106338, + "rural": 178622, + "total": 17569 + }, + "2019": { + "urban": 330490, + "town": 120541, + "rural": 191776, + "total": 18173 + }, + "2020": { + "urban": 359998, + "town": 130699, + "rural": 207127, + "total": 22172 + }, + "2021": { + "urban": 356676, + "town": 131101, + "rural": 209250, + "total": 16325 + }, + "2022": { + "urban": 371435, + "town": 141418, + "rural": 212089, + "total": 17928 + }, + "2023": { + "urban": 372271, + "town": 142937, + "rural": 209396, + "total": 19938 + }, + "2024": { + "urban": 371086, + "town": 146793, + "rural": 205803, + "total": 18490 + } + }, + "vocational": { + "2015": { + "total": 175583 + }, + "2016": { + "total": 0 + }, + "2017": { + "total": 0 + }, + "2018": { + "total": 0 + }, + "2019": { + "total": 0 + }, + "2020": { + "total": 0 + }, + "2021": { + "total": 175398 + }, + "2022": { + "total": 158216 + }, + "2023": { + "total": 146282 + }, + "2024": { + "total": 137889 + } + } + } + }, { "area_name": "昆明市", "area_code": "530100000", diff --git a/Model/__pycache__/RuYuanZaiYuanCount.cpython-310.pyc b/Model/__pycache__/RuYuanZaiYuanCount.cpython-310.pyc new file mode 100644 index 0000000..fa50296 Binary files /dev/null and b/Model/__pycache__/RuYuanZaiYuanCount.cpython-310.pyc differ diff --git a/Tools/T5_ZhaoShengCount.py b/Tools/T5_ZhaoShengCount.py index d8ef080..6972f79 100644 --- a/Tools/T5_ZhaoShengCount.py +++ b/Tools/T5_ZhaoShengCount.py @@ -17,8 +17,8 @@ JSON_PATH = os.path.join(DATA_DIR, 'ZhaoShengCount.json') # 工作表名称 SHEET_NAME = '招生数' -# 起始行(跳过前4行表头) -START_ROW = 5 +# 起始行(跳过前3行表头) +START_ROW = 4 # 年份范围 YEAR_RANGE = [2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024] diff --git a/Tools/T6_ZaiXiaoShengCount.py b/Tools/T6_ZaiXiaoShengCount.py index 48ba204..72b4a74 100644 --- a/Tools/T6_ZaiXiaoShengCount.py +++ b/Tools/T6_ZaiXiaoShengCount.py @@ -29,7 +29,7 @@ SHEET_NAME = '在校生数' REGION_NAME_COLUMN = 'B' # 数据起始行 -START_ROW = 5 +START_ROW = 4 # 年份范围 YEAR_RANGE = range(2015, 2025) diff --git a/static/preschool_education.html b/static/preschool_education.html new file mode 100644 index 0000000..570a7ca --- /dev/null +++ b/static/preschool_education.html @@ -0,0 +1,66 @@ + + + + + + 学前教育数据测试 + + + + + +
+

学前教育招生人数统计

+
+
+
+ + + + \ No newline at end of file