diff --git a/src/views/mapPage/realTimeMap/components/indexPage.vue b/src/views/mapPage/realTimeMap/components/indexPage.vue index b30b94a6..8da1325f 100644 --- a/src/views/mapPage/realTimeMap/components/indexPage.vue +++ b/src/views/mapPage/realTimeMap/components/indexPage.vue @@ -113,11 +113,11 @@ >
{{ item.robotNo || '' }} @@ -717,22 +717,14 @@ const linkWebSocket = (url) => { // testCarList.value = JSON.parse(JSON.stringify(dataList)) // testCarList.value = mergeCarArrays(testCarList.value, dataList) testCarList.value = mergeArraysWithoutDelete(testCarList.value, dataList) - // if (testCarList.value.length) { - // testCarList.value.forEach((item) => { - // item.originWidth = width - // item.originHeight = height - // item.origin = JSON.parse(imgBgObj.yamlJson).origin - // item.realX = convertActualToBrowser(item.data.pose2d.x, item.data.pose2d.y).x - // item.realY = convertActualToBrowser(item.data.pose2d.x, item.data.pose2d.y).y - // item.robotNo =item.data.pose2d.robotNo - // }) - // } + testCarList.value.forEach((item) => { item.originWidth = imgBgObj.width item.originHeight = imgBgObj.height item.origin = imgBgObj.origin item.realX = convertActualToBrowser(item.data.pose2d.x, item.data.pose2d.y).x item.realY = convertActualToBrowser(item.data.pose2d.x, item.data.pose2d.y).y + item.robotNo =item.data.pose2d.robotNo }) // console.log(testCarList.value)