From ce034b4c0db0eec0928fa54ee35f91ff2005a75c Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 12 Nov 2022 11:41:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/views/home/components/leftContainer.vue | 77 ++++++++++++++++----------------------
1 files changed, 33 insertions(+), 44 deletions(-)
diff --git a/src/views/home/components/leftContainer.vue b/src/views/home/components/leftContainer.vue
index 555980c..4c425f1 100644
--- a/src/views/home/components/leftContainer.vue
+++ b/src/views/home/components/leftContainer.vue
@@ -217,7 +217,8 @@
initPersonOptions (xDate, yDate) {
return {
tooltip: {
- trigger: 'item'
+ trigger: 'item',
+ formatter: ' <span style="display: inline-block; margin-right: 4px; border-radius: 10px; width: 10px; height: 10px;background-color: #91cc75;"></span> {b0}<strong style="margin-left:10px">{c0}人</strong>'
},
xAxis: {
type: 'category',
@@ -246,18 +247,6 @@
{
data: yDate,
type: 'bar',
- itemStyle: {
- normal: {
- label: {
- show: true,
- position: 'top',
- textStyle: {
- color: '#1a94a8',
- fontSize: 16
- }
- }
- }
- }
}
],
grid: {
@@ -296,7 +285,6 @@
initHouseOptions (xDate, y1Date, y2Date) {
return {
tooltip: {
- trigger: 'item'
},
color: ['#2967c4', '#112d54'],
xAxis: {
@@ -333,33 +321,35 @@
data: y1Date,
type: 'bar',
zlevel: 2,
+ tooltip: {
+ trigger: 'item',
+ formatter: params => {
+ let msg
+ if (params.value > 10000) {
+ msg = (params.value / 10000).toFixed(2) + '万人'
+ } else {
+ msg = params.value + '人'
+ }
+ msg = ` <span style="display: inline-block; margin-right: 4px; border-radius: 10px; width: 10px; height: 10px;background-color: #2d71d7;"></span> ${params.name}<strong style="margin-left:10px">${msg}</strong>'`
+ return msg
+ }
+ },
},
{
data: y2Date,
type: 'bar',
barGap: '-100%',
- label: {
- show: true,
- color: '#fff',
- position: 'right', // 标签右对齐
- distance: 0,// 标签距离柱条的距离
- formatter: params => {
- let msg
- if (params.data.realValue > 10000) {
- msg = (params.data.realValue / 10000).toFixed(2) + '万个'
- } else {
- msg = params.data.realValue + '个'
- }
+ tooltip: {
+ trigger: 'item',
+ show: false
- return msg
- }
}
}
],
grid: {
top: '2%',
left: '60',
- right: '40',
+ right: '-30',
bottom: '2%'
},
@@ -392,7 +382,8 @@
initLandOptions (xDate, yDate) {
return {
tooltip: {
- trigger: 'item'
+ trigger: 'item',
+ formatter: ' <span style="display: inline-block; margin-right: 4px; border-radius: 10px; width: 10px; height: 10px;background-color: #91cc75;"></span> {b0}<strong style="margin-left:10px">{c0}个</strong>'
},
xAxis: {
type: 'category',
@@ -421,18 +412,6 @@
{
data: yDate,
type: 'bar',
- itemStyle: {
- normal: {
- label: {
- show: true,
- position: 'top',
- textStyle: {
- color: '#1a94a8',
- fontSize: 16
- }
- }
- }
- }
}
],
grid: {
@@ -580,7 +559,17 @@
initkeyPersonOption (dataArr) {
return {
tooltip: {
- trigger: 'item'
+ trigger: 'item',
+ formatter: params => {
+ let msg
+ if (params.value > 10000) {
+ msg = (params.value / 10000).toFixed(2) + '万人'
+ } else {
+ msg = params.value + '人'
+ }
+ msg = ` <span style="display: inline-block; margin-right: 4px; border-radius: 10px; width: 10px; height: 10px;background-color: #5470c6;"></span> ${params.name}<strong style="margin-left:10px">${msg}</strong>'`
+ return msg
+ }
},
legend: {
left: '48%',
@@ -598,7 +587,7 @@
}
}
let v = tarValue
- return `${name} ${v} 个 `
+ return `${name} ${v} 人 `
},
},
series: [
--
Gitblit v1.9.3