实时广播问题调整&注释iscs信号系统&stationNav换成车站名称&iscs点击修改mode
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 8m17s
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 8m17s
This commit is contained in:
fan
parent
bd10b05228
commit
98662ec177
@ -471,7 +471,11 @@ export default {
|
||||
const audio = document.getElementById(position.toLowerCase() + '_voice');
|
||||
if (!audio) { return; }
|
||||
audio.pause();
|
||||
audio.src = this.$store.state.user.ossUrl + info.url;
|
||||
if(info.url.startsWith('http')) {
|
||||
audio.src = info.url;
|
||||
} else {
|
||||
audio.src = this.$store.state.user.ossUrl + info.url;
|
||||
}
|
||||
audio.play();
|
||||
const _that = this;
|
||||
audio.addEventListener('ended', function() {
|
||||
|
||||
@ -270,12 +270,12 @@ export default {
|
||||
id: 'schedule',
|
||||
type: 'interface'
|
||||
},
|
||||
{
|
||||
name: '信号系统',
|
||||
mode: 'signal',
|
||||
id: 'signal',
|
||||
type: 'interface'
|
||||
},
|
||||
// {
|
||||
// name: '信号系统',
|
||||
// mode: 'signal',
|
||||
// id: 'signal',
|
||||
// type: 'interface'
|
||||
// },
|
||||
// {
|
||||
// name: '全线信号系统界面',
|
||||
// mode: 'allLineSignal',
|
||||
@ -365,7 +365,7 @@ export default {
|
||||
res.data.forEach(station => {
|
||||
if (!station.depot && station.visible) {
|
||||
const param = {
|
||||
name: station.runPlanName.includes('站') ? station.runPlanName : `${station.runPlanName}站`,
|
||||
name: station.name,
|
||||
id: station.code
|
||||
};
|
||||
|
||||
|
||||
@ -488,7 +488,11 @@ export default {
|
||||
const audio = document.getElementById(position.toLowerCase() + '_voice');
|
||||
if (!audio) { return; }
|
||||
audio.pause();
|
||||
audio.src = this.$store.state.user.ossUrl + info.url;
|
||||
if(info.url.startsWith('http')) {
|
||||
audio.src = info.url;
|
||||
} else {
|
||||
audio.src = this.$store.state.user.ossUrl + info.url;
|
||||
}
|
||||
audio.play();
|
||||
// const _that = this;
|
||||
// audio.addEventListener('ended', function() {
|
||||
@ -635,13 +639,13 @@ 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();
|
||||
}).catch(() => {
|
||||
positionList.forEach(elem => {
|
||||
const audio = document.getElementById(elem.toLowerCase() + '_voice');
|
||||
audio && audio.pause();
|
||||
});
|
||||
const audio = document.getElementById('voice');
|
||||
audio.pause();
|
||||
}).catch((e) => {
|
||||
this.$message.error('背景音乐终止播放失败！');
|
||||
});
|
||||
},
|
||||
|
||||
@ -24,7 +24,6 @@ export default {
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
|
||||
},
|
||||
methods:{
|
||||
selectIscsPane(param) {
|
||||
|
||||
@ -33,6 +33,7 @@ import PidsEmergency from '../config/pis/emergencyRelease';
|
||||
import PidsMain from '../config/pis/mainScreen';
|
||||
import PidsPreview from '../config/pis/timePreview';
|
||||
import PidsLcd from '../config/pis/lcdControl';
|
||||
import { EventBus } from '@/scripts/event-bus';
|
||||
|
||||
export default {
|
||||
name:'StationConfig',
|
||||
@ -67,6 +68,14 @@ export default {
|
||||
]
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
EventBus.$on('iscsModeChange', (type) => {
|
||||
this.mode = type;
|
||||
});
|
||||
},
|
||||
beforeDestroy() {
|
||||
EventBus.$off('iscsModeChange',(type) => {this.mode = type});
|
||||
},
|
||||
methods:{
|
||||
showPane(param) {
|
||||
this.mode = param.type;
|
||||
|
||||
@ -18,6 +18,7 @@ import ProtectReset from './dialog/protectReset';
|
||||
import mapElement from '@/iscs/status/mapElement.js';
|
||||
import {deviceFactory} from '@/iscs/utils/parser';
|
||||
import { setNum } from '@/iscs/status/mapElement.js';
|
||||
import { EventBus } from '@/scripts/event-bus';
|
||||
|
||||
export default {
|
||||
name: 'IscsStation',
|
||||
@ -109,15 +110,6 @@ export default {
|
||||
|
||||
onlclick(em) {
|
||||
// 父编组上元素内容
|
||||
const query = {
|
||||
stationName: this.$route.query.stationName,
|
||||
stationId: this.$route.query.stationId,
|
||||
group: this.$route.query.group,
|
||||
mapId: this.$route.query.mapId,
|
||||
lineCode:'02',
|
||||
noPreLogout:this.$route.query.noPreLogout,
|
||||
partId: ''
|
||||
};
|
||||
let type = '';
|
||||
if (em.deviceType == 'IscsButton') {
|
||||
if (em.deviceModel.function == 'goToStand') {
|
||||
@ -149,7 +141,7 @@ export default {
|
||||
|
||||
}
|
||||
if (type) {
|
||||
this.$router.replace({ path: `/displayIscs/system/stationConfig/${type}`, query: query });
|
||||
EventBus.$emit('iscsModeChange', type)
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -259,12 +259,12 @@ export default {
|
||||
id: 'schedule',
|
||||
type: 'interface'
|
||||
},
|
||||
{
|
||||
name: '信号系统',
|
||||
mode: 'signal',
|
||||
id: 'signal',
|
||||
type: 'interface'
|
||||
},
|
||||
// {
|
||||
// name: '信号系统',
|
||||
// mode: 'signal',
|
||||
// id: 'signal',
|
||||
// type: 'interface'
|
||||
// },
|
||||
// {
|
||||
// name: '全线信号系统界面',
|
||||
// mode: 'allLineSignal',
|
||||
@ -335,7 +335,7 @@ export default {
|
||||
res.data.forEach(station => {
|
||||
if (!station.depot && station.visible) {
|
||||
const param = {
|
||||
name: station.runPlanName.includes('站') ? station.runPlanName : `${station.runPlanName}站`,
|
||||
name: station.name,
|
||||
id: station.code
|
||||
};
|
||||
if (station.centralized) {
|
||||
|
||||
@ -70,7 +70,7 @@ export default {
|
||||
res.data.forEach(station => {
|
||||
if (!station.depot && station.visible) {
|
||||
const param = {
|
||||
name: station.runPlanName.includes('站') ? station.runPlanName : `${station.runPlanName}站`,
|
||||
name: station.name,
|
||||
id: station.code
|
||||
};
|
||||
if (station.centralized) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user