diff --git a/src/views/newMap/displayNew/practiceDisplay.vue b/src/views/newMap/displayNew/practiceDisplay.vue index ff661e0d8..9477b0995 100644 --- a/src/views/newMap/displayNew/practiceDisplay.vue +++ b/src/views/newMap/displayNew/practiceDisplay.vue @@ -206,10 +206,11 @@ export default { '$store.state.socket.trainPfiBL':function(val) { if (val) { const trainNum = this.$store.state.socket.trainPfiBL; - const device = this.$store.getters['map/getDeviceByCode'](trainNum.code); + // const device = this.$store.getters['map/getDeviceByCode'](trainNum.code); trainNum.deviceType = 'TRAIN'; // console.log(trainNum, device, device.num, trainNum.in, trainNum.out, 'changed'); - trainNum.num = device.num + trainNum.in - trainNum.out; + trainNum.num = trainNum.remain; + // device.num + trainNum.in - trainNum.out; // console.log(trainNum.num, 'changeder'); this.$store.dispatch('training/updateMapState', [trainNum]); } diff --git a/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue b/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue index 4a8f7d303..0453a7df0 100644 --- a/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue +++ b/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue @@ -278,10 +278,11 @@ export default { return this.editModel.type != 'StationTurnBack'; }, isDisabledStation() { - return this.editModel.type == 'AutoTurnBack' || this.editModel.type == 'AutomaticRoute'; + // || this.editModel.type == 'AutomaticRoute' + return this.editModel.type == 'AutoTurnBack'; }, isHiddenStation() { - return this.editModel.type == 'AutoTurnBack' || this.editModel.type == 'GuideLock' || this.editModel.type == 'AxleReset' || this.editModel.type == 'StationTurnBack'; + return this.editModel.type == 'AutoTurnBack' || this.editModel.type == 'GuideLock' || this.editModel.type == 'AxleReset' || this.editModel.type == 'StationTurnBack' || this.editModel.type == 'AutomaticRoute'; }, isHiddenCreateAutomaticRoute() { @@ -301,9 +302,9 @@ export default { }, methods: { setStation(data) { - if (data.automaticRouteCode) { - this.changeEditStation(data.automaticRouteCode); - } + // if (data.automaticRouteCode) { + // this.changeEditStation(data.automaticRouteCode); + // } if (data.cycleCode) { this.changeEditStation(data.cycleCode); }