diff --git a/src/api/map/mapTask.ts b/src/api/map/mapTask.ts index 83b8d9a5..ac1a347b 100644 --- a/src/api/map/mapTask.ts +++ b/src/api/map/mapTask.ts @@ -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 }) } //更新优先级 diff --git a/src/views/mapPage/logList/index.vue b/src/views/mapPage/logList/index.vue index 20f1da20..5aae917a 100644 --- a/src/views/mapPage/logList/index.vue +++ b/src/views/mapPage/logList/index.vue @@ -189,6 +189,27 @@ /> + + + + + + + + + + + + + + + - + + + -
-
-
-
- - - - - - - - - - -
- 确认 -
-
- - - - - -
- 确认 -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- 取消 - 确认 -
-
-
-
- -
{{ item.name }}
-
- -
- 确定 -
-
-
-
- -
{{ item.name }}
-
-
-
- -
- -
-
- - -
- - -
-
- - - - - - - - - - -
-
-
- {{ item.text }} -
-
- -
- - - - - -
-
- - -
- -
- - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - -
- - - - - diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue index 5db94672..21c178c6 100644 --- a/src/views/mapPage/realTimeMap/editMap.vue +++ b/src/views/mapPage/realTimeMap/editMap.vue @@ -342,7 +342,10 @@
{ 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 () => { //判断是否存在库位未填写排序号 diff --git a/src/views/mapPage/taskManagement/taskList.vue b/src/views/mapPage/taskManagement/taskList.vue index f0a571de..98bc618a 100644 --- a/src/views/mapPage/taskManagement/taskList.vue +++ b/src/views/mapPage/taskManagement/taskList.vue @@ -162,7 +162,6 @@ />
- { 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 {} }