diff --git a/src/assets/images/hygiene/ylbx_ybsyje.png b/src/assets/images/hygiene/ylbx_ybsyje.png new file mode 100644 index 0000000..2cdb666 Binary files /dev/null and b/src/assets/images/hygiene/ylbx_ybsyje.png differ diff --git a/src/assets/images/hygiene/ylbx_ylbxffrc.png b/src/assets/images/hygiene/ylbx_ylbxffrc.png new file mode 100644 index 0000000..1689fe5 Binary files /dev/null and b/src/assets/images/hygiene/ylbx_ylbxffrc.png differ diff --git a/src/assets/images/yl/gllrbt_btje.png b/src/assets/images/yl/gllrbt_btje.png new file mode 100644 index 0000000..bb9fa3e Binary files /dev/null and b/src/assets/images/yl/gllrbt_btje.png differ diff --git a/src/assets/images/yl/gllrbt_btrc.png b/src/assets/images/yl/gllrbt_btrc.png new file mode 100644 index 0000000..d34e7e2 Binary files /dev/null and b/src/assets/images/yl/gllrbt_btrc.png differ diff --git a/src/assets/images/yl/tkdb_bzje.png b/src/assets/images/yl/tkdb_bzje.png new file mode 100644 index 0000000..a68e25e Binary files /dev/null and b/src/assets/images/yl/tkdb_bzje.png differ diff --git a/src/assets/images/yl/tkdb_ffrc.png b/src/assets/images/yl/tkdb_ffrc.png new file mode 100644 index 0000000..d28e77e Binary files /dev/null and b/src/assets/images/yl/tkdb_ffrc.png differ diff --git a/src/assets/images/yl/ylbx_ylbxffrc.png b/src/assets/images/yl/ylbx_ylbxffrc.png new file mode 100644 index 0000000..73e9ef5 Binary files /dev/null and b/src/assets/images/yl/ylbx_ylbxffrc.png differ diff --git a/src/assets/images/yl/ylbx_ylbxje.png b/src/assets/images/yl/ylbx_ylbxje.png new file mode 100644 index 0000000..9679874 Binary files /dev/null and b/src/assets/images/yl/ylbx_ylbxje.png differ diff --git a/src/components/header.vue b/src/components/header.vue index f7f539c..635e565 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -131,18 +131,14 @@ const data = reactive({ }, ], urlLeft: [ - { - name: "评估模型", - url: "/home/index/table", - }, - { - name: "要素一张图", - url: "/home/index/map", - }, { name: "总体概览", url: "/home/index", }, + { + name: "评估模型", + url: "/home/index/table", + }, // { // name: "养老", // url: "/home/yl", @@ -159,6 +155,10 @@ const data = reactive({ // name: "救助", // url: "/home/work", // }, + { + name: "要素一张图", + url: "/home/index/map", + }, { name: "智能分析", url: "/home/analyze", diff --git a/src/view/analyze.vue b/src/view/analyze.vue index 22270e0..7473a32 100644 --- a/src/view/analyze.vue +++ b/src/view/analyze.vue @@ -507,10 +507,10 @@ const dataEc = reactive({ title: "", }); const nlfb = reactive({ - year: [2022, 2023, 2024, 2025, 2026], - list1: [0, 1000, 500, 0, 0], - list2: [0, 2000, 1000, 0, 0], - list3: [0, 3000, 1500, 0, 0], + 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], }); const showEnrol = () => { dialogShowEnrol.value = true; diff --git a/src/view/dialog/diaLogElderlyData.vue b/src/view/dialog/diaLogElderlyData.vue index e98093c..432d8f6 100644 --- a/src/view/dialog/diaLogElderlyData.vue +++ b/src/view/dialog/diaLogElderlyData.vue @@ -188,7 +188,7 @@ const closeDialog = () => { :deep(.el-dialog) { --el-dialog-bg-color: none; --el-dialog-width: 55% !important; - --el-dialog-margin-top: 11vh; + --el-dialog-margin-top: 14vh; } .my-header { diff --git a/src/view/dialog/dialogEnrol.vue b/src/view/dialog/dialogEnrol.vue index de369a8..c97ab70 100644 --- a/src/view/dialog/dialogEnrol.vue +++ b/src/view/dialog/dialogEnrol.vue @@ -240,7 +240,7 @@ const selectChange1 = (e) => { :deep(.el-dialog) { --el-dialog-bg-color: none; --el-dialog-width: 76% !important; - --el-dialog-margin-top: 11vh; + --el-dialog-margin-top: 14vh; // --el-dialog-margin-bottom: 0px !important; margin-bottom: 0px !important; } diff --git a/src/view/dialog/dialogMapDp.vue b/src/view/dialog/dialogMapDp.vue index bb01be5..179dcea 100644 --- a/src/view/dialog/dialogMapDp.vue +++ b/src/view/dialog/dialogMapDp.vue @@ -152,7 +152,7 @@ const handleRowClick = (row, column, event) => { console.log(row); router.push({ path: `/home/index/person`, - query: {nm: row.nm, identNo: row.identNo }, + query: {nm: row.nm, identNo: row.identNo,type:'map'}, }); }; // 详情弹框 diff --git a/src/view/echart_analyze/dialog_jjlxfb.vue b/src/view/echart_analyze/dialog_jjlxfb.vue index 9097d32..9015039 100644 --- a/src/view/echart_analyze/dialog_jjlxfb.vue +++ b/src/view/echart_analyze/dialog_jjlxfb.vue @@ -35,31 +35,38 @@ const colors = [ }, ]; const maxList = ref([ - 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, + 18000, 18000, 18000, 18000, 18000, 18000, 18000, 18000, 18000, 18000, 18000, + 18000, 18000, 18000, 18000, ]); // const valueList = [20, 53, 47, 65, 29, 11, 10]; const data = reactive({ list: [], option: {}, - Max: 200, - valueList: [20, 53, 47, 65, 29, 11, 10, 20, 53, 47, 65, 29, 11, 10, 30], - valueList2: [120, 153, 47, 65, 29, 11, 10, 20, 53, 47, 65, 29, 11, 10, 30], + Max: 20000, + valueList: [ + 4504, 16086, 6130, 2844, 4967, 179, 1685, 5010, 633, 569, 219, 5152, 40, + 631, 536, + ], + valueList2: [ + 1181, 2177, 3720, 3711, 4642, 1654, 3395, 5552, 2651, 3468, 5078, 1944, + 1959, 4593, 3823, + ], xxname: [ + "龙洲街道", "东华街道", - "大街乡", - "塔石镇", + "湖镇镇", "小南海镇", - "模环乡", + "溪口镇", "横山镇", - "沐尘畲族乡", - "石佛乡", + "塔石镇", + "詹家镇", "罗家乡", "庙下乡", - "溪口镇", + "沐尘畲族乡", + "模环乡", + "石佛乡", "社阳乡", - "詹家镇", - "龙洲街道", - "湖镇镇", + "大街乡", ], }); // 注册5个面图形:左侧、前面、右面、上面、下面 @@ -294,7 +301,7 @@ const getOption = () => { }, tooltip: { trigger: "axis", - // formatter: "{b0}:{c1}", + formatter: "{b0}:
{a0}:{c0}
{a1}:{c1}", }, grid: { left: 0, @@ -630,6 +637,45 @@ const getOption = () => { }, data: data.valueList2, }, + //顶部字体 + { + type: "bar", + xAxisIndex: 1, + label: { + show: true, + fontSize: 18, + position: "top", + color: "#ffffff", + formatter: function (data) { + return data.value - 5; + }, + }, + itemStyle: { + color: "rgba(221, 242, 255, 0)", + }, + + data: data.valueList.map((item) => parseInt(item) + 5), + barWidth: 30, + }, + { + type: "bar", + xAxisIndex: 1, + label: { + show: true, + fontSize: 18, + position: "top", + color: "#ffffff", + formatter: function (data) { + return data.value - 5; + }, + }, + itemStyle: { + color: "rgba(221, 242, 255, 0)", + }, + + data: data.valueList2.map((item) => parseInt(item) + 5), + barWidth: 20, + }, ], }; }; diff --git a/src/view/echarts_yl/table_pie.vue b/src/view/echarts_yl/table_pie.vue new file mode 100644 index 0000000..40b4b0e --- /dev/null +++ b/src/view/echarts_yl/table_pie.vue @@ -0,0 +1,272 @@ + + + + + \ No newline at end of file diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue index cc792e1..2ce0f53 100644 --- a/src/view/hygiene.vue +++ b/src/view/hygiene.vue @@ -119,20 +119,20 @@
-
- -
-
门急诊人次
- -
{{ data.mz.mjzrc }}
+
+ +
+
门急诊人次
+ +
{{ data.mz.mjzrc }}
-
- -
-
住院人数
- -
{{ data.mz.zyrs }}
+
+ +
+
住院人数
+ +
{{ data.mz.zyrs }}
@@ -163,20 +163,20 @@
-
-
+
+
-
+
建档率
{{ data.jkda.jdl }}%
-
-
+
+
-
+
家庭医生签约率
{{ data.jkda.jtysqyl }}%
@@ -734,26 +734,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; @@ -1186,16 +1186,16 @@ const getData = async () => { margin-top: 35px; padding: 0 5px; box-sizing: border-box; - .left { + .left5 { display: flex; align-items: center; justify-content: center; margin-left: 13px; - .leftImg { + .leftImg5 { width: 90px; height: 90px; } - .left_me { + .left5_me { margin-left: 10px; display: flex; flex-direction: column; @@ -1218,16 +1218,16 @@ const getData = async () => { } } } - .right { + .right5 { display: flex; align-items: center; // justify-content: center; - .rightImg { + .rightImg5 { width: 90px; height: 90px; } - .right_me { + .right5_me { margin-left: 10px; display: flex; flex-direction: column; diff --git a/src/view/person/index.vue b/src/view/person/index.vue index f09764a..4226495 100644 --- a/src/view/person/index.vue +++ b/src/view/person/index.vue @@ -9,7 +9,7 @@
姓  名
-

{{ baseInfo.nm }}

+

{{ baseInfo.nm || baseInfo.xm}}

@@ -21,7 +21,8 @@
证件号码
-

{{ baseInfo.identNo }}

+

******************

+
@@ -34,7 +35,8 @@
居住状态

居住

-

未居住

+

未居住

+

@@ -52,7 +54,7 @@
户口登记地
-

{{ baseInfo.domicAddr }}

+

{{ baseInfo.domicAddr || baseInfo.dz }}

@@ -408,13 +410,59 @@ const getData = (nm, identNo) => { item.show = Number(res.data[item.jkName]); } }); + if(res.data.yljlx){ + data.value=[ + { + type:res.data.yljlx, + date:res.data.yljffrq, + sum:res.data.yljffje + } + ] + }else{ + data.value=[] + } // console.log(dataMyTag.myTag, 555); } }); }; +// const getData2 = (nm, identNo) => { +// http +// .get(`/api/ggfwyth/pg/lyxsdbrymdDetails?xm=${nm}&sfzhm=${identNo}`) +// .then((res) => { +// if (res.code == 200) { +// baseInfo.value = res.data; + +// // dataMyTag.myTag.map((item) => { +// // if (res.data[item.jkName]) { +// // item.show = Number(res.data[item.jkName]); +// // } +// // }); +// if(res.data.yljlx){ +// data.value=[ +// { +// type:res.data.yljlx, +// date:res.data.yljffrq, +// sum:res.data.yljffje +// } +// ] +// }else{ +// data.value=[] +// } +// // console.log(dataMyTag.myTag, 555); +// } +// }); +// }; onMounted(() => { // console.log(routers.query); - getData(routers.query.nm, routers.query.identNo); + if(routers.query.type == 'map'){ + getData(routers.query.nm, routers.query.identNo); + }else{ + // getData2(routers.query.nm, routers.query.identNo); + baseInfo.value.nm=routers.query.nm; + baseInfo.value.dz=routers.query.dz; + baseInfo.value.identNo=routers.query.identNo; + } + }); diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index 8fb4969..c7e2bd4 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -19,6 +19,7 @@ class="table_border" :row-style="rowState" :header-cell-style="tableHeaderColor" + @row-click="handleRowClick" > @@ -115,7 +116,7 @@ > - + @@ -137,7 +138,9 @@ + + + diff --git a/src/view/table_gk/gk_hygiene.vue b/src/view/table_gk/gk_hygiene.vue new file mode 100644 index 0000000..ff1e33b --- /dev/null +++ b/src/view/table_gk/gk_hygiene.vue @@ -0,0 +1,1325 @@ + + + + + diff --git a/src/view/table_gk/gk_work.vue b/src/view/table_gk/gk_work.vue new file mode 100644 index 0000000..84196e7 --- /dev/null +++ b/src/view/table_gk/gk_work.vue @@ -0,0 +1,1307 @@ + + + + + diff --git a/src/view/table_gk/gk_yl.vue b/src/view/table_gk/gk_yl.vue new file mode 100644 index 0000000..fc900ec --- /dev/null +++ b/src/view/table_gk/gk_yl.vue @@ -0,0 +1,1538 @@ + + + + + diff --git a/src/view/yl.vue b/src/view/yl.vue index 90a6138..38294a8 100644 --- a/src/view/yl.vue +++ b/src/view/yl.vue @@ -217,10 +217,7 @@
-
+
{{ data.yljgzlzx.yljg }}
@@ -313,7 +310,7 @@
晚餐
- +
@@ -445,10 +442,10 @@ const showDialog = (title, url, coulumn) => { getTable(url, pagination.currentPage); }; //养老机构地图 -const showMapDialog =(title)=>{ +const showMapDialog = (title) => { mapTitle.value = title; dialogShowMap.value = true; -} +}; //获取表格数据 const getTable = (url, currentPage) => { http @@ -657,7 +654,7 @@ const getData = () => { // 计划生育 res.data.familyPlanning.familyPlanningData.forEach((element) => { data.centerBottom1.push(element.jhsyrs); // 人次 - data.centerBottom2.push((element.jhsybtje / 10000)); // 金额 + data.centerBottom2.push(element.jhsybtje / 10000); // 金额 // data.centerBottom2.push(element.jhsybtje); // 金额 }); // 年份 @@ -668,9 +665,20 @@ const getData = () => { // 助老服务 data.smfwcs = res.data.zlfw.smfwcs; // 乡镇助餐次数 - res.data.zlfw.xzzccs.forEach((element) => { - data.zccs1.push(element.xzjd); // 地点 - data.zccs2.push(element.zccs); // 次数 + let elements = res.data.zlfw.xzzccs; + // 先处理 zccs 不等于 0 的元素 + elements.forEach((element) => { + if (element.zccs !== 0) { + data.zccs1.push(element.xzjd); // 地点 + data.zccs2.push(element.zccs); // 次数 + } + }); + // 处理 zccs 等于 0 的元素 + elements.forEach((element) => { + if (element.zccs === 0) { + data.zccs1.push(element.xzjd); // 地点 + data.zccs2.push(element.zccs); // 次数 + } }); } showEchart.value = true;