diff --git a/vue/src/views/components/player/deviceLiveStream.vue b/vue/src/views/components/player/deviceLiveStream.vue index 699b3d14..d78929c7 100644 --- a/vue/src/views/components/player/deviceLiveStream.vue +++ b/vue/src/views/components/player/deviceLiveStream.vue @@ -138,16 +138,7 @@ export default { this.$refs.player.registercallback('loadingTimeout', this.TimeoutCallback); this.$refs.player.registercallback('delayTimeout', this.TimeoutCallback); if (this.playrecord) { - startPlayRecord(this.deviceId, this.channelId).then((response) => { - console.log('开始录像:' + this.deviceId + ' : ' + this.channelId); - const res = response.data; - this.streamId = res.streamId; - this.playurl = res.playurl; - this.$refs.player.play(res.playurl); - this.playing = true; - this.playrecording = true; - this.pushStream = true; - }); + } else { startPlay(this.deviceId, this.channelId).then((response) => { console.log('开始推流: [' + this.streamId + ']'); diff --git a/vue/src/views/components/player/player.vue b/vue/src/views/components/player/player.vue index 2d01ab63..99baa96e 100644 --- a/vue/src/views/components/player/player.vue +++ b/vue/src/views/components/player/player.vue @@ -63,7 +63,7 @@ export default { if (useVconsole && window.VConsole) { new window.VConsole(); } - this.$nextTick(() => { + this.$forceUpdate(() => { this.initplayer(); }); }, diff --git a/vue/src/views/iot/device/device-edit.vue b/vue/src/views/iot/device/device-edit.vue index 0d5271bd..4c6e684c 100644 --- a/vue/src/views/iot/device/device-edit.vue +++ b/vue/src/views/iot/device/device-edit.vue @@ -562,7 +562,6 @@ export default { tabChange(panel) { if (this.form.deviceType == 3 && panel.name != 'deviceReturn') { if (panel.name === 'videoLive') { - this.$refs.deviceVideo.destroy(); if (this.channelId) { this.$refs.deviceLiveStream.channelId = this.channelId; this.$refs.deviceLiveStream.changeChannel(); @@ -570,11 +569,6 @@ export default { if (this.$refs.deviceLiveStream.channelId) { this.$refs.deviceLiveStream.changeChannel(); } - } else if (panel.name === 'deviceVideo') { - this.$refs.deviceLiveStream.destroy(); - if (this.$refs.deviceVideo.channelId && this.$refs.deviceVideo.queryDate) { - this.$refs.deviceVideo.loadDevRecord(); - } } else if (panel.name === 'sipChannel') { this.$refs.deviceChannel.getList(); } @@ -584,12 +578,6 @@ export default { this.$refs.deviceLiveStream.closeDestroy(false); } } - //关闭录像流 - if (panel.name !== 'deviceVideo') { - if(this.$refs.deviceVideo.playing) { - this.$refs.deviceVideo.closeDestroy(); - } - } } this.$nextTick(() => { // 获取监测统计数据