Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

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;

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' }],
+          },
         },
       ],
     });

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,
           },
         },