diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 914a332..0000000 Binary files a/dist.zip and /dev/null differ 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/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 32fdccf..9015039 100644 --- a/src/view/echart_analyze/dialog_jjlxfb.vue +++ b/src/view/echart_analyze/dialog_jjlxfb.vue @@ -655,7 +655,7 @@ const getOption = () => { }, data: data.valueList.map((item) => parseInt(item) + 5), - barWidth: 20, + barWidth: 30, }, { type: "bar", 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 701a948..ad7b458 100644 --- a/src/view/person/index.vue +++ b/src/view/person/index.vue @@ -9,7 +9,7 @@
姓  名
-

{{ baseInfo.nm }}

+

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

@@ -53,7 +53,7 @@
户口登记地
-

{{ baseInfo.domicAddr }}

+

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

@@ -424,9 +424,41 @@ const getData = (nm, identNo) => { } }); }; +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); + } + }); diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index 8fb4969..8a94890 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 @@