From d6caa7f8cbdd1f57ed9be4571fc7d86d21bdfbeb Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 14 Aug 2021 15:59:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory
---
src/views/home/indexEchart.js | 136 +++++++++++++++++----------------------------
1 files changed, 51 insertions(+), 85 deletions(-)
diff --git a/src/views/home/indexEchart.js b/src/views/home/indexEchart.js
index e6e7e2d..74b89fc 100644
--- a/src/views/home/indexEchart.js
+++ b/src/views/home/indexEchart.js
@@ -6,6 +6,7 @@
let data2 = [];
let data3 = [];
let data4 = [];
+ let data5 = [];
// let legend = ["自招保安单位", "保安培训公司", "保安服务公司", "武装守押公司"];
allData.forEach(item => {
nameArr.push(item.name);
@@ -13,31 +14,8 @@
data2.push(item.server.staff);
data3.push(item.server.security);
data4.push(item.server.armed);
+ data5.push(item.server.region);
});
- function add(arr) {
- let total = 0;
- arr.forEach(i => {
- total += Number(i)
- })
- return total
- }
- // let legend1 = ["自招保安单位" + add(data1), "保安培训公司", "保安服务公司", "武装守押公司"];
- // let legendData = [{
- // name: "自招保安单位",
- // value: add(data1)
- // },
- // {
- // name: "保安培训公司",
- // value: add(data2)
- // },
- // {
- // name: "保安服务公司",
- // value: add(data3)
- // },
- // {
- // name: "武装守押公司",
- // value: add(data4)
- // }];
let option = {
tooltip: {
trigger: "axis",
@@ -82,7 +60,7 @@
// // }
// },
grid: {
- top: '5%',
+ top: '10%',
left: "5%",
right: "6%",
bottom: "10%",
@@ -144,6 +122,15 @@
focus: "series"
},
data: data4
+ },
+ {
+ name: "跨区域保安公司",
+ type: "bar",
+ stack: "total",
+ emphasis: {
+ focus: "series"
+ },
+ data: data5
}
]
};
@@ -248,77 +235,56 @@
}
function left3Data(allData) {
+ let data = [
+ { value: allData[0].mnum ? Number(allData[0].mnum) : 0, name: '男' },
+ { value: allData[0].gnum ? Number(allData[0].gnum) : 0, name: '女' }
+ ]
let option = {
tooltip: {
- trigger: 'axis',
+ trigger: 'item',
+ formatter: "{a}<br>{b}:{c}({d}%)",
axisPointer: {
- type: 'shadow'
- }
- },
- legend: {
- data: ['男', '女'],
- bottom: "1%",
- itemWidth: 20,
+ type: "shadow"
+ },
+ backgroundColor: "#031952", //设置背景图片 rgba格式
+ color: "#fff",
+ borderWidth: "0", //边框宽度设置1
+ // borderColor: "gray", //设置边框颜色
textStyle: {
- color: "#fff"
- }
+ color: "#fff" //设置文字颜色
+ },
},
color: [
- "#91cc75",
- "#fac858",
- "#73c0de",
+ '#008DEC',
+ '#886EFF',
],
- grid: {
- top: '5%',
- left: "5%",
- right: "6%",
- bottom: "15%",
- containLabel: true
+ legend: {
+ right: "8%",
+ bottom: "10%",
+ itemHeight: 10,
+ show: true,
+ selectedMode: false,
+ textStyle: {
+ color: "#fff"
+ },
+ data: ['男', '女'],
+ orient: "vertical"
},
- xAxis: [
- {
- type: 'value',
- splitLine: {
- show: false
- },
- axisLabel: {
- color: "#fff"
- },
- }
- ],
- yAxis: [
-
- {
- type: 'category',
- data: ['红谷滩分局', '青山湖分局', '南昌市公安局东湖分局', '南昌市公安局西湖分局', '南昌市公安局青云谱分局', '南昌市公安局湾里分局', '南昌市公安局高新开发区分局'],
-
- splitLine: {
- show: false
- },
- axisLabel: {
- color: "#fff"
- },
- }
- ],
series: [
{
- name: '男',
- type: 'bar',
- stack: '性别',
+ name: '性别比例',
+ type: 'pie',
+ center: ['43%', '50%'],
+ radius: '70%',
+ data: data,
emphasis: {
- focus: 'series'
+ itemStyle: {
+ shadowBlur: 10,
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)'
+ }
},
- data: [120, 132, 101, 134, 90, 230, 210]
- },
- {
- name: '女',
- type: 'bar',
- stack: '性别',
- emphasis: {
- focus: 'series'
- },
- data: [220, 182, 191, 234, 290, 330, 310]
- },
+ }
]
};
return option
@@ -690,7 +656,7 @@
{
name: '分局预警占比',
type: 'pie',
- radius: '70%',
+ radius: '75%',
center: ['30%', '50%'],
roseType: 'radius',
itemStyle: {
--
Gitblit v1.9.3