diff --git a/src/assets/images/sy/jtsy.gif b/src/assets/images/sy/jtsy.gif new file mode 100644 index 0000000..87b0d96 Binary files /dev/null and b/src/assets/images/sy/jtsy.gif differ diff --git a/src/assets/images/sy/jyfw.png b/src/assets/images/sy/jyfw.png index 0d3c9a0..8e5ca3e 100644 Binary files a/src/assets/images/sy/jyfw.png and b/src/assets/images/sy/jyfw.png differ diff --git a/src/assets/images/sy/jyfwM.png b/src/assets/images/sy/jyfwM.png new file mode 100644 index 0000000..f1f194d Binary files /dev/null and b/src/assets/images/sy/jyfwM.png differ diff --git a/src/assets/images/sy/主页人口.gif b/src/assets/images/sy/主页人口.gif new file mode 100644 index 0000000..bea9f9b Binary files /dev/null and b/src/assets/images/sy/主页人口.gif differ diff --git a/src/assets/ylMove.gif b/src/assets/ylMove.gif new file mode 100644 index 0000000..9ecab1b Binary files /dev/null and b/src/assets/ylMove.gif differ diff --git a/src/components/header.vue b/src/components/header.vue index abe7919..064df20 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -164,6 +164,7 @@ onMounted(() => { display: flex; position: absolute; align-items: center; + z-index: 2; } &-left { 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/sy.vue b/src/view/sy.vue index ab5f247..02a6dc9 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -2,12 +2,12 @@
- +
- - -
+ + +
@@ -16,16 +16,13 @@
- 收入:{{ data.LivelihoodWelfare.zgylbxzsr }}万元 + 收入:{{ data.LivelihoodWelfare.zgylbxzsr }}万元
-
- 支出:{{ data.LivelihoodWelfare.zgylbxzzc }}万元 +
+ 支出:{{ data.LivelihoodWelfare.zgylbxzzc }}万元
@@ -33,16 +30,13 @@
工伤保险
- 收入:{{ data.LivelihoodWelfare.gsbxzsr }}万元 + 收入:{{ data.LivelihoodWelfare.gsbxzsr }}万元
-
- 支出:{{ data.LivelihoodWelfare.gsbxzzc }}万元 +
+ 支出:{{ data.LivelihoodWelfare.gsbxzzc }}万元
@@ -52,16 +46,13 @@
- 收入:{{ data.LivelihoodWelfare.cxylbxzsr }}万元 + 收入:{{ data.LivelihoodWelfare.cxylbxzsr }}万元
-
- 支出:{{ data.LivelihoodWelfare.cxylbxzzc }}万元 +
+ 支出:{{ data.LivelihoodWelfare.cxylbxzzc }}万元
@@ -71,16 +62,13 @@
- 收入:{{ data.LivelihoodWelfare.zgyilbxzsr }}万元 + 收入:{{ data.LivelihoodWelfare.zgyilbxzsr }}万元
-
- 支出:{{ data.LivelihoodWelfare.zgyilbxzzc }}万元 +
+ 支出:{{ data.LivelihoodWelfare.zgyilbxzzc }}万元
@@ -90,16 +78,13 @@
- 收入:{{ data.LivelihoodWelfare.cxyilbxzsr }}万元 + 收入:{{ data.LivelihoodWelfare.cxyilbxzsr }}万元
-
- 支出:{{ data.LivelihoodWelfare.cxyilbxzzc }}万元 +
+ 支出:{{ data.LivelihoodWelfare.cxyilbxzzc }}万元
@@ -116,12 +101,15 @@ -
+
- - -
+ + +
@@ -141,40 +129,46 @@
- {{ jysyList[0].title }}学校师生比 + {{ jysyList[0].title }}学校师生比
- {{ jysyList[0].teacher }}:{{ jysyList[0].student }} + {{ jysyList[0].teacher }}:{{ jysyList[0].student }}
-
+
- {{ jysyList[1].title }}学校师生比 + {{ jysyList[1].title }}学校师生比
{{ jysyList[1].teacher }}:{{ jysyList[1].student }}
-
+
-
+
- - -
+ + +
{{ data.employmentService.jypx }}
就业培训
+
{{ data.employmentService.jyjxfw }}
就业见习服务
+
{{ data.employmentService.jyyz }}
就业援助
+
@@ -204,24 +201,44 @@
+
{{ data.PopulationData.man }}
- +
男性人口
- +
{{ data.PopulationData.rkzs }}
人口总数
{{ data.PopulationData.woman }}
- +
女性人口
- - + +
- + - +