diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..cd53d9b
Binary files /dev/null and b/dist.zip differ
diff --git a/src/view/echarts_work/eP1.vue b/src/view/echarts_work/eP1.vue
index 9c19d5b..319cc1b 100644
--- a/src/view/echarts_work/eP1.vue
+++ b/src/view/echarts_work/eP1.vue
@@ -7,6 +7,7 @@ import {
onBeforeMount,
onMounted,
ref,
+ watch,
reactive,
defineProps,
nextTick,
@@ -286,7 +287,16 @@ const setChart1 = () => {
data.list2.push(item.jzje); //救助金额
});
};
-
+watch(
+ () => props.list,
+ (newVal, oldVal) => {
+ data.list = newVal;
+ // console.log("救助人1", data.list);
+ setChart1();
+ getOption();
+ setChart();
+ }
+);
// 使用生命钩子
onBeforeMount(() => {
setTimeout(() => {
diff --git a/src/view/echarts_work/eP2.vue b/src/view/echarts_work/eP2.vue
index 1c75ec5..727383b 100644
--- a/src/view/echarts_work/eP2.vue
+++ b/src/view/echarts_work/eP2.vue
@@ -268,6 +268,7 @@ const getOption = () => {
color: "rgba(221, 242, 255, 0.1)",
},
data: data.list.year.map(() => 100),
+ // data: 100,
barWidth: 50,
},
],
diff --git a/src/view/echarts_work/eP4.vue b/src/view/echarts_work/eP4.vue
index d93d41e..f410307 100644
--- a/src/view/echarts_work/eP4.vue
+++ b/src/view/echarts_work/eP4.vue
@@ -3,283 +3,307 @@
diff --git a/src/view/echarts_work/eP6.vue b/src/view/echarts_work/eP6.vue
new file mode 100644
index 0000000..c13a68d
--- /dev/null
+++ b/src/view/echarts_work/eP6.vue
@@ -0,0 +1,358 @@
+
+
+
+
+
+
+
diff --git a/src/view/work.vue b/src/view/work.vue
index 57403b0..17c2a35 100644
--- a/src/view/work.vue
+++ b/src/view/work.vue
@@ -23,7 +23,7 @@
就业
-->
-
+
@@ -157,6 +158,7 @@ import eP2 from "./echarts_work/eP2.vue";
import eP3 from "./echarts_work/eP3.vue";
import eP4 from "./echarts_work/eP4.vue";
import eP5 from "./echarts_work/eP5.vue";
+import eP6 from "./echarts_work/eP6.vue";
import ePjz from "./echarts_work/ePjz.vue";
import http from "@/utils/request.js";
// 专项&其他救助切换
@@ -178,24 +180,25 @@ const jz = ref([
]);
const jzChange = (index, value) => {
jz.value[index].choose = value;
- switch (index) {
- case 0:
- // console.log(111, jz.value[index].choose);
- break;
- case 1:
- value == "1" ? (data.list = data.housing) : (data.list = data.temporary);
- // console.log(data.list, jz.value[index].choose);
- break;
- case 2:
- // console.log(333, jz.value[index].choose);
- break;
- default:
- break;
+ if (index === 0) {
+ data.list2 = value === "1" ? data.education : data.education1;
+ console.log(111, jz.value[index].choose);
+ } else if (index === 1) {
+ data.list = value === "1" ? data.housing : data.temporary;
+ } else if (index === 2) {
+ const listMap = {
+ 1: data.needyWorkers1,
+ 2: data.difficultSoldiers,
+ 3: data.needyWorkers,
+ };
+ data.list1 = listMap[value];
}
};
const data = reactive({
list: {},
+ list1: {},
+ list2: {},
education: {
data: [
{
@@ -206,6 +209,16 @@ const data = reactive({
],
year: ["2019"],
}, //教育
+ education1: {
+ data: [
+ {
+ nf: "2019", //救助年份
+ jzrs: "4202", //救助人数
+ jzje: "1523", //救助金额
+ },
+ ],
+ year: ["2019"],
+ }, //医疗
housing: {
data: [
{
@@ -245,6 +258,26 @@ const data = reactive({
],
year: ["2019"],
}, //困难军人
+ needyWorkers1: {
+ data: [
+ {
+ nf: "2019", //补贴年份
+ jzrs: "0", //补贴人数
+ jzje: "0", //补贴金额 万元
+ },
+ ],
+ year: ["2019"],
+ }, //困难残疾人补助信息
+ needyWorkers: {
+ data: [
+ {
+ nf: "2019", //补贴年份
+ jzrs: "0", //补贴人数
+ jzje: "0", //补贴金额 万元
+ },
+ ],
+ year: ["2019"],
+ }, //困难职工补助信息
diversification: {
hszhxms: [
{
@@ -274,6 +307,7 @@ const getData = async () => {
// 教育&医疗
data.education.data = res.data.specialAssistance.education.data;
data.education.year = res.data.specialAssistance.education.year;
+ data.list2 = data.education;
// 住房&临时救助
data.housing.data = res.data.specialAssistance.housing.data;
data.housing.year = res.data.specialAssistance.housing.year;
@@ -286,19 +320,25 @@ const getData = async () => {
// 生活类救助模块
// 一卡通补贴
data.lifeAssistance.yktTotal = addThousandSeparator(
- String((res.data.lifeAssistance.yktTotal/ 10000).toFixed(2))
+ String((res.data.lifeAssistance.yktTotal / 10000).toFixed(2))
);
- data.lifeAssistance.subsidyInformation = res.data.lifeAssistance.subsidyInformation;
+ data.lifeAssistance.subsidyInformation =
+ res.data.lifeAssistance.subsidyInformation;
res.data.lifeAssistance.subsidyInformation.forEach((item, index) => {
data.lifeAssistance.subsidyInformation[index].btje =
- addThousandSeparator((item.btje/ 10000).toFixed(2));
+ addThousandSeparator((item.btje / 10000).toFixed(2));
});
// 弱势群体补贴
// 困难残疾人&困难军人&困难职工
+ // 困难军人
data.difficultSoldiers.data =
res.data.underprivileged.difficultSoldiers.data;
data.difficultSoldiers.year =
res.data.underprivileged.difficultSoldiers.year;
+ // 困难职工
+ data.needyWorkers.data = res.data.underprivileged.needyWorkers.data;
+ data.needyWorkers.year = res.data.underprivileged.needyWorkers.year;
+ data.list1 = data.needyWorkers1;
// 多元化力量参与
data.diversification.hszhxms = res.data.diversification.hszhxms;