diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 8e281cb..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/assets/images/sjfx/sjfx6.png b/src/assets/images/sjfx/sjfx6.png new file mode 100644 index 0000000..c3e8825 Binary files /dev/null and b/src/assets/images/sjfx/sjfx6.png differ diff --git a/src/assets/images/sjfx/sjfx7.png b/src/assets/images/sjfx/sjfx7.png new file mode 100644 index 0000000..fb805da Binary files /dev/null and b/src/assets/images/sjfx/sjfx7.png differ diff --git a/src/assets/images/sjfx/sjfx8.png b/src/assets/images/sjfx/sjfx8.png new file mode 100644 index 0000000..da5f591 Binary files /dev/null and b/src/assets/images/sjfx/sjfx8.png differ diff --git a/src/view/analyze.vue b/src/view/analyze.vue index e690a13..b410f01 100644 --- a/src/view/analyze.vue +++ b/src/view/analyze.vue @@ -67,7 +67,7 @@ --> -
+
集聚类型分布 @@ -101,7 +101,60 @@
- +
+
+ 特困 +
+
+ 低保 +
+
+ 低边 +
+
+ 困难残疾人 +
+
+ 困难军人 +
+
+ 困难职工 +
+
+ +
@@ -157,6 +210,7 @@ import edxs from "./echart_analyze/edXS.vue"; import eP2 from "./echart_analyze/eP2.vue"; import ylXZZC from "./echart_analyze/ylXZZC.vue"; import FlipClock from "./echart_analyze/FlipClock.vue"; +import ePie4 from "./echart_analyze/pie4.vue"; import ViewDataimg from "@/assets/images/sjfx/sjfx.png"; import ViewDataimg1 from "@/assets/images/sjfx/sjfx1.png"; @@ -179,8 +233,48 @@ const jypxList = reactive([ img: jypx2, }, ]); +// 救助分析tap切换 +const jz = ref("1"); +const jzChange = (value) => { + jz.value = value; + data.list = data.dataAnalysis[value -1]; +}; const showEchart = ref(false); const data = reactive({ + list: { + data: ["50", "100", "120", "62", "70"], + year: ["2020", "2021", "2022", "2023", "2024"], + }, + list1: {}, + list2: {}, + + dataAnalysis: [ + { + data: ["50", "100", "120", "62", "70"], + year: ["2020", "2021", "2022", "2023", "2024"], + }, + { + data: ["10", "100", "120", "62", "70"], + year: ["2020", "2021", "2022", "2023", "2024"], + }, + { + data: ["60", "100", "120", "62", "70"], + year: ["2020", "2021", "2022", "2023", "2024"], + }, + { + data: ["40", "100", "120", "62", "70"], + year: ["2020", "2021", "2022", "2023", "2024"], + }, + { + data: ["50", "190", "120", "62", "70"], + year: ["2020", "2021", "2022", "2023", "2024"], + }, + { + data: ["50", "100", "120", "82", "70"], + year: ["2020", "2021", "2022", "2023", "2024"], + }, + ], //数据分析 + datashow: null, backgroundImageUrl: ViewDataimg, backgroundImageUrl1: ViewDataimg1, @@ -363,42 +457,42 @@ const getData = async () => { data.whistleblower.culeTotal.data[index] = res.data.lnr.rksj[key]; }); data.wjybrysl = res.data.wjybrysl; //医保 - // const mappings = [ - // { key: 'ylzzwyrs', dataKey: 'ylzzwy' }, - // { key: 'dbzyrs', dataKey: 'dbzyrs' }, - // { key: 'gxyrs', dataKey: 'gxyrs' }, - // { key: 'tnbrs', dataKey: 'tnbrs' }, - // { key: 'gxzrs', dataKey: 'gxzrs' }, - // { key: 'gxtrs', dataKey: 'gxtrs' }, - // { key: 'cjrs', dataKey: 'cjrs' }, - // { key: 'dibao', dataKey: 'dbjzrc' }, - // { key: 'tekun', dataKey: 'tkjzrc' }, - // { key: 'qtjbrs', dataKey: 'qtjbrs' }, - // ]; + // const mappings = [ + // { key: 'ylzzwyrs', dataKey: 'ylzzwy' }, + // { key: 'dbzyrs', dataKey: 'dbzyrs' }, + // { key: 'gxyrs', dataKey: 'gxyrs' }, + // { key: 'tnbrs', dataKey: 'tnbrs' }, + // { key: 'gxzrs', dataKey: 'gxzrs' }, + // { key: 'gxtrs', dataKey: 'gxtrs' }, + // { key: 'cjrs', dataKey: 'cjrs' }, + // { key: 'dibao', dataKey: 'dbjzrc' }, + // { key: 'tekun', dataKey: 'tkjzrc' }, + // { key: 'qtjbrs', dataKey: 'qtjbrs' }, + // ]; - // mappings.forEach((mapping, index) => { - // data.ViewData[index].data = res.data.dataShow[mapping.key][mapping.dataKey]; - // data.ViewData[index].value = res.data.dataShow[mapping.key].total; - // }); + // mappings.forEach((mapping, index) => { + // data.ViewData[index].data = res.data.dataShow[mapping.key][mapping.dataKey]; + // data.ViewData[index].value = res.data.dataShow[mapping.key].total; + // }); data.leftCenterYear = res.data.dataShow.year; // data.ViewData[0].data = res.data.dataShow.ylzzwyrs.ylzzwy; //医保支出万元以上 // data.ViewData[0].value = res.data.dataShow.ylzzwyrs.total; //医保支出万元以上年份 // data.ViewData[1].data = res.data.dataShow.dbzyrs.dbzyrs; //大病住院 // data.ViewData[1].value = res.data.dataShow.dbzyrs.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[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[4].data = res.data.dataShow.gxzrs.gxzrs; //高血脂 // data.ViewData[4].value = res.data.dataShow.gxzrs.total; //高血脂年份 // data.ViewData[5].data = res.data.dataShow.gxtrs.gxtrs; //高血糖 // data.ViewData[5].value = res.data.dataShow.gxtrs.total; //高血糖年份 // data.ViewData[6].data = res.data.dataShow.cjrs.cjrs; //残疾 // data.ViewData[6].value = res.data.dataShow.cjrs.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[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[9].data = res.data.dataShow.qtjbrs.qtjbrs; //其他疾病 // data.ViewData[9].value = res.data.dataShow.qtjbrs.total; //其他疾病年份 showEchart.value = true; @@ -493,6 +587,11 @@ onBeforeUnmount(() => { } .center_1 { + background-image: url(@/assets/images/sjfx/sjfx6.png); + background-repeat: no-repeat; + background-size: 100% 100%; +} +.center_2 { background-image: url(@/assets/images/sjfx/ymt.png); background-repeat: no-repeat; background-size: 100% 100%; @@ -812,11 +911,44 @@ onBeforeUnmount(() => { .jypx { width: 100%; height: 200px; - margin: 20px 0; + // margin: 20px 0; + margin-bottom: 10px; position: relative; display: flex; align-items: center; } + +.choose { + display: flex; + justify-content: center; + margin: 8px 0; + .choose_0 { + cursor: pointer; + width: 110px; + height: 42px; + display: flex; + align-items: center; + justify-content: center; + font-weight: 500; + font-size: 15px; + color: #ffffff; + margin-right: 10px; + } + // .choose_0:last-child { + // margin-right: 0px; + // } + .choose_1 { + background-image: url(@/assets/images/sjfx/sjfx7.png); + background-repeat: no-repeat; + background-size: 100% 100%; + } + + .choose_2 { + background-image: url(@/assets/images/sjfx/sjfx8.png); + background-repeat: no-repeat; + background-size: 100% 100%; + } +} .minPieImg2 { position: absolute; width: 137px; diff --git a/src/view/echart_analyze/pie4.vue b/src/view/echart_analyze/pie4.vue new file mode 100644 index 0000000..2a1ab7e --- /dev/null +++ b/src/view/echart_analyze/pie4.vue @@ -0,0 +1,194 @@ + + + + +