From b31574e5fd51a09d644911207fbaf271b5313f97 Mon Sep 17 00:00:00 2001
From: selia-zx <1771203023@qq.com>
Date: Wed, 9 Jul 2025 10:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=83=BD=E6=BA=90=E5=88=86?=
 =?UTF-8?q?=E6=9E=90-=E8=83=BD=E8=80=97=E6=8A=A5=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/energyReport.vue               | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/views/hotWater/energyAnalysis/components/energyReport.vue b/src/views/hotWater/energyAnalysis/components/energyReport.vue
index 7d628d8..7c65ea7 100644
--- a/src/views/hotWater/energyAnalysis/components/energyReport.vue
+++ b/src/views/hotWater/energyAnalysis/components/energyReport.vue
@@ -11,13 +11,13 @@
           <div v-if="dateType === 'day'">与昨日相比</div>
           <div v-if="dateType === 'month'">与上月相比</div>
           <div v-if="dateType === 'year'">与上年相比</div>
-          <div class="upText" v-if="useWaterRadio > 0">
-            <i class="el-icon-bottom"></i>
-            <span>+{{ useWaterRadio }}</span>
+          <div class="upText" v-if="isPositive(useWaterRadio)">
+            <i class="el-icon-top"></i>
+            <span>{{ useWaterRadio }}</span>
           </div>
           <div class="downText" v-else>
             <i class="el-icon-bottom"></i>
-            <span>-{{ useWaterRadio }}</span>
+            <span>{{ useWaterRadio }}</span>
           </div>
         </div>
         <img
@@ -36,13 +36,13 @@
           <div v-if="dateType === 'day'">与昨日相比</div>
           <div v-if="dateType === 'month'">与上月相比</div>
           <div v-if="dateType === 'year'">与上年相比</div>
-          <div class="upText" v-if="useElectRadio > 0">
-            <i class="el-icon-bottom"></i>
-            <span>+{{ useElectRadio }}</span>
+          <div class="upText" v-if="isPositive(useElectRadio)">
+            <i class="el-icon-top"></i>
+            <span>{{ useElectRadio }}</span>
           </div>
           <div class="downText" v-else>
             <i class="el-icon-bottom"></i>
-            <span>-{{ useElectRadio }}</span>
+            <span>{{ useElectRadio }}</span>
           </div>
         </div>
         <img
@@ -61,13 +61,13 @@
           <div v-if="dateType === 'day'">与昨日相比</div>
           <div v-if="dateType === 'month'">与上月相比</div>
           <div v-if="dateType === 'year'">与上年相比</div>
-          <div class="upText" v-if="useUnitRadio > 0">
-            <i class="el-icon-bottom"></i>
-            <span>+{{ useUnitRadio }}</span>
+          <div class="upText" v-if="isPositive(useUnitRadio)">
+            <i class="el-icon-top"></i>
+            <span>{{ useUnitRadio }}</span>
           </div>
           <div class="downText" v-else>
             <i class="el-icon-bottom"></i>
-            <span>-{{ useUnitRadio }}</span>
+            <span>{{ useUnitRadio }}</span>
           </div>
         </div>
         <img
@@ -250,6 +250,13 @@ export default {
     window.removeEventListener("resize", this.screenAdapter);
   },
   methods: {
+    isPositive(value) {
+      // 提取数字部分并去除百分号
+      const numberPart = value.replace("%", "");
+      // 将提取的字符串转换为数字类型
+      const num = parseFloat(numberPart);
+      return num > 0;
+    },
     handleEnter(index) {
       this.currentIndex = index;
       this.renderingBroken();
@@ -620,12 +627,7 @@ export default {
         import("@/assets/excel/Export2Excel").then((excel) => {
           // 导出的excel表头字段名，需要导出表格字段名
           if (this.building == "所有") {
-            var tHeader = [
-              "日期",
-              "用水量(吨)",
-              "用电量(度)",
-              "单耗(度/吨)",
-            ]; // 导出的excel表头名信息 改参数
+            var tHeader = ["日期", "用水量(吨)", "用电量(度)", "单耗(度/吨)"]; // 导出的excel表头名信息 改参数
             var filterVal = [
               "curDate",
               "useHotWater",