From 06c8c955b1bb06e5a753a149ffd0b0c271ba0019 Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Tue, 6 Aug 2024 14:35:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=8F=A3?= =?UTF-8?q?=E4=B8=BA0=E6=97=B6=E7=9A=84=E9=94=99=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/sy_mapcopy.vue | 228 ++++++++++++++++++++++++++++------------ 1 file changed, 159 insertions(+), 69 deletions(-) diff --git a/src/view/sy_mapcopy.vue b/src/view/sy_mapcopy.vue index d5ddd0f..09e5f79 100644 --- a/src/view/sy_mapcopy.vue +++ b/src/view/sy_mapcopy.vue @@ -16,7 +16,7 @@
@@ -76,7 +76,7 @@
@@ -159,14 +159,14 @@ :pagination="pagination" @close="close" @handle="handlePagination" - @openMessage="openMessage" + @openMessage="openMessage" > - { }; //点击人口数 const buten = async (item) => { - getData(item.id, item.age); + getData(item.age); getDatas(cfJd.value, item.age); }; //点击特殊标签 @@ -1113,7 +1112,8 @@ const buten2 = async (item) => { getDataBqs(cfJd.value, cfCs.value, item.id); }; //人口 -const getData = async (i, e) => { +const getData = async (e) => { + let e1=e; if (e == "9999") { e = ""; } @@ -1125,7 +1125,7 @@ const getData = async (i, e) => { { id: "9999", ages: "总人口", - age: "", + age: "9999", value: "res.data.total", }, { @@ -1133,7 +1133,7 @@ const getData = async (i, e) => { name: "近一年死亡", value: "5650", ages: "近一年死亡", - age: "1000", + age: "6666", percent: "", }, ]; @@ -1195,8 +1195,8 @@ const getData = async (i, e) => { } catch (error) { console.error("Error fetching data:", error); } - if (i) { - changeRs(i); + if (e1) { + changeRs(e1); } }; const getDatas = async (e, i) => { @@ -1211,33 +1211,64 @@ const getDatas = async (e, i) => { } else if (cfJd.value !== "") { personTotal.value = [ { - id: "9999", + // id: "9999", ages: "总人口", - age: "", + age: "9999", value: "res.data.total", }, { - id: "6666", + // id: "6666", name: "近一年死亡", value: "5650", ages: "近一年死亡", - age: "1000", + age: "6666", percent: "", }, ]; + let before_age = ""; personTotal.value[0].rksl = res.data.total; personTotal.value[0].ages = "总人口"; personTotal.value[1].rksl = res.data.swrs; personTotal.value[1].ages = "近一年死亡"; personTotal.value[1].percent = res.data.swrsPercent; res.data.age.forEach((item, index) => { - personTotal.value.push({ - id: index + 1, - rksl: item.rksl, - age: item.age + "", - ages: item.age + "岁", - percent: item.percent, - }); + if (index == 0) { + personTotal.value.push({ + rksl: item.rksl, + age: item.age + "", + ages: item.age + "岁", + percent: item.percent, + }); + before_age = item.age; + console.log("执行111", before_age); + } else { + if (item.age - before_age == 1) { + personTotal.value.push({ + rksl: item.rksl, + age: item.age + "", + ages: item.age + "岁", + percent: item.percent, + }); + before_age = item.age; + } else { + for (let i = 0; i < item.age - before_age - 1; i++) { + ++before_age; + personTotal.value.push({ + rksl: 0, + age: before_age + "", + ages: before_age + "岁", + percent: 0.0, + }); + } + personTotal.value.push({ + rksl: item.rksl, + age: item.age + "", + ages: item.age + "岁", + percent: item.percent, + }); + before_age = item.age; + } + } }); } if (cfJd.value != "") { @@ -1346,17 +1377,18 @@ const getDatas2 = async (e, i, cs) => { if (res.code == 200) { personTotal.value = [ { - id: "9999", + // id: "9999", + name: "总人口", ages: "总人口", - age: "", + age: "9999", value: "res.data.total", }, { - id: "6666", + // id: "6666", name: "近一年死亡", value: "5650", ages: "近一年死亡", - age: "1000", + age: "6666", }, ]; personTotal.value[0].rksl = res.data.total; @@ -1364,14 +1396,54 @@ const getDatas2 = async (e, i, cs) => { personTotal.value[1].rksl = res.data.swrs; personTotal.value[1].ages = "近一年死亡"; personTotal.value[1].percent = res.data.swrsPercent; + // res.data.age.forEach((item, index) => { + // personTotal.value.push({ + // id: index + 1, + // rksl: item.rksl, + // age: item.age + "", + // ages: item.age + "岁", + // percent: item.percent, + // }); + // }); + let before_age = ""; res.data.age.forEach((item, index) => { - personTotal.value.push({ - id: index + 1, - rksl: item.rksl, - age: item.age + "", - ages: item.age + "岁", - percent: item.percent, - }); + if (index == 0) { + personTotal.value.push({ + rksl: item.rksl, + age: item.age + "", + ages: item.age + "岁", + percent: item.percent, + }); + before_age = item.age; + console.log("执行111", before_age); + } else { + if (item.age - before_age == 1) { + personTotal.value.push({ + rksl: item.rksl, + age: item.age + "", + ages: item.age + "岁", + percent: item.percent, + }); + before_age = item.age; + } else { + for (let i = 0; i < item.age - before_age - 1; i++) { + ++before_age; + personTotal.value.push({ + rksl: 0, + age: before_age + "", + ages: before_age + "岁", + percent: 0.0, + }); + } + personTotal.value.push({ + rksl: item.rksl, + age: item.age + "", + ages: item.age + "岁", + percent: item.percent, + }); + before_age = item.age; + } + } }); xkzCenter.map((item) => { item.swrs = 0; @@ -1722,11 +1794,12 @@ const to_jd = (item_name) => { if (choose.value.person == "9999") { getDatas(cfJd.value, ""); } else { - if (choose.value.person == 1) { - getDatas(cfJd.value, "0"); //0岁传字符串 - } else { - getDatas(cfJd.value, choose.value.person - 1); - } + // if (choose.value.person == 1) { + // getDatas(cfJd.value, "0"); //0岁传字符串 + // } else { + // getDatas(cfJd.value, choose.value.person); + // } + getDatas(cfJd.value, choose.value.person); } } // if (title_jd.value == item.name) { @@ -1746,18 +1819,29 @@ const to_jd = (item_name) => { //详情 const open_detail = () => { let age = ""; + // if (choose.value.person == "9999") { + // age = ""; + // person_detail(age); + // dialogShow.value = true; + // } else if (choose.value.person == "6666") { + // age = ""; + // } else if (choose.value.person == 1) { + // age = "0"; + // person_detail(age); + // dialogShow.value = true; + // } else { + // age = choose.value.person - 1; + // person_detail(age); + // dialogShow.value = true; + // } if (choose.value.person == "9999") { age = ""; person_detail(age); dialogShow.value = true; } else if (choose.value.person == "6666") { age = ""; - } else if (choose.value.person == 1) { - age = "0"; - person_detail(age); - dialogShow.value = true; } else { - age = choose.value.person - 1; + age = choose.value.person; person_detail(age); dialogShow.value = true; } @@ -1765,21 +1849,26 @@ const open_detail = () => { const close = () => { dialogShow.value = false; pagination.total = 100; - - pagination.currentPage = 1; }; //表格分页 const handlePagination = (current) => { pagination.currentPage = current; let age = ""; + // if (choose.value.person == "9999") { + // age = ""; + // } else if (choose.value.person == "6666") { + // age = ""; + // } else if (choose.value.person == 1) { + // age = "0"; + // } else { + // age = choose.value.person - 1; + // } if (choose.value.person == "9999") { age = ""; } else if (choose.value.person == "6666") { age = ""; - } else if (choose.value.person == 1) { - age = "0"; } else { - age = choose.value.person - 1; + age = choose.value.person; } person_detail(age); }; @@ -1796,7 +1885,7 @@ const closeDetail = () => { openD.value = true; window.removeEventListener('resize', reset_font2); }; -//获取人口详情接口 +//获取人口列表接口 const person_detail = (age) => { http .get( @@ -2140,11 +2229,13 @@ const addPolygonCounty = () => { if (choose.value.person == "9999") { getDatas(cfJd.value, ""); } else { - if (choose.value.person == 1) { - getDatas(cfJd.value, "0"); //0岁传字符串 - } else { - getDatas(cfJd.value, choose.value.person - 1); - } + // if (choose.value.person == 1) { + // getDatas(cfJd.value, "0"); //0岁传字符串 + // } else { + // getDatas(cfJd.value, choose.value.person - 1); + // } + + getDatas(cfJd.value, choose.value.person); } } if (title_jd.value == item.name) { @@ -2415,11 +2506,12 @@ const addPolygonCountyCs = () => { // getDataBqs(cfJd.value, cfCs.value); } //这段注意 - if (choose.value.person == 1) { - getDatas2(cfJd.value, "0", cfCs.value); //0岁传字符串 - } else { - getDatas2(cfJd.value, choose.value.person - 1, cfCs.value); - } + // if (choose.value.person == 1) { + // getDatas2(cfJd.value, "0", cfCs.value); //0岁传字符串 + // } else { + // getDatas2(cfJd.value, choose.value.person - 1, cfCs.value); + // } + getDatas2(cfJd.value, choose.value.person, cfCs.value); // getDatas2(cfJd.value, choose.value.person, cfCs.value); addCsChoose(); addCsUnChoose(); @@ -2513,11 +2605,12 @@ const addCsUnChoose = () => { // }); // getDataBqs(cfJd.value, cfCs.value); getDataBq(cfJd.value, cfCs.value); - if (choose.value.person == 1) { - getDatas2(cfJd.value, "0", cfCs.value); //0岁传字符串 - } else { - getDatas2(cfJd.value, choose.value.person - 1, cfCs.value); - } + // if (choose.value.person == 1) { + // getDatas2(cfJd.value, "0", cfCs.value); //0岁传字符串 + // } else { + // getDatas2(cfJd.value, choose.value.person - 1, cfCs.value); + // } + getDatas2(cfJd.value, choose.value.person, cfCs.value); // getDatas2(cfJd.value, choose.value.person, cfCs.value); // if ( // choose.value.person == "cjr" || @@ -2888,8 +2981,6 @@ const reset_font = () => { } }; const reset_font2 = () => { - console.log(111111); - let width = document.documentElement.clientWidth || document.body.clientWidth; let height = document.documentElement.clientHeight || document.body.clientHeight; @@ -2899,13 +2990,12 @@ const reset_font2 = () => { "scale(" + width / 1920 + "," + height / 1080 + ")"; }; onMounted(() => { - // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); + tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); reset_font(); initMap(); getData(); getDataBq(); BMAP(); - }); From 2c42020acfc557ce31b5f96ced23d25eb2654530 Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Tue, 6 Aug 2024 15:17:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?gxfor=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/view/sy_mapcopy.vue | 65 +++++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/src/view/sy_mapcopy.vue b/src/view/sy_mapcopy.vue index 09e5f79..23f979b 100644 --- a/src/view/sy_mapcopy.vue +++ b/src/view/sy_mapcopy.vue @@ -159,14 +159,14 @@ :pagination="pagination" @close="close" @handle="handlePagination" - @openMessage="openMessage" + @openMessage="openMessage" > - { }; //人口 const getData = async (e) => { - let e1=e; + let e1 = e; if (e == "9999") { e = ""; } @@ -1195,7 +1195,7 @@ const getData = async (e) => { } catch (error) { console.error("Error fetching data:", error); } - if (e1) { + if (e1) { changeRs(e1); } }; @@ -1232,7 +1232,7 @@ const getDatas = async (e, i) => { personTotal.value[1].ages = "近一年死亡"; personTotal.value[1].percent = res.data.swrsPercent; res.data.age.forEach((item, index) => { - if (index == 0) { + if (index == 0 && item.age == 0) { personTotal.value.push({ rksl: item.rksl, age: item.age + "", @@ -1240,7 +1240,6 @@ const getDatas = async (e, i) => { percent: item.percent, }); before_age = item.age; - console.log("执行111", before_age); } else { if (item.age - before_age == 1) { personTotal.value.push({ @@ -1251,8 +1250,8 @@ const getDatas = async (e, i) => { }); before_age = item.age; } else { - for (let i = 0; i < item.age - before_age - 1; i++) { - ++before_age; + for (let k = before_age; k < item.age - 1; k++) { + before_age = before_age + 1; personTotal.value.push({ rksl: 0, age: before_age + "", @@ -1407,7 +1406,44 @@ const getDatas2 = async (e, i, cs) => { // }); let before_age = ""; res.data.age.forEach((item, index) => { - if (index == 0) { + // if (index == 0) { + // personTotal.value.push({ + // rksl: item.rksl, + // age: item.age + "", + // ages: item.age + "岁", + // percent: item.percent, + // }); + // before_age = item.age; + // console.log("执行111", before_age); + // } else { + // if (item.age - before_age == 1) { + // personTotal.value.push({ + // rksl: item.rksl, + // age: item.age + "", + // ages: item.age + "岁", + // percent: item.percent, + // }); + // before_age = item.age; + // } else { + // for (let i = 0; i < item.age - before_age - 1; i++) { + // ++before_age; + // personTotal.value.push({ + // rksl: 0, + // age: before_age + "", + // ages: before_age + "岁", + // percent: 0.0, + // }); + // } + // personTotal.value.push({ + // rksl: item.rksl, + // age: item.age + "", + // ages: item.age + "岁", + // percent: item.percent, + // }); + // before_age = item.age; + // } + // } + if (index == 0 && item.age == 0) { personTotal.value.push({ rksl: item.rksl, age: item.age + "", @@ -1415,7 +1451,6 @@ const getDatas2 = async (e, i, cs) => { percent: item.percent, }); before_age = item.age; - console.log("执行111", before_age); } else { if (item.age - before_age == 1) { personTotal.value.push({ @@ -1426,8 +1461,8 @@ const getDatas2 = async (e, i, cs) => { }); before_age = item.age; } else { - for (let i = 0; i < item.age - before_age - 1; i++) { - ++before_age; + for (let k = before_age; k < item.age - 1; k++) { + before_age = before_age + 1; personTotal.value.push({ rksl: 0, age: before_age + "", @@ -1878,12 +1913,12 @@ const openMessage = (e) => { openD.value = false; reset_font2(); //监听实现人物详情动态缩放 - window.addEventListener('resize', reset_font2); + window.addEventListener("resize", reset_font2); }; //关闭人物详情页面 const closeDetail = () => { openD.value = true; - window.removeEventListener('resize', reset_font2); + window.removeEventListener("resize", reset_font2); }; //获取人口列表接口 const person_detail = (age) => { @@ -2990,7 +3025,7 @@ const reset_font2 = () => { "scale(" + width / 1920 + "," + height / 1080 + ")"; }; onMounted(() => { - tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); + // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); reset_font(); initMap(); getData(); From 52c7f145590fcdd65bb83062072cdfd37bda42ff Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Tue, 6 Aug 2024 15:45:34 +0800 Subject: [PATCH 3/3] gx --- src/view/analyze.vue | 6 +- src/view/echart_analyze/dialog_nlfb.vue | 9 ++- src/view/table_gk/gk_hygiene.vue | 101 +++++++++++++----------- 3 files changed, 64 insertions(+), 52 deletions(-) diff --git a/src/view/analyze.vue b/src/view/analyze.vue index 7473a32..bbba965 100644 --- a/src/view/analyze.vue +++ b/src/view/analyze.vue @@ -508,9 +508,9 @@ const dataEc = reactive({ }); const nlfb = reactive({ year: [2022, 2023, 2024, 2025, 2026,2027], - list1: [0, 1000, 500, 0, 0,0], - list2: [0, 2000, 1000, 0, 0,0], - list3: [0, 3000, 1500, 0, 0,0], + list1: [709, 3424, 2064, 0, 0,0], + list2: [1548, 5895, 2753, 0, 0,0], + list3: [180, 930, 632, 0, 0,0], }); const showEnrol = () => { dialogShowEnrol.value = true; diff --git a/src/view/echart_analyze/dialog_nlfb.vue b/src/view/echart_analyze/dialog_nlfb.vue index 2c0d1b3..ab8be69 100644 --- a/src/view/echart_analyze/dialog_nlfb.vue +++ b/src/view/echart_analyze/dialog_nlfb.vue @@ -104,9 +104,10 @@ const getOption = () => { }, series: [ { + xAxisIndex: 0, name: "0-18岁", type: "line", - stack: "Total", + // stack: "Total", symbol: "emptyCircle", smooth: true, symbolSize: 10, @@ -151,9 +152,10 @@ const getOption = () => { data: data.list, }, { + xAxisIndex: 0, name: "19-60岁", type: "line", - stack: "Total", + // stack: "Total", symbol: "emptyCircle", smooth: true, symbolSize: 10, @@ -198,9 +200,10 @@ const getOption = () => { data: data.list2, }, { + xAxisIndex: 0, name: "60岁以上", type: "line", - stack: "Total", + // stack: "Total", symbol: "emptyCircle", smooth: true, symbolSize: 10, diff --git a/src/view/table_gk/gk_hygiene.vue b/src/view/table_gk/gk_hygiene.vue index ff1e33b..99c3a1c 100644 --- a/src/view/table_gk/gk_hygiene.vue +++ b/src/view/table_gk/gk_hygiene.vue @@ -2,8 +2,11 @@
-
+
@@ -120,20 +123,20 @@
-
- -
-
门急诊人次
- -
{{ data.mz.mjzrc }}
+
+ +
+
门急诊人次
+ +
{{ data.mz.mjzrc }}
-
- -
-
住院人数
- -
{{ data.mz.zyrs }}
+
+ +
+
住院人数
+ +
{{ data.mz.zyrs }}
@@ -160,24 +163,26 @@ src="@/assets/images/hygiene/jd.gif" alt="" /> -
建档份数
+
+ 建档份数 +
-
-
+
+
-
+
建档率
{{ data.jkda.jdl }}%
-
-
+
+
-
+
家庭医生签约率
{{ data.jkda.jtysqyl }}%
@@ -211,14 +216,14 @@ -
孕产妇系统管理人数
+
孕产妇系统管理人数
{{ data.fyglrs.etrs }}
-
0-6岁儿童系统管理人数
+
0-6岁儿童系统管理人数
@@ -297,7 +302,7 @@ const data = reactive({ fyglrs: {}, //系统管理 jktj: {}, //65岁健康体检 jkhd: [], //健康活动 - lxbx:{},//手工零星报销 + lxbx: {}, //手工零星报销 }); const tabYd = ref([ { @@ -316,7 +321,7 @@ const lmbqh = () => { }; // const change2 = (name) => { - if (leftchoose.value[name] == "0") { + if (leftchoose.value[name] == "0") { leftchoose.value[name] = "1"; } else { leftchoose.value[name] = "0"; @@ -412,7 +417,7 @@ const getData = async () => { .module11 { display: flex; width: 100%; -// margin-top: 112px; + // margin-top: 112px; } .yd_title { @@ -746,26 +751,26 @@ const getData = async () => { display: flex; align-items: center; justify-content: space-around; - .item { + .item5 { display: flex; align-items: center; - .left { + .left5 { width: 102px; height: 102px; } - .right { + .right5 { margin-left: 10px; - .right_top { + .right5_top { font-size: 16px; color: #ffffff; line-height: 22px; letter-spacing: 2px; } - .right_center { + .right5_center { width: 100px; height: 7px; } - .right_bottom { + .right5_bottom { margin-top: 3px; padding: 5px; font-size: 22px; @@ -1187,30 +1192,34 @@ const getData = async () => { } .minTopPart2 { margin-left: 5px; - width: 420px; - height: 136px; + width: 390px; + height: 160px; background-image: url(@/assets/images/hygiene/xia_1.png); background-repeat: no-repeat; background-size: 100% 100%; align-items: center; position: relative; display: flex; + justify-content: space-around; margin-top: 35px; padding: 0 5px; box-sizing: border-box; - .left { + .left5 { display: flex; + flex-direction: column; align-items: center; justify-content: center; margin-left: 13px; - .leftImg { + .leftImg5 { width: 90px; height: 90px; + margin-bottom: 10px; } - .left_me { + .left5_me { margin-left: 10px; display: flex; flex-direction: column; + text-align: center; font-family: PingFangSC, PingFang SC; font-weight: 500; font-size: 14px; @@ -1220,7 +1229,7 @@ const getData = async () => { text-shadow: 0px 0px 4px rgba(255, 255, 255, 0.65); .bo { - margin-top: 5px; + // margin-top: 5px; font-family: TCloudNumber, TCloudNumber; font-weight: bold; font-size: 18px; @@ -1230,19 +1239,20 @@ const getData = async () => { } } } - .right { + .right5 { display: flex; + flex-direction: column; align-items: center; - // justify-content: center; - - .rightImg { + justify-content: center; + .rightImg5 { width: 90px; height: 90px; + margin-bottom: 10px; } - .right_me { - margin-left: 10px; + .right5_me { display: flex; flex-direction: column; + text-align: center; font-family: PingFangSC, PingFang SC; font-weight: 500; font-size: 14px; @@ -1251,7 +1261,6 @@ const getData = async () => { letter-spacing: 2px; text-shadow: 0px 0px 4px rgba(255, 255, 255, 0.65); .bo { - margin-top: 5px; font-family: TCloudNumber, TCloudNumber; font-weight: bold; font-size: 18px; @@ -1319,7 +1328,7 @@ const getData = async () => { margin-top: 15px; margin-bottom: 10px; } -.font{ +.font { font-size: 18px !important; }