diff --git a/src/view/echarts_hygiene/eP2.vue b/src/view/echarts_hygiene/eP2.vue index c11a487..e6c9747 100644 --- a/src/view/echarts_hygiene/eP2.vue +++ b/src/view/echarts_hygiene/eP2.vue @@ -81,7 +81,7 @@ let option = { axisLabel: { show: true, textStyle: { - color: "#ccc", + color: "#ffffff", fontSize: "11", }, }, diff --git a/src/view/echarts_hygiene/eP3.vue b/src/view/echarts_hygiene/eP3.vue index 5a1214a..415aa61 100644 --- a/src/view/echarts_hygiene/eP3.vue +++ b/src/view/echarts_hygiene/eP3.vue @@ -65,7 +65,7 @@ let option = { return str; //返回字符串 }, textStyle: { - color: "#ccc", + color: "#ffffff", }, rotate: 30, }, diff --git a/src/view/echarts_hygiene/eP5.vue b/src/view/echarts_hygiene/eP5.vue index 52b08fb..3309847 100644 --- a/src/view/echarts_hygiene/eP5.vue +++ b/src/view/echarts_hygiene/eP5.vue @@ -65,7 +65,7 @@ let option = { return str; //返回字符串 }, textStyle: { - color: "#ccc", + color: "#ffffff", }, rotate: 40, }, diff --git a/src/view/echarts_hygiene/eP7.vue b/src/view/echarts_hygiene/eP7.vue index 4d38fdc..60b4e2b 100644 --- a/src/view/echarts_hygiene/eP7.vue +++ b/src/view/echarts_hygiene/eP7.vue @@ -65,7 +65,7 @@ let option = { return str; //返回字符串 }, textStyle: { - color: "#ccc", + color: "#ffffff", }, rotate: 30, }, diff --git a/src/view/echarts_work/eP1.vue b/src/view/echarts_work/eP1.vue index 14a2905..a0f0fee 100644 --- a/src/view/echarts_work/eP1.vue +++ b/src/view/echarts_work/eP1.vue @@ -88,7 +88,7 @@ const option = { }, ], yAxis: [ - { + { type: "value", scale: true, name: "救助人数", @@ -146,13 +146,15 @@ const option = { }, }, }, - ], series: [ { name: "救助金额", data: lineData, type: "line", //线状图 + stack: "Total", + symbol: "emptyCircle", + symbolSize: 10, itemStyle: { borderColor: "#00FCFF", borderWidth: 1, @@ -164,7 +166,7 @@ const option = { data: data, barWidth: 20, type: "bar", - itemStyle: { + itemStyle: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ { offset: 0, diff --git a/src/view/echarts_work/eP2.vue b/src/view/echarts_work/eP2.vue index ae5b3ba..f5005f1 100644 --- a/src/view/echarts_work/eP2.vue +++ b/src/view/echarts_work/eP2.vue @@ -152,6 +152,9 @@ const option = { name: "救助金额", data: lineData, type: "line", //线状图 + stack: "Total", + symbol: "emptyCircle", + symbolSize: 10, itemStyle: { borderColor: "#00FCFF", borderWidth: 1, diff --git a/src/view/echarts_work/eP3.vue b/src/view/echarts_work/eP3.vue index ebd19a5..b01e56a 100644 --- a/src/view/echarts_work/eP3.vue +++ b/src/view/echarts_work/eP3.vue @@ -13,7 +13,7 @@ const data = [120, 200, 50, 80, 70]; const data2 = [12, 20, 5, 8, 7]; const data3 = [20, 100, 40, 80, 70]; const lineData = [150, 230, 24, 218, 135]; -const lineData2 = [15, 23, 4, 18, 15]; +const lineData2 = [100, 200, 40, 180, 15]; const max = data .concat(lineData) .reduce((pre, cur) => (pre > cur ? pre : cur), 0); //找到这个新数组中的最大值 @@ -38,77 +38,81 @@ const option = { }, }, }, -// legend: [ -// { -// orient: "horizontal", -// icon: "circle", -// align: "left", -// bottom: "0", -// itemWidth: 8, -// itemHeight: 8, -// y: "20", -// x: "center", -// data: ["特困救助金额", "低保救助金额"], -// formatter: (name) => { -// return `{b|${name}} `; -// }, -// textStyle: { -// color: "#999999", -// fontSize: 12, -// align: "left", -// // 文字块背景色,一定要加上,否则对齐不会生效 -// backgroundColor: "transparent", -// rich: { -// b: { -// width: 200, -// }, -// }, -// }, -// }, -// { -// orient: "horizontal", -// icon: "circle", -// align: "left", -// bottom: "0", -// itemWidth: 8, -// itemHeight: 8, -// y: "40", -// x: "center", -// data: ["特困救助人次", "低保救助人次", "低边救助人次/感觉良好"], -// formatter: (name) => { -// return `{a|${name}} `; -// }, + // legend: [ + // { + // orient: "horizontal", + // icon: "circle", + // align: "left", + // bottom: "0", + // itemWidth: 8, + // itemHeight: 8, + // y: "20", + // x: "center", + // data: ["特困救助金额", "低保救助金额"], + // formatter: (name) => { + // return `{b|${name}} `; + // }, + // textStyle: { + // color: "#999999", + // fontSize: 12, + // align: "left", + // // 文字块背景色,一定要加上,否则对齐不会生效 + // backgroundColor: "transparent", + // rich: { + // b: { + // width: 200, + // }, + // }, + // }, + // }, + // { + // orient: "horizontal", + // icon: "circle", + // align: "left", + // bottom: "0", + // itemWidth: 8, + // itemHeight: 8, + // y: "40", + // x: "center", + // data: ["特困救助人次", "低保救助人次", "低边救助人次/感觉良好"], + // formatter: (name) => { + // return `{a|${name}} `; + // }, -// textStyle: { -// color: "#999999", -// fontSize: 12, -// align: "left", -// // 文字块背景色,一定要加上,否则对齐不会生效 -// backgroundColor: "transparent", -// rich: { -// a: { -// width: 200, -// }, -// }, -// }, -// }, -// ], + // textStyle: { + // color: "#999999", + // fontSize: 12, + // align: "left", + // // 文字块背景色,一定要加上,否则对齐不会生效 + // backgroundColor: "transparent", + // rich: { + // a: { + // width: 200, + // }, + // }, + // }, + // }, + // ], - legend: { - data: [ - "特困救助金额", - "低保救助金额", - "", - "特困救助人次", - "低保救助人次", - "低边救助人次", - ], - top: "8%", - textStyle: { - fontSize: 12, - color: "#ffffff", //上文字标题颜色 + legend: [ + { + data: ["特困救助金额", "低保救助金额"], + top: "3%", + textStyle: { + fontSize: 12, + color: "#ffffff", //上文字标题颜色 + }, }, - }, + { + data: ["特困救助人次", "低保救助人次", "低边救助人次"], + top: "13%", + textStyle: { + fontSize: 12, + color: "#ffffff", //上文字标题颜色 + }, + }, + ], + grid: { top: "28%", left: "6%", diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue index ae2132f..47ae323 100644 --- a/src/view/hygiene.vue +++ b/src/view/hygiene.vue @@ -8,6 +8,7 @@ v-if="leftchoose.first == '1'" src="@/assets/images/hygiene/yb_1.png" class="c" + style="width:160px;" />
-
-
-
+
diff --git a/src/view/yl.vue b/src/view/yl.vue index 9797359..b35aa5f 100644 --- a/src/view/yl.vue +++ b/src/view/yl.vue @@ -7,24 +7,27 @@
@@ -37,7 +40,8 @@ @@ -67,7 +72,8 @@ { position: absolute; right: 5px; top: 1px; + align-items: center; } .c { width: 130px;