From 224116f2c17203c26ddff77b22a25ee774247335 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 16 Jul 2021 09:51:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity
---
src/views/wel/home.vue | 86 ++++++++++++++++++++++---------------------
src/views/system/user.vue | 13 +++---
2 files changed, 51 insertions(+), 48 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 7d3a5b7..fd461b2 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -311,12 +311,13 @@
slot: true,
display: false
}
- // , {
- // label: "在线状态",
- // prop: "online_status",
- // slot: true,
- // display: false
- // }
+ , {
+ label: "在线状态",
+ prop: "online_status",
+ slot: true,
+ hide: true,
+ display: false
+ }
,
{
label: "工作状态",
diff --git a/src/views/wel/home.vue b/src/views/wel/home.vue
index 07d2434..14cafa2 100644
--- a/src/views/wel/home.vue
+++ b/src/views/wel/home.vue
@@ -7,7 +7,7 @@
<div>
<div>
<div>
- 组织机构
+ 群防群控队伍
</div>
</div>
<div id="on_three_yjy">
@@ -67,7 +67,7 @@
<div>
<div>
- 任务完成情况
+ 生长树
</div>
</div>
<div id="on_four_yjy">
@@ -108,7 +108,7 @@
<div>
<div>
- 用户使用概况
+ 平台用户分析
</div>
</div>
<div id="on_six_yjy"></div>
@@ -557,8 +557,8 @@
baseOption: {
animation: true,
animationDuration: 1000,
- animationEasing: 'cubicInOut',
animationDurationUpdate: 1000,
+ animationEasing: 'cubicInOut',
animationEasingUpdate: 'cubicInOut',
grid: {
right: '4%',
@@ -603,8 +603,10 @@
},
label: {
+
emphasis: {
- show: false
+
+ color: '#fff'
}
},
itemStyle: {
@@ -724,37 +726,37 @@
data: mapData
},
//地图中闪烁的点
- {
- // name: 'Top 5',
- type: 'effectScatter',
- coordinateSystem: 'geo',
- data: convertData(mapData[n].sort(function (a, b) {
- return b.value - a.value;
- }).slice(0, 20)),
- symbolSize: function (val) {
- return val[2] / 10;
- },
- showEffectOn: 'render',
- rippleEffect: {
- brushType: 'stroke'
- },
- hoverAnimation: true,
- label: {
- normal: {
- formatter: '{b}',
- position: 'right',
- show: true
- }
- },
- itemStyle: {
- normal: {
- color: colors[colorIndex][n],
- shadowBlur: 10,
- shadowColor: colors[colorIndex][n]
- }
- },
- zlevel: 1
- },
+ // {
+ // // name: 'Top 5',
+ // type: 'effectScatter',
+ // coordinateSystem: 'geo',
+ // data: convertData(mapData[n].sort(function (a, b) {
+ // return b.value - a.value;
+ // }).slice(0, 20)),
+ // symbolSize: function (val) {
+ // return val[2] / 10;
+ // },
+ // showEffectOn: 'render',
+ // rippleEffect: {
+ // brushType: 'stroke'
+ // },
+ // hoverAnimation: true,
+ // label: {
+ // normal: {
+ // formatter: '{b}',
+ // position: 'right',
+ // show: true
+ // }
+ // },
+ // itemStyle: {
+ // normal: {
+ // color: colors[colorIndex][n],
+ // shadowBlur: 10,
+ // shadowColor: colors[colorIndex][n]
+ // }
+ // },
+ // zlevel: 1
+ // },
//柱状图
{
zlevel: 1.5,
@@ -942,14 +944,14 @@
flex-direction: column;
justify-content: space-around;
& > div {
- height: calc(36% - 4px);
+ height: calc(40% - 4px);
display: flex;
justify-content: space-around;
flex-wrap: wrap;
& > div {
width: 30%;
& > div {
- height: calc(100% - 24px);
+ height: calc(100% - 40px);
border-top: 2px solid #97eaf3;
border-bottom: 2px solid #97eaf3;
border-radius: 8px;
@@ -978,7 +980,7 @@
display: block;
height: 36px;
line-height: 36px;
- font-size: 18px;
+ font-size: 24px;
color: #fbe78a;
text-align: center;
font-weight: 700;
@@ -987,9 +989,9 @@
& > span {
display: block;
- height: 20px;
- line-height: 20px;
- font-size: 12px;
+ height: 36px;
+ line-height: 36px;
+ font-size: 14px;
color: #97eaf3;
text-align: center;
}
--
Gitblit v1.9.3