修改 南京2 刚登陆进去执行操作异常的问题

This commit is contained in:
lVAL 2021-01-26 10:42:39 +08:00
parent 8d9114cfa7
commit c2ecb60cd7
2 changed files with 8 additions and 14 deletions

View File

@ -327,9 +327,6 @@ export default {
cr2ConfirmId() {
return OperationEvent.Command.commandHaerbin.confrimCr2.domId;
},
centerStation() {
return this.getCentralizedStationByInputStr(this.inputStr) || {};
},
stationContorl() {
return this.getStationControl(this.selected || {}) || this.getStationControl({_type: 'Station', code: this.$store.state.map.showCentralizedStationCode}) || {};
},
@ -337,16 +334,13 @@ export default {
return this.$store.state.training.prdType == '01';
},
isLogin() {
return this.isLocal ? this.loginActive && this.centerStation.code == this.stationContorl.code : true;
return this.isLocal ? this.loginActive && this.checkInputStrBelongCentralizedStation(this.inputStr, this.stationContorl) : true;
},
menuPosition() {
return this.$store.state.menuOperation.menuPosition;
}
},
watch: {
'$store.state.menuOperation.setMenuChangeCount': function (val) {
},
'$store.state.training.prdType': function (val) {
this.trainOperationShow = false;
this.initMenus();
@ -391,9 +385,9 @@ export default {
}
},
'$store.state.map.showCentralizedStationCode': function(val) {
this.cancle();
if (!this.oldSelected) {
this.handleBasicMenu();
this.cancle();
}
},
'$store.state.map.mapStationStateUpdateCount': function() {
@ -407,10 +401,10 @@ export default {
this.handleBasicMenu();
},
methods: {
getCentralizedStationByInputStr(inputStr) {
const station = this.stationList.find(el => el.depot ? false : el.jp == this.inputStr );
if (station) {
return this.getStationControl(station);
checkInputStrBelongCentralizedStation(inputStr, station) {
const child= this.stationList.find(el => el.depot ? false : el.jp == inputStr );
if (child && station) {
return station.code == child.code || station.chargeStationCodeList.includes(child.code);
}
},
interceptLogin(cb) {

View File

@ -65,11 +65,11 @@ class Handler {
}
getCommand(operation) {
let command = null;
let command = null;
if (operation.cmdType) {
const cmdType = operation.cmdType;
const wholeParam = this.getWholeParam();
command = CommandHandler.getCommand(cmdType, wholeParam);
command = CommandHandler.getCommand(cmdType, wholeParam);
if (command && command.isError) {
this.operations.pop();
command = null;