diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue index a108b17cc..0912bf28e 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue @@ -204,7 +204,7 @@ export default { this.commitDisabled = true; } - const operate = {val:code}; + const operate = {val:this.selection.toString()}; if (this.operation == OperationEvent.Signal.humanControl.menu.operation) { /** 进路交人工控*/ operate.operation = OperationEvent.Signal.humanControl.choose.operation; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue index 3ac6a613d..1015f978b 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue @@ -54,7 +54,7 @@ export default { menuNormal: { Local: [ { - label: this.$t('menu.menuSection.sectionFaultUnlock'), + label: '故障解锁', handler: this.fault, cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK }, @@ -69,7 +69,7 @@ export default { cmdType: CMD.Section.CMD_SECTION_ACTIVE }, { - label: this.$t('menu.menuSection.sectionAxisPreReset'), + label: '计轴预复位', handler: this.axlePreReset, cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET }, @@ -97,7 +97,7 @@ export default { ], Center: [ { - label: this.$t('menu.menuSection.sectionFaultUnlock'), + label: '故障解锁', handler: this.fault, cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK }, @@ -112,7 +112,7 @@ export default { cmdType: CMD.Section.CMD_SECTION_ACTIVE }, { - label: this.$t('menu.menuSection.sectionAxisPreReset'), + label: '计轴预复位', handler: this.axlePreReset, cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET }, diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue index 4ab788f05..f8cea7876 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue @@ -75,12 +75,12 @@ export default { cmdType:CMD.Switch.CMD_SWITCH_TURN }, { - label: '道岔故障解锁', + label: '故障解锁', handler: this.fault, cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK }, { - label: '道岔计轴预复位', + label: '计轴预复位', handler: this.axlePreReset, cmdType:CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET }, diff --git a/src/jmapNew/theme/fuzhou_01/operationConfig.js b/src/jmapNew/theme/fuzhou_01/operationConfig.js index b5f4f4c7c..58459c1bb 100644 --- a/src/jmapNew/theme/fuzhou_01/operationConfig.js +++ b/src/jmapNew/theme/fuzhou_01/operationConfig.js @@ -329,7 +329,7 @@ export default { trainingType: 'Section', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' }, + { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【故障解锁】' }, { deviceType: '03', orderNum: 2, operateCode: '4026', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '03', orderNum: 3, operateCode: '4024', tip: '鼠标左键点击【确认1】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '4025', tip: '鼠标左键点击【确认2】按钮' }, @@ -536,7 +536,7 @@ export default { trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【道岔故障解锁】' }, + { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【故障解锁】' }, { deviceType: '02', orderNum: 2, operateCode: '1091', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '1093', tip: '鼠标左键点击【确认1】按钮' }, { deviceType: '02', orderNum: 4, operateCode: '1094', tip: '鼠标左键点击【确认2】按钮' }, @@ -808,7 +808,7 @@ export default { { deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' } ] }, - { // 未生成实训 + { maxDuration: 15, minDuration: 8, operateType: 'Signal_Cancel_CI_Auto', diff --git a/src/jmapNew/theme/xian_01/operationConfig.js b/src/jmapNew/theme/xian_01/operationConfig.js index e9e77c242..165003bb6 100644 --- a/src/jmapNew/theme/xian_01/operationConfig.js +++ b/src/jmapNew/theme/xian_01/operationConfig.js @@ -373,7 +373,7 @@ export default { trainingType: 'Section', productTypes: ['01'], stepVOList: [ - { deviceType: '03', orderNum: 1, operateCode: '409', tip: '鼠标右键菜单选择【区段计轴预复位】' }, + { deviceType: '03', orderNum: 1, operateCode: '409', tip: '鼠标右键菜单选择【计轴预复位】' }, { deviceType: '03', orderNum: 2, operateCode: '4091', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '03', orderNum: 3, operateCode: '4093', tip: '鼠标左键点击【确认1】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '4094', tip: '鼠标左键点击【确认2】按钮' }, @@ -535,7 +535,7 @@ export default { trainingType: 'Switch', productTypes: ['01', '02'], stepVOList: [ - { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【道岔故障解锁】' }, + { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【故障解锁】' }, { deviceType: '02', orderNum: 2, operateCode: '1091', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '02', orderNum: 3, operateCode: '1093', tip: '鼠标左键点击【确认1】按钮' }, { deviceType: '02', orderNum: 4, operateCode: '1094', tip: '鼠标左键点击【确认2】按钮' },