diff --git a/package.json b/package.json index 852892b6b..f3dbbec22 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "vue-i18n": "^8.12.0", "vue-quill-editor": "^3.0.6", "vue-router": "^3.1.6", - "vue-video-player": "^5.0.1", + "vue-video-player": "^5.0.1", "vuedraggable": "^2.24.3", "vuex": "^3.1.0", "wangeditor": "^4.6.17", diff --git a/src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue b/src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue index 0a6e478ae..7bb698f4d 100644 --- a/src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue +++ b/src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue @@ -312,7 +312,10 @@ export default { ADMINISTRATIVE_AREA: {}, GATE: {}, TRANSFER_CHANNEL: {}, - PROPERTY: {} + PROPERTY: {}, + OVERPASS1: {}, + OVERPASS2: {}, + LED: {} }, timedList: [] }; @@ -486,7 +489,6 @@ export default { if (!audio) { return; } audio.pause(); audio.src = this.$store.state.user.ossUrl + info.url; - console.log(audio.src, ';src'); audio.play(); const _that = this; audio.addEventListener('ended', function() { @@ -633,12 +635,12 @@ export default { return; } sendCommandNew(this.$route.query.group, 'ISCS_PA_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes }).then(resp => { - positionList.forEach(elem => { - const audio = document.getElementById(elem.toLowerCase() + '_voice'); - audio.pause(); - }); - const audio = document.getElementById('voice'); - audio.pause(); + // positionList.forEach(elem => { + // const audio = document.getElementById(elem.toLowerCase() + '_voice'); + // audio.pause(); + // }); + // const audio = document.getElementById('voice'); + // audio.pause(); }).catch(() => { this.$message.error('背景音乐终止播放失败!'); }); @@ -709,11 +711,10 @@ export default { type: this.videoMode }; sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => { - this.voiceUrl = this.$store.state.user.ossUrl + this.resourcesList[this.messageIndex].url; - console.log(this.voiceUrl, ']]]]]]'); - const audio = document.getElementById('voice'); - audio.src = this.voiceUrl; - audio.play(); + // this.voiceUrl = this.$store.state.user.ossUrl + this.resourcesList[this.messageIndex].url; + // const audio = document.getElementById('voice'); + // audio.src = this.voiceUrl; + // audio.play(); }).catch(() => { this.$message.error('发布广播失败!'); }); diff --git a/src/views/newMap/display/terminals/paScreen.vue b/src/views/newMap/display/terminals/paScreen.vue index fd227be42..a84b64e16 100644 --- a/src/views/newMap/display/terminals/paScreen.vue +++ b/src/views/newMap/display/terminals/paScreen.vue @@ -15,7 +15,7 @@ - + @@ -52,6 +52,7 @@ export default { } }); this.selectStation = this.$store.state.training.roleDeviceCode; + console.log(this.selectStation, '===='); } this.$store.dispatch('app/animationsClose'); },