南京十一站调整&添加线路配置switchTurnOperationCanRecoverSplitFault
This commit is contained in:
fan
parent
ee6d3b41b1
commit
fd49034b57
@ -262,8 +262,8 @@ export default {
|
||||
cmdType: '',
|
||||
securityCommand: '',
|
||||
switchRelevanceSectionList: [], // 道岔关联的区段列表
|
||||
param: {},
|
||||
stationObj: null,
|
||||
param: {},
|
||||
stationObj: null,
|
||||
selectedObj: null,
|
||||
oldClickObj: null, // 上一次点击对象
|
||||
route: null, // 进路对象
|
||||
@ -317,12 +317,12 @@ export default {
|
||||
commandId() {
|
||||
return OperationEvent.Command.commandHaerbin.confirm.domId;
|
||||
},
|
||||
mapDevice() {
|
||||
return this.$store.state.map.mapDevice;
|
||||
},
|
||||
actualSelected() {
|
||||
return adapter.adapterAsDevice(this.selected, this.mapDevice);
|
||||
},
|
||||
mapDevice() {
|
||||
return this.$store.state.map.mapDevice;
|
||||
},
|
||||
actualSelected() {
|
||||
return adapter.adapterAsDevice(this.selected, this.mapDevice);
|
||||
},
|
||||
setDetainTrainId() {
|
||||
return OperationEvent.StationStand.setDetainTrain.menuButton.domId;
|
||||
},
|
||||
@ -367,8 +367,8 @@ export default {
|
||||
this.selectedObj = this.actualSelected;
|
||||
this.rightClickDialogVisible = false;
|
||||
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;
|
||||
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')) {
|
||||
this.selectedObj = this.selectedObj.switch;
|
||||
@ -378,34 +378,42 @@ export default {
|
||||
operation: 'click',
|
||||
code: this.selectedObj.code,
|
||||
subType:this.$store.state.menuOperation.subType
|
||||
};
|
||||
};
|
||||
|
||||
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
|
||||
if (valid) { this.handleDeviceMenu(); }
|
||||
}).catch((error) => {
|
||||
console.error(error);
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
if (error && error.code == '10017') {
|
||||
EventBus.$emit('sendMsg', {message: error.message});
|
||||
} else {
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
}
|
||||
});
|
||||
if (val._type != 'Psd' && val._type != 'StationStand') {
|
||||
this.dialogVisible = !this.isLocal;
|
||||
}
|
||||
this.handleIbpShow();
|
||||
} else {
|
||||
const step = {
|
||||
const step = {
|
||||
operation: 'click',
|
||||
code: '',
|
||||
subType:this.$store.state.menuOperation.subType
|
||||
};
|
||||
code: '',
|
||||
subType:this.$store.state.menuOperation.subType
|
||||
};
|
||||
|
||||
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.handleBasicMenu();
|
||||
this.dialogVisible = false;
|
||||
}
|
||||
this.handleBasicMenu();
|
||||
this.dialogVisible = false;
|
||||
}
|
||||
}).catch((error) => {
|
||||
console.error(error);
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
});
|
||||
if (error && error.code == '10017') {
|
||||
EventBus.$emit('sendMsg', {message: error.message});
|
||||
} else {
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
},
|
||||
@ -417,30 +425,30 @@ export default {
|
||||
},
|
||||
'$store.state.map.mapStationStateUpdateCount': function() {
|
||||
this.initCentralizedStationList([...this.menuCmdList]);
|
||||
},
|
||||
'$store.state.training.steps': function(steps) {
|
||||
this.initTrainingStation(steps);
|
||||
this.handleBasicMenu();
|
||||
}
|
||||
},
|
||||
'$store.state.training.steps': function(steps) {
|
||||
this.initTrainingStation(steps);
|
||||
this.handleBasicMenu();
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.param = {};
|
||||
this.initMenus();
|
||||
this.param = {};
|
||||
this.initMenus();
|
||||
this.handleBasicMenu();
|
||||
EventBus.$on('sendMsg', ({message = ''}) => {
|
||||
this.tempData = [{name: message}];
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
initTrainingStation(steps) {
|
||||
if (steps && steps.length) {
|
||||
const code = steps[0].code;
|
||||
this.stationObj = this.getStationControl(this.$store.getters['map/getDeviceByCode'](code));
|
||||
if (this.stationObj) {
|
||||
this.$store.dispatch('map/setShowCentralizedStationCode', this.stationObj.code);
|
||||
}
|
||||
}
|
||||
},
|
||||
initTrainingStation(steps) {
|
||||
if (steps && steps.length) {
|
||||
const code = steps[0].code;
|
||||
this.stationObj = this.getStationControl(this.$store.getters['map/getDeviceByCode'](code));
|
||||
if (this.stationObj) {
|
||||
this.$store.dispatch('map/setShowCentralizedStationCode', this.stationObj.code);
|
||||
}
|
||||
}
|
||||
},
|
||||
initCentralizedStationList(list) {
|
||||
const stationContorl = this.stationContorl;
|
||||
this.menuCmdList = new Array(15).fill({});
|
||||
@ -453,7 +461,7 @@ export default {
|
||||
},
|
||||
checkBelongCentralizedStationByInputStr(inputStr) {
|
||||
const stationContorl = this.stationContorl;
|
||||
return stationContorl && stationContorl.depot? false: stationContorl.jp == inputStr;
|
||||
return stationContorl && stationContorl.depot ? false : stationContorl.jp == inputStr;
|
||||
},
|
||||
interceptLogin(cb) {
|
||||
return (args) => {
|
||||
@ -537,23 +545,23 @@ export default {
|
||||
this.stationDialogVisible = true;
|
||||
}
|
||||
},
|
||||
getStationControl(selected={}) {
|
||||
getStationControl(selected = {}) {
|
||||
let control = null;
|
||||
let model = this.$store.getters['map/getDeviceByCode'](selected.code)||{};
|
||||
const model = this.$store.getters['map/getDeviceByCode'](selected.code) || {};
|
||||
if (model._type == 'StationStand') {
|
||||
control = this.$store.getters['map/getDeviceStationCodeByStationCode'](model.deviceStationCode);
|
||||
} else if (model._type == 'Station') {
|
||||
if (model.centralized) {
|
||||
if (model.centralized) {
|
||||
control = model;
|
||||
} else {
|
||||
this.stationList.forEach(el => {
|
||||
if (el.centralized &&
|
||||
} else {
|
||||
this.stationList.forEach(el => {
|
||||
if (el.centralized &&
|
||||
el.chargeStationCodeList.includes(model.code)) {
|
||||
control = this.$store.getters['map/getDeviceByCode'](el.code);
|
||||
return;
|
||||
}
|
||||
})
|
||||
}
|
||||
control = this.$store.getters['map/getDeviceByCode'](el.code);
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
} else if (model._type == 'Train') { // 车次窗单独处理
|
||||
control = model;
|
||||
} else if (model._type == 'TrainWindow') {
|
||||
@ -563,7 +571,7 @@ export default {
|
||||
} else if (model._type == 'Psd') {
|
||||
const stand = this.$store.getters['map/getDeviceByCode'](model.standCode);
|
||||
control = this.$store.getters['map/getDeviceStationCodeByStationCode'](stand.deviceStationCode);
|
||||
} else if (model._type){
|
||||
} else if (model._type) {
|
||||
control = this.$store.getters['map/getDeviceStationCodeByStationCode'](model.stationCode);
|
||||
}
|
||||
return control;
|
||||
@ -763,9 +771,9 @@ export default {
|
||||
|
||||
this.rightClickDialogVisible = false;
|
||||
|
||||
if (![OperationEvent.Command.common.choose].includes(row.operate)) {
|
||||
this.commandInfo = row;
|
||||
}
|
||||
if (![OperationEvent.Command.common.choose].includes(row.operate)) {
|
||||
this.commandInfo = row;
|
||||
}
|
||||
|
||||
if (row.commandTip) {
|
||||
EventBus.$emit('sendMsg', {message: row.commandTip});
|
||||
@ -777,20 +785,20 @@ export default {
|
||||
this.canCommand = false;
|
||||
step.operation = this.operate;
|
||||
|
||||
if (row.next) {
|
||||
step.val = row.name;
|
||||
}
|
||||
if (row.next) {
|
||||
step.val = row.name;
|
||||
}
|
||||
|
||||
if (row.fillStationCode) {
|
||||
const station = this.stationObj||{};
|
||||
step.code = station.code;
|
||||
}
|
||||
if (row.fillStationCode) {
|
||||
const station = this.stationObj || {};
|
||||
step.code = station.code;
|
||||
}
|
||||
|
||||
if (row.param) {
|
||||
this.param = row.param;
|
||||
}
|
||||
if (row.param) {
|
||||
this.param = row.param;
|
||||
}
|
||||
|
||||
step.param = this.param;
|
||||
step.param = this.param;
|
||||
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.checkConfirmParam();
|
||||
@ -799,7 +807,11 @@ export default {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
}
|
||||
}).catch((error) => {
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
if (error && error.code == '10017') {
|
||||
EventBus.$emit('sendMsg', {message: error.message});
|
||||
} else {
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
@ -830,7 +842,11 @@ export default {
|
||||
}).catch((error) => {
|
||||
this.doClose();
|
||||
this.handleClose();
|
||||
EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
|
||||
if (error && error.code == '10017') {
|
||||
EventBus.$emit('sendMsg', {message: error.message});
|
||||
} else {
|
||||
EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
|
||||
}
|
||||
});
|
||||
},
|
||||
clickCr1Confirm() {
|
||||
@ -848,7 +864,11 @@ export default {
|
||||
}, 10000);
|
||||
}
|
||||
}).catch((error) => {
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
if (error && error.code == '10017') {
|
||||
EventBus.$emit('sendMsg', {message: error.message});
|
||||
} else {
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
}
|
||||
this.doClose();
|
||||
});
|
||||
},
|
||||
@ -865,13 +885,17 @@ export default {
|
||||
this.doClose();
|
||||
this.handleDeviceMenu();
|
||||
this.handleClose();
|
||||
EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`});
|
||||
EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`});
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.doClose();
|
||||
this.handleDeviceMenu();
|
||||
this.handleClose();
|
||||
EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
|
||||
if (error && error.code == '10017') {
|
||||
EventBus.$emit('sendMsg', {message: error.message});
|
||||
} else {
|
||||
EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
|
||||
}
|
||||
});
|
||||
},
|
||||
handleRightClickClose() {
|
||||
@ -964,7 +988,11 @@ export default {
|
||||
}
|
||||
}).catch((error) => {
|
||||
console.error(error);
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
if (error && error.code == '10017') {
|
||||
EventBus.$emit('sendMsg', {message: error.message});
|
||||
} else {
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
EventBus.$emit('sendMsg', {message: '请输入正确的车次号'});
|
||||
@ -983,7 +1011,11 @@ export default {
|
||||
}).catch((error) => {
|
||||
console.error(error);
|
||||
this.handleStationClose();
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
if (error && error.code == '10017') {
|
||||
EventBus.$emit('sendMsg', {message: error.message});
|
||||
} else {
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
}
|
||||
});
|
||||
},
|
||||
stationCommand(row) {
|
||||
@ -1001,7 +1033,11 @@ export default {
|
||||
}
|
||||
}).catch((error) => {
|
||||
console.error(error);
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
if (error && error.code == '10017') {
|
||||
EventBus.$emit('sendMsg', {message: error.message});
|
||||
} else {
|
||||
EventBus.$emit('sendMsg', {message: '命令执行失败！'});
|
||||
}
|
||||
});
|
||||
},
|
||||
stationDetainTrain() {
|
||||
@ -1121,7 +1157,7 @@ export default {
|
||||
{ name: '车队单关', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
|
||||
{ name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
|
||||
{ name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
|
||||
];
|
||||
];
|
||||
this.stationParamList = this.$store.state.training.prdType === '01' ? [
|
||||
{ name: '关站信号', commandTip: '封锁车站所有信号机', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch || !['Local'].includes(stationControl.controlMode) }
|
||||
] : [
|
||||
|
||||
@ -30,7 +30,8 @@ export const MapDeviceType = {
|
||||
/** 设备故障类型 */
|
||||
export const deviceFaultType = {
|
||||
Section: [
|
||||
{label: '计轴故障', value: 'FAULT'}
|
||||
{label: '计轴故障', value: 'FAULT'},
|
||||
{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'}
|
||||
// {label: '计轴干扰', value: 'DISTURBANCE'}
|
||||
],
|
||||
Signal: [
|
||||
@ -41,6 +42,7 @@ export const deviceFaultType = {
|
||||
{label: '定位失表', value: 'NORMAL_SPLIT'},
|
||||
{label: '反位失表', value: 'REVERSE_SPLIT'},
|
||||
{label: '挤岔', value: 'SQUEEZE'},
|
||||
{label: '通信车占用', value: 'CBTC_OCCUPIED_FAULT'},
|
||||
{label: '计轴故障', value: 'AXLE_FAULT'}
|
||||
// {label: '道岔区段计轴故障', value: 'AXLE_FAULT'}
|
||||
],
|
||||
|
||||
@ -105,7 +105,8 @@ export default {
|
||||
'blockadeCommandOnlyValidInStandbyMode',
|
||||
'ebwhenCancelRoute',
|
||||
'stationPreResetBeforeAxlePreReset',
|
||||
'generateDestination'
|
||||
'generateDestination',
|
||||
'switchTurnOperationCanRecoverSplitFault'
|
||||
],
|
||||
selectList: ['runMode'],
|
||||
generalConfig: [
|
||||
@ -141,7 +142,8 @@ export default {
|
||||
'blockadeCommandOnlyValidInStandbyMode',
|
||||
'ebwhenCancelRoute',
|
||||
'stationPreResetBeforeAxlePreReset',
|
||||
'generateDestination'
|
||||
'generateDestination',
|
||||
'switchTurnOperationCanRecoverSplitFault'
|
||||
],
|
||||
rangeList: ['noParkingSM', 'parkingSM'],
|
||||
speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
|
||||
@ -182,7 +184,8 @@ export default {
|
||||
blockadeCommandOnlyValidInStandbyMode: '封锁命令（状态）仅在后备模式下有效',
|
||||
ebwhenCancelRoute: '取消进路时列车紧急制动',
|
||||
stationPreResetBeforeAxlePreReset: '计轴预复位前需要车站预复位',
|
||||
generateDestination: '是否生成目的地码定义（泰雷兹）'
|
||||
generateDestination: '是否生成目的地码定义（泰雷兹）',
|
||||
switchTurnOperationCanRecoverSplitFault: '道岔转动操作可以使失表故障恢复'
|
||||
}
|
||||
};
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user