From dff404a76987de5b632ae635a6dea6c95dc37a4d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 17 四月 2024 16:58:59 +0800
Subject: [PATCH] 合并冲突
---
src/util/echarts.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/util/echarts.js b/src/util/echarts.js
index 0842962..b653849 100644
--- a/src/util/echarts.js
+++ b/src/util/echarts.js
@@ -69,6 +69,7 @@
}],
yAxis: [{
+ minInterval:1,
type: 'value',
min: 0,
splitNumber: 4,
@@ -83,7 +84,7 @@
},
axisLabel: {
color: 'rgba(43,48,52, 0.4)',
- margin: 30
+ margin: 30,
},
axisTick: {
show: false,
@@ -164,6 +165,7 @@
}],
yAxis: [{
+ minInterval:1,
type: 'value',
min: 0,
splitNumber: 4,
@@ -178,7 +180,7 @@
},
axisLabel: {
color: 'rgba(43,48,52, 0.4)',
- margin: 30
+ margin: 30,
},
axisTick: {
show: false,
--
Gitblit v1.9.3