diff --git a/src/jmapNew/shape/graph/Train/EMouse.js b/src/jmapNew/shape/graph/Train/EMouse.js index 54d7b0a69..5e37c7d7b 100644 --- a/src/jmapNew/shape/graph/Train/EMouse.js +++ b/src/jmapNew/shape/graph/Train/EMouse.js @@ -59,7 +59,7 @@ class EMouse extends Group { } const physicalSection = store.getters['map/getDeviceByCode'](this.device.model.model.physicalCode); let closeDoorTip = ''; - if (physicalSection.standTrack) { + if (physicalSection && physicalSection.standTrack) { const stationStand = store.state.map.map.stationStandList.find(item => item.standTrackCode === physicalSection.code); if ((stationStand.right && this.device.model.right) || (!stationStand.right && !this.device.model.right)) { if (stationStand.inside) { diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js index 853a93f29..a98851c87 100644 --- a/src/jmapNew/shape/graph/Train/index.js +++ b/src/jmapNew/shape/graph/Train/index.js @@ -455,7 +455,7 @@ export default class Train extends Group { } setShowMode() { } initShowStation(model) { - if (model.trainWindowModel && model.trainWindowModel.instance && !store.getters['map/checkDeviceShow'](model.trainWindowModel.instance.stationCode, model.sectionModel.code)) { + if (model.trainWindowModel && model.trainWindowModel.instance && model.trainWindowModel.instance.stationCode && !store.getters['map/checkDeviceShow'](model.trainWindowModel.instance.stationCode, model.sectionModel.code)) { this.eachChild(item => { item.hide(); }); diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index bbd31fc1e..35365614a 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -814,7 +814,7 @@ export default { over: true }; if (this.trainOperateType === 'update') { - params.groupNumber = this.trainModel.groupNumber; + params.groupNumber = this.trainModel.groupNumber || this.trainModel.code; params.serviceNumber = '0' + this.formModelNewTrip.slice(3, 6); params.tripNumber = this.formModelNewTrip.slice(6, 8); step.cmdType = CMD.TrainWindow.CMD_TRAIN_SET_PLAN; @@ -831,12 +831,12 @@ export default { step.operation = OperationEvent.Train.addTrainId.menu.operation; step.param = params; } else if (this.trainOperateType === 'delete') { - params.groupNumber = this.trainModel.groupNumber; + params.groupNumber = this.trainModel.groupNumber || this.trainModel.code; step.cmdType = CMD.TrainWindow.CMD_TRAIN_REMOVE_TRAIN_TRACE; step.operation = OperationEvent.Train.delTrainId.menu.operation; step.param = params; } else if (this.trainOperateType === 'move') { - params.groupNumber = this.trainModel.groupNumber; + params.groupNumber = this.trainModel.groupNumber || this.trainModel.code; params.sectionCode = this.formModelNewSection; step.cmdType = CMD.TrainWindow.CMD_TRAIN_MOVE_TRAIN_TRACE; step.operation = OperationEvent.Train.moveTrainId.menu.operation; diff --git a/src/views/newMap/jointTrainingNew/menuTrainList.vue b/src/views/newMap/jointTrainingNew/menuTrainList.vue index 209e5a14a..c2ec272b6 100644 --- a/src/views/newMap/jointTrainingNew/menuTrainList.vue +++ b/src/views/newMap/jointTrainingNew/menuTrainList.vue @@ -43,6 +43,7 @@