diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index 5cebc115c..9649a0ded 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -1336,8 +1336,8 @@ export default { { name: '自动折返', commandTip: '自动折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.AutoTurnBack.menuButton, params: {val: 'DEFAULT'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '01' }, { name: '换上至下', commandTip: '换上至下', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutUpTheDown.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }, { name: '换下至上', commandTip: '换下至上', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutDownTheUp.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }, - { name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutUpStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }, - { name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutDownStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' } + { name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }, + { name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' } ]; this.switchParamList = this.$store.state.training.prdType === '01' ? [ { name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch}, diff --git a/src/jmapNew/theme/nanjing_02/operationConfig.js b/src/jmapNew/theme/nanjing_02/operationConfig.js index 2f879a480..5da5d73bd 100644 --- a/src/jmapNew/theme/nanjing_02/operationConfig.js +++ b/src/jmapNew/theme/nanjing_02/operationConfig.js @@ -468,31 +468,31 @@ export default { minDuration: 8, operateType: 'Stand_Early_Depart', skinCode: '14', - trainingName: '终止站停-上({8}{9})', + trainingName: '终止站停({8}{9})', trainingRemark: '设置提前发车功能', trainingType: 'Section', productTypes: ['01'], stepVOList: [ { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' }, - { deviceType: '03', orderNum: 2, operateCode: '422', tip: '鼠标左键点击【终止站停-上】按钮' }, + { deviceType: '03', orderNum: 2, operateCode: '422', tip: '鼠标左键点击【终止站停】按钮' }, { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮'} ] }, - { - maxDuration: 15, - minDuration: 8, - operateType: 'Stand_Early_Depart', - skinCode: '14', - trainingName: '终止站停-下({8}{9})', - trainingRemark: '设置提前发车功能', - trainingType: 'Section', - productTypes: ['01'], - stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' }, - { deviceType: '03', orderNum: 2, operateCode: '423', tip: '鼠标左键点击【终止站停-下】按钮' }, - { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' } - ] - }, + // { + // maxDuration: 15, + // minDuration: 8, + // operateType: 'Stand_Early_Depart', + // skinCode: '14', + // trainingName: '终止站停-下({8}{9})', + // trainingRemark: '设置提前发车功能', + // trainingType: 'Section', + // productTypes: ['01'], + // stepVOList: [ + // { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' }, + // { deviceType: '03', orderNum: 2, operateCode: '423', tip: '鼠标左键点击【终止站停-下】按钮' }, + // { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' } + // ] + // }, { maxDuration: 15, minDuration: 8, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index b7fac8c70..071610881 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -2163,20 +2163,20 @@ export const OperationEvent = { domId: '_Tips-Section-Put-Down-The-Up-menu-Button{BOTTOM}' } }, - // 上行终止站停 - PutUpStop: { + // 终止站停 + PutStop: { menuButton: { operation: '422', - domId: '_Tips-Section-Put-Up-Stop-menu-Button{BOTTOM}' - } - }, - // 下行终止站停 - PutDownStop: { - menuButton: { - operation: '423', - domId: '_Tips-Section-Put-Down-Stop-menu-Button{BOTTOM}' + domId: '_Tips-Section-Put-Stop-menu-Button{BOTTOM}' } }, + // // 下行终止站停 + // PutDownStop: { + // menuButton: { + // operation: '423', + // domId: '_Tips-Section-Put-Down-Stop-menu-Button{BOTTOM}' + // } + // }, // 设置折返策略 setBackStrategy: { // (南京二号线) 01 不折返 02 缺省折返 03 换端 04 自动折返