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

bug修改

Browse Source
This commit is contained in:
yyy 2025-04-30 15:37:02 +08:00
parent bbdfe12392
commit d06be14bd4
3 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/board/allBoard/index.vue
View File

@ -113,7 +113,21 @@
<el-table :data="data.underway" style="width: 100%" :height="tableHeight"> <el-table :data="data.underway" style="width: 100%" :height="tableHeight">
<el-table-column prop="taskNo" label="任务编号" /> <el-table-column prop="taskNo" label="任务编号" />
<el-table-column prop="skuNumber" label="车辆编号" /> <el-table-column prop="skuNumber" label="车辆编号" />
<el-table-column prop="address" label="任务阶段" /> <el-table-column prop="taskStage" label="任务阶段">
<template #default="scope">
<el-text v-if="scope.row.taskStage == 0">待执行</el-text>
<el-text v-if="scope.row.taskStage == 1">前往取货</el-text>
<el-text v-if="scope.row.taskStage == 2">取货中</el-text>
<el-text v-if="scope.row.taskStage == 3">前往放货</el-text>
<el-text v-if="scope.row.taskStage == 4">放货中</el-text>
<el-text v-if="scope.row.taskStage == 5">已完成</el-text>
<el-text v-if="scope.row.taskStage == 6">移动中</el-text>
<el-text v-if="scope.row.taskStage == 7">正在充电</el-text>
<el-text v-if="scope.row.taskStage == 8">取消</el-text>
<el-text v-if="scope.row.taskStage == 9">人工完成</el-text>
<el-text v-if="scope.row.taskStage == 10">异常</el-text>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
@ -140,7 +154,7 @@
style="width: 160px" style="width: 160px"
/> />
</div> </div>
<div class="map-box-allBoard map-box-container"> <div class="map-box-container">
<indexPage <indexPage
ref="indexPageRef" ref="indexPageRef"
:isAllBoard="true" :isAllBoard="true"
@ -500,8 +514,9 @@ const widthVal = ref(0)
const tableHeight = ref(200) const tableHeight = ref(200)
const pageWidthChange = () => { const pageWidthChange = () => {
nextTick(() => { nextTick(() => {
widthVal.value = getElementWidthByClass('map-box-allBoard') widthVal.value = getElementWidthByClass('map-box-container')
tableHeight.value = (getElementHeightByClass('bottom-box') - 60) / 2 tableHeight.value = (getElementHeightByClass('bottom-box') - 60) / 2
indexPageRef.value.computedRatio()
}) })
} }

6
src/views/mapPage/realTimeMap/components/indexPage.vue
View File

@ -809,10 +809,8 @@ const linkWebSocket = (url) => {
// 规划路线信息 // 规划路线信息
if (jsonMsg.type == 'planning_move_pose') { if (jsonMsg.type == 'planning_move_pose') {
let data = JSON.parse(jsonMsg.content) let data = JSON.parse(jsonMsg.content)
// console.log('======规划路线======', JSON.parse(data).data)
let dataList = JSON.parse(data).data let dataList = JSON.parse(data).data
if (lineList.value.length > 0) { if (lineList.value.length > 0) {
// console.log(lineList.value)
lineList.value = setIsSelect(lineList.value, dataList) lineList.value = setIsSelect(lineList.value, dataList)
} }
} }
@ -984,8 +982,6 @@ const computedRatio = () => {
radio.value = width / imgBgObj.width radio.value = width / imgBgObj.width
imgBgObj.width = imgBgObj.width * radio.value imgBgObj.width = imgBgObj.width * radio.value
imgBgObj.height = imgBgObj.height * 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))) carDialogRef.value.open(JSON.parse(JSON.stringify(item)))
} }
defineExpose({ getMapData }) // 提供 open 方法，用于打开弹窗 defineExpose({ getMapData, computedRatio }) // 提供 open 方法，用于打开弹窗
onMounted(() => {}) onMounted(() => {})
onBeforeUnmount(() => { onBeforeUnmount(() => {
clearInterval(robotListTimerRef.value) clearInterval(robotListTimerRef.value)

18
src/views/mapPage/taskManagement/taskList.vue
View File

@ -90,15 +90,15 @@
> >
<el-table-column align="center" label="指令" prop="taskType"> <el-table-column align="center" label="指令" prop="taskType">
<template #default="scope"> <template #default="scope">
<el-text class="mx-1" v-if="scope.row.taskType == 1">取放货</el-text> <el-text v-if="scope.row.taskType == 1">取放货</el-text>
<el-text class="mx-1" v-if="scope.row.taskType == 2">停车</el-text> <el-text v-if="scope.row.taskType == 2">停车</el-text>
<el-text class="mx-1" v-if="scope.row.taskType == 3">充电</el-text> <el-text v-if="scope.row.taskType == 3">充电</el-text>
<el-text class="mx-1" v-if="scope.row.taskType == 4">移动</el-text> <el-text v-if="scope.row.taskType == 4">移动</el-text>
<el-text class="mx-1" v-if="scope.row.taskType == 5">仅取货</el-text> <el-text v-if="scope.row.taskType == 5">仅取货</el-text>
<el-text class="mx-1" v-if="scope.row.taskType == 6">仅放货</el-text> <el-text v-if="scope.row.taskType == 6">仅放货</el-text>
<el-text class="mx-1" v-if="scope.row.taskType == 7">扫描码</el-text> <el-text v-if="scope.row.taskType == 7">扫描码</el-text>
<el-text class="mx-1" v-if="scope.row.taskType == 8">检测托盘类型</el-text> <el-text v-if="scope.row.taskType == 8">检测托盘类型</el-text>
<el-text class="mx-1" v-if="scope.row.taskType == 8">移动到点位</el-text> <el-text v-if="scope.row.taskType == 9">移动到点位</el-text>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="车辆编号" prop="robotNo" /> <el-table-column align="center" label="车辆编号" prop="robotNo" />