From 541a0e3ddc65d44013a111ff1557beb76018db7b Mon Sep 17 00:00:00 2001
From: zhengpz <1838927346@qq.com>
Date: Fri, 13 Aug 2021 02:19:12 +0800
Subject: [PATCH] 图上数据汇总
---
src/views/home/index.scss | 67 ++++++++++++++++++++++++++++++++-
src/views/home/index.vue | 24 ++++++++++++
src/views/home/indexEchart.js | 22 +++++-----
3 files changed, 100 insertions(+), 13 deletions(-)
diff --git a/src/views/home/index.scss b/src/views/home/index.scss
index 7f2f0d5..cade789 100644
--- a/src/views/home/index.scss
+++ b/src/views/home/index.scss
@@ -40,7 +40,7 @@
float: right;
color: #fff;
margin-right: 52px;
- font-size: 17px;
+ font-size: 18px;
margin-top: -35px;
cursor: pointer;
&:hover {
@@ -76,7 +76,7 @@
height: 260px;
}
.echartClass {
- height: 100%;
+ // height: 100%;
width: 100%;
height: calc(100% - 70px);
}
@@ -86,8 +86,11 @@
height: 60%;
width: 100%;
background-size: 100% 100%;
+ position: relative;
#left1Echart {
@extend .echartClass;
+ height: calc(100% - 140px) !important;
+ margin-top: 68px;
}
}
.left2 {
@@ -532,5 +535,65 @@
opacity: 0;
}
}
+ .leftEchartTitle{
+ height: 30px;
+ display: flex;
+ line-height: 30px;
+ margin-top: 10px;
+ margin-left: 67px;
+ position: absolute;
+ .block1{
+ width: 23px;
+ height: 13px;
+ background: #2ec7c9;
+ border-radius: 3px;
+ margin-top: 9px;
+ }
+ span:nth-child(2){
+ color: #fff;
+ font-size: 13px;
+ margin: 0px 10px 0px 3px;
+ }
+ span:nth-child(3){
+ color: #2ec7c9;
+ font-size: 17px;
+ font-weight: 700;
+ }
+ span:nth-child(4){
+ font-size: 13px;
+ color: #2ec7c9;
+ }
+ }
+ .leftEchartTitle2{
+ right: 72px;
+ .block1{
+ background: #b6a2de;
+ }
+ span:nth-child(3){
+ color: #b6a2de;
+ font-size: 15px;
+ }
+ }
+ .leftEchartTitle3{
+ margin-top: 43px;
+ .block1{
+ background: #5ab1ef;
+ }
+ span:nth-child(3){
+ color: #5ab1ef;
+ font-size: 15px;
+ }
+ }
+ .leftEchartTitle4{
+ margin-top: 34px;
+ right: 72px;
+ .block1{
+ background: #ffb980;
+ }
+ span:nth-child(3){
+ color: #ffb980;
+ font-size: 15px;
+ }
+ }
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 28e4088..9e603ed 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -12,6 +12,30 @@
<img src="../../../public/img/bajgxt/icon1.png" />
<span>各辖区单位统计情况</span>
</div>
+ <div class='leftEchartTitle'>
+ <div class='block1'></div>
+ <span>自招保安单位</span>
+ <span>230</span>
+ <span>个</span>
+ </div>
+ <div class='leftEchartTitle leftEchartTitle2'>
+ <div class='block1'></div>
+ <span>保安培训公司</span>
+ <span>210</span>
+ <span>个</span>
+ </div>
+ <div class='leftEchartTitle leftEchartTitle3'>
+ <div class='block1'></div>
+ <span>保安服务公司</span>
+ <span>180</span>
+ <span>个</span>
+ </div>
+ <div class='leftEchartTitle leftEchartTitle4'>
+ <div class='block1'></div>
+ <span>武装守押公司</span>
+ <span>150</span>
+ <span>个</span>
+ </div>
<div id="left1Echart" v-loading="left1loading"></div>
</div>
<div class="left2">
diff --git a/src/views/home/indexEchart.js b/src/views/home/indexEchart.js
index c3e3cea..e6e7e2d 100644
--- a/src/views/home/indexEchart.js
+++ b/src/views/home/indexEchart.js
@@ -70,17 +70,17 @@
'#c4ebad',
'#96dee8'
],
- legend: {
- data: ["自招保安单位", "保安培训公司", "保安服务公司", "武装守押公司"],
- bottom: "1%",
- itemWidth: 20,
- textStyle: {
- color: "#fff"
- },
- // formatter: function (legend1) {
- // return legend1;
- // }
- },
+ // legend: {
+ // data: ["自招保安单位", "保安培训公司", "保安服务公司", "武装守押公司"],
+ // bottom: "1%",
+ // itemWidth: 20,
+ // textStyle: {
+ // color: "#fff"
+ // },
+ // // formatter: function (legend1) {
+ // // return legend1;
+ // // }
+ // },
grid: {
top: '5%',
left: "5%",
--
Gitblit v1.9.3