From 27cf960ce17de1ac1152a39ba0e51c8054c3db3c Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Wed, 3 Sep 2025 15:14:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(property):=20-=20=E6=B7=BB=E5=8A=A0=20w?=
 =?UTF-8?q?ebsocket=20=E8=BF=9E=E6=8E=A5=E7=8A=B6=E6=80=81=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../electricEnergy/elctricitySituation/index.vue      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
index 4b6b1c7d..e5642255 100644
--- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
+++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue
@@ -8,6 +8,9 @@ import { getWebSocketService } from '#/api/websocket';
 import { currentReading } from '#/api/property/energyManagement/meterInfo';
 
 const ws = getWebSocketService();
+const readingData = ref<any>({});
+const readingTime = ref('');
+let readingLoading = ref(false);
 
 if (ws) {
   // 使用setOnMessageCallback方法设置消息回调
@@ -34,15 +37,15 @@ if (ws) {
     currentReading({ meterType: 0, floorId: 0 });
     readingLoading.value = false;
   });
+}else {
+  readingLoading.value = false;
+  message.warn('websocket未连接！请刷新页面重试！');
 }
 
 onBeforeUnmount(() => {
+  // 关闭页面，发送请求停止心跳
   currentReading({ meterType: 0, floorId: 0 });
 });
-
-const readingData = ref<any>({});
-const readingTime = ref('');
-let readingLoading = ref(false);
 async function handleSelectFloor(selectedKeys, info) {
   if (typeof selectedKeys[0] === 'undefined') {
     return;

From 6935372fad8df7aa7b6f3cd0f801b2405afc8638 Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Thu, 4 Sep 2025 17:14:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(electricEnergy):=20=E7=94=B5=E8=83=BD?=
 =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E5=9B=BE=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=B9=B3?=
 =?UTF-8?q?=E5=9D=87=E5=80=BC=E6=A0=87=E8=AE=B0=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../electricEnergy/electricTrend/index.vue     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue
index 37d2ba4c..50fd77c2 100644
--- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue
+++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue
@@ -266,6 +266,9 @@ async function handleSelectFloor(selectedKeys, info) {
               { type: 'min', name: 'Min' },
             ],
           },
+          markLine: {
+            data: [{ type: 'average', name: 'Avg' }],
+          },
         },
         {
           name: '当日',
@@ -277,6 +280,9 @@ async function handleSelectFloor(selectedKeys, info) {
               { type: 'min', name: 'Min' },
             ],
           },
+          markLine: {
+            data: [{ type: 'average', name: 'Avg' }],
+          },
         },
       ],
     });
@@ -297,6 +303,9 @@ async function handleSelectFloor(selectedKeys, info) {
               { type: 'min', name: 'Min' },
             ],
           },
+          markLine: {
+            data: [{ type: 'average', name: 'Avg' }],
+          },
         },
         {
           name: '当月',
@@ -308,6 +317,9 @@ async function handleSelectFloor(selectedKeys, info) {
               { type: 'min', name: 'Min' },
             ],
           },
+          markLine: {
+            data: [{ type: 'average', name: 'Avg' }],
+          },
         },
       ],
     });
@@ -328,6 +340,9 @@ async function handleSelectFloor(selectedKeys, info) {
               { type: 'min', name: 'Min' },
             ],
           },
+          markLine: {
+            data: [{ type: 'average', name: 'Avg' }],
+          },
         },
         {
           name: '当年',
@@ -339,6 +354,9 @@ async function handleSelectFloor(selectedKeys, info) {
               { type: 'min', name: 'Min' },
             ],
           },
+          markLine: {
+            data: [{ type: 'average', name: 'Avg' }],
+          },
         },
       ],
     });

From 5c4f2e6588b21b2ddef39f9ad008349f93a67702 Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Thu, 4 Sep 2025 17:16:01 +0800
Subject: [PATCH 3/3] build(web-antd): 1

---
 apps/web-antd/vite.config.mts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts
index ded7ff75..7e884500 100644
--- a/apps/web-antd/vite.config.mts
+++ b/apps/web-antd/vite.config.mts
@@ -27,7 +27,7 @@ export default defineConfig(async () => {
             changeOrigin: true,
             rewrite: (path) => path.replace(/^\/api/, ''),
             // mock代理目标地址
-            target: 'http://192.168.1.110:8080',
+            target: 'http://localhost:8080',
             ws: true,
           },
         },