diff --git a/dist.zip b/dist.zip index 58a2a85..2e6d9fd 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/view/echarts_lysd/eP3.vue b/src/view/echarts_lysd/eP3.vue index 45bcbc8..e4a52d2 100644 --- a/src/view/echarts_lysd/eP3.vue +++ b/src/view/echarts_lysd/eP3.vue @@ -204,8 +204,6 @@ const setChart = () => { onBeforeMount(() => { setTimeout(() => { data.list = props.list; - console.log(666,data.list); - getOption(); setChart(); }, 600); diff --git a/src/view/echarts_lysd/eP4.vue b/src/view/echarts_lysd/eP4.vue index 8a3422a..63ebee4 100644 --- a/src/view/echarts_lysd/eP4.vue +++ b/src/view/echarts_lysd/eP4.vue @@ -28,7 +28,7 @@ const props = defineProps({ // return []; // }, // }, - year: { + month: { type: Array, default: () => { return []; @@ -42,7 +42,7 @@ const data = reactive({ list: [], list1: [], list2: [], - year: [], + month: [], option: {}, // max: null, }); @@ -57,10 +57,10 @@ const getOption = () => { data.option = { tooltip: { trigger: "axis", - formatter: "{b0}
{a0}:{c0}
{a1}:{c1}", + formatter: "{b0}月
{a0}:{c0}
{a1}:{c1}", }, legend: { - data: ["救助金额", "救助人数"], + data: ["失业保险金享受人数", "发放失业保险金金额"], top: "8%", textStyle: { fontSize: 14, @@ -91,19 +91,19 @@ const getOption = () => { show: false, // 设置轴刻度不显示 }, // data: ["2019", "2020", "2021", "2022", "2023"], - data: data.list.year, + data: data.month, }, { type: "category", show: false, - data: data.list.year, + data: data.month, }, ], yAxis: [ { type: "value", scale: true, - name: "救助人数", + // name: "发放失业保险金金额", min: 0, splitLine: { //分割线配置 @@ -136,8 +136,7 @@ const getOption = () => { type: "value", scale: true, min: 0, - - name: "救助金额/万", + // name: "失业保险金享受人数/万", splitLine: { show: false, lineStyle: { @@ -192,7 +191,7 @@ const getOption = () => { series: [ { yAxisIndex: 1, - name: "救助金额", + name: "失业保险金享受人数", data: data.list2, type: "line", //线状图 stack: "Total", @@ -207,15 +206,15 @@ const getOption = () => { }, }, itemStyle: { - borderColor: "#00FCFF", + borderColor: "rgba(165, 255, 200, 1)", borderWidth: 1, - color: "#00FCFF", + color: "rgba(165, 255, 200, 1)", }, }, { z: 1, yAxisIndex: 0, - name: "救助人数", + name: "发放失业保险金金额", data: data.list1, barWidth: 20, type: "bar", @@ -235,10 +234,10 @@ const getOption = () => { y: 0, y2: 0, colorStops: [ - { offset: 0, color: "rgba(255, 242, 142, .7)" }, - { offset: 0.5, color: "rgba(255, 242, 142, .7)" }, - { offset: 0.5, color: "rgba(255, 242, 142, .3)" }, - { offset: 1, color: "rgba(255, 242, 142, .5)" }, + { offset: 0, color: "rgba(142, 187, 255, 0.7)" }, + { offset: 0.5, color: "rgba(142, 187, 255, 0.7)" }, + { offset: 0.5, color: "rgba(142, 187, 255, 0.3)" }, + { offset: 1, color: "rgba(142, 187, 255, 0.5)" }, ], }, }, @@ -271,8 +270,8 @@ const getOption = () => { itemStyle: { color: "rgba(221, 242, 255, 0.1)", }, - data: data.list.year.map(() => 100), - barWidth: 50, + data: data.month.map(() => 100), + barWidth: 30, }, { z: 1, @@ -282,10 +281,9 @@ const getOption = () => { symbol: "diamond", symbolOffset: ["0%", "-50%"], symbolSize: [21, 15], - itemStyle: { borderColor: "#2fffa4", - color: "rgba(255, 242, 142, 1)", + color: "rgba(142, 187, 255, 1)", }, }, ], @@ -298,34 +296,48 @@ const setChart = () => { }; const setChart1 = () => { - if(data.list.length !== 0) { - data.list1 = []; - data.list2 = []; - data.list.data.forEach((item) => { - data.list1.push(item.jzrs); //救助人数 - data.list2.push(item.jzje); //救助金额 - }); + if (data.list.length !== 0) { + data.list1 = []; + data.list2 = []; + data.list1 = data.list.sybxjxsrs; + data.list2 = data.list.ffsybxjje; + // data.list.forEach((item) => { + // data.list1.push(item.sybxjxsrs); //失业保险金享受人数 + // data.list2.push(item.ffsybxjje); //发放失业保险金金额 + // }); } }; watch( () => props.list, (newVal, oldVal) => { data.list = newVal; + data.month = props.month; // console.log("救助人1", data.list); - // setChart1(); - // getOption(); - // setChart(); + setChart1(); + getOption(); + setChart(); } ); +// watch( +// () => props.list, +// (newVal, oldVal) => { +// data.list = newVal; +// // console.log("救助人1", data.list); +// // setChart1(); +// // getOption(); +// // setChart(); +// } +// ); // 使用生命钩子 onBeforeMount(() => { - // setTimeout(() => { - // data.list = props.list; - // setChart1(); - // // console.log(data.list, "教育"); - // getOption(); - // setChart(); - // }, 600); + setTimeout(() => { + data.list = props.list; + data.month = props.month; + setChart1(); + console.log("失业", props.list, data.list1, data.list2); + getOption(); + setChart(); + }, 600); }); diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue index 3a9eb02..9a597b9 100644 --- a/src/view/sy_table.vue +++ b/src/view/sy_table.vue @@ -287,16 +287,16 @@ const data = reactive({ img: icon3, visible: false, son: [ - // { - // id: "0", - // name: "概况", - // }, { id: "0", - name: "就业创业服务", + name: "概况", }, { id: "1", + name: "就业创业服务", + }, + { + id: "2", name: "工伤失业保险服务", }, ], @@ -568,6 +568,8 @@ const tapshow = (parentId, childId) => { childId == 0 && (parentId.name == "幼有所育" || parentId.name == "弱有所扶" || + parentId.name == "劳有所得" || + parentId.name == "学有所教" || parentId.name == "老有所养" || parentId.name == "病有所医" || @@ -631,9 +633,9 @@ const gaikuang = (name) => { } else if (name == "学有所教") { gaikuangList.education = true; } - // else if (name == "劳有所得") { - // gaikuangList.lysd = true; - // } + else if (name == "劳有所得") { + gaikuangList.lysd = true; + } else if (name == "老有所养") { gaikuangList.yl = true; } else if (name == "病有所医") { diff --git a/src/view/table_gk/gk_lysd.vue b/src/view/table_gk/gk_lysd.vue index e1f7145..776073e 100644 --- a/src/view/table_gk/gk_lysd.vue +++ b/src/view/table_gk/gk_lysd.vue @@ -76,7 +76,7 @@ 参保人数 - +
@@ -124,7 +124,7 @@ import jy7 from "@/assets/images/lysd/jy7.png"; import jy8 from "@/assets/images/lysd/jy8.png"; const data = reactive({ - //就业服务 + list2: {}, // 失业保险概况 employmentList: [ { name: "2024年发布人力资源供求信息", @@ -174,7 +174,7 @@ const data = reactive({ dw: "份", img: jy8, }, - ], + ], //就业服务 ViewData: [ { name: "一级/高级技师", @@ -222,7 +222,14 @@ const data = reactive({ { name: "博士", value: 0 }, { name: "其他", value: 0 }, ], // 人才资源统计 - sybx: {}, // 失业保险概况 + sybx: { + month: [], //月份 + cbrs: [], //参保人数 + sybx: { + sybxjxsrs: [], //失业保险金享受人数 + ffsybxjje: [], //发放失业保险金金额 + }, //失业保险 + }, // 失业保险概况 gsbx: {}, //工伤保险 }); const showEchart = ref(false); @@ -239,8 +246,8 @@ const jzChange = (index, value) => { console.log(index, value); jz.value[index].choose = value; if (index === 0) { - data.list2 = value == "1" ? data.education : data.medical; - // console.log(value, data.education, data.medical); + data.list2 = value == "1" ? data.sybx.sybx : data.sybx.cbrs; + console.log(value, data.list2); } else if (index === 1) { data.list = value === "1" ? data.housing : data.temporary; } @@ -280,7 +287,11 @@ const getData = async () => { data.rczy[3].value = res.data.rczy.bs; // 人才资源统计 data.rczy[4].value = res.data.rczy.qt; // 人才资源统计 - data.sybx = res.data.sybx; // 失业保险概况 + data.sybx.month = res.data.sybx.month; // 失业保险概况 月份 + data.sybx.cbrs = res.data.sybx.cbrs; //参保人数 + data.sybx.sybx = res.data.sybx.sybx; //失业保险金享受人数 + data.list2 = data.sybx.sybx; + data.gsbx = res.data.gsbx; //工伤保险 } });