序号:{{ item.sortNum || '节点未保存' }}
所属线库:{{ item.laneName }}
@@ -353,12 +356,26 @@
序号:{{ item.sortNum || '节点未保存' }}
+
+ 设备类型:{{ getDeviceTypeName(item.deviceType) }}
+
设备编号:{{ item.deviceNo }}
序号:{{ item.sortNum || '节点未保存' }}
+
+ 节点类型:{{
+ item.type == 4
+ ? '停车点'
+ : item.type == 5
+ ? '区域变更点'
+ : item.type == 6
+ ? '等待点'
+ : ''
+ }}
+
{
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 {}
}