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-03-31 10:02:45 +08:00
parent b2d31a2f5e
commit f94e7bb75b
5 changed files with 70 additions and 3145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/map/mapTask.ts
View File

@ -27,7 +27,7 @@ export const deleteTask = (id: number) => {
// 更新机器人任务主表
export const updateTask = (data) => {
return request.put({ url: '/system/robot/task/close', data })
return request.post({ url: '/system/robot/task-detail/manuallyCompleted?id=' + data.id })
}
//更新优先级

40
src/views/mapPage/logList/index.vue
View File

@ -189,6 +189,27 @@
/>
</el-select>
</el-form-item>
<el-form-item label="任务阶段" prop="taskStage">
<el-select
v-model="taskLogParams.taskStage"
class="!w-240px"
clearable
placeholder="请选择任务阶段"
@change="handleQuery()"
>
<el-option label="待执行" :value="0" />
<el-option label="前往取货" :value="1" />
<el-option label="取货中" :value="2" />
<el-option label="前往放货" :value="3" />
<el-option label="放货中" :value="4" />
<el-option label="结束" :value="5" />
<el-option label="移动中" :value="6" />
<el-option label="正在充电" :value="7" />
<el-option label="取消" :value="8" />
<el-option label="人工完成" :value="9" />
<el-option label="异常" :value="10" />
</el-select>
</el-form-item>
<!-- <el-form-item label="开始时间" prop="startTime" :formatter="dateFormatter">
<el-date-picker
class="!w-240px"
@ -210,7 +231,7 @@
/>
</el-form-item> -->
<el-form-item label="时间" prop="endTime" :formatter="dateFormatter">
<el-date-picker
<el-date-picker
v-model="taskLogParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
@ -260,6 +281,21 @@
<dict-tag :type="DICT_TYPE.ROBOT_TASK_STATUS" :value="scope.row.taskStatus" />
</template>
</el-table-column>
<el-table-column prop="taskStage" label="任务阶段" align="center" width="120">
<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-column
prop="startTime"
label="开始时间"
@ -295,7 +331,6 @@ import * as MapTaskAPi from '@/api/map/mapTask'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
defineOptions({ name: 'mapLogQueriesList' })
const message = useMessage() // 消息弹窗
@ -348,6 +383,7 @@ const taskLogParams = reactive({
taskNo: null, //任务号
taskType: null, //任务类型
taskStatus: null, //任务状态
taskStage: null, //任务状态
startTime: null, //开始时间
endTime: null, //结束时间
createTime: []

3134
src/views/mapPage/realTimeMap/editMap copy.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -342,7 +342,10 @@
<!-- 1 路径点 -->
<el-tooltip effect="dark" placement="top" trigger="click">
<template #content>
<div v-if="item.type === 2">
<div v-if="item.type === 1">
<div>序号：{{ item.sortNum || '节点未保存' }}</div>
</div>
<div v-else-if="item.type === 2">
<div>序号：{{ item.sortNum || '节点未保存' }}</div>
<div class="item-tooltip-name" v-if="item.laneId && item.laneName">
所属线库：{{ item.laneName }}
@ -353,12 +356,26 @@
</div>
<div v-else-if="item.type === 3">
<div>序号：{{ item.sortNum || '节点未保存' }}</div>
<div class="item-tooltip-name" v-if="item.deviceType">
设备类型：{{ getDeviceTypeName(item.deviceType) }}
</div>
<div class="item-tooltip-name" v-if="item.deviceNo">
设备编号：{{ item.deviceNo }}
</div>
</div>
<div v-else>
<div>序号：{{ item.sortNum || '节点未保存' }}</div>
<div class="item-tooltip-name">
节点类型：{{
item.type == 4
? '停车点'
: item.type == 5
? '区域变更点'
: item.type == 6
? '等待点'
: ''
}}
</div>
</div>
</template>
<div
@ -742,10 +759,12 @@ import lineLibrarySettingDialog from './components-tool/lineLibrarySettingDialog
import layerSelectionToolDialog from './components-tool/layerSelectionToolDialog.vue'
import itemAreaManagementDialog from './components-tool/itemAreaManagementDialog.vue'
import lineLibraryManagementDialog from './components-tool/lineLibraryManagementDialog.vue'
import GenerateStraightLinesDialog from './components-tool/GenerateStraightLinesDialog.vue'
import mapScaleTool from './components-tool/map-scale-tool.vue'
import * as MapApi from '@/api/map/map'
import cursorCollection from './cursorCollection'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
defineOptions({ name: 'editMapPageRealTimeMap' })
@ -2553,6 +2572,7 @@ const getAllNodeList = async () => {
item.locationWide = item.dataObj.locationWide
item.deviceId = item.dataObj.id
item.deviceNo = item.dataObj.deviceNo
item.deviceType = item.dataObj.deviceType
item.mapImageUrl = item.dataObj.mapImageUrl
item.draggable = true
item.resizable = true
@ -2601,6 +2621,14 @@ const getAllMapRoute = async () => {
mapRouteList: JSON.parse(JSON.stringify(state.mapRouteList))
}
}
//获取设备类型
const getDeviceTypeName = (deviceType) => {
let list = getIntDictOptions(DICT_TYPE.DEVICE_TYPE)
let deviceItem = list.find((item) => {
return item.value == deviceType
})
return deviceItem.label
}
//保存地图按钮
const saveMap = async () => {
//判断是否存在库位未填写排序号

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

@ -162,7 +162,6 @@
/>
</div>
</el-popover>
<el-button
type="primary"
@click="finishTask(props.row, scope.row)"
@ -292,13 +291,9 @@ const finishTask = async (mainItem, item) => {
try {
await message.delConfirm('请确认是否人工完成任务？')
await MapTaskAPi.updateTask({
id: mainItem.id,
priority: mainItem.priority,
montageTask: mainItem.montageTask,
montageNumber: mainItem.montageNumber,
taskStatus: 5
id: item.id
})
message.success('已取消')
message.success('已完成')
await getList()
} catch {}
}