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

南京二实训调整

Browse Source
This commit is contained in:
fan 2021-11-23 17:53:34 +08:00
parent c65049a84d
commit 79591e1339
3 changed files with 65 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -923,7 +923,7 @@ export default {
name: `${el} km/h`,
commandTip: `${tip}${el}KM`,
cmdType: this.cmdType,
operate: OperationEvent.Command.common.choose,
operate: OperationEvent.Switch.setSpeed['choose' + el],
next: true,
param:{speedLimitValue:el},
value: el
@ -1285,21 +1285,21 @@ export default {
row.cmdType = CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL;
row.param = { 'standCodes': lists.map(el => el.code) };
this.stationCommand(row);
// this.stationCommand(row);264
// this.stationCommand(row);
},
getStationControlForbidden(code) {
const device = this.$store.getters['map/getDeviceByCode'](code);
return device && device.interlockMachineStarting;
const device = this.$store.getters['map/getDeviceByCode'](code);
return device && device.interlockMachineStarting;
},
initMenus() {
this.basicParamList = this.$store.state.training.prdType === '01' ? [
{ name: '自排全开', commandTip: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
{ name: '自排全关', commandTip: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menu, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
{ name: '自排全开', commandTip: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menuButton, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
{ name: '自排全关', commandTip: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menuButton, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
{ name: '释放指令', commandTip: '释放指令', cmdType: CMD.Station.CMD_STATION_RELEASE, operate: OperationEvent.Station.stationRelease.menuButton, securityCommand: true, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) },
{ name: '重启令解', commandTip: '重启令解', cmdType: CMD.Station.CMD_STATION_RESTART, operate: OperationEvent.Station.stationRestart.menuButton, securityCommand: true, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) },
{ name: '追踪全开', commandTip: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
{ name: '追踪全关', commandTip: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
{ name: '关区信号', commandTip: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
{ name: '追踪全开', commandTip: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menuButton, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
{ name: '追踪全关', commandTip: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menuButton, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
{ name: '关区信号', commandTip: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menuButton, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
{ name: '强行站控', commandTip: '车站强行取得控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menuButton, securityCommand: true, fillStationCode: true, disabledCb: (stationControl, device) => ['Local'].includes(stationControl.controlMode) },
{ name: '接收控制', commandTip: '接收控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menuButton, fillStationCode: true, disabledCb: (stationControl, device) => ['Local'].includes(stationControl.controlMode) },
{ name: '交出控制', commandTip: '交出控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },

46
src/jmapNew/theme/nanjing_02/operationConfig.js
View File

@ -82,7 +82,7 @@ export default {
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4077', tip: '鼠标左键点击【岔芯设限】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: 'com01', tip: '鼠标左键点击【25 km/h】按钮', val: '25 km/h' },
{ deviceType: '03', orderNum: 3, operateCode: '113c', tip: '鼠标左键点击【25 km/h】按钮', val: '25 km/h' },
{ deviceType: '03', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
@ -182,7 +182,7 @@ export default {
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4077', tip: '鼠标左键点击【轨区设限】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: 'com01', tip: '鼠标左键点击【25 km/h】按钮', val: '25 km/h' },
{ deviceType: '03', orderNum: 3, operateCode: '113c', tip: '鼠标左键点击【25 km/h】按钮', val: '25 km/h' },
{ deviceType: '03', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
@ -536,7 +536,7 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '02', orderNum: 2, operateCode: '11a0', tip: '鼠标左键点击【挤岔恢复】按钮' },
{ deviceType: '02', orderNum: 2, operateCode: '11a1', tip: '鼠标左键点击【挤岔恢复】按钮' },
{ deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
@ -684,7 +684,7 @@ export default {
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '03', orderNum: 2, operateCode: '1137', tip: '鼠标左键点击【岔区设限】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: 'com01', tip: '鼠标左键点击【25 km/h】按钮', val: '25 km/h' },
{ deviceType: '03', orderNum: 3, operateCode: '113c', tip: '鼠标左键点击【25 km/h】按钮', val: '25 km/h' },
{ deviceType: '03', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
@ -766,7 +766,7 @@ export default {
trainingName: '封锁信号({5})',
trainingRemark: '封锁信号',
trainingType: 'Signal',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3062', tip: '鼠标左键点击【封锁信号】按钮' },
@ -781,7 +781,7 @@ export default {
trainingName: '解封信号({5})',
trainingRemark: '解封信号',
trainingType: 'Signal',
productTypes: ['01', '02'],
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3077', tip: '鼠标左键点击【解封信号】按钮' },
@ -798,7 +798,7 @@ export default {
trainingName: '自排单开({5})',
trainingRemark: '自排单开',
trainingType: 'Signal',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3153', tip: '鼠标左键点击【自排单开】按钮' },
@ -813,7 +813,7 @@ export default {
trainingName: '自排单关({5})',
trainingRemark: '自排单关',
trainingType: 'Signal',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3143', tip: '鼠标左键点击【自排单关】按钮' },
@ -843,7 +843,7 @@ export default {
trainingName: '开放信号({3})',
trainingRemark: '开放信号',
trainingType: 'Signal',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3042', tip: '鼠标左键点击【开放信号】按钮' },
@ -1216,7 +1216,7 @@ export default {
trainingType: 'Station',
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '6124', tip: '鼠标左键点击【关站信号】按钮' },
{ deviceType: 'mbm', orderNum: 1, operateCode: '6124', tip: '鼠标左键点击【关站信号】按钮' },
{ deviceType: '04', orderNum: 2, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
},
@ -1245,7 +1245,7 @@ export default {
trainingType: 'Station',
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '6061', tip: '鼠标左键点击【自排全开】按钮' },
{ deviceType: 'mbm', orderNum: 1, operateCode: '6061', tip: '鼠标左键点击【自排全开】按钮' },
{ deviceType: '04', orderNum: 2, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
},
@ -1274,7 +1274,7 @@ export default {
trainingType: 'Station',
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '6051', tip: '鼠标左键点击【自排全关】按钮'},
{ deviceType: 'mbm', orderNum: 1, operateCode: '6051', tip: '鼠标左键点击【自排全关】按钮'},
{ deviceType: '04', orderNum: 2, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
},
@ -1303,7 +1303,7 @@ export default {
trainingType: 'Station',
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '6011', tip: '鼠标左键点击【追踪全开】按钮' },
{ deviceType: 'mbm', orderNum: 1, operateCode: '6011', tip: '鼠标左键点击【追踪全开】按钮' },
{ deviceType: '04', orderNum: 2, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
},
@ -1332,7 +1332,7 @@ export default {
trainingType: 'Station',
productTypes: ['01'],
stepVOList:[
{ deviceType: '04', orderNum: 1, operateCode: '6021', tip: '鼠标左键点击【追踪全关】按钮'},
{ deviceType: 'mbm', orderNum: 1, operateCode: '6021', tip: '鼠标左键点击【追踪全关】按钮'},
{ deviceType: '04', orderNum: 2, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
},
@ -1346,7 +1346,23 @@ export default {
trainingType: 'Station',
productTypes: ['01'],
stepVOList:[
{ deviceType: '04', orderNum: 1, operateCode: '613', tip: '鼠标左键点击【重启令解】按钮'},
{ deviceType: 'mbm', orderNum: 1, operateCode: '613', tip: '鼠标左键点击【重启令解】按钮'},
{ deviceType: '04', orderNum: 2, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Station_Release',
skinCode: '14',
trainingName: '释放指令({26})',
trainingRemark: '释放指令',
trainingType: 'Station',
productTypes: ['01'],
stepVOList:[
{ deviceType: 'mbm', orderNum: 1, operateCode: '620', tip: '鼠标左键点击【释放指令】按钮'},
{ deviceType: '04', orderNum: 2, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }

25
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -1016,6 +1016,31 @@ export const OperationEvent = {
menuButton: {
operation: '1137',
domId: '_Tips-Switch-SetSpeed-Menu{BOTTOM}'
},
// 65, 55, 45, 35, 25, 0
choose65: {
operation: '1138',
domId: '_Tips-Switch-SetSpeed-Choose65'
},
choose55: {
operation: '1139',
domId: '_Tips-Switch-SetSpeed-Choose55'
},
choose45: {
operation: '113a',
domId: '_Tips-Switch-SetSpeed-Choose45'
},
choose35: {
operation: '113b',
domId: '_Tips-Switch-SetSpeed-Choose35'
},
choose25: {
operation: '113c',
domId: '_Tips-Switch-SetSpeed-Choose25'
},
choose0: {
operation: '113d',
domId: '_Tips-Switch-SetSpeed-Choose0'
}
},
// 取消速度