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 @@
{{ baseInfo.nm }}
+{{ baseInfo.nm || baseInfo.xm}}
{{ baseInfo.identNo }}
+******************
+居住
-未居住
+未居住
+{{ baseInfo.domicAddr }}
+{{ baseInfo.domicAddr || baseInfo.dz }}