From 0c045df28935e21879b8c0b58b58311c011294c5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 16:42:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/EnergyConsum.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index 33a6337..3bbb3c3 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -17,7 +17,7 @@
<div class="com_header">
<div class="title">
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
- <div>鏈勾绱寰幆鐑熺</div>
+ <div>鏈勾瀹夊窘涓儫绱寰幆鐑熺</div>
</div>
<img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
@@ -357,7 +357,7 @@
formatter: function (params) {
// 閬嶅巻鎮诞鏃剁殑鎵�鏈夌偣锛屽畾鍒跺寲鏄剧ず鍐呭
let result = `<div>
- <div style="width: 120px">${params[0].name}鏈�</div>
+ <div style="width: 120px">${params[0].name}鏈�</div>
<div style="display: flex;align-items: center;;margin-top: 2px;">
<div style="display: flex;align-items: center;"><div style="width: 10px;height: 10px; border-radius: 50%;background-color: #f6d047;margin-right: 6px;"></div></div>
<div><strong>${params[0].value} L</strong></div>
@@ -651,7 +651,7 @@
formatter: function (params) {
// 閬嶅巻鎮诞鏃剁殑鎵�鏈夌偣锛屽畾鍒跺寲鏄剧ず鍐呭
let result = `<div>
- <div style="width: 120px">${params[0].name}鏈�</div>
+ <div style="width: 120px">${params[0].name}鏈�</div>
<div style="display: flex;align-items: center;;margin-top: 2px;">
<div style="display: flex;align-items: center;"><div style="width: 10px;height: 10px; border-radius: 50%;background-color: #61a1c4;margin-right: 6px;"></div></div>
<div><strong>${params[0].value} </strong></div>
@@ -1281,4 +1281,4 @@
z-index: -1;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3