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 @@
{{ baseInfo.nm }}
+{{ baseInfo.nm || baseInfo.xm}}
{{ baseInfo.domicAddr }}
+{{ baseInfo.domicAddr || baseInfo.dz }}