From 35276d8317e8d53039cfaa373dfc9e8b425dfca1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 17 一月 2025 18:06:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/EnergyConsum.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index 130a929..6386749 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -85,9 +85,9 @@
src="@/assets/images/ic_up.webp" alt="" />
<img v-else class="icon" src="@/assets/images/ic_down.webp" alt="" />
<span class="val"
- v-if="data1.electricityQuantity.totalNum && data1.electricityQuantity.totalNum != 0">{{
+ v-if="data1.electricityQuantity.sameNum && data1.electricityQuantity.sameNum != 0">{{
Math.abs(((data1.electricityQuantity.totalNum -
- data1.electricityQuantity.sameNum) / data1.electricityQuantity.totalNum * 100).toFixed(1))
+ data1.electricityQuantity.sameNum) / data1.electricityQuantity.sameNum * 100).toFixed(1))
}}%</span>
<span class="val" v-else style="margin-left: 4px;"> -</span>
<span class="lab">鐜瘮</span>
@@ -95,9 +95,9 @@
src="@/assets/images/ic_up.webp" alt="" />
<img v-else class="icon" src="@/assets/images/ic_down.webp" alt="" />
<span class="val"
- v-if="data1.electricityQuantity.totalNum && data1.electricityQuantity.totalNum != 0">{{
+ v-if="data1.electricityQuantity.ringNum && data1.electricityQuantity.ringNum != 0">{{
Math.abs(((data1.electricityQuantity.totalNum -
- data1.electricityQuantity.ringNum) / data1.electricityQuantity.totalNum * 100).toFixed(1))
+ data1.electricityQuantity.ringNum) / data1.electricityQuantity.ringNum * 100).toFixed(1))
}}%</span>
<span class="val" v-else style="margin-left: 4px;"> -</span>
</div>
@@ -146,8 +146,8 @@
<img v-if="data1.gasQuantity.totalNum > data1.gasQuantity.sameNum" class="icon"
src="@/assets/images/ic_up.webp" alt="" />
<img v-else class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val" v-if="data1.gasQuantity.totalNum && data1.gasQuantity.totalNum != 0">{{
- Math.abs(((data1.gasQuantity.totalNum - data1.gasQuantity.sameNum) / data1.gasQuantity.totalNum
+ <span class="val" v-if="data1.gasQuantity.sameNum && data1.gasQuantity.sameNum != 0">{{
+ Math.abs(((data1.gasQuantity.totalNum - data1.gasQuantity.sameNum) / data1.gasQuantity.sameNum
* 100).toFixed(1))
}}%</span>
<span class="val" v-else style="margin-left: 4px;">-</span>
@@ -155,8 +155,8 @@
<img v-if="data1.gasQuantity.totalNum > data1.gasQuantity.ringNum" class="icon"
src="@/assets/images/ic_up.webp" alt="" />
<img v-else class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val" v-if="data1.gasQuantity.totalNum && data1.gasQuantity.totalNum != 0">{{
- Math.abs(((data1.gasQuantity.totalNum - data1.gasQuantity.ringNum) / data1.gasQuantity.totalNum
+ <span class="val" v-if="data1.gasQuantity.ringNum && data1.gasQuantity.ringNum != 0">{{
+ Math.abs(((data1.gasQuantity.totalNum - data1.gasQuantity.ringNum) / data1.gasQuantity.ringNum
* 100).toFixed(1))
}}%</span>
<span class="val" v-else style="margin-left: 4px;">-</span>
--
Gitblit v1.9.3