From abfe6985b2678445ea8da974b204d9fe2ffdb887 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 24 十二月 2024 15:23:41 +0800
Subject: [PATCH] ll

---
 screen/src/views/EnergyConsum.vue |   56 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index 25f3234..3ad40c9 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -27,7 +27,7 @@
                 <div class="name">鏈勾绱寰幆鐑熺</div>
                 <div><span class="num" style="color: #68cfb2;" v-if="data1.smokeBoxTotal || data1.smokeBoxTotal == 0">{{
                   data1.smokeBoxTotal.toLocaleString()
-                    }}</span><span>鍙�</span></div>
+                    }}</span><span>涓�</span></div>
               </div>
             </div>
           </div>
@@ -81,11 +81,9 @@
                 </div>
                 <div class="static" v-if="data1.electricityQuantity">
                   <span class="lab">鍚屾瘮</span>
-                  <template v-if="data1.electricityQuantity.sameNum">
-                    <img v-if="data1.electricityQuantity.totalNum > data1.electricityQuantity.sameNum" class="icon"
-                      src="@/assets/images/ic_up.webp" alt="" />
-                    <img v-else class="icon" src="@/assets/images/ic_down.webp" alt="" />
-                  </template>
+                  <img v-if="data1.electricityQuantity.totalNum > data1.electricityQuantity.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.electricityQuantity.totalNum && data1.electricityQuantity.totalNum != 0">{{
                       Math.abs(((data1.electricityQuantity.totalNum -
@@ -93,12 +91,9 @@
                     }}%</span>
                   <span class="val" v-else style="margin-left: 4px;"> -</span>
                   <span class="lab">鐜瘮</span>
-                  <template v-if="data1.electricityQuantity.ringNum">
-                    <img v-if="data1.electricityQuantity.totalNum > data1.electricityQuantity.ringNum" class="icon"
-                      src="@/assets/images/ic_up.webp" alt="" />
-                    <img v-else class="icon" src="@/assets/images/ic_down.webp" alt="" />
-                  </template>
-
+                  <img v-if="data1.electricityQuantity.totalNum > data1.electricityQuantity.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.electricityQuantity.totalNum && data1.electricityQuantity.totalNum != 0">{{
                       Math.abs(((data1.electricityQuantity.totalNum -
@@ -204,21 +199,23 @@
             </template>
             <div class="bottom_wrap" v-if="data1.yesterdayElectricity">
               <div class="bottom bottom1" @click="changeacDay(3)">
-                <div :class="{active: activeDays == 3}" class="num fs_linear">{{ data1.yesterdayElectricity.total || 0 }}</div>
+                <div :class="{ active: activeDays == 3 }" class="num fs_linear">{{ data1.yesterdayElectricity.total || 0
+                  }}</div>
                 <div class="name">鏄ㄦ棩鐢ㄧ數</div>
                 <div class="unit">kw路h</div>
                 <img v-if="activeDays == 3" src="@/assets/images/ic_dianliang@2x.png" class="bg" alt="" />
                 <img v-else src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
               </div>
               <div class="bottom bottom2" @click="changeacDay(1)">
-                <div :class="{active: activeDays == 1}" class="num">{{ data1.todayElectricity.total || 0 }}</div>
+                <div :class="{ active: activeDays == 1 }" class="num">{{ data1.todayElectricity.total || 0 }}</div>
                 <div class="name">浠婃棩鐢ㄧ數</div>
                 <div class="unit">kw路h</div>
                 <img v-if="activeDays == 1" src="@/assets/images/ic_dianliang@2x.png" class="bg" alt="" />
                 <img v-else src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
               </div>
               <div class="bottom bottom3" @click="changeacDay(2)">
-                <div :class="{active: activeDays == 2}" class="num fs_linear">{{ data1.monthElectricity.total || 0 }}</div>
+                <div :class="{ active: activeDays == 2 }" class="num fs_linear">{{ data1.monthElectricity.total || 0 }}
+                </div>
                 <div class="name">鏈湀鐢ㄧ數</div>
                 <div class="unit">kw路h</div>
                 <img v-if="activeDays == 2" src="@/assets/images/ic_dianliang@2x.png" class="bg" alt="" />
@@ -347,6 +344,9 @@
     xAxis: {
       type: 'category',
       boundaryGap: false,
+      axisLabel: {
+        color: '#D2E0FF' 
+      },
       data: data5.value.map(i => dayjs(i.timeData).format('M'))
     },
     tooltip: {
@@ -358,8 +358,12 @@
     yAxis: {
       type: 'value',
       name: '鍗曚綅锛歀',
+      axisLabel: {
+        color: '#D2E0FF' 
+      },
       nameTextStyle: {
-        padding: [0, 0, 0, -16]    // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
+        color: '#D2E0FF',
+        padding: [0, 0, 0, -18]    // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
       },
       splitLine: {
         show: true,
@@ -464,13 +468,17 @@
     xAxis: {
       type: 'category',
       boundaryGap: false,
+      axisLabel: {
+        color: '#D2E0FF' 
+      },
       data: data4.value.map(i => i.timeData)
     },
     yAxis: {
       type: 'value',
       name: '鍗曚綅锛歬w路h',
       nameTextStyle: {
-        padding: [0, 0, 0, -16]    // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
+        padding: [0, 0, 0, -16],    // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
+        color: '#D2E0FF'
       },
       splitLine: {
         show: true,
@@ -480,6 +488,9 @@
           type: 'dashed',
         },
         splitNumber: 4
+      },
+      axisLabel: {
+        color: '#D2E0FF' 
       }
     },
     grid: {
@@ -557,7 +568,7 @@
   getData6()
 }
 const getData6 = () => {
-  regionDataRanking({type: activeDays.value}).then(res => {
+  regionDataRanking({ type: activeDays.value }).then(res => {
     const result = res.data
     data6.value = result
   })
@@ -591,12 +602,19 @@
     },
     xAxis: {
       type: 'category',
+      axisLabel: {
+        color: '#D2E0FF' 
+      },
       data: data2.value.map(i => dayjs(i.timeData).format('M'))
     },
     yAxis: {
       type: 'value',
       name: unit,
+      axisLabel: {
+        color: '#D2E0FF' 
+      },
       nameTextStyle: {
+        color: '#D2E0FF',
         padding: [0, 0, 4, -30]    // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
       },
       splitLine: {
@@ -899,6 +917,7 @@
         text-align: center;
         padding-top: 70px;
         cursor: pointer;
+
         .num {
           font-size: 24px;
           color: #D0FFFA;
@@ -915,6 +934,7 @@
           font-size: 14px;
           color: #D0FFFA;
         }
+
         .active {
           font-size: 36px;
           color: #01D9FE;

--
Gitblit v1.9.3