diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue index 30672b938..d5207e778 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue @@ -77,9 +77,9 @@ export default { domIdConfirm() { if (this.dialogShow) { if (this.operation == OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation) { - return OperationEvent.AutoTurnBack.SetAutoTurnBackButton.confirm.operation; + return OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.domId; } else if (this.operation == OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation) { - return OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.confirm.operation; + return OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.domId; } else { return ''; } diff --git a/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue b/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue index 30f0b2547..0844aeed9 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue @@ -106,13 +106,13 @@ export default { }, // 设置自动折返 handlerTurnBack() { - commitOperate(menuOperate.Signal.setAutoTurnBack, {cycleCode:this.selected.cycleCode}, 0).then((data)=>{ + commitOperate(menuOperate.Signal.setAutoTurnBack, {code:this.selected.code, cycleCode:this.selected.cycleCode}, 0).then((data)=>{ this.$refs.turnBackControl.doShow(data.operate, this.selected); }); }, // 取消自动折返 cancelTurnBack() { - commitOperate(menuOperate.Signal.cancelAutoTurnBack, {cycleCode:this.selected.cycleCode, cancelRoute:false}, 0).then((data)=>{ + commitOperate(menuOperate.Signal.cancelAutoTurnBack, {code:this.selected.code, cycleCode:this.selected.cycleCode, cancelRoute:false}, 0).then((data)=>{ this.$refs.turnBackControl.doShow(data.operate, this.selected); }); } diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js index 886e3bd11..66a85e9d3 100644 --- a/src/jmapNew/theme/ningbo_01/operationConfig.js +++ b/src/jmapNew/theme/ningbo_01/operationConfig.js @@ -772,7 +772,7 @@ export default { productTypes: ['02'], stepVOList: [ { deviceType: '05', orderNum: 1, operateCode: '900', tip: '鼠标右键菜单选择【设置自动折返】'}, - { deviceType: '05', orderNum: 2, operateCode: '9001', tip: '鼠标左键点击【应用】' } + { deviceType: '05', orderNum: 2, operateCode: '900', tip: '鼠标左键点击【应用】' } ] }, { @@ -786,7 +786,7 @@ export default { productTypes: ['02'], stepVOList: [ { deviceType: '05', orderNum: 1, operateCode: '901', tip: '鼠标右键菜单选择【取消自动折返】'}, - { deviceType: '05', orderNum: 2, operateCode: '9011', tip: '鼠标左键点击【应用】' } + { deviceType: '05', orderNum: 2, operateCode: '901', tip: '鼠标左键点击【应用】' } ] } ] diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index 287691459..3c30a9716 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -117,7 +117,19 @@ export default { } }, '$store.state.training.rezoomCount': function (val, old) { - this.setCenter(this.$store.state.training.offsetStationCode); + // 单独处理 自动折返 + let code = this.$store.state.training.offsetStationCode; + if (code && code.includes('TurnedAround')) { + const buttonList = this.$store.state.map.map.cycleButtonList; + if (buttonList && buttonList.length > 0) { + buttonList.forEach(element => { + if (code == element.cycleCode) { + code = element.code; + } + }); + } + } + this.setCenter(code); }, '$store.state.exam.deviceCode': function (val) { val && this.setCenter(val); diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue index 119abdfb3..35fa60fbe 100644 --- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue +++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue @@ -57,6 +57,17 @@ export default { this.popTipShow(); } } else if (step.code) { + // 单独处理 自动折返 + if (step.code.includes('TurnedAround')) { + const buttonList = this.$store.state.map.map.cycleButtonList; + if (buttonList && buttonList.length > 0) { + buttonList.forEach(element => { + if (element.cycleCode == step.code) { + step.code = element.code; + } + }); + } + } /** 默认是shape类型,如果找不到坐标,则可以认为是存在code的dailog*/ const position = this.getShapeTipPoint(step); if (position) {