diff --git a/dist.zip b/dist.zip index 30f40cf..a0d981c 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/assets/images/lysd/lysd_2.png b/src/assets/images/lysd/lysd_2.png index ec7f83b..14274ea 100644 Binary files a/src/assets/images/lysd/lysd_2.png and b/src/assets/images/lysd/lysd_2.png differ diff --git a/src/utils/request.js b/src/utils/request.js index 02a9252..ab56c12 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -2,7 +2,7 @@ import axios from "axios"; import { ElMessage } from "element-plus"; import tools from "@/utils/tools"; import router from "../router"; -axios.defaults.baseURL = 'https://jzzf.longyou.gov.cn:998/' +// axios.defaults.baseURL = 'https://jzzf.longyou.gov.cn:998/' axios.defaults.timeout = 120000; // HTTP request 拦截器 diff --git a/src/view/echarts_lysd/eP2.vue b/src/view/echarts_lysd/eP2.vue index 7967f24..ae52ab1 100644 --- a/src/view/echarts_lysd/eP2.vue +++ b/src/view/echarts_lysd/eP2.vue @@ -262,7 +262,7 @@ echarts.graphic.registerShape("CubeBottom_2", CubeBottom_2); const getOption = () => { data.option = { legend: { - data: ["帮扶就业人数", "重点群体结构类型"], + data: ["重点群体帮扶","帮扶就业人数" ], top: "0%", // right: "30%", textStyle: { @@ -350,7 +350,7 @@ const getOption = () => { series: [ { xAxisIndex: 0, - name: "重点群体结构类型", + name: "重点群体帮扶", type: "custom", renderItem: (params, api) => { const location = api.coord([api.value(0), api.value(1)]); diff --git a/src/view/table_gk/gk_lysd.vue b/src/view/table_gk/gk_lysd.vue index c827754..3aa51f2 100644 --- a/src/view/table_gk/gk_lysd.vue +++ b/src/view/table_gk/gk_lysd.vue @@ -143,6 +143,7 @@ import jy7 from "@/assets/images/lysd/jy7.png"; import jy8 from "@/assets/images/lysd/jy8.png"; const data = reactive({ + list1: {}, // 失业保险概况 list2: {}, // 失业保险概况 employmentList: [ { @@ -152,7 +153,7 @@ const data = reactive({ dw: "次", }, { - name: "见习岗位信息3次", + name: "见习岗位信息", value: "0", img: jy2, dw: "个", @@ -272,43 +273,69 @@ const jzChange = (index, value) => { 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; + data.list1 = value === "1" ? data.housing : data.temporary; + console.log(value, data.list1); } }; // 更新employmentList中的value -const updateEmploymentValues = (list, data) => { - const regex = /(\d+)(次|个|人次|份|场)?/g; // 提取所有数字及其单位 +// const updateEmploymentValues = (list, data) => { +// const regex = /(\d+)(次|个|人次|份|场)?/g; // 提取所有数字及其单位 - list.forEach((item) => { - const match = data.find((entry) => entry.includes(item.name)); - if (match) { - const results = match.match(regex); // 获取所有匹配的结果 - if (results && results.length > 0) { - item.value = results[results.length - 1].replace(/[^\d]/g, ""); // 取最后一个结果并提取数字 - } else { - item.value = "0"; // 默认值 - } - } - }); -}; +// list.forEach((item) => { +// const match = data.find((entry) => entry.includes(item.name)); +// if (match) { +// const results = match.match(regex); // 获取所有匹配的结果 +// if (results && results.length > 0) { +// item.value = results[results.length - 1].replace(/[^\d]/g, ""); // 取最后一个结果并提取数字 +// } else { +// item.value = "0"; // 默认值 +// } +// } +// }); +// }; const getData = async () => { await http.get("/api/ggfwyth/lysdOverview").then((res) => { if (res.code == 200) { data.jnrcs.month = res.data.jnrcs.month; //新增技能人才数 - data.ViewData[0].data = res.data.jnrcs.one; //一级/高级技师 - data.ViewData[1].data = res.data.jnrcs.two; //二级/技师 - data.ViewData[2].data = res.data.jnrcs.three; //三级/高级工 - data.ViewData[3].data = res.data.jnrcs.four; //四级/中级工 - data.ViewData[4].data = res.data.jnrcs.five; //五级/初级工 + const skillLevels = [ + "one", //一级/高级技师 + "two", //二级/技师 + "three", //三级/高级工 + "four", //四级/中级工 + "five", //五级/初级工 + ]; + skillLevels.forEach((level, index) => { + data.ViewData[index].data = res.data.jnrcs[level]; + }); data.syl.bf = res.data.syl.bf; // 失业率 帮扶 data.syl.zd = res.data.syl.zd; // 失业率 重点 - updateEmploymentValues(data.employmentList, res.data.jyfws); //就业服务 - data.rczy[0].value = res.data.rczy.dz; // 人才资源统计 - data.rczy[1].value = res.data.rczy.bk; // 人才资源统计 - data.rczy[2].value = res.data.rczy.yjs; // 人才资源统计 - data.rczy[3].value = res.data.rczy.bs; // 人才资源统计 - data.rczy[4].value = res.data.rczy.qt; // 人才资源统计 + // updateEmploymentValues(data.employmentList, res.data.jyfws); //就业服务 + const keys = [ + "rlzygq", // 人力资源供求信息 + "jxgw", // 见习岗位信息 + "kzjycyzcxc", // 开展就业创业政策宣传 + "ldygzcfgzx", // 劳动用工政策法规咨询 + "zzzph", // 组织招聘会 + "tggw", // 提供岗位 + "qzyxdj", // 求职意向登记 + "ldryrsda", // 流动人员人事档案 + ]; + + keys.forEach((key, index) => { + data.employmentList[index].value = res.data.jyfw[key]; + }); + // 人才资源统计 + const rczyKeys = [ + "dz", // 大专 + "bk", // 本科 + "yjs", // 研究生 + "bs", // 博士 + "qt", // 其他 + ]; + rczyKeys.forEach((key, index) => { + data.rczy[index].value = res.data.rczy[key]; + }); data.sybx.month = res.data.sybx.month; // 失业保险概况 月份 data.sybx.cbrs = res.data.sybx.cbrs; //参保人数