diff --git a/src/utils/getRobotInfo.js b/src/utils/getRobotInfo.js index 448ef5b..b501706 100644 --- a/src/utils/getRobotInfo.js +++ b/src/utils/getRobotInfo.js @@ -89,47 +89,49 @@ export const getRobotDeviceListFn = async () => { // 获取地图信息 export const getRobotMapInfoFn = async (puId) => { - // if (!robotData.mapInfo.mapBase64) { - // const { data: res } = await handleRobotActionApi({ - // puId, - // 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 - // } + if (!robotData.mapInfo.mapBase64) { + const { data: res } = await handleRobotActionApi({ + puId, + type: 4, + }) - 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, + 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 } - - robotData.setMapInfo(mapInfo) - - return mapInfo + } else { + return robotData.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) => { diff --git a/src/views/home/components/modal-content/add-or-edit-marker-form.vue b/src/views/home/components/modal-content/add-or-edit-marker-form.vue index edd2858..0a20f26 100644 --- a/src/views/home/components/modal-content/add-or-edit-marker-form.vue +++ b/src/views/home/components/modal-content/add-or-edit-marker-form.vue @@ -161,7 +161,7 @@ const dialog = useDialog() const emits = defineEmits(['onHandleCloseAddMarkerModal', 'onHandleConfirm']) const addOrEditMarkerFormRules = ref({ - markerName: [{ required: true, message: '请输入点位名称' }], + markerName: [{ required: true, message: '请输入点位名称', trigger: 'blur' }], }) const cameraNode = ref({ token: '',