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_hygiene/eP5.vue b/src/view/echarts_hygiene/eP5.vue index 6676019..a809692 100644 --- a/src/view/echarts_hygiene/eP5.vue +++ b/src/view/echarts_hygiene/eP5.vue @@ -44,32 +44,6 @@ const getOption = () => { { type: "category", axisLabel: { - // formatter: function (params) { - // var str = ""; // 最终拼接成的字符串 - // var paramsLen = params.length; // 获取每项文字的个数 - // var len = 6; // 每行能显示的字的个数(根据实际情况自己设置) - // var rowNumber = Math.ceil(paramsLen / len); // 换行的话,需要显示几行,向上取整 - // if (paramsLen > len) { - // //大于设定的len就换行,不大于就不变化 - // for (var i = 0; i < rowNumber; i++) { - // var temp = ""; // 表示每一次截取的字符串 - // var start = i * len; // 开始截取的位置 - // var end = start + len; // 结束截取的位置 - // if (i == rowNumber - 1) { - // // 最后一次不换行 - // temp = params.substring(start, paramsLen); - // } else { - // // 每一次拼接字符串并换行 - // temp = params.substring(start, end) + "\n"; - // } - // str += temp; // 最终拼成的字符串 - // } - // } else { - // // 给新的字符串赋值 - // str = params; - // } - // return str; //返回字符串 - // }, textStyle: { color: "#ffffff", fontSize: 15, @@ -116,6 +90,7 @@ const getOption = () => { ], series: [ { + z: 1, name: "精神病健康居家在册管理人数", type: "bar", data: data.rs, @@ -131,65 +106,143 @@ const getOption = () => { itemStyle: { normal: { color: function (params) { + // var colorList = [ + // new echarts.graphic.LinearGradient( + // 0, + // 0, + // 0, + // 1, + // [ + // { + // offset: 0, + // color: "rgba(23, 237, 255, 1)", + // }, + // { + // offset: 1, + // color: "rgba(23, 237, 255, 0.20)", + // }, + // ], + // false + // ), + // new echarts.graphic.LinearGradient( + // 0, + // 0, + // 0, + // 1, + // [ + // { + // offset: 0, + // color: "rgba(255, 243, 119, 1)", + // }, + // { + // offset: 1, + // color: "rgba(255, 242, 142, 0.20)", + // }, + // ], + // false + // ), + // new echarts.graphic.LinearGradient( + // 0, + // 0, + // 0, + // 1, + // [ + // { + // offset: 0, + // color: "rgba(142, 187, 255, 1)", + // }, + // { + // offset: 1, + // color: "rgba(142, 187, 255, 0.20)", + // }, + // ], + // false + // ), + // ]; var colorList = [ - new echarts.graphic.LinearGradient( - 0, - 0, - 0, - 1, - [ - { - offset: 0, - color: "rgba(23, 237, 255, 1)", - }, - { - offset: 1, - color: "rgba(23, 237, 255, 0.20)", - }, + { + type: "linear", + x: 0, + x2: 1, + y: 0, + y2: 0, + colorStops: [ + { offset: 0, color: "rgba(23, 237, 255, .7)" }, + { offset: 0.5, color: "rgba(23, 237, 255, .7)" }, + { offset: 0.5, color: "rgba(23, 237, 255, .3)" }, + { offset: 1, color: "rgba(23, 237, 255, .5)" }, ], - false - ), - new echarts.graphic.LinearGradient( - 0, - 0, - 0, - 1, - [ - { - offset: 0, - color: "rgba(255, 243, 119, 1)", - }, - { - offset: 1, - color: "rgba(255, 242, 142, 0.20)", - }, + }, + { + type: "linear", + x: 0, + x2: 1, + 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)" }, ], - false - ), - new echarts.graphic.LinearGradient( - 0, - 0, - 0, - 1, - [ - { - offset: 0, - color: "rgba(142, 187, 255, 1)", - }, - { - offset: 1, - color: "rgba(142, 187, 255, 0.20)", - }, + }, + { + type: "linear", + x: 0, + x2: 1, + y: 0, + y2: 0, + colorStops: [ + { offset: 0, color: "rgba(142, 187, 255, .7)" }, + { offset: 0.5, color: "rgba(142, 187, 255, .7)" }, + { offset: 0.5, color: "rgba(142, 187, 255, .3)" }, + { offset: 1, color: "rgba(142, 187, 255, .5)" }, ], - false - ), + }, ]; - return colorList[params.dataIndex % colorList.length]; }, }, }, }, + { + z: 1, + name: "上部1", + type: "pictorialBar", + symbolPosition: "end", + data: data.rs, + symbol: "diamond", + symbolOffset: ["0%", "-50%"], + symbolSize: [21, 15], + itemStyle: { + normal: { + color: function (params) { + var colorList = [ + { + offset: 1, + color: "rgba(23, 237, 255, 1)", + }, + + { + offset: 1, + color: "rgba(255, 242, 142, 1)", + }, + + { + offset: 1, + color: "rgba(142, 187, 255, 1)", + }, + ]; + + return colorList[params.dataIndex % colorList.length].color; + }, + }, + }, + // itemStyle: { + // borderColor: "#2fffa4", + // color: "rgba(142, 187, 255, 1)", + // }, + }, ], }; }; diff --git a/src/view/echarts_hygiene/eP7.vue b/src/view/echarts_hygiene/eP7.vue index 41f42a6..bd005dd 100644 --- a/src/view/echarts_hygiene/eP7.vue +++ b/src/view/echarts_hygiene/eP7.vue @@ -3,7 +3,7 @@ diff --git a/src/view/sy.vue b/src/view/sy.vue index 5879b73..687e7c4 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -177,6 +177,7 @@ >
{{ data.employmentService.jypx }}
就业培训
+
{{ data.employmentService.jyjxfw }}
就业见习服务
+
{{ data.employmentService.jyyz }}
就业援助
+
@@ -198,6 +201,11 @@
+
{{ data.PopulationData.man }}
{ //就业服务 .left_3_1 { width: 94%; - margin-top: 15px; + margin-top: 40px; display: flex; justify-content: space-around; &_item { box-sizing: border-box; width: 160px; - height: 133px; + height: 112px; background-image: url(@/assets/images/sy/jyfw.png); background-repeat: no-repeat; background-size: 100% 100%; text-align: center; - padding-top: 22px; - animation: example 3s infinite linear; + position: relative; + .moveImg { + position: absolute; + width: 160px; + height: 140px; + bottom: 18px; + background-image: url(@/assets/images/sy/jyfwM.png); + background-repeat: no-repeat; + background-size: 100% 100%; + animation: example 3s infinite linear; + } @keyframes example { 0% { @@ -2559,7 +2576,7 @@ table { width: 146px; height: 104px; position: absolute; - left: -38px; + left: -40px; top: -31px; } span { @@ -2609,7 +2626,7 @@ table { width: 146px; height: 104px; position: absolute; - left: -38px; + left: -40px; top: -31px; } span { diff --git a/src/view/yl.vue b/src/view/yl.vue index ca30b68..1132ff6 100644 --- a/src/view/yl.vue +++ b/src/view/yl.vue @@ -150,6 +150,7 @@
+
@@ -1044,6 +1045,16 @@ const getData = async () => { margin-top: 10px; position: relative; + .moveImg{ + position: absolute; + background-image: url(@/assets/ylMove.gif); + background-repeat: no-repeat; + background-size: 100% 100%; + left: 170px; + width: 190px; + height: 173px; + } + .mtpImg1 { width: 140px; height: 24px;