From c088fee4c1d38382274f4558f2a92b26617b4575 Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Thu, 11 Sep 2025 14:59:20 +0800 Subject: [PATCH] 'commit' --- .../RuYuanZaiYuanCountModel.cpython-312.pyc | Bin 6327 -> 6288 bytes static/js/data/index.js | 75 +++++++++++++++++- static/js/index.js | 22 ++--- 3 files changed, 80 insertions(+), 17 deletions(-) diff --git a/Model/__pycache__/RuYuanZaiYuanCountModel.cpython-312.pyc b/Model/__pycache__/RuYuanZaiYuanCountModel.cpython-312.pyc index ac85732e4c1941675b4493ca716e716b64fdb389..f176688296a4341f12bea5c7d63d1d2dcd953308 100644 GIT binary patch delta 678 zcmYL`&ubGw6vs2Wv%6{1Y&NN;(F$ryij!X?Xxd7H*h6D0)k{;wpSVdjW;NNQv(ctu zD+nGu3Zn->6g*jP5~X*+lk^X8Zh{Conb?28nGNbL`{B*|e&3t7Gke)*S@mlm;PbG@ z-27bog+8dCpif~-k$ndj$v(_X$!|dw>`0Es0gm8^4s@i7@=D&39l19x6#GzQiH;5ZvKD>{2WoF$`3V6cAICSr<=$-IIq)Z# zor>*d3onr`Y69fRP(9+$vn=KkK2Ht@H!dx*up7j8OZury(tXoeguIyhD75s3LB)n? zG3XuYHLbRRAL?~n41(Vb3Tq-dX(74+MU+0+{95*>`5lM?J z|L@?{JEmPU%lGkZE-y1sv83a!GLt(qpDE8F*q6Cd;}HG=33!n-wc~!b{pi2QOYLO5 zz#OdhY_?pU&*2NBRaGx9|6{9mcqIHrEMJMht zH}x8gR!z4}n}RN0CD%ez34V0A$>DC!r|U}$UEy@BD`s;s1lfK@wTG{Qi=`9`zypl+PQ@5rNQJh&x-$ZroPPBHxt^cty8 delta 748 zcmYLGOKTHR6waM@VxFy}52#j4#7W!GAkhX=p)UGDL}=Q8w#G?j+KkQ1J0m7xf-c<% zh3irjx)AD4gSc|zN)#9F%3Zh=vXRvM0KI3Tb%y!oJimLsbN7?)lff^6fX~C8Z}pF* zyYV-{cY;r0F3-MxmV6cFV&Va6i@P3OIzT(9EjbuhZjgdJMIOr&{-bk=dq}-yvudo{&9b42 z7%~{j@gn&d+!)I+vlYU-1?}S8jQb{%s;b}xvK2ZL-GIVP2GncS%cgyuG2vCRADTIz zg;bHjlIkC@-iF8)z&5}g@;wwA|IeUk4b#e+#XX#d^b(l}j}4h%a{oZ(aE7de&u+R@ zC!)hLz$vfU5u`c0~p)?ozBp?nMGfBaO&xV4B6K=njGH&fCaqgw{IS!$=6v zLi0<2I6#6_M=oEO7Ekwik2KWdnAN+5n0d@KIWg)+2PP~1JYtOxx}Y`6fGU|vO@B}} VuHr+I8;ysWJc|DE0OAD8{{j4l!=V5G diff --git a/static/js/data/index.js b/static/js/data/index.js index fd5ccfe..267e998 100644 --- a/static/js/data/index.js +++ b/static/js/data/index.js @@ -31,6 +31,78 @@ option_1_1 = { { type: "value", axisLabel: { formatter: "{value}", color: "#fff" } }, { type: "value", axisLabel: { formatter: "{value}", color: "#fff" } }, ], + series: [ + { + name: "城区", + type: "bar", + data: [], + tooltip: { valueFormatter: (v) => v + " 万人" }, + itemStyle: { borderRadius: [6, 6, 0, 0] }, + }, + { + name: "镇区", + type: "bar", + data: [], + tooltip: { valueFormatter: (v) => v + " 万人" }, + itemStyle: { borderRadius: [6, 6, 0, 0] }, + }, + { + name: "乡村", + type: "bar", + data: [], + tooltip: { valueFormatter: (v) => v + " 万人" }, + itemStyle: { borderRadius: [6, 6, 0, 0] }, + }, + { + name: "总入园数", + type: "line", + yAxisIndex: 1, + data: [], + tooltip: { valueFormatter: (v) => v + " 万人" }, + }, + { + name: "2022年基数", + type: "line", + yAxisIndex: 1, + data: [], + tooltip: { valueFormatter: (v) => v + " 万人" }, + }, + ], +}; + +option_1_2 = { + grid: { left: 0, right: 0, top: 40, bottom: 10, containLabel: true }, + textStyle: { color: "#fff" }, + tooltip: { + trigger: "axis", + axisPointer: { type: "cross", crossStyle: { color: "#999" } }, + textStyle: { color: "#fff" }, + backgroundColor: "rgba(96,98,102,0.8)", + borderColor: "rgba(255,255,255,0.3)", + borderWidth: 1, + }, + legend: { + data: ["城区", "镇区", "乡村", "总在园数", "2022年基数"], + top: 0, + textStyle: { color: "#fff" }, + icon: "roundRect", + itemWidth: 12, + itemHeight: 12, + }, + xAxis: [ + { + type: "category", + data: [], + axisPointer: { type: "shadow" }, + axisLine: { lineStyle: { color: "#fff" } }, + axisLabel: { color: "#fff" }, + nameTextStyle: { color: "#fff" }, + }, + ], + yAxis: [ + { type: "value", axisLabel: { formatter: "{value}", color: "#fff" } }, + { type: "value", axisLabel: { formatter: "{value}", color: "#fff" } }, + ], series: [ { name: "城区", @@ -51,7 +123,7 @@ option_1_1 = { itemStyle: { borderRadius: [6, 6, 0, 0] }, }, { - name: "总入园数", + name: "总在园数", type: "line", yAxisIndex: 1, data: [], @@ -64,3 +136,4 @@ option_1_1 = { }, ], }; + diff --git a/static/js/index.js b/static/js/index.js index d542886..8307f2a 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -16,11 +16,11 @@ $(window).load(function () { }); $(function () { - echarts_1(); + echarts_1_1(); echarts_2(); // echarts_3(); - function echarts_1() { + function echarts_1_1() { var myChart = echarts.init(document.getElementById("echarts01")); $.ajax({ @@ -28,17 +28,13 @@ $(function () { async: false, dataType: "json", url: "/RuYuanZaiYuan/school/preschool/chart", - success: function (res) { - option_1_1.series.forEach((seriesItem, index) => { - seriesItem.tooltip = { valueFormatter: (v) => v + " 万人" }; - }); + success: function (res) { option_1_1.xAxis[0].data = res.xAxis_data; option_1_1.series[0].data = res.series_data_0; option_1_1.series[1].data = res.series_data_1; option_1_1.series[2].data = res.series_data_2; option_1_1.series[3].data = res.series_data_3; - option_1_1.series[4].data = res.series_data_4; - option_1_1.series[5].data = res.series_data_5; + option_1_1.series[4].data = res.series_data_4; myChart.setOption(option_1_1); window.addEventListener("resize", function () { myChart.resize(); @@ -284,18 +280,12 @@ $(function () { $(this).siblings().removeClass("active"); // 添加active类到当前点击的元素 $(this).addClass("active"); - // 获取当前选中的标签数据 - var selectedTab = $(this).data("tab"); - - // 这里可以添加根据标签切换内容的逻辑 - console.log("切换到: " + selectedTab); - - // 示例：根据标签切换图表数据 + var selectedTab = $(this).data("tab"); switch (selectedTab) { case "入园数": // 加载入园数数据 - echarts_1(); + echarts_1_1(); break; case "在园数": echarts_3();