From e103bd3e9dec3230bbf02346924ae817055be2b0 Mon Sep 17 00:00:00 2001 From: duanxiaohai <1812246227@qq.com> Date: Tue, 25 Jun 2024 11:29:38 +0800 Subject: [PATCH] gx --- src/router/index.js | 2 +- src/view/analyze.vue | 30 +++++++++++++++++------------- src/view/echarts_yl/ylJHSY.vue | 6 +++--- src/view/education.vue | 17 +++++++++-------- src/view/guide.vue | 1 + src/view/sy.vue | 2 +- 6 files changed, 32 insertions(+), 26 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 1a031c1..da154d7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,7 +9,7 @@ const router = createRouter({ routes: [ { path: '/', - redirect: '/guide' + redirect: '/home/index' }, { name: '引导页', diff --git a/src/view/analyze.vue b/src/view/analyze.vue index dbf1d17..a547e15 100644 --- a/src/view/analyze.vue +++ b/src/view/analyze.vue @@ -260,9 +260,9 @@ const data = reactive({ data: ["0", "0", "0", "0", "0", "0"], //医保支出万元以上 }, ], //数据查看 - leftCenterYear: ["2019","2020", "2021", "2022", "2023", "2024"], //年份 - zccs1: ["图书馆", "交通出行", "景区"], //一码通 - zccs2: ["100", "130", "220"], //一码通 + leftCenterYear: ["2019", "2020", "2021", "2022", "2023", "2024"], //年份 + zccs1: ["图书馆", "公共自行车", "小奔通"], //一码通 + zccs2: ["100", "3924", "3905"], //一码通 analysis: { lnr: { fgxy: { rs: "1610", zb: "51.77" }, @@ -288,7 +288,12 @@ const data = reactive({ woman: "194178", }, }, - push: [{ name: "小奔通", num: 4196 }], + push: [ + { name: "小奔通", num: 4196 }, + { name: "交通", num: 102 }, + { name: "两慢病", num: 2 }, + { name: "天气", num: 102 }, + ], }, }); const minData = reactive({ @@ -354,15 +359,14 @@ const getData = async () => { }); data.leftCenterYear = res.data.dataShow.year; - data.ViewData[2].data = res.data.dataShow.gxyrs.gxyrs;//高血压 - data.ViewData[2].value = res.data.dataShow.gxyrs.total;//高血压年份 - data.ViewData[3].data = res.data.dataShow.tnbrs.tnbrs;//糖尿病 - data.ViewData[3].value = res.data.dataShow.tnbrs.total;//糖尿病年份 - data.ViewData[7].data = res.data.dataShow.dibao.dbjzrc;//低保 - data.ViewData[7].value = res.data.dataShow.dibao.total;//低保年份 - data.ViewData[8].data = res.data.dataShow.tekun.tkjzrc;//特困 - data.ViewData[8].value = res.data.dataShow.tekun.total;//特困年份 - + data.ViewData[2].data = res.data.dataShow.gxyrs.gxyrs; //高血压 + data.ViewData[2].value = res.data.dataShow.gxyrs.total; //高血压年份 + data.ViewData[3].data = res.data.dataShow.tnbrs.tnbrs; //糖尿病 + data.ViewData[3].value = res.data.dataShow.tnbrs.total; //糖尿病年份 + data.ViewData[7].data = res.data.dataShow.dibao.dbjzrc; //低保 + data.ViewData[7].value = res.data.dataShow.dibao.total; //低保年份 + data.ViewData[8].data = res.data.dataShow.tekun.tkjzrc; //特困 + data.ViewData[8].value = res.data.dataShow.tekun.total; //特困年份 } }); }; diff --git a/src/view/echarts_yl/ylJHSY.vue b/src/view/echarts_yl/ylJHSY.vue index 05fd460..f5bcdf7 100644 --- a/src/view/echarts_yl/ylJHSY.vue +++ b/src/view/echarts_yl/ylJHSY.vue @@ -85,7 +85,7 @@ const getOption = () => { }, }, legend: { - data: ["计划生育人数", "计划生育补贴金额"], + data: ["计划生育补贴人数", "计划生育补贴金额"], top: "3%", textStyle: { fontSize: 16, @@ -125,7 +125,7 @@ const getOption = () => { { type: "value", scale: true, - name: "计划生育人数", + name: "计划生育补贴人数", splitLine: { //分割线配置 show: false, @@ -212,7 +212,7 @@ const getOption = () => { { z: 1, yAxisIndex: 0, - name: "计划生育人数", + name: "计划生育补贴人数", data: data.list1, barWidth: 20, type: "bar", diff --git a/src/view/education.vue b/src/view/education.vue index f30fb1c..0be4248 100644 --- a/src/view/education.vue +++ b/src/view/education.vue @@ -447,6 +447,14 @@ const tableType = reactive({ label: "学校名称", property: "xxmc", }, + { + label: "区域", + property: "qq", + }, + { + label: "学段", + property: "xd", + }, { label: "班级数", property: "bjs", @@ -459,14 +467,7 @@ const tableType = reactive({ label: "学生数", property: "xss", }, - { - label: "区域", - property: "qq", - }, - { - label: "学段", - property: "xd", - }, + { label: "性质", property: "xz", diff --git a/src/view/guide.vue b/src/view/guide.vue index 79a3206..05326ff 100644 --- a/src/view/guide.vue +++ b/src/view/guide.vue @@ -215,6 +215,7 @@ const changeTab = (val) => { transTime.value = 0 }, 800); } + const toPage = (val) => { router.push({ path: `${val}`, diff --git a/src/view/sy.vue b/src/view/sy.vue index 9caac58..c73813e 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -280,7 +280,7 @@ 龙游通平均日活 - 2714 + 9073