This commit is contained in:
BianLzhaoMin 2025-08-15 13:06:48 +08:00
parent f975d3d32c
commit b13b33203d
2 changed files with 41 additions and 39 deletions

View File

@ -89,47 +89,49 @@ export const getRobotDeviceListFn = async () => {
// 获取地图信息 // 获取地图信息
export const getRobotMapInfoFn = async (puId) => { export const getRobotMapInfoFn = async (puId) => {
// if (!robotData.mapInfo.mapBase64) { if (!robotData.mapInfo.mapBase64) {
// const { data: res } = await handleRobotActionApi({ const { data: res } = await handleRobotActionApi({
// puId, puId,
// type: 4, type: 4,
// }) })
// if (res.code === 200) {
// const { Data, Height, Width, MapId, Name } = res.data
// const mapInfo = {
// mapBase64: 'data:image/png;base64,' + Data,
// mapWidth: Width,
// mapHeight: Height,
// mapName: Name,
// mapId: MapId,
// }
// robotData.setMapInfo(mapInfo)
// return mapInfo
// }
// } else {
// return robotData.mapInfo
// }
const { data: res } = await handleRobotActionApi({ console.log(res, '机器人地图信息---')
puId, if (res.code === 200) {
type: 4, const { Data, Height, Width, MapId, Name } = res.data
}) const mapInfo = {
mapBase64: 'data:image/png;base64,' + Data,
console.log(res, '机器人地图信息---') mapWidth: Width,
if (res.code === 200) { mapHeight: Height,
const { Data, Height, Width, MapId, Name } = res.data mapName: Name,
const mapInfo = { mapId: MapId,
mapBase64: 'data:image/png;base64,' + Data, }
mapWidth: Width, robotData.setMapInfo(mapInfo)
mapHeight: Height, return mapInfo
mapName: Name,
mapId: MapId,
} }
} else {
robotData.setMapInfo(mapInfo) return robotData.mapInfo
return mapInfo
} }
// const { data: res } = await handleRobotActionApi({
// puId,
// type: 4,
// })
// console.log(res, '机器人地图信息---')
// if (res.code === 200) {
// const { Data, Height, Width, MapId, Name } = res.data
// const mapInfo = {
// mapBase64: 'data:image/png;base64,' + Data,
// mapWidth: Width,
// mapHeight: Height,
// mapName: Name,
// mapId: MapId,
// }
// robotData.setMapInfo(mapInfo)
// return mapInfo
// }
} }
// 获取机器人实时定位信息 // 获取机器人实时定位信息
export const getRobotPointsInfoFn = async (puId) => { export const getRobotPointsInfoFn = async (puId) => {

View File

@ -161,7 +161,7 @@ const dialog = useDialog()
const emits = defineEmits(['onHandleCloseAddMarkerModal', 'onHandleConfirm']) const emits = defineEmits(['onHandleCloseAddMarkerModal', 'onHandleConfirm'])
const addOrEditMarkerFormRules = ref({ const addOrEditMarkerFormRules = ref({
markerName: [{ required: true, message: '请输入点位名称' }], markerName: [{ required: true, message: '请输入点位名称', trigger: 'blur' }],
}) })
const cameraNode = ref({ const cameraNode = ref({
token: '', token: '',