diff --git a/src/view/echarts_work/eP1.vue b/src/view/echarts_work/eP1.vue index a289c4b..a0b9597 100644 --- a/src/view/echarts_work/eP1.vue +++ b/src/view/echarts_work/eP1.vue @@ -302,7 +302,7 @@ onBeforeMount(() => { setTimeout(() => { data.list = props.list; setChart1(); - console.log(data.list, "教育"); + // console.log(data.list, "教育"); getOption(); setChart(); }, 600); diff --git a/src/view/echarts_work/eP3.vue b/src/view/echarts_work/eP3.vue index 8e3aa16..f8ed792 100644 --- a/src/view/echarts_work/eP3.vue +++ b/src/view/echarts_work/eP3.vue @@ -37,7 +37,7 @@ const data = reactive({ list3: [], lineData: [], lineData1: [], - year: [], + month: [], option: {}, initialLegendData: ["特困救助金额", "低保救助金额"], initialLegendData1: ["特困救助人次", "低保救助人次", "低边救助人次"], @@ -72,7 +72,7 @@ const getOption = () => { tooltip: { trigger: "axis", formatter: - "{b0}
{a0}:{c0}
{a1}:{c1}
{a2}:{c2}
{a3}:{c3}
{a4}:{c4}", + "{b0}月
{a0}:{c0}
{a1}:{c1}
{a2}:{c2}
{a3}:{c3}
{a4}:{c4}", }, legend: [ { @@ -118,12 +118,12 @@ const getOption = () => { axisTick: { show: false, // 设置轴刻度不显示 }, - data: data.year, + data: data.month, }, { type: "category", show: false, - data: data.year, + data: data.month, }, ], yAxis: [ @@ -354,7 +354,7 @@ const getOption = () => { itemStyle: { color: "rgba(180, 180, 180, 0.2)", //外阴影背景 }, - data: data.list.subsidyInformation.map(() => 100), + data: data.list.data.map(() => 100), barWidth: 60, //外阴影背景宽 emphasis: { itemStyle: { @@ -436,21 +436,20 @@ const setChart1 = () => { data.list3 = []; data.lineData = []; data.lineData1 = []; - data.list.subsidyInformation.forEach((item) => { - data.list1.push(item.btsx); //特困补贴金额 - data.list2.push(item.btje1); //低保补贴金额 - data.list3.push(item.btje2); //特困补贴人数 - data.lineData.push(item.btje3); //低保补贴人数 - data.lineData1.push(item.btje4); //低边补贴人数 + data.list.data.forEach((item) => { + data.lineData.push(item.tkjzje); //特困救助金额 + data.lineData1.push(item.dbjzje); //低保救助金额 + data.list1.push(item.tkjzrs); //特困救助人数 + data.list2.push(item.dbjzrs); //低保救助人数 + data.list3.push(item.dibianJzrs); //低边救助人数 }); - // console.log("补贴人2", data.list1, data.list2); }; // 使用生命钩子 onBeforeMount(() => { setTimeout(() => { data.list = props.list; - data.year = props.list.year; + data.month = props.list.month; // console.log(data.list, "生活"); setChart1(); getOption(); diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue index 4ed1525..4ee3f09 100644 --- a/src/view/hygiene.vue +++ b/src/view/hygiene.vue @@ -250,11 +250,11 @@ onBeforeMount(async () => { }); onMounted(() => { startAutoScroll(); - console.log( - mainRef.value.scrollTop, - mainRef.value.scrollHeight, - mainRef.value.clientHeight - ); + // console.log( + // mainRef.value.scrollTop, + // mainRef.value.scrollHeight, + // mainRef.value.clientHeight + // ); }); const getData = async () => { await http.get("/api/ggfwyth/health").then((res) => { diff --git a/src/view/work.vue b/src/view/work.vue index 88adafd..5233161 100644 --- a/src/view/work.vue +++ b/src/view/work.vue @@ -71,7 +71,7 @@ - +
@@ -272,19 +272,18 @@ const data = reactive({ btje: "11515620", //补贴金额 }, ], - }, //生活类救助模块 - lifeAssistance1: { - subsidyInformation: [ + }, //一卡通 + salvation: { + data: [ { - nf: "2019", //救助年份 - btsx: "11", //特困补贴金额 - btje1: "22", //低保补贴金额 - btje2: "33", //特困补贴人数 - btje3: "44", //低保补贴人数 - btje4: "55", //低边补贴人数 + tkjzje:"868.4888", //特困救助金额 + tkjzrs: "9430", //特困救助人数 + dbjzrs: "9430", //低保救助人数 + dbjzje: "868.4888", //低保救助金额 + dibianJzrs: "2310", //低边救助人数 }, ], - year: ["2019"], + month: ["1"], }, //生活类救助模块 difficultSoldiers: { data: [ @@ -369,6 +368,8 @@ const getData = async () => { data.lifeAssistance.subsidyInformation[index].btje = addThousandSeparator((item.btje / 10000).toFixed(2)); }); + // 救助统计图 + data.salvation = res.data.lifeAssistance.jz; // 弱势群体补贴 // 困难残疾人&困难军人&困难职工 // 困难军人