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

宁波一号线 站遥控 控制权转移代码调整

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-07-30 18:59:48 +08:00
parent 8663a4fba0
commit 329b3efef3
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
View File

@ -189,6 +189,7 @@ export default {
this.restoreBeforeDevices();
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('socket/shiftMsgQueue');
mouseCancelState(this.selected);
},
restoreBeforeDevices() {

13
src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue
View File

@ -134,17 +134,18 @@ export default {
this.operation = operate.operation;
}
this.dialogShow = true;
if (this.$store.state.training.prdType == '01') {
this.controlProps = {
'03': '紧急站控',
'02': '站控'
};
}
// if (this.$store.state.training.prdType == '01') {
// this.controlProps = {
// '03': '紧急站控',
// '02': '站控'
// };
// }
this.$store.dispatch('training/emitTipFresh');
},
doClose() {
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('socket/shiftMsgQueue');
},
cancel() {
const operate = {

8
src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue
View File

@ -110,11 +110,13 @@ export default {
deep: true
},
'$store.state.socket.msgHead': function (elem) {
if (elem && (elem.operateType == 'CM_Apply_For_Station_Control' || elem.operateType == 'CM_Apply_For_Center_Control')) {
if (!this.dialogShow && elem && (elem.operateType == 'CM_Apply_For_Station_Control' || elem.operateType == 'CM_Apply_For_Center_Control') && !elem.success) {
if (elem.params.stationCodes && elem.params.stationCodes.length) {
this.doShow(elem);
this.sourceMemberId = elem.sourceMemberId;
}
} else {
this.$store.dispatch('socket/shiftMsgQueue');
}
},
'$store.state.map.keyboardEnterCount': function (val) {
@ -228,9 +230,7 @@ export default {
},
doClose() {
this.disabledAgree = false;
if (this.dialogShow) {
this.$store.dispatch('socket/shiftMsgQueue');
}
this.$store.dispatch('socket/shiftMsgQueue');
this.count = 0;
this.dialogShow = false;