标记
This commit is contained in:
parent
e338647105
commit
85aa1503c1
@ -4,7 +4,7 @@ NODE_ENV=development
|
||||
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'
|
||||
|
||||
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
|
||||
|
@ -325,7 +325,7 @@
|
||||
style="border: none; z-index: 999"
|
||||
>
|
||||
<!-- 节点合集 -->
|
||||
<div @mousedown="startFromPoint(index, $event)">
|
||||
<div @mousedown="startFromPoint(index, $event)" :style="nodeStyle(item, index)">
|
||||
<!-- 1 路径点 -->
|
||||
<el-tooltip
|
||||
class="box-item"
|
||||
@ -1563,6 +1563,7 @@ const markFormSubmit = async () => {
|
||||
return
|
||||
}
|
||||
let res = await MapApi.getAGVPointInformation(state.markForm.macAddress)
|
||||
if (res) {
|
||||
let content = JSON.parse(res.content)
|
||||
let point = JSON.parse(content[state.markForm.robotNo]) //标记传过来的数据
|
||||
let pointPx = convertActualToBrowser(point.x, point.y)
|
||||
@ -1596,6 +1597,9 @@ const markFormSubmit = async () => {
|
||||
})
|
||||
|
||||
addEditHistory()
|
||||
} else {
|
||||
message.warning('未采集到该AGV点位信息')
|
||||
}
|
||||
} else {
|
||||
//新增一个节点
|
||||
state.allMapPointInfo.push({
|
||||
@ -2170,8 +2174,6 @@ const getMapList = async () => {
|
||||
imgBgObj.area = res.area
|
||||
imgBgObj.width = yamlJson.width
|
||||
imgBgObj.height = yamlJson.height
|
||||
// imgBgObj.width = 1423
|
||||
// imgBgObj.height = 1406
|
||||
imgBgObj.origin = yamlJson.origin
|
||||
imgBgObj.resolution = yamlJson.resolution
|
||||
// 调转换成png的接口
|
||||
@ -2194,6 +2196,7 @@ const getAllNodeList = async () => {
|
||||
let list = await MapApi.getPositionMapItemList({
|
||||
positionMapId: imgBgObj.positionMapId
|
||||
})
|
||||
console.log(imgBgObj.width)
|
||||
state.allMapPointInfo = []
|
||||
state.currentIndex = 0
|
||||
list.forEach((item) => {
|
||||
|
Loading…
Reference in New Issue
Block a user