From 93fc01349aa48a086c71123a2317765a925c0897 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 06 一月 2025 10:22:14 +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 76eaed1..6a4ec2a 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -558,7 +558,7 @@
 const data1 = ref({})
 const getData1 = () => {
   zxcenterData().then(res => {
-    const result = res.data
+    const result = res.data || {}
     data1.value = result
   })
 }
@@ -570,7 +570,7 @@
 }
 const getData6 = () => {
   regionDataRanking({ type: activeDays.value }).then(res => {
-    const result = res.data
+    const result = res.data || {}
     data6.value = result
   })
 }
@@ -674,7 +674,7 @@
 const data4 = ref([])
 const getData4 = () => {
   zxloadCurve().then(res => {
-    const result = res.data
+    const result = res.data || []
     data4.value = result
     if (data4.value && data4.value.length > 0) {
       initLoadReal()
@@ -685,7 +685,7 @@
 const data5 = ref([])
 const getData5 = () => {
   zxenergyDataList({ type: 2 }).then(res => {
-    const result = res.data
+    const result = res.data || []
     data5.value = result
     initOperation()
   })

--
Gitblit v1.9.3