diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..0f06eb7 Binary files /dev/null and b/dist.zip differ diff --git a/src/view/analyze.vue b/src/view/analyze.vue index b39bdda..82a6f77 100644 --- a/src/view/analyze.vue +++ b/src/view/analyze.vue @@ -9,7 +9,7 @@
- +
- +
@@ -261,12 +261,35 @@ const data = reactive({ }, ], //数据查看 leftCenterYear: ["2019", "2020", "2021", "2022", "2023"], //年份 - // leftCenter1: ["100", "120", "199", "133", "210"], //医保支出万元以上 - // leftCenter3: ["100", "80", "199", "133", "210"], //大病住院 - // leftCenter4: ["100", "120", "199", "133", "210"], //糖尿病 - zccs1: ["图书馆", "交通出行", "景区"], //一码通 zccs2: ["100", "130", "220"], //一码通 + analysis: { + lnr: { + fgxy: { rs: "1610", zb: "51.77" }, + gxy: { rs: "1500", zb: "48.23" }, + rksj: { + man: "196576", + nl17: "48.23", // 17岁以下人口总数 + nl60: "0", // 60以上人口总数 + nl100: "0", // 100岁以上人口总数, + nl110: "0", // 1-10岁人口总数 + nl1120: "0", // 11-20岁人口总数 + nl1834: "0", // 18-34人口总数 + nl2130: "0", // 21-30岁人口总数 + nl3140: "0", // 31-40岁人口总数 + nl3569: "0", // 35-69人口总数 + nl4150: "0", // 41-50岁人口总数 + nl5160: "0", // 51-60岁人口总数 + nl6170: "0", // 61-70岁人口总数 + nl7180: "0", // 71-80岁人口总数 + nl8190: "0", // 81-90岁人口总数 + nl91100: "0", // 91-100岁人口总数 + rkzs: "390754", + woman: "194178", + }, + }, + push: [{ name: "小奔通", num: 4196 }], + }, }); const minData = reactive({ minTop: 49162, @@ -320,11 +343,26 @@ const toggleShow = () => { const startAutoSwitching = () => { interval = setInterval(toggleShow, 6000); // 每6秒切换一次 }; +const getData = async () => { + await http.get("/api/ggfwyth/analysis").then((res) => { + if (res.code == 200) { + // console.log(res.data, "信息推送"); + data.analysis = res.data; + const ageBt = ["nl6170", "nl7180", "nl8190", "nl91100", "nl100"]; + ageBt.forEach((key, index) => { + data.whistleblower.culeTotal.data[index] = res.data.lnr.rksj[key]; + }); + } + }); +}; + onMounted(() => { startAutoSwitching(); }); -onBeforeMount(() => {}); +onBeforeMount(() => { + getData(); +}); onBeforeUnmount(() => { clearInterval(interval); //清除定时器 diff --git a/src/view/echart_analyze/eP2.vue b/src/view/echart_analyze/eP2.vue index 59c9fa9..86382e1 100644 --- a/src/view/echart_analyze/eP2.vue +++ b/src/view/echart_analyze/eP2.vue @@ -67,6 +67,7 @@ const updateSeries = () => { ]; if (data.list.length > 0) { + // if (!data.list) { data.list.forEach((item, index) => { const color = data.bgColor[index % data.bgColor.length]; data.series.push({ diff --git a/src/view/echart_analyze/edXS.vue b/src/view/echart_analyze/edXS.vue index 41d1ce4..e8b0d58 100644 --- a/src/view/echart_analyze/edXS.vue +++ b/src/view/echart_analyze/edXS.vue @@ -35,8 +35,8 @@ const getOption = () => { }, grid: { top: "20%", - left: "1%", - right: "5%", + left: "0%", + right: "3%", bottom: "0%", containLabel: true, }, @@ -186,12 +186,12 @@ const setChart = () => { var myChart = echarts.init(chart.value); myChart.setOption(data.option); }; + // 使用生命钩子 onBeforeMount(() => { setTimeout(() => { data.list = props.list; data.month = props.month; - // console.log(data.list, props.month, "教育"); getOption(); setChart(); }, 600); diff --git a/src/view/echart_analyze/pie3dMt1.vue b/src/view/echart_analyze/pie3dMt1.vue index d6b2b42..b2ab91f 100644 --- a/src/view/echart_analyze/pie3dMt1.vue +++ b/src/view/echart_analyze/pie3dMt1.vue @@ -1,8 +1,5 @@ - - + diff --git a/src/view/echarts_sy/pie.vue b/src/view/echarts_sy/pie.vue index 7d7eac8..5b56470 100644 --- a/src/view/echarts_sy/pie.vue +++ b/src/view/echarts_sy/pie.vue @@ -138,6 +138,8 @@ const resultData = [ value: 100, }, ]; + var max = 0; + var number = 0; const getOption1 = () => { // data.list[0].value = data.list.nl17; // data.list[1].value = data.list.nl1834; @@ -157,11 +159,20 @@ const getOption1 = () => { data.list[10].value = parseInt(data.list1.nl100); let sum = 0; + data.list.forEach((item) => { + if (item.value > max) { + max = item.value; + } sum += item.value; }); + //放大 + number = Math.round(max * 0.2); data.list.forEach((item) => { - optionData.push({ value: item.value, name: item.name }); + optionData.push({ + value: item.value + number, + name: item.name, + }); optionData.push({ name: "", value: sum / 100, @@ -224,7 +235,7 @@ const getOption = () => { let res = ""; const { marker, name, value } = params; if (name !== "") { - res += `${marker}${name}:${value}`; + res += `${marker}${name}:${value-number}`; } return res; }, diff --git a/src/view/echarts_yl/ylSMFW.vue b/src/view/echarts_yl/ylSMFW.vue index 07b04f7..705770c 100644 --- a/src/view/echarts_yl/ylSMFW.vue +++ b/src/view/echarts_yl/ylSMFW.vue @@ -326,7 +326,7 @@ onBeforeMount(() => { setTimeout(() => { data.list = props.list; data.day = props.list.day; - console.log(data.list, "助老服务"); + // console.log(data.list, "助老服务"); setChart1(); getOption(); setChart(); diff --git a/src/view/education.vue b/src/view/education.vue index 0f0bfcb..2f81e4d 100644 --- a/src/view/education.vue +++ b/src/view/education.vue @@ -92,32 +92,32 @@
-
+
初中 {{ data.xxgk.czxxsl }}
-
+
高中 {{ data.xxgk.gzxxsl }}
-
+
小学 {{ data.xxgk.xxxxsl }}
-
+
中职 {{ data.xxgk.zzxxsl }}
-
+
幼儿园 {{ data.xxgk.yeyxxsl }}
- 特殊教育 {{ data.xxgk.tsjyxxsl }} @@ -426,21 +426,50 @@ const tableType = reactive({ url: "", title: "", columns: [ + // { + // label: "学校", + // property: "school", + // }, + // { + // label: "教师数", + // property: "teacher", + // }, + // { + // label: "学生数", + // property: "student", + // }, + // { + // label: "班级数", + // property: "banji", + // }, + { - label: "学校", - property: "school", + label: "班级数", + property: "bjs", }, { - label: "教师数", - property: "teacher", + label: " 教师数", + property: "jss", + }, + { + label: "区域", + property: "qq", + }, + { + label: "学段", + property: "xd", }, { label: "学生数", - property: "student", + property: "xss", }, { - label: "班级数", - property: "banji", + label: " 学校名称", + property: "xxmc", + }, + { + label: "性质", + property: "xz", }, ], data: [], @@ -460,20 +489,20 @@ const showDialog = (title, url) => { tableType.url = url; pagination.currentPage = 1; dialogShow.value = true; - // getTable(url, pagination.currentPage); + getTable(url, pagination.currentPage); }; //获取表格数据 const getTable = (url, currentPage) => { dialogShow.value = true; - // http - // .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`) - // .then((res) => { - // if (res.code == 200) { - // tableType.data = res.data; - // pagination.total = res.count; - // dialogShow.value = true; - // } - // }); + http + .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`) + .then((res) => { + if (res.code == 200) { + tableType.data = res.data; + pagination.total = res.count; + dialogShow.value = true; + } + }); }; const close = () => { dialogShow.value = false; @@ -1789,6 +1818,34 @@ onMounted(() => { } } } + +:deep(.el-table) { + background: rgba(32, 64, 115, 1); + + --el-table-border-color: none; + border: 1px solid #7aceff; +} +.table { + :deep(.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf) { + border: none !important; + padding-left: 10px !important; + } + + :deep(.el-table td.el-table__cell) { + padding-left: 10px; + } +} +:deep(.el-table--enable-row-hover .el-table__body tr:hover > td) { + background-color: #2f4b74; +} + +:deep(.el-table__empty-block) { + background-color: #122560; +} + +:deep(.el-table .el-table__row) { + border-bottom: none; +}