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

Merge remote-tracking branch 'origin/develop' into local-test
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 10m48s Details

This commit is contained in:
joylink_fanyuhong 2024-09-14 13:50:57 +08:00
parent 47a0eceebb f2efa437df
commit a192c71555
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/newMap/display/trainingList/trainingPositionTip.vue
View File

@ -101,9 +101,6 @@ export default {
}, },
methods: { methods: {
async tipInit(timetamp) { async tipInit(timetamp) {
if (this.timetamp !== timetamp) {
return;
}
if (this.teachMode === ScriptMode.TEACH) { if (this.teachMode === ScriptMode.TEACH) {
this.tipShow = true; this.tipShow = true;
const offset = this.$store.state.config.canvasOffset; const offset = this.$store.state.config.canvasOffset;
@ -123,28 +120,34 @@ export default {
x: position.x + offset.x, x: position.x + offset.x,
y: position.y + offset.y - distance y: position.y + offset.y - distance
}; };
this.popTipShow(); this.popTipShow(timetamp);
} }
} else if (stepInfo.tipPosition && stepInfo.tipPosition.domId) { } else if (stepInfo.tipPosition && stepInfo.tipPosition.domId) {
const position = await this.getOtherTipPoint(stepInfo.tipPosition); const position = await this.getOtherTipPoint(stepInfo.tipPosition);
if (position) { if (position) {
this.position = position; this.position = position;
this.position.y -= distance; this.position.y -= distance;
this.popTipShow(); this.popTipShow(timetamp);
} else { } else {
this.popTipHide(); this.popTipHide(timetamp);
} }
} else { } else {
this.popTipHide(); this.popTipHide(timetamp);
} }
} else { } else {
this.tipShow = false; this.tipShow = false;
} }
}, },
popTipShow() { popTipShow(timetamp) {
if (this.timetamp !== timetamp) {
return;
}
this.popShow = true; this.popShow = true;
}, },
popTipHide() { popTipHide(timetamp) {
if (this.timetamp !== timetamp) {
return;
}
this.popShow = false; this.popShow = false;
}, },
// 获取地图设备提示位置 // 获取地图设备提示位置