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'
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 8m32s Details

This commit is contained in:
joylink_fanyuhong 2024-09-14 13:58:04 +08:00
parent a1c8b4f662 f2efa437df
commit f14d998f19
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,8 @@ export default {
x: 0, x: 0,
y: 0 y: 0
}, },
tip: '' tip: '',
timetamp: 0
}; };
}, },
computed: { computed: {
@ -47,7 +48,8 @@ export default {
awaitOperateFlag = !document.getElementById(OperationEvent.StationControl.requestStationControl.awaitAlarm.domId); awaitOperateFlag = !document.getElementById(OperationEvent.StationControl.requestStationControl.awaitAlarm.domId);
} }
if (val && this.trainingDetail && this.trainingDetail.type === 'SINGLE' && val.memberId == this.myMemberId && !awaitOperateFlag) { if (val && this.trainingDetail && this.trainingDetail.type === 'SINGLE' && val.memberId == this.myMemberId && !awaitOperateFlag) {
this.tipInit(); this.timetamp = new Date().getTime();
this.tipInit(this.timetamp);
} else { } else {
this.tip = ''; this.tip = '';
this.popShow = false; this.popShow = false;
@ -56,7 +58,8 @@ export default {
}, },
'$store.state.trainingNew.voiceStepIndex': function(val) { '$store.state.trainingNew.voiceStepIndex': function(val) {
if (val > -1 && this.trainingDetail && this.trainingDetail.type === 'SINGLE') { if (val > -1 && this.trainingDetail && this.trainingDetail.type === 'SINGLE') {
this.tipInit(); this.timetamp = new Date().getTime();
this.tipInit(this.timetamp);
} else { } else {
this.tip = ''; this.tip = '';
this.popShow = false; this.popShow = false;
@ -76,9 +79,11 @@ export default {
this.position = { x: 0, y: 0 }; this.position = { x: 0, y: 0 };
}, },
'$store.state.training.tipEvent': function (val) { '$store.state.training.tipEvent': function (val) {
const timetamp = new Date().getTime();
this.timetamp = timetamp;
setTimeout(() => { setTimeout(() => {
if (this.tip) { if (this.tip) {
this.tipInit(); this.tipInit(timetamp);
} }
}, 10); }, 10);
}, },
@ -87,13 +92,15 @@ export default {
const stepInfo = this.$store.state.trainingNew.stepInfo; const stepInfo = this.$store.state.trainingNew.stepInfo;
const domId = OperationEvent.StationControl.requestStationControl.awaitAlarm.operation; const domId = OperationEvent.StationControl.requestStationControl.awaitAlarm.operation;
if (val && val.sourceMemberId == this.$store.state.training.myMemberId && stepInfo && stepInfo.tipPosition && stepInfo.tipPosition.domId === domId) { if (val && val.sourceMemberId == this.$store.state.training.myMemberId && stepInfo && stepInfo.tipPosition && stepInfo.tipPosition.domId === domId) {
setTimeout(() => { this.tipInit(); }, 10); const timetamp = new Date().getTime();
this.timetamp = timetamp;
setTimeout(() => { this.tipInit(timetamp); }, 10);
} }
} }
} }
}, },
methods: { methods: {
async tipInit() { async tipInit(timetamp) {
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;
@ -113,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;
}, },
// 获取地图设备提示位置 // 获取地图设备提示位置