bonus
/
on-site-robots-screen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
BianLzhaoMin 2025-07-16 13:51:05 +08:00
parent 353bfba3b4
commit 5a448431aa
1 changed files with 45 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
src/views/home/components/modal-content/add-or-edit-marker-form.vue
View File

@ -249,6 +249,39 @@ const getRobotCurrentPosition = async (puId) => {
} }
} }
// 新增或者修改点位
const addOrEditMarker = async (isCurrentPosition) => {
const { Robot_x, Robot_y, PTZ_x, PTZ_y, PTZ_zoom, Robot_theta } = isCurrentPosition
markerParams.value.xCount = Robot_x
markerParams.value.yCount = Robot_y
markerParams.value.PTZ_x = PTZ_x
markerParams.value.PTZ_y = PTZ_y
markerParams.value.markerAngle = Robot_theta
markerParams.value.PTZ_zoom = PTZ_zoom
const addMarkerParams = {
ptzz: markerParams.value.PTZ_zoom,
theta: markerParams.value.markerAngle,
ptzx: markerParams.value.PTZ_x,
ptzy: markerParams.value.PTZ_y,
positionX: Math.ceil(markerParams.value.xCount),
positionY: Math.ceil(markerParams.value.yCount),
mapId: markerParams.value.mapId,
pointName: markerParams.value.markerName,
}
if (markerParams.value.type === '修改') {
addMarkerParams.id = markerParams.value.id
}
const { data: result } = await addMarkerApi(addMarkerParams)
if (result.code == 200) {
message.success(markerParams.value.type === '修改' ? '修改点位成功' : '新增点位成功')
onHandleCloseAddModal()
}
}
// 确认按钮 // 确认按钮
const onHandleConfirm = () => { const onHandleConfirm = () => {
// emits('onHandleConfirm', markerParams.value) // emits('onHandleConfirm', markerParams.value)
@ -259,8 +292,16 @@ const onHandleConfirm = () => {
}).then(async (res) => { }).then(async (res) => {
const { Robot_x, Robot_y, PTZ_x, PTZ_y, PTZ_zoom, Robot_theta } = res?.data.data const { Robot_x, Robot_y, PTZ_x, PTZ_y, PTZ_zoom, Robot_theta } = res?.data.data
// 如果是修改时判断当前位置是否与点位一致 const isCurrentPosition = {
Robot_x,
Robot_y,
PTZ_x,
PTZ_y,
PTZ_zoom,
Robot_theta,
}
// 判断当前点位和机器人位置是否一致
if ( if (
Math.abs(Robot_x - markerParams.value.xCount) > 2 || Math.abs(Robot_x - markerParams.value.xCount) > 2 ||
Math.abs(Robot_y - markerParams.value.yCount) > 2 Math.abs(Robot_y - markerParams.value.yCount) > 2
@ -276,31 +317,7 @@ const onHandleConfirm = () => {
onHandleGoToPoint() onHandleGoToPoint()
}, },
onNegativeClick: async () => { onNegativeClick: async () => {
markerParams.value.xCount = Robot_x addOrEditMarker(isCurrentPosition)
markerParams.value.yCount = Robot_y
markerParams.value.PTZ_x = PTZ_x
markerParams.value.PTZ_y = PTZ_y
markerParams.value.markerAngle = Robot_theta
markerParams.value.PTZ_zoom = PTZ_zoom
const addMarkerParams = {
ptzz: markerParams.value.PTZ_zoom,
theta: markerParams.value.markerAngle,
ptzx: markerParams.value.PTZ_x,
ptzy: markerParams.value.PTZ_y,
positionX: Math.ceil(markerParams.value.xCount),
positionY: Math.ceil(markerParams.value.yCount),
mapId: markerParams.value.mapId,
pointName: markerParams.value.markerName,
}
addMarkerParams.id = markerParams.value.id
const { data: result } = await addMarkerApi(addMarkerParams)
if (result.code == 200) {
message.success('修改点位成功')
onHandleCloseAddModal()
}
}, },
}) })
} else { } else {
@ -311,58 +328,12 @@ const onHandleConfirm = () => {
negativeText: '取消', negativeText: '取消',
onPositiveClick: () => {}, onPositiveClick: () => {},
onNegativeClick: async () => { onNegativeClick: async () => {
markerParams.value.xCount = Robot_x addOrEditMarker(isCurrentPosition)
markerParams.value.yCount = Robot_y
markerParams.value.PTZ_x = PTZ_x
markerParams.value.PTZ_y = PTZ_y
markerParams.value.markerAngle = Robot_theta
markerParams.value.PTZ_zoom = PTZ_zoom
const addMarkerParams = {
ptzz: markerParams.value.PTZ_zoom,
theta: markerParams.value.markerAngle,
ptzx: markerParams.value.PTZ_x,
ptzy: markerParams.value.PTZ_y,
positionX: Math.ceil(markerParams.value.xCount),
positionY: Math.ceil(markerParams.value.yCount),
mapId: markerParams.value.mapId,
pointName: markerParams.value.markerName,
}
const { data: result } = await addMarkerApi(addMarkerParams)
if (result.code == 200) {
message.success('新增点位成功')
onHandleCloseAddModal()
}
}, },
}) })
} }
} else { } else {
markerParams.value.xCount = Robot_x addOrEditMarker(isCurrentPosition)
markerParams.value.yCount = Robot_y
markerParams.value.PTZ_x = PTZ_x
markerParams.value.PTZ_y = PTZ_y
markerParams.value.markerAngle = Robot_theta
markerParams.value.PTZ_zoom = PTZ_zoom
const addMarkerParams = {
ptzz: markerParams.value.PTZ_zoom,
theta: markerParams.value.markerAngle,
ptzx: markerParams.value.PTZ_x,
ptzy: markerParams.value.PTZ_y,
positionX: Math.ceil(markerParams.value.xCount),
positionY: Math.ceil(markerParams.value.yCount),
mapId: markerParams.value.mapId,
pointName: markerParams.value.markerName,
}
addMarkerParams.id = markerParams.value.id
const { data: result } = await addMarkerApi(addMarkerParams)
if (result.code == 200) {
message.success('修改点位成功')
onHandleCloseAddModal()
}
} }
}) })
} }