From b78c4af1052ef80483d8ea8058f1ae0776438d6c Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Thu, 6 Jun 2024 11:41:26 +0800 Subject: [PATCH] 1 --- src/view/echarts_work/eP3.vue | 2 +- src/view/echarts_work/eP6.vue | 2 +- src/view/work.vue | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/view/echarts_work/eP3.vue b/src/view/echarts_work/eP3.vue index 974c0a5..78e10e1 100644 --- a/src/view/echarts_work/eP3.vue +++ b/src/view/echarts_work/eP3.vue @@ -449,7 +449,7 @@ const setChart1 = () => { onBeforeMount(() => { setTimeout(() => { data.list = props.list; - data.month = props.list.month; + data.month = props.list.month.map((item) => item + "月"); // console.log(data.list, "生活"); setChart1(); getOption(); diff --git a/src/view/echarts_work/eP6.vue b/src/view/echarts_work/eP6.vue index 58cde34..5ca05f1 100644 --- a/src/view/echarts_work/eP6.vue +++ b/src/view/echarts_work/eP6.vue @@ -353,7 +353,7 @@ const setChart1 = () => { data.lineData.push(item.shbtje); //困难残疾人生活补贴金额 data.lineData2.push(item.hlbtje); //护理补贴金额 }); - data.month = data.list.month; + data.month = data.list.month.map((item) => item + "月"); // console.log("补贴人2", data.list1, data.list2); }; diff --git a/src/view/work.vue b/src/view/work.vue index e204ec8..7ae4750 100644 --- a/src/view/work.vue +++ b/src/view/work.vue @@ -212,7 +212,7 @@ const jzChange = (index, value) => { } else if (index === 2) { const listMap = { 1: data.disabilitySubsidies, - 2: data.needyWorkers1, + 2: data.difficultSoldiers, 3: data.needyWorkers, }; data.list1 = listMap[value]; @@ -296,7 +296,7 @@ const data = reactive({ month: ["1"], }, //困难军人 - needyWorkers1: { + difficultSoldiers: { data: [ { nf: "2019", //补贴年份 @@ -380,8 +380,8 @@ const getData = async () => { data.disabilitySubsidies.month = res.data.underprivileged.disabilitySubsidies.month; // 困难军人 - data.needyWorkers1.data = res.data.underprivileged.difficultSoldiers.data; - data.needyWorkers1.year = + data.difficultSoldiers.data = res.data.underprivileged.difficultSoldiers.data; + data.difficultSoldiers.year = res.data.underprivileged.difficultSoldiers.year; // 困难职工 data.needyWorkers.data = res.data.underprivileged.needyWorkers.data;