feat: map rotation with overlay fix — rotate only img, keep overlay with points + nav click

This commit is contained in:
ywb
2026-05-17 09:24:34 +08:00
parent 4b964b7067
commit 6a5fce819f
2 changed files with 61 additions and 12 deletions
+47
View File
@@ -17,6 +17,9 @@ createApp({
mapImageUrl: '',
mapMeta: null,
mapRotation: 0,
mapVersion: 0,
navCurrentPos: null,
nav2Available: false,
// 点位
points: [],
newPointName: '',
@@ -47,6 +50,7 @@ createApp({
mounted() {
this.refresh()
this.refreshAngles()
this.nav2Timer = setInterval(this.refreshNavStatus, 3000)
},
watch: {
tab(val) {
@@ -65,6 +69,7 @@ createApp({
beforeUnmount() {
Object.values(this.jogIntervals).forEach(i => clearInterval(i))
if (this.agvCameraTimer) clearInterval(this.agvCameraTimer)
if (this.nav2Timer) clearInterval(this.nav2Timer)
},
methods: {
async refresh() {
@@ -114,6 +119,48 @@ createApp({
rotateMap(deg) {
this.mapRotation = (this.mapRotation + deg) % 360
},
resetMapView() {
this.mapRotation = 0
this.mapVersion++
},
async refreshNavStatus() {
try {
const res = await fetch(API + '/api/navigate/status')
if (res.ok) {
const data = await res.json()
this.nav2Available = data.nav2_available
if (data.current_pos) {
this.navCurrentPos = data.current_pos
}
}
} catch (e) {}
},
async onMapClick(e) {
if (!this.mapMeta || !this.agvConnected) return
const rect = e.target.getBoundingClientRect()
const px = (e.clientX - rect.left) / rect.width
const py = (e.clientY - rect.top) / rect.height
const { resolution, origin } = this.mapMeta
const wx = origin[0] + px * resolution * this.mapMeta.width
const wy = origin[1] + (1 - py) * resolution * this.mapMeta.height
try {
const res = await fetch(API + '/api/navigate/to', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ x: wx, y: wy })
})
const data = await res.json()
if (data.ok) {
this.mapMsg = '✅ 导航目标已发送'
this.mapVersion++
} else {
this.mapMsg = '❌ ' + (data.error || '导航失败')
}
} catch (e) {
this.mapMsg = '❌ 导航请求失败'
}
setTimeout(() => { this.mapMsg = '' }, 3000)
},
getMapX(coords) {
if (!coords || !this.mapMeta) return 50
const [x, y, yaw] = coords