From 0aa494d81a665c143729ce4cb70d33fb4168f081 Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Thu, 16 Mar 2023 09:57:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AEbim=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=85=89=E6=BA=90=E6=96=B9=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=85=88=E8=8E=B7=E5=8F=96=E5=85=89=E6=BA=90?=
 =?UTF-8?q?=E5=86=8D=E6=B8=85=E9=99=A4=EF=BC=8C=E7=94=A8=E6=9D=A5=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=B8=9A=E5=8A=A1=E5=8C=BA=E5=92=8C=E5=A1=94=E5=8F=B0?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2bim=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/monitoring/electricity.vue | 3 ++-
 src/components/monitoring/lift.vue        | 6 ++++--
 src/components/monitoring/light.vue       | 6 ++++--
 src/util/bfHelper.js                      | 1 +
 src/views/garden/generalizePattern.vue    | 3 ++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/monitoring/electricity.vue b/src/components/monitoring/electricity.vue
index 1fb01a2..5a76a60 100644
--- a/src/components/monitoring/electricity.vue
+++ b/src/components/monitoring/electricity.vue
@@ -193,7 +193,7 @@
                   curElectro.sumBuilding > curElectro.sumCompare
                     ? '#ff8b2e'
                     : '#2cd52c',
-              }" class="use-unit">{{ item.comEle }}kw·h</span>
+              }" class="use-unit">{{ (item.comEle + '').substring('.').length > 2 ? item.comEle.toFixed(2) : item.comEle }}kw·h</span>
             </div>
             <div class="last_ele">
               <span>上月：</span><span>{{ item.lastEle }}kw·h</span>
@@ -467,6 +467,7 @@ export default {
     "$store.state.bfHelperState.bfState": {
       immediate: true,
       handler(newval, olval) {
+        console.log('bfState',newval)
         if (newval) {
           // 模型恢复全部状态
           resetStatus(2);
diff --git a/src/components/monitoring/lift.vue b/src/components/monitoring/lift.vue
index 340dd3f..c55659b 100644
--- a/src/components/monitoring/lift.vue
+++ b/src/components/monitoring/lift.vue
@@ -173,8 +173,8 @@ export default {
 			pos: 0,
 			height: 5350,
 			offsetZ: 250,
-			// path: "ws://192.168.1.106/blade-datamqtt/ws",
-			path: "ws://10.90.100.204/blade-datamqtt/ws",
+			path: "ws://192.168.1.3/blade-websocket/ws?lift",
+			// path: "ws://10.90.100.204/blade-websocket/ws?lift",
 			socket: "",
 			arr: [], //电梯信息
 			listData: [],
@@ -312,6 +312,7 @@ export default {
 	},
 	beforeDestroy() {
 		if (this.socket) {
+			console.log('close scoket');
 			this.socket.close();
 			this.socket = "";
 		}
@@ -320,6 +321,7 @@ export default {
 	destroyed() {
 		// 销毁监听
 		if (this.socket) {
+			console.log('close scoket');
 			this.socket.close();
 			this.socket = "";
 		}
diff --git a/src/components/monitoring/light.vue b/src/components/monitoring/light.vue
index e6d437d..a5bb8a7 100644
--- a/src/components/monitoring/light.vue
+++ b/src/components/monitoring/light.vue
@@ -310,7 +310,8 @@ export default {
   },
   data() {
     return {
-      path:'ws://192.168.1.12/blade-datahttp/ws',//socket地址
+      // path:'ws://10.90.100.204/blade-websocket/ws?light',//socket地址
+      path:'ws://192.168.1.3/blade-websocket/ws?light_kk',//socket地址
       build: "00", //楼
       floored: null, //楼层
       controlAll: 2, //批量控制开关
@@ -363,7 +364,7 @@ export default {
       handler(newval, olval) {
         if (newval) {
           // 模型恢复全部状态
-          bfHelper.resetStatus(2);
+          // bfHelper.resetStatus(2);
           if (newval == 1) {
             window.sessionStorage.setItem(
               "camera",
@@ -458,6 +459,7 @@ export default {
   },
   beforeDestroy() {
     if (this.socket) {
+			console.log('close scoket');
 			this.socket.close();
 			this.socket = "";
 		}
diff --git a/src/util/bfHelper.js b/src/util/bfHelper.js
index 3551d40..d5f3fb5 100644
--- a/src/util/bfHelper.js
+++ b/src/util/bfHelper.js
@@ -3063,6 +3063,7 @@ const resetStatus = (bgType, cameraState, mode) => {
 
 // 清除所有光源
 const clearAllLight = () => {
+  lightManager = viewer3D.getLightManager();
   lightManager != undefined && lightManager && lightManager.clear(); //清除所有光源对象，对FillLight、CSMLight不生效
 };
 
diff --git a/src/views/garden/generalizePattern.vue b/src/views/garden/generalizePattern.vue
index 9069c34..4ea58a9 100644
--- a/src/views/garden/generalizePattern.vue
+++ b/src/views/garden/generalizePattern.vue
@@ -710,11 +710,12 @@ export default {
     },
   },
   beforeDestroy() {
-    console.log('销毁interval')
     if (this.setInterval) {
+      console.log('销毁interval1')
       clearInterval(this.setInterval);
     }
     if (this.setIntervalCar2) {
+      console.log('销毁interval2')
       clearInterval(this.setIntervalCar2);
     }
   },