From eed39ea913dddfe6572f37de8c7de3f1523b6816 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 20 Jul 2021 09:36:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory
---
src/views/home/indexEchart.js | 192 ++++++++++++++++++++++++++++++-----------------
1 files changed, 121 insertions(+), 71 deletions(-)
diff --git a/src/views/home/indexEchart.js b/src/views/home/indexEchart.js
index 321e9fe..ea83db0 100644
--- a/src/views/home/indexEchart.js
+++ b/src/views/home/indexEchart.js
@@ -19,15 +19,18 @@
}
},
color: [
- "#516b91",
- "#59c4e6",
- "#93b7e3",
- "#a5e7f0",
- "#cbb0e3",
+ "#91cc75",
+ "#fac858",
+ "#73c0de",
+ "#3ba272",
+ "#fc8452",
+ "#9a60b4",
+ "#3fb1e3",
"#6be6c1",
- "#a0a7e6",
- "#c4ebad",
- "#96dee8"
+ '#626c91',
+ '#a0a7e6',
+ '#c4ebad',
+ '#96dee8'
],
legend: {
data: ["自招保安单位", "保安培训公司", "保安服务公司", "武装守押公司"],
@@ -47,6 +50,12 @@
type: "value",
axisLabel: {
color: "#fff"
+ },
+ axisLine: {
+ show: true
+ },
+ splitLine: {
+ show: false
}
},
yAxis: {
@@ -63,9 +72,6 @@
stack: "total",
barMinWidth: 20,
barMaxWidth: 40,
- label: {
- show: true
- },
emphasis: {
focus: "series"
},
@@ -75,9 +81,6 @@
name: "保安培训公司",
type: "bar",
stack: "total",
- label: {
- show: true
- },
emphasis: {
focus: "series"
},
@@ -87,9 +90,6 @@
name: "保安服务公司",
type: "bar",
stack: "total",
- label: {
- show: true
- },
emphasis: {
focus: "series"
},
@@ -99,9 +99,6 @@
name: "武装守押公司",
type: "bar",
stack: "total",
- label: {
- show: true
- },
emphasis: {
focus: "series"
},
@@ -128,15 +125,18 @@
}
},
color: [
- "#516b91",
- "#59c4e6",
- "#93b7e3",
- "#a5e7f0",
- "#cbb0e3",
+ "#91cc75",
+ "#fac858",
+ "#73c0de",
+ "#3ba272",
+ "#fc8452",
+ "#9a60b4",
+ "#3fb1e3",
"#6be6c1",
- "#a0a7e6",
- "#c4ebad",
- "#96dee8"
+ '#626c91',
+ '#a0a7e6',
+ '#c4ebad',
+ '#96dee8'
],
legend: {
data: ["持证人数", "未持证人数"],
@@ -157,7 +157,13 @@
axisLabel: {
color: "#fff"
},
- boundaryGap: [0, 0.01]
+ boundaryGap: [0, 0.01],
+ axisLine: {
+ show: true
+ },
+ splitLine: {
+ show: false
+ }
},
yAxis: {
type: "category",
@@ -174,9 +180,6 @@
barMinWidth: 20,
barMaxWidth: 40,
stack: "total",
- label: {
- show: true
- },
emphasis: {
focus: "series"
},
@@ -186,9 +189,6 @@
name: "未持证人数",
type: "bar",
stack: "total",
- label: {
- show: true
- },
emphasis: {
focus: "series"
},
@@ -226,15 +226,18 @@
trigger: "axis"
},
color: [
- "#516b91",
- "#59c4e6",
- "#93b7e3",
- "#a5e7f0",
- "#cbb0e3",
+ "#91cc75",
+ "#fac858",
+ "#73c0de",
+ "#3ba272",
+ "#fc8452",
+ "#9a60b4",
+ "#3fb1e3",
"#6be6c1",
- "#a0a7e6",
- "#c4ebad",
- "#96dee8"
+ '#626c91',
+ '#a0a7e6',
+ '#c4ebad',
+ '#96dee8'
],
legend: {
@@ -288,15 +291,18 @@
trigger: "axis"
},
color: [
- "#516b91",
- "#59c4e6",
- "#93b7e3",
- "#a5e7f0",
- "#cbb0e3",
+ "#91cc75",
+ "#fac858",
+ "#73c0de",
+ "#3ba272",
+ "#fc8452",
+ "#9a60b4",
+ "#3fb1e3",
"#6be6c1",
- "#a0a7e6",
- "#c4ebad",
- "#96dee8"
+ '#626c91',
+ '#a0a7e6',
+ '#c4ebad',
+ '#96dee8'
],
legend: {
@@ -349,7 +355,7 @@
let data = [
{
name: "新建县",
- value: 754
+ value: 154
},
{
name: "安义县",
@@ -362,6 +368,34 @@
{
name: "西湖区",
value: 200
+ },
+ {
+ name: "东湖区",
+ value: 250
+ },
+ {
+ name: "经开区",
+ value: 281
+ },
+ {
+ name: "青云谱区",
+ value: 320
+ },
+ {
+ name: "高新区",
+ value: 231
+ },
+ {
+ name: "湾里区",
+ value: 210
+ },
+ {
+ name: "进贤县",
+ value: 187
+ },
+ {
+ name: "青山湖区",
+ value: 190
}
];
// let arrName = getArrayValue(data, "name");
@@ -396,13 +430,13 @@
};
for (let i = 0; i < data.length; i++) {
res.series.push({
- name: "学历",
+ name: "分局预警占比",
type: "pie",
clockWise: true,
z: 2,
hoverAnimation: false,
- radius: [73 - i * 15 + "%", 68 - i * 15 + "%"],
- center: ["50%", "55%"],
+ radius: [90 - i * 8 + "%", 85 - i * 8 + "%"],
+ center: ["30%", "50%"],
labelLine: {
show: false
},
@@ -443,32 +477,49 @@
formatter: "{a}<br>{b}:{c}({d}%)"
},
color: [
- "#516b91",
- "#59c4e6",
- "#93b7e3",
- "#a5e7f0",
- "#cbb0e3",
+ "#91cc75",
+ "#fac858",
+ "#73c0de",
+ "#3ba272",
+ "#fc8452",
+ "#9a60b4",
+ "#3fb1e3",
"#6be6c1",
- "#a0a7e6",
- "#c4ebad",
- "#96dee8"
+ '#626c91',
+ '#a0a7e6',
+ '#c4ebad',
+ '#96dee8'
],
legend: {
- bottom: "0%",
+ right: "2%",
+ top: "3%",
// icon: "circle",
itemHeight: 10,
show: true,
- data: ["新建县", "安义县", "红谷滩新区", "西湖区"],
+ data: [
+ "新建县",
+ "安义县",
+ "红谷滩新区",
+ "西湖区",
+ "东湖区",
+ "经开区",
+ "青云谱区",
+ "高新区",
+ "湾里区",
+ "进贤县",
+ "青山湖区"
+ ],
selectedMode: false,
textStyle: {
color: "#fff"
- }
+ },
+ orient: "vertical"
},
grid: {
- top: "16%",
- bottom: "55%",
- left: "50%",
+ top: "5%",
+ bottom: "50%",
+ left: "30%",
containLabel: false
},
yAxis: [
@@ -487,7 +538,7 @@
inside: false,
textStyle: {
color: "#fff",
- fontSize: 15
+ fontSize: 8
},
show: true
},
@@ -503,7 +554,6 @@
};
return option;
}
-
export default {
left1Data,
left2Data,
--
Gitblit v1.9.3