Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 10m48s
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 10m48s
This commit is contained in:
commit
a192c71555
@ -101,9 +101,6 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
async tipInit(timetamp) {
|
||||
if (this.timetamp !== timetamp) {
|
||||
return;
|
||||
}
|
||||
if (this.teachMode === ScriptMode.TEACH) {
|
||||
this.tipShow = true;
|
||||
const offset = this.$store.state.config.canvasOffset;
|
||||
@ -123,28 +120,34 @@ export default {
|
||||
x: position.x + offset.x,
|
||||
y: position.y + offset.y - distance
|
||||
};
|
||||
this.popTipShow();
|
||||
this.popTipShow(timetamp);
|
||||
}
|
||||
} else if (stepInfo.tipPosition && stepInfo.tipPosition.domId) {
|
||||
const position = await this.getOtherTipPoint(stepInfo.tipPosition);
|
||||
if (position) {
|
||||
this.position = position;
|
||||
this.position.y -= distance;
|
||||
this.popTipShow();
|
||||
this.popTipShow(timetamp);
|
||||
} else {
|
||||
this.popTipHide();
|
||||
this.popTipHide(timetamp);
|
||||
}
|
||||
} else {
|
||||
this.popTipHide();
|
||||
this.popTipHide(timetamp);
|
||||
}
|
||||
} else {
|
||||
this.tipShow = false;
|
||||
}
|
||||
},
|
||||
popTipShow() {
|
||||
popTipShow(timetamp) {
|
||||
if (this.timetamp !== timetamp) {
|
||||
return;
|
||||
}
|
||||
this.popShow = true;
|
||||
},
|
||||
popTipHide() {
|
||||
popTipHide(timetamp) {
|
||||
if (this.timetamp !== timetamp) {
|
||||
return;
|
||||
}
|
||||
this.popShow = false;
|
||||
},
|
||||
// 获取地图设备提示位置
|
||||
|
Loading…
Reference in New Issue
Block a user