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

BUG176、174

Browse Source
This commit is contained in:
fan 2021-05-26 10:40:17 +08:00
parent 16faefb526
commit c4b4955541
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
View File

@ -198,7 +198,7 @@ export default {
}
this.tempTableData = [device];
this.sectionCode = device.sectionModel.name;
this.tripNum = device.destinationCode + (device.serviceNumber.substring(1)) + (device.tripNumber.substring(2));
this.tripNum = device.destinationCode + device.serviceNumber + device.tripNumber;
this.groupNum = device.groupNumber;
}
if (this.dialogShow && device && device.code && device.deviceType === 'SECTION') {
@ -241,7 +241,7 @@ export default {
if (this.controlMode === 'edit') {
params.groupNumber = this.groupNum;
params.serviceNumber = this.newTripNum.slice(3, 6);
params.tripNumber = '0' + this.newTripNum.slice(6, 8);
params.tripNumber = this.newTripNum.slice(6, 8);
step.cmdType = CMD.TrainWindow.CMD_TRAIN_SET_PLAN;
step.operation = OperationEvent.Train.setPlanTrainId.menu.operation;
step.param = params;
@ -250,7 +250,7 @@ export default {
params.groupNumber = this.newGroupNum;
params.dn = this.newTripNum.slice(0, 3);
params.sn = this.newTripNum.slice(3, 6);
params.tn = '0' + this.newTripNum.slice(6, 8);
params.tn = this.newTripNum.slice(6, 8);
params.cn = this.newGrewNum;
step.cmdType = CMD.TrainWindow.CMD_TRAIN_ADD_TRAIN_TRACE;
step.operation = OperationEvent.Train.addTrainId.menu.operation;

6
src/jmapNew/theme/haerbin_01/menus/menuButton.vue
View File

@ -787,7 +787,7 @@ export default {
this.$store.state.map.activeTrainList.forEach(trainCode => {
const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode);
if (trainModel && trainModel.sectionCode === this.selectedObj.code) {
this.formModelTripNum = trainModel.destinationCode + trainModel.serviceNumber + (trainModel.tripNumber.substring(1));
this.formModelTripNum = trainModel.destinationCode + trainModel.serviceNumber + trainModel.tripNumber;
this.trainModel = trainModel;
this.formModelNewTrip = '';
}
@ -816,7 +816,7 @@ export default {
if (this.trainOperateType === 'update') {
params.groupNumber = this.trainModel.groupNumber;
params.serviceNumber = '0' + this.formModelNewTrip.slice(3, 6);
params.tripNumber = '0' + this.formModelNewTrip.slice(6, 8);
params.tripNumber = this.formModelNewTrip.slice(6, 8);
step.cmdType = CMD.TrainWindow.CMD_TRAIN_SET_PLAN;
step.operation = OperationEvent.Train.setPlanTrainId.menu.operation;
step.param = params;
@ -825,7 +825,7 @@ export default {
params.groupNumber = this.formModelNewGroup.slice(0, 3);
params.dn = this.formModelNewTrip.slice(0, 3);
params.sn = this.formModelNewTrip.slice(3, 6);
params.tn = '0' + this.formModelNewTrip.slice(6, 8);
params.tn = this.formModelNewTrip.slice(6, 8);
params.cn = this.formModelNewGroup.slice(3, 6);
step.cmdType = CMD.TrainWindow.CMD_TRAIN_ADD_TRAIN_TRACE;
step.operation = OperationEvent.Train.addTrainId.menu.operation;

4
src/jmapNew/theme/nanjing_02/menus/menuButton.vue
View File

@ -466,8 +466,8 @@ export default {
if (this.selectedObj._type && (val._event == MouseEvent.Left || (val._event == MouseEvent.Right && this.$store.state.training.prdType === '01'))) {
const type = this.State2SimulationMap[this.$store.state.training.prdType];
this.modeMatch = this.stationContorl.controlMode == type;
// 道岔区段 道岔计轴区段 都是道岔操作
if (this.selectedObj._type == 'Section' && (this.selectedObj.type == '03' || this.selectedObj.type == '04')) {
// 道岔区段 是道岔操作
if (this.selectedObj._type == 'Section' && this.selectedObj.type == '03') {
this.selectedObj = this.selectedObj.switch;
}
this.canCommand = true;