重置bim状态清除光源方法,补充先获取光源再清除,用来处理业务区和塔台切换bim样式错误问题

dev
zhangqun 3 years ago
parent b0b434956d
commit 0aa494d81a
  1. 3
      src/components/monitoring/electricity.vue
  2. 6
      src/components/monitoring/lift.vue
  3. 6
      src/components/monitoring/light.vue
  4. 1
      src/util/bfHelper.js
  5. 3
      src/views/garden/generalizePattern.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);

@ -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 = "";
}

@ -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 = "";
}

@ -3063,6 +3063,7 @@ const resetStatus = (bgType, cameraState, mode) => {
// 清除所有光源
const clearAllLight = () => {
lightManager = viewer3D.getLightManager();
lightManager != undefined && lightManager && lightManager.clear(); //清除所有光源对象,对FillLight、CSMLight不生效
};

@ -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);
}
},

Loading…
Cancel
Save