joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

宁波一号线 自动折返按钮实训操作代码调整

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-04-10 10:41:41 +08:00
parent 25fcebdc75
commit 888ae6e936
5 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue
View File

@ -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 '';
}

4
src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue
View File

@ -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);
});
}

4
src/jmapNew/theme/ningbo_01/operationConfig.js
View File

@ -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: '鼠标左键点击【应用】' }
]
}
]

14
src/views/newMap/jlmapNew/index.vue
View File

@ -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);

11
src/views/newMap/mapsystemNew/plugin/trainingtip.vue
View File

@ -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) {