diff --git a/src/assets/images/education/new_cpfx.png b/src/assets/images/education/new_cpfx.png new file mode 100644 index 0000000..695b87f Binary files /dev/null and b/src/assets/images/education/new_cpfx.png differ diff --git a/src/assets/images/education/new_csr.png b/src/assets/images/education/new_csr.png new file mode 100644 index 0000000..100f382 Binary files /dev/null and b/src/assets/images/education/new_csr.png differ diff --git a/src/assets/images/education/new_xsqk.png b/src/assets/images/education/new_xsqk.png new file mode 100644 index 0000000..d95e006 Binary files /dev/null and b/src/assets/images/education/new_xsqk.png differ diff --git a/src/assets/images/education/new_xxgk.png b/src/assets/images/education/new_xxgk.png new file mode 100644 index 0000000..5420c08 Binary files /dev/null and b/src/assets/images/education/new_xxgk.png differ diff --git a/src/assets/images/hygiene/center_title_1.png b/src/assets/images/hygiene/center_title_1.png deleted file mode 100644 index 21bf2c1..0000000 Binary files a/src/assets/images/hygiene/center_title_1.png and /dev/null differ diff --git a/src/assets/images/hygiene/center_title_2.png b/src/assets/images/hygiene/center_title_2.png deleted file mode 100644 index d5ded56..0000000 Binary files a/src/assets/images/hygiene/center_title_2.png and /dev/null differ diff --git a/src/assets/images/hygiene/left_title_1.png b/src/assets/images/hygiene/left_title_1.png deleted file mode 100644 index 930dda6..0000000 Binary files a/src/assets/images/hygiene/left_title_1.png and /dev/null differ diff --git a/src/assets/images/hygiene/left_title_2.png b/src/assets/images/hygiene/left_title_2.png deleted file mode 100644 index 87a426b..0000000 Binary files a/src/assets/images/hygiene/left_title_2.png and /dev/null differ diff --git a/src/assets/images/hygiene/left_title_3.png b/src/assets/images/hygiene/left_title_3.png deleted file mode 100644 index a18219d..0000000 Binary files a/src/assets/images/hygiene/left_title_3.png and /dev/null differ diff --git a/src/assets/images/hygiene/new_center.png b/src/assets/images/hygiene/new_center.png deleted file mode 100644 index f9ed1eb..0000000 Binary files a/src/assets/images/hygiene/new_center.png and /dev/null differ diff --git a/src/assets/images/hygiene/new_fygl.png b/src/assets/images/hygiene/new_fygl.png new file mode 100644 index 0000000..298b703 Binary files /dev/null and b/src/assets/images/hygiene/new_fygl.png differ diff --git a/src/assets/images/hygiene/new_jkda.png b/src/assets/images/hygiene/new_jkda.png new file mode 100644 index 0000000..b833a92 Binary files /dev/null and b/src/assets/images/hygiene/new_jkda.png differ diff --git a/src/assets/images/hygiene/new_jkhd.png b/src/assets/images/hygiene/new_jkhd.png new file mode 100644 index 0000000..636e0c7 Binary files /dev/null and b/src/assets/images/hygiene/new_jkhd.png differ diff --git a/src/assets/images/hygiene/new_lmb.png b/src/assets/images/hygiene/new_lmb.png new file mode 100644 index 0000000..9d65a9c Binary files /dev/null and b/src/assets/images/hygiene/new_lmb.png differ diff --git a/src/assets/images/hygiene/new_mz.png b/src/assets/images/hygiene/new_mz.png new file mode 100644 index 0000000..0514b49 Binary files /dev/null and b/src/assets/images/hygiene/new_mz.png differ diff --git a/src/assets/images/hygiene/new_tjrs.png b/src/assets/images/hygiene/new_tjrs.png new file mode 100644 index 0000000..754d978 Binary files /dev/null and b/src/assets/images/hygiene/new_tjrs.png differ diff --git a/src/assets/images/hygiene/new_ylbx.png b/src/assets/images/hygiene/new_ylbx.png new file mode 100644 index 0000000..c6f2fae Binary files /dev/null and b/src/assets/images/hygiene/new_ylbx.png differ diff --git a/src/assets/images/hygiene/new_zcs.png b/src/assets/images/hygiene/new_zcs.png new file mode 100644 index 0000000..c3a3af5 Binary files /dev/null and b/src/assets/images/hygiene/new_zcs.png differ diff --git a/src/assets/images/hygiene/right_title_1.png b/src/assets/images/hygiene/right_title_1.png deleted file mode 100644 index df2b833..0000000 Binary files a/src/assets/images/hygiene/right_title_1.png and /dev/null differ diff --git a/src/assets/images/sy/left_1.png b/src/assets/images/sy/left_1.png deleted file mode 100644 index 8586158..0000000 Binary files a/src/assets/images/sy/left_1.png and /dev/null differ diff --git a/src/assets/images/sy/left_1_1.png b/src/assets/images/sy/left_1_1.png deleted file mode 100644 index 6b9b37c..0000000 Binary files a/src/assets/images/sy/left_1_1.png and /dev/null differ diff --git a/src/assets/images/sy/left_2.png b/src/assets/images/sy/left_2.png deleted file mode 100644 index ec8cdbe..0000000 Binary files a/src/assets/images/sy/left_2.png and /dev/null differ diff --git a/src/assets/images/sy/left_3.png b/src/assets/images/sy/left_3.png deleted file mode 100644 index 0f9c842..0000000 Binary files a/src/assets/images/sy/left_3.png and /dev/null differ diff --git a/src/assets/images/sy/new_jtsy.png b/src/assets/images/sy/new_jtsy.png new file mode 100644 index 0000000..9558b5d Binary files /dev/null and b/src/assets/images/sy/new_jtsy.png differ diff --git a/src/assets/images/sy/new_jyfw.png b/src/assets/images/sy/new_jyfw.png new file mode 100644 index 0000000..98e39dc Binary files /dev/null and b/src/assets/images/sy/new_jyfw.png differ diff --git a/src/assets/images/sy/new_jysy.png b/src/assets/images/sy/new_jysy.png new file mode 100644 index 0000000..ebf6dac Binary files /dev/null and b/src/assets/images/sy/new_jysy.png differ diff --git a/src/assets/images/sy/new_jzfw.png b/src/assets/images/sy/new_jzfw.png new file mode 100644 index 0000000..22f203f Binary files /dev/null and b/src/assets/images/sy/new_jzfw.png differ diff --git a/src/assets/images/sy/new_msfz.png b/src/assets/images/sy/new_msfz.png new file mode 100644 index 0000000..4eada28 Binary files /dev/null and b/src/assets/images/sy/new_msfz.png differ diff --git a/src/assets/images/sy/new_tysy.png b/src/assets/images/sy/new_tysy.png new file mode 100644 index 0000000..38117e0 Binary files /dev/null and b/src/assets/images/sy/new_tysy.png differ diff --git a/src/assets/images/sy/new_whsy.png b/src/assets/images/sy/new_whsy.png new file mode 100644 index 0000000..5d41141 Binary files /dev/null and b/src/assets/images/sy/new_whsy.png differ diff --git a/src/assets/images/sy/new_ylws.png b/src/assets/images/sy/new_ylws.png new file mode 100644 index 0000000..2fe8611 Binary files /dev/null and b/src/assets/images/sy/new_ylws.png differ diff --git a/src/assets/images/sy/right_1.png b/src/assets/images/sy/right_1.png deleted file mode 100644 index 7f18e12..0000000 Binary files a/src/assets/images/sy/right_1.png and /dev/null differ diff --git a/src/assets/images/sy/right_2.png b/src/assets/images/sy/right_2.png deleted file mode 100644 index 5af981f..0000000 Binary files a/src/assets/images/sy/right_2.png and /dev/null differ diff --git a/src/assets/images/sy/right_3.png b/src/assets/images/sy/right_3.png deleted file mode 100644 index ebab8cf..0000000 Binary files a/src/assets/images/sy/right_3.png and /dev/null differ diff --git a/src/assets/images/sy/right_4.png b/src/assets/images/sy/right_4.png deleted file mode 100644 index eec9704..0000000 Binary files a/src/assets/images/sy/right_4.png and /dev/null differ diff --git a/src/assets/images/work/center.png b/src/assets/images/work/center.png deleted file mode 100644 index 0d21b17..0000000 Binary files a/src/assets/images/work/center.png and /dev/null differ diff --git a/src/assets/images/work/center1.png b/src/assets/images/work/center1.png deleted file mode 100644 index 858b1d9..0000000 Binary files a/src/assets/images/work/center1.png and /dev/null differ diff --git a/src/assets/images/work/left_1.png b/src/assets/images/work/left_1.png deleted file mode 100644 index 7e0c9a5..0000000 Binary files a/src/assets/images/work/left_1.png and /dev/null differ diff --git a/src/assets/images/work/left_1_1.png b/src/assets/images/work/left_1_1.png deleted file mode 100644 index 1706843..0000000 Binary files a/src/assets/images/work/left_1_1.png and /dev/null differ diff --git a/src/assets/images/work/new_dyh.png b/src/assets/images/work/new_dyh.png new file mode 100644 index 0000000..6fb8ab7 Binary files /dev/null and b/src/assets/images/work/new_dyh.png differ diff --git a/src/assets/images/work/new_jzgk.png b/src/assets/images/work/new_jzgk.png new file mode 100644 index 0000000..079df4f Binary files /dev/null and b/src/assets/images/work/new_jzgk.png differ diff --git a/src/assets/images/work/new_qtjz.png b/src/assets/images/work/new_qtjz.png new file mode 100644 index 0000000..ac3d379 Binary files /dev/null and b/src/assets/images/work/new_qtjz.png differ diff --git a/src/assets/images/work/new_rsqt.png b/src/assets/images/work/new_rsqt.png new file mode 100644 index 0000000..c4e701a Binary files /dev/null and b/src/assets/images/work/new_rsqt.png differ diff --git a/src/assets/images/work/new_shljz.png b/src/assets/images/work/new_shljz.png new file mode 100644 index 0000000..3439f6a Binary files /dev/null and b/src/assets/images/work/new_shljz.png differ diff --git a/src/assets/images/work/new_zxjz.png b/src/assets/images/work/new_zxjz.png new file mode 100644 index 0000000..3c61711 Binary files /dev/null and b/src/assets/images/work/new_zxjz.png differ diff --git a/src/assets/images/work/right_1.png b/src/assets/images/work/right_1.png deleted file mode 100644 index b54beba..0000000 Binary files a/src/assets/images/work/right_1.png and /dev/null differ diff --git a/src/assets/images/work/right_2.png b/src/assets/images/work/right_2.png deleted file mode 100644 index e6d2f87..0000000 Binary files a/src/assets/images/work/right_2.png and /dev/null differ diff --git a/src/assets/images/yl/new_gllrbt.png b/src/assets/images/yl/new_gllrbt.png new file mode 100644 index 0000000..bd25318 Binary files /dev/null and b/src/assets/images/yl/new_gllrbt.png differ diff --git a/src/assets/images/yl/new_jhsy.png b/src/assets/images/yl/new_jhsy.png new file mode 100644 index 0000000..85ff598 Binary files /dev/null and b/src/assets/images/yl/new_jhsy.png differ diff --git a/src/assets/images/yl/new_lnrzb.png b/src/assets/images/yl/new_lnrzb.png new file mode 100644 index 0000000..ff8f610 Binary files /dev/null and b/src/assets/images/yl/new_lnrzb.png differ diff --git a/src/assets/images/yl/new_tklrjz.png b/src/assets/images/yl/new_tklrjz.png new file mode 100644 index 0000000..8404c61 Binary files /dev/null and b/src/assets/images/yl/new_tklrjz.png differ diff --git a/src/assets/images/yl/new_ylbx.png b/src/assets/images/yl/new_ylbx.png new file mode 100644 index 0000000..3582130 Binary files /dev/null and b/src/assets/images/yl/new_ylbx.png differ diff --git a/src/assets/images/yl/new_yljg.png b/src/assets/images/yl/new_yljg.png new file mode 100644 index 0000000..a385969 Binary files /dev/null and b/src/assets/images/yl/new_yljg.png differ diff --git a/src/assets/images/yl/new_zlfw.png b/src/assets/images/yl/new_zlfw.png new file mode 100644 index 0000000..38a9c38 Binary files /dev/null and b/src/assets/images/yl/new_zlfw.png differ diff --git a/src/view/echarts_education/edCSR.vue b/src/view/echarts_education/edCSR.vue index 13e72b0..d151157 100644 --- a/src/view/echarts_education/edCSR.vue +++ b/src/view/echarts_education/edCSR.vue @@ -157,6 +157,14 @@ const option = { data: data, barWidth: 20, type: "bar", + label:{ + show:true, + position:'top', + color:'#ffffff', + formatter:function(data){ + return data.value + } + }, }, // { // // name: "上门服务次数", diff --git a/src/view/echarts_education/pie.vue b/src/view/echarts_education/pie.vue index 241015d..1d34abc 100644 --- a/src/view/echarts_education/pie.vue +++ b/src/view/echarts_education/pie.vue @@ -136,6 +136,14 @@ const getOption = () => { type: "bar", data: data.list[1], barWidth: "18%", + label:{ + show:true, + position:'top', + color:'#ffffff', + formatter:function(data){ + return data.value + } + }, itemStyle: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ { @@ -154,6 +162,14 @@ const getOption = () => { type: "bar", data: data.list[0], barWidth: "18%", + label:{ + show:true, + position:'top', + color:'#ffffff', + formatter:function(data){ + return data.value + } + }, itemStyle: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ { diff --git a/src/view/echarts_hygiene/eP7.vue b/src/view/echarts_hygiene/eP7.vue index ee8495f..41f42a6 100644 --- a/src/view/echarts_hygiene/eP7.vue +++ b/src/view/echarts_hygiene/eP7.vue @@ -127,6 +127,14 @@ data.option = { type: "bar", data: data.list, barWidth: 20, + label: { + show: true, + color: "#ffffff", + position:'top', + formatter: function (data) { + return data.value; + }, + }, itemStyle: { normal: { color: function (params) { diff --git a/src/view/echarts_hygiene/gxy.vue b/src/view/echarts_hygiene/gxy.vue index 939c142..2f74bca 100644 --- a/src/view/echarts_hygiene/gxy.vue +++ b/src/view/echarts_hygiene/gxy.vue @@ -94,6 +94,14 @@ const getOption = () => { symbol: "emptyCircle", symbolSize: 10, + label: { + show: true, + color: "#ffffff", + position:'top', + formatter: function (data) { + return data.value; + }, + }, itemStyle: { borderColor: "#00FCFF", borderWidth: 1, diff --git a/src/view/echarts_hygiene/pie.vue b/src/view/echarts_hygiene/pie.vue index d780f89..331d81c 100644 --- a/src/view/echarts_hygiene/pie.vue +++ b/src/view/echarts_hygiene/pie.vue @@ -1,5 +1,5 @@ - + diff --git a/src/view/echarts_yl/pie.vue b/src/view/echarts_yl/pie.vue index a2e3d9e..bab5a73 100644 --- a/src/view/echarts_yl/pie.vue +++ b/src/view/echarts_yl/pie.vue @@ -1,5 +1,5 @@ - + diff --git a/src/view/echarts_yl/pie2.vue b/src/view/echarts_yl/pie2.vue index d8f0f28..e298927 100644 --- a/src/view/echarts_yl/pie2.vue +++ b/src/view/echarts_yl/pie2.vue @@ -53,7 +53,7 @@ const getOption = () => { }, }, grid: { - top:'25%', + top: "25%", left: "1%", right: "10%", bottom: "0%", @@ -109,6 +109,11 @@ const getOption = () => { { name: "城乡养老保险金额", type: "value", + min: 0, // 设置Y轴最小值 + max: function (value) { + // 自定义Y轴最大值,确保数据点显示在顶部 + return Math.ceil(Math.max(value.max, value.max * 1.4) / 50) * 50; + }, nameTextStyle: { // 设置Y轴名称的样式 fontSize: 14, // 这里设置字体大小为20 @@ -162,6 +167,14 @@ const getOption = () => { borderWidth: 1, color: "#00FCFF", }, + label: { + show: true, + color: "#ffffff", + position: "bottom", + formatter: function (data) { + return data.value; + }, + }, data: data.list1, }, { @@ -176,7 +189,14 @@ const getOption = () => { borderWidth: 1, color: "#2468FF", }, - + label: { + show: true, + color: "#ffffff", + position: "bottom", + formatter: function (data) { + return data.value; + }, + }, data: data.list2, }, ], diff --git a/src/view/education.vue b/src/view/education.vue index 1a7591f..e0d07fe 100644 --- a/src/view/education.vue +++ b/src/view/education.vue @@ -572,25 +572,25 @@ onMounted(() => { .left_1 { // background-image: url(@/assets/eduImg/title1.png); - background-image: url(@/assets/eduImg/title5.png); + background-image: url(@/assets/images/education/new_xsqk.png); background-repeat: no-repeat; background-size: 100% 100%; } .left_2 { - background-image: url(@/assets/eduImg/title2.png); + background-image: url(@/assets/images/education/new_cpfx.png); background-repeat: no-repeat; background-size: 100% 100%; } .center_1 { - background-image: url(@/assets/eduImg/title3.png); + background-image: url(@/assets/images/education/new_xxgk.png); background-repeat: no-repeat; background-size: 100% 100%; } .right_1 { - background-image: url(@/assets/eduImg/title4.png); + background-image: url(@/assets/images/education/new_csr.png); background-repeat: no-repeat; background-size: 100% 100%; } diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue index ff17bde..1d57f1d 100644 --- a/src/view/hygiene.vue +++ b/src/view/hygiene.vue @@ -102,7 +102,6 @@