diff --git a/src/views/board/allBoard/index.vue b/src/views/board/allBoard/index.vue
index b7c77f95..80d39c74 100644
--- a/src/views/board/allBoard/index.vue
+++ b/src/views/board/allBoard/index.vue
@@ -113,7 +113,21 @@
-
+
+
+ 待执行
+ 前往取货
+ 取货中
+ 前往放货
+ 放货中
+ 已完成
+ 移动中
+ 正在充电
+ 取消
+ 人工完成
+ 异常
+
+
@@ -140,7 +154,7 @@
style="width: 160px"
/>
-
+
{
nextTick(() => {
- widthVal.value = getElementWidthByClass('map-box-allBoard')
+ widthVal.value = getElementWidthByClass('map-box-container')
tableHeight.value = (getElementHeightByClass('bottom-box') - 60) / 2
+ indexPageRef.value.computedRatio()
})
}
diff --git a/src/views/mapPage/realTimeMap/components/indexPage.vue b/src/views/mapPage/realTimeMap/components/indexPage.vue
index b19056cc..25b5f109 100644
--- a/src/views/mapPage/realTimeMap/components/indexPage.vue
+++ b/src/views/mapPage/realTimeMap/components/indexPage.vue
@@ -809,10 +809,8 @@ const linkWebSocket = (url) => {
// 规划路线信息
if (jsonMsg.type == 'planning_move_pose') {
let data = JSON.parse(jsonMsg.content)
- // console.log('======规划路线======', JSON.parse(data).data)
let dataList = JSON.parse(data).data
if (lineList.value.length > 0) {
- // console.log(lineList.value)
lineList.value = setIsSelect(lineList.value, dataList)
}
}
@@ -984,8 +982,6 @@ const computedRatio = () => {
radio.value = width / imgBgObj.width
imgBgObj.width = imgBgObj.width * radio.value
imgBgObj.height = imgBgObj.height * radio.value
-
- // console.log("====",testCarList.value)
}
})
}
@@ -1125,7 +1121,7 @@ const carDbClick = (item, index) => {
carDialogRef.value.open(JSON.parse(JSON.stringify(item)))
}
-defineExpose({ getMapData }) // 提供 open 方法,用于打开弹窗
+defineExpose({ getMapData, computedRatio }) // 提供 open 方法,用于打开弹窗
onMounted(() => {})
onBeforeUnmount(() => {
clearInterval(robotListTimerRef.value)
diff --git a/src/views/mapPage/taskManagement/taskList.vue b/src/views/mapPage/taskManagement/taskList.vue
index 1d503260..c2ea8c1d 100644
--- a/src/views/mapPage/taskManagement/taskList.vue
+++ b/src/views/mapPage/taskManagement/taskList.vue
@@ -90,15 +90,15 @@
>
- 取放货
- 停车
- 充电
- 移动
- 仅取货
- 仅放货
- 扫描码
- 检测托盘类型
- 移动到点位
+ 取放货
+ 停车
+ 充电
+ 移动
+ 仅取货
+ 仅放货
+ 扫描码
+ 检测托盘类型
+ 移动到点位