From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/EnergyConsum.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index a2f532f..9229a23 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -347,7 +347,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: data5.value.map(i => i.timeData)
+ data: data5.value.map(i => dayjs(i.timeData).format('M'))
},
tooltip: {
trigger: 'axis',
@@ -483,7 +483,7 @@
}
},
grid: {
- top: '26%',
+ top: '18%',
left: '4%',
right: '2%',
bottom: '2%',
@@ -577,7 +577,7 @@
myChart.setOption({
grid: {
- top: '24%',
+ top: '20%',
left: '6%',
right: '2%',
bottom: '4%',
@@ -591,7 +591,7 @@
},
xAxis: {
type: 'category',
- data: data2.value.map(i => i.timeData)
+ data: data2.value.map(i => dayjs(i.timeData).format('M'))
},
yAxis: {
type: 'value',
@@ -999,7 +999,7 @@
font-weight: 500;
margin-right: 6px;
font-size: 13px;
- width: 64px;
+ width: 68px;
}
.num {
--
Gitblit v1.9.3