ak/zn-admin-vue3-wcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标记

Browse Source
This commit is contained in:
yyy 2025-03-06 09:31:18 +08:00
parent e338647105
commit 85aa1503c1
2 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.local
View File

@ -4,7 +4,7 @@ NODE_ENV=development
VITE_DEV=true VITE_DEV=true
# 请求路径 # 请求路径
VITE_BASE_URL='http://192.168.0.172:48080' VITE_BASE_URL='http://192.168.0.74:48080'
# VITE_BASE_URL='http://192.168.0.189:48080' # VITE_BASE_URL='http://192.168.0.189:48080'
# 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务

69
src/views/mapPage/realTimeMap/editMap.vue
View File

@ -325,7 +325,7 @@
style="border: none; z-index: 999" style="border: none; z-index: 999"
> >
<!-- 节点合集 --> <!-- 节点合集 -->
<div @mousedown="startFromPoint(index, $event)"> <div @mousedown="startFromPoint(index, $event)" :style="nodeStyle(item, index)">
<!-- 1 路径点 --> <!-- 1 路径点 -->
<el-tooltip <el-tooltip
class="box-item" class="box-item"
@ -1563,39 +1563,43 @@ const markFormSubmit = async () => {
return return
} }
let res = await MapApi.getAGVPointInformation(state.markForm.macAddress) let res = await MapApi.getAGVPointInformation(state.markForm.macAddress)
let content = JSON.parse(res.content) if (res) {
let point = JSON.parse(content[state.markForm.robotNo]) //标记传过来的数据 let content = JSON.parse(res.content)
let pointPx = convertActualToBrowser(point.x, point.y) let point = JSON.parse(content[state.markForm.robotNo]) //标记传过来的数据
let actualPoint = disposeEventPoint(pointPx.x, pointPx.y) let pointPx = convertActualToBrowser(point.x, point.y)
let actualPoint = disposeEventPoint(pointPx.x, pointPx.y)
if (state.currentItemIndex !== -1) { if (state.currentItemIndex !== -1) {
state.allMapPointInfo[state.currentItemIndex].locationX = pointPx.x state.allMapPointInfo[state.currentItemIndex].locationX = pointPx.x
state.allMapPointInfo[state.currentItemIndex].locationY = pointPx.y state.allMapPointInfo[state.currentItemIndex].locationY = pointPx.y
state.allMapPointInfo[state.currentItemIndex].actualLocationX = actualPoint.actualLocationX state.allMapPointInfo[state.currentItemIndex].actualLocationX = actualPoint.actualLocationX
state.allMapPointInfo[state.currentItemIndex].actualLocationY = actualPoint.actualLocationY state.allMapPointInfo[state.currentItemIndex].actualLocationY = actualPoint.actualLocationY
//更改路线里的 //更改路线里的
let item = state.allMapPointInfo[state.currentItemIndex] let item = state.allMapPointInfo[state.currentItemIndex]
state.mapRouteList.forEach((route) => { state.mapRouteList.forEach((route) => {
if (item.id === route.startingPointId) { if (item.id === route.startingPointId) {
route.startPointX = pointPx.x route.startPointX = pointPx.x
route.startPointY = pointPx.y route.startPointY = pointPx.y
route.beginHigh = Number(item.locationDeepPx) route.beginHigh = Number(item.locationDeepPx)
route.beginWidth = Number(item.locationWidePx) route.beginWidth = Number(item.locationWidePx)
route.actualStartPointX = actualPoint.actualLocationX route.actualStartPointX = actualPoint.actualLocationX
route.actualStartPointY = actualPoint.actualLocationY route.actualStartPointY = actualPoint.actualLocationY
} }
if (item.id === route.endPointId) { if (item.id === route.endPointId) {
route.endPointX = pointPx.x route.endPointX = pointPx.x
route.endPointY = pointPx.y route.endPointY = pointPx.y
route.endHigh = Number(item.locationDeepPx) route.endHigh = Number(item.locationDeepPx)
route.endWidth = Number(item.locationWidePx) route.endWidth = Number(item.locationWidePx)
route.actualEndPointX = actualPoint.actualLocationX route.actualEndPointX = actualPoint.actualLocationX
route.actualEndPointY = actualPoint.actualLocationY route.actualEndPointY = actualPoint.actualLocationY
} }
}) })
addEditHistory() addEditHistory()
} else {
message.warning('未采集到该AGV点位信息')
}
} else { } else {
//新增一个节点 //新增一个节点
state.allMapPointInfo.push({ state.allMapPointInfo.push({
@ -2170,8 +2174,6 @@ const getMapList = async () => {
imgBgObj.area = res.area imgBgObj.area = res.area
imgBgObj.width = yamlJson.width imgBgObj.width = yamlJson.width
imgBgObj.height = yamlJson.height imgBgObj.height = yamlJson.height
// imgBgObj.width = 1423
// imgBgObj.height = 1406
imgBgObj.origin = yamlJson.origin imgBgObj.origin = yamlJson.origin
imgBgObj.resolution = yamlJson.resolution imgBgObj.resolution = yamlJson.resolution
// 调转换成png的接口 // 调转换成png的接口
@ -2194,6 +2196,7 @@ const getAllNodeList = async () => {
let list = await MapApi.getPositionMapItemList({ let list = await MapApi.getPositionMapItemList({
positionMapId: imgBgObj.positionMapId positionMapId: imgBgObj.positionMapId
}) })
console.log(imgBgObj.width)
state.allMapPointInfo = [] state.allMapPointInfo = []
state.currentIndex = 0 state.currentIndex = 0
list.forEach((item) => { list.forEach((item) => {