diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 529bed990..2f6e52146 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -1,49 +1,49 @@ export const OperationEvent = { // 直接指令 Command: { - // 对话框 - common: { - choose: { - operation: 'com01', - domId: '_Tips-Cmd-Common-Choose' - }, - select: { - operation: 'com02', - domId: '_Tips-Cmd-Common-Select' - }, - confirm: { - operation: 'com03', - domId: '_Tips-Cmd-Common-Confirm' - }, - apply: { - operation: 'com04', - domId: '_Tips-Cmd-Common-Apply' - }, - close: { - operation: 'com05', - domId: '_Tips-Cmd-Common-Close' - }, - choose1: { - operation: 'com06', - domId: '_Tips-Cmd-Common-Choose1' - }, - select: { - operation: 'com07', - domId: '_Tips-Cmd-Common-Select' - }, - confirm1: { - operation: 'com08', - domId: '_Tips-Cmd-Common-Confirm1' - }, - apply1: { - operation: 'com09', - domId: '_Tips-Cmd-Common-Apply1' - }, - close1: { - operation: 'com10', - domId: '_Tips-Cmd-Common-Close1' - }, - }, + // 对话框 + common: { + choose: { + operation: 'com01', + domId: '_Tips-Cmd-Common-Choose' + }, + select: { + operation: 'com02', + domId: '_Tips-Cmd-Common-Select' + }, + confirm: { + operation: 'com03', + domId: '_Tips-Cmd-Common-Confirm' + }, + apply: { + operation: 'com04', + domId: '_Tips-Cmd-Common-Apply' + }, + close: { + operation: 'com05', + domId: '_Tips-Cmd-Common-Close' + }, + choose1: { + operation: 'com06', + domId: '_Tips-Cmd-Common-Choose1' + }, + select: { + operation: 'com07', + domId: '_Tips-Cmd-Common-Select' + }, + confirm1: { + operation: 'com08', + domId: '_Tips-Cmd-Common-Confirm1' + }, + apply1: { + operation: 'com09', + domId: '_Tips-Cmd-Common-Apply1' + }, + close1: { + operation: 'com10', + domId: '_Tips-Cmd-Common-Close1' + } + }, // 取消操作 cancel: { @@ -625,26 +625,26 @@ export const OperationEvent = { menu: { operation: '107', domId: '_Tips-Switch-Turnout-Menu' - }, - menuButton: { + }, + menuButton: { operation: '1071', domId: '_Tips-Switch-Turnout-MenuButton{BOTTOM}' - } + } }, // 强制扳动 turnoutForce: { - menu: { + menu: { operation: '108', domId: '_Tips-Switch-TurnoutForce-Menu' - }, - button: { + }, + button: { operation: '1080', domId: '_Tips-Switch-TurnoutForce-Mbm{TOP}' }, - menuButton: { + menuButton: { operation: '1081', domId: '_Tips-Switch-TurnoutForce-MenuButton{BOTTOM}' - } + } }, // 道岔故障解锁 fault: { @@ -671,11 +671,11 @@ export const OperationEvent = { stop: { operation: '1095', domId: '_Tips-Switch-Fault-Stop' - }, - menuButton: { + }, + menuButton: { operation: '1096', domId: '_Tips-Switch-Fault-MenuButton{BOTTOM}' - } + } }, // 计轴预复位 axlePreReset: { @@ -854,18 +854,18 @@ export const OperationEvent = { operation: '1190', domId: '_Tips-Switch-GuideLock-Button{TOP}' } - }, - // 挤岔恢复 - squeezeRecovery: { + }, + // 挤岔恢复 + squeezeRecovery: { button: { operation: '11a0', domId: '_Tips-Switch-Squeeze-Recovery-Button{TOP}' - }, - menuButton: { + }, + menuButton: { operation: '11a1', domId: '_Tips-Switch-Squeeze-Recovery-MenuButton{TOP}' - } - } + } + } }, // 控制模式操作 @@ -949,11 +949,11 @@ export const OperationEvent = { passwordConfirm: { operation: '2035', domId: '_Tips-Control-Forced-PasswordConfirm' - }, - menuButton: { - operation: '2036', + }, + menuButton: { + operation: '2036', domId: '_Tips-Control-Forced-Menu{BOTTOM}' - } + } }, // 请求中控 requestCentralControl: { @@ -1637,11 +1637,11 @@ export const OperationEvent = { stop: { operation: '4095', domId: '_Tips-Section-AxlePreReset-Stop' - }, - menuButton: { + }, + menuButton: { operation: '4096', domId: '_Tips-Section-AxlePreReset-Menu{BOTTOM}' - } + } }, // 设备状态 detail: { @@ -2105,14 +2105,14 @@ export const OperationEvent = { operation: '519', domId: '_Tips-Stand-openPsdByHand-Menu' } - }, - // 取消设置 + }, + // 取消设置 cancelTrain:{ menuButton: { operation: '520', domId: '_Tips-Stand-CancelTrain-MenuButton{BOTTOM}' } - } + } }, Station: { diff --git a/src/views/newMap/newMapdraft/ciConfig.vue b/src/views/newMap/newMapdraft/ciConfig.vue index c0e4e065c..fcfaf7b19 100644 --- a/src/views/newMap/newMapdraft/ciConfig.vue +++ b/src/views/newMap/newMapdraft/ciConfig.vue @@ -70,32 +70,34 @@ export default { falseValue: false, id: '', height: 800, - initData: { - upRight: false, - signalApproachOnlyOne: false, - signalApproachOnlyNpSwitch: false, - routeNameUseEndOppositeSignalName: false, - generateTbRoute: false, - tbRouteNameUseEndOppositeSignalName: false, - routeSignalAlwaysGreen: false, - routeApartByOverlap: false, - overlapOnlySwitch: false, - overlapSwitchNpOnly: false, - overlapSignalOppositeSwitchNpOnly: false, - overlapOnlyOneSwitch: false, - generateCycle: false, - routeButton: false, - likeHa1: false, - getNearlySignal: false, - overlapSettingByTrigger: false, - overlapReleaseTime: 45, - routeReleaseTime: 60 - }, + // initData: { + // upRight: false, + // signalApproachOnlyOne: false, + // signalApproachOnlyNpSwitch: false, + // routeNameUseEndOppositeSignalName: false, + // generateTbRoute: false, + // tbRouteNameUseEndOppositeSignalName: false, + // routeSignalAlwaysGreen: false, + // routeApartByOverlap: false, + // overlapOnlySwitch: false, + // overlapSwitchNpOnly: false, + // overlapSignalOppositeSwitchNpOnly: false, + // overlapOnlyOneSwitch: false, + // generateCycle: false, + // routeButton: false, + // likeHa1: false, + // getNearlySignal: false, + // overlapSettingByTrigger: false, + // generateFls:false, + // signalApproachNotPassPreSignal:false, + // overlapReleaseTime: 45, + // routeReleaseTime: 60 + // }, roadData: [], focus: false, booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'signalApproachOnlyOne', 'signalApproachOnlyNpSwitch', 'routeNameUseEndOppositeSignalName', 'generateTbRoute', 'tbRouteNameUseEndOppositeSignalName', 'routeSignalAlwaysGreen', - 'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly', 'overlapOnlyOneSwitch', 'generateCycle', 'routeButton', 'likeHa1', 'getNearlySignal', 'overlapSettingByTrigger', 'generateFls'], + 'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly', 'overlapOnlyOneSwitch', 'generateCycle', 'routeButton', 'likeHa1', 'getNearlySignal', 'overlapSettingByTrigger', 'generateFls', 'signalApproachNotPassPreSignal'], selectList: [], numberList: ['overlapReleaseTime', 'routeReleaseTime'], optionsMap: { @@ -123,7 +125,8 @@ export default { likeHa1: '是否类似哈尔滨一号线,联锁分为ATP信号、地面信号、引导信号', getNearlySignal: '生成进路信号按钮,进路信号按钮是否取最近的一个信号机', overlapSettingByTrigger: '延续保护的建立方式:是-通过触发建立,否-随进路建立', - generateFls: '是否生成侧防:是-生成侧防,不要联动道岔,否-不生成侧防,用联动道岔' + generateFls: '是否生成侧防:是-生成侧防,不要联动道岔,否-不生成侧防,用联动道岔', + signalApproachNotPassPreSignal:'信号机接近区段不跨过前方同向信号机' } }; },