From 6c9440f8afc4556986c6bbdfc02780048d395c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Fri, 13 Sep 2024 15:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=9B=B4=E6=96=B0=E3=80=81?=
=?UTF-8?q?=E6=8F=90=E7=8E=B0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dashboard/Brief.vue | 2 +-
.../dashboard/component/SmallLineChart.vue | 28 +++++++++++++++----
.../dashboard/component/UserRoundPieChart.vue | 3 +-
src/views/system/smUser/index.vue | 6 ++++
4 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/src/views/dashboard/Brief.vue b/src/views/dashboard/Brief.vue
index 0a10b08..a54b872 100644
--- a/src/views/dashboard/Brief.vue
+++ b/src/views/dashboard/Brief.vue
@@ -279,7 +279,7 @@ export default {
position: relative;
height: 100%;
flex: 1;
- padding: 44px 16px 20px 10px;
+ padding: 0;
.panel-chart {
float: right;
diff --git a/src/views/dashboard/component/SmallLineChart.vue b/src/views/dashboard/component/SmallLineChart.vue
index 2fca8dc..cae46e1 100644
--- a/src/views/dashboard/component/SmallLineChart.vue
+++ b/src/views/dashboard/component/SmallLineChart.vue
@@ -80,10 +80,10 @@ export default {
setOptions(data) {
let option = {
grid: {
- top: 4,
- left: 4,
- right: 4,
- bottom: 4,
+ top: 42,
+ left: 16,
+ right: 16,
+ bottom: 24,
show: false,
},
tooltip: {
@@ -107,7 +107,25 @@ export default {
color: this.color,
data: data.map(item => item.value),
type: this.type,
- smooth: true
+ smooth: true,
+ // label: {
+ // show: true,
+ // position: 'top'
+ // }
+ markPoint: {
+ symbol: 'pin',
+ symbolSize: 10,
+ data: [
+ { type: 'max', name: '最大值' },
+ { type: 'min', name: '最小值' }
+ ]
+ },
+ // markLine: {
+ // data: [
+ // {type: 'max', name: '最大值'},
+ // {type: 'min', name: '最小值'}
+ // ]
+ // }
}]
};
this.chart.setOption(option)
diff --git a/src/views/dashboard/component/UserRoundPieChart.vue b/src/views/dashboard/component/UserRoundPieChart.vue
index f635134..375cc3a 100644
--- a/src/views/dashboard/component/UserRoundPieChart.vue
+++ b/src/views/dashboard/component/UserRoundPieChart.vue
@@ -71,13 +71,14 @@ export default {
series: [
{
left: '-50%',
+ top: '10%',
name: '用户组成',
type: 'pie',
color: [
'#8D4EDA',
'#00B2FF'
],
- radius: ['50%', '80%'],
+ radius: ['30%', '50%'],
avoidLabelOverlap: false,
itemStyle: {
borderRadius: 0,
diff --git a/src/views/system/smUser/index.vue b/src/views/system/smUser/index.vue
index 51e594d..7daa313 100644
--- a/src/views/system/smUser/index.vue
+++ b/src/views/system/smUser/index.vue
@@ -250,6 +250,12 @@
+
+
+
+
+
+