diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue index fc8144152..214c3a945 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue @@ -138,7 +138,7 @@ export default { let name = section.name; if (section.type == '02') { const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode); - name = `${sectionParent.name}-${section.name}`; + name = `${sectionParent.name}${section.name}`; } list.push({ name: name, code: section.code }); }); diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue index 5f45fa8bf..30672b938 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue @@ -75,7 +75,17 @@ export default { return this.dialogShow ? OperationEvent.Command.close.menu.domId : ''; }, domIdConfirm() { - return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : ''; + if (this.dialogShow) { + if (this.operation == OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation) { + return OperationEvent.AutoTurnBack.SetAutoTurnBackButton.confirm.operation; + } else if (this.operation == OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation) { + return OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.confirm.operation; + } else { + return ''; + } + } else { + return ''; + } }, title() { return '自动折返'; diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js index a94a13ad8..886e3bd11 100644 --- a/src/jmapNew/theme/ningbo_01/operationConfig.js +++ b/src/jmapNew/theme/ningbo_01/operationConfig.js @@ -760,6 +760,34 @@ export default { { deviceType: 'button', orderNum: 1, operateCode: '202', tip: '鼠标右键菜单选择【请求站控】'}, { deviceType: '05', orderNum: 2, operateCode: '2023', tip: '鼠标左键点击【应用】' } ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: 'Signal_Set_Auto_Turn_Back', + skinCode: '06', + trainingName: '设置自动折返进路({3})', + trainingRemark: '设置自动折返进路', + trainingType: 'Signal', + productTypes: ['02'], + stepVOList: [ + { deviceType: '05', orderNum: 1, operateCode: '900', tip: '鼠标右键菜单选择【设置自动折返】'}, + { deviceType: '05', orderNum: 2, operateCode: '9001', tip: '鼠标左键点击【应用】' } + ] + }, + { + maxDuration: 15, + minDuration: 8, + operateType: 'Signal_Cancel_Auto_Turn_Back', + skinCode: '06', + trainingName: ' 取消自动折返进路({3})', + trainingRemark: ' 取消自动折返进路', + trainingType: 'Signal', + productTypes: ['02'], + stepVOList: [ + { deviceType: '05', orderNum: 1, operateCode: '901', tip: '鼠标右键菜单选择【取消自动折返】'}, + { deviceType: '05', orderNum: 2, operateCode: '9011', tip: '鼠标左键点击【应用】' } + ] } ] };