diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue index 04cf2ce..cdee756 100644 --- a/src/views/page/largeScreen.vue +++ b/src/views/page/largeScreen.vue @@ -906,6 +906,13 @@ export default { }, 1000); }, beforeDestroy() { + // 销毁播放器 + if (this.player) { + // this.player.dispose(); + this.player.stop() + this.player.destroy() + this.player = null + } clearInterval(this.timer_) && this.timer_; }, methods: { diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index 206a918..389dcc0 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -1527,7 +1527,11 @@ export default { //立面保温1234 var statusData = { name: el.nickName, type: 16, id: el.id, open: res.data.data[(1196 + ((el.id - 34) * 3))], progress: res.data.data[(1198 + ((el.id - 34) * 3))], index: res.data.data[(1197 + ((el.id - 34) * 3))], count: 0 } statusList.push(statusData) - } + } else if (el.id ==38) { + //空调 + var statusData = { name: el.nickName, type:11, id: el.id, open: res.data.data['1160'], progress: 0, index: res.data.data['1161'], count: res.data.data['1162'] } + statusList.push(statusData) + } })