joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

pa调整

Browse Source
This commit is contained in:
joylink_fanyuhong 2024-03-11 18:59:56 +08:00
parent f134ea6b5f
commit 991121f9d8
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -46,7 +46,7 @@
"vue-i18n": "^8.12.0", "vue-i18n": "^8.12.0",
"vue-quill-editor": "^3.0.6", "vue-quill-editor": "^3.0.6",
"vue-router": "^3.1.6", "vue-router": "^3.1.6",
"vue-video-player": "^5.0.1", "vue-video-player": "^5.0.1",
"vuedraggable": "^2.24.3", "vuedraggable": "^2.24.3",
"vuex": "^3.1.0", "vuex": "^3.1.0",
"wangeditor": "^4.6.17", "wangeditor": "^4.6.17",

27
src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue
View File

@ -312,7 +312,10 @@ export default {
ADMINISTRATIVE_AREA: {}, ADMINISTRATIVE_AREA: {},
GATE: {}, GATE: {},
TRANSFER_CHANNEL: {}, TRANSFER_CHANNEL: {},
PROPERTY: {} PROPERTY: {},
OVERPASS1: {},
OVERPASS2: {},
LED: {}
}, },
timedList: [] timedList: []
}; };
@ -486,7 +489,6 @@ export default {
if (!audio) { return; } if (!audio) { return; }
audio.pause(); audio.pause();
audio.src = this.$store.state.user.ossUrl + info.url; audio.src = this.$store.state.user.ossUrl + info.url;
console.log(audio.src, ';src');
audio.play(); audio.play();
const _that = this; const _that = this;
audio.addEventListener('ended', function() { audio.addEventListener('ended', function() {
@ -633,12 +635,12 @@ export default {
return; return;
} }
sendCommandNew(this.$route.query.group, 'ISCS_PA_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes }).then(resp => { sendCommandNew(this.$route.query.group, 'ISCS_PA_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes }).then(resp => {
positionList.forEach(elem => { // positionList.forEach(elem => {
const audio = document.getElementById(elem.toLowerCase() + '_voice'); // const audio = document.getElementById(elem.toLowerCase() + '_voice');
audio.pause(); // audio.pause();
}); // });
const audio = document.getElementById('voice'); // const audio = document.getElementById('voice');
audio.pause(); // audio.pause();
}).catch(() => { }).catch(() => {
this.$message.error('背景音乐终止播放失败！'); this.$message.error('背景音乐终止播放失败！');
}); });
@ -709,11 +711,10 @@ export default {
type: this.videoMode type: this.videoMode
}; };
sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => { sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
this.voiceUrl = this.$store.state.user.ossUrl + this.resourcesList[this.messageIndex].url; // this.voiceUrl = this.$store.state.user.ossUrl + this.resourcesList[this.messageIndex].url;
console.log(this.voiceUrl, ']]]]]]'); // const audio = document.getElementById('voice');
const audio = document.getElementById('voice'); // audio.src = this.voiceUrl;
audio.src = this.voiceUrl; // audio.play();
audio.play();
}).catch(() => { }).catch(() => {
this.$message.error('发布广播失败！'); this.$message.error('发布广播失败！');
}); });

3
src/views/newMap/display/terminals/paScreen.vue
View File

@ -15,7 +15,7 @@
</div> </div>
</div> </div>
</div> </div>
<station-home ref="stationHome" :staiton-id="selectStation" /> <station-home ref="stationHome" :station-id="selectStation"/>
</div> </div>
</template> </template>
@ -52,6 +52,7 @@ export default {
} }
}); });
this.selectStation = this.$store.state.training.roleDeviceCode; this.selectStation = this.$store.state.training.roleDeviceCode;
console.log(this.selectStation, '====');
} }
this.$store.dispatch('app/animationsClose'); this.$store.dispatch('app/animationsClose');
}, },