diff --git a/src/api/map/map.ts b/src/api/map/map.ts
index c8a1f871..bc05dc78 100644
--- a/src/api/map/map.ts
+++ b/src/api/map/map.ts
@@ -110,3 +110,20 @@ export const getPositionMapLineById = async (id: number) => {
export const getPositionMapLineByPositionMapId = async (positionMapId: number) => {
return await request.get({ url: `/system/position-map-line/list?positionMapId=` + positionMapId })
}
+
+//获取仓库点位地图节点列表
+export const getWareHouseAreaPage = async (params) => {
+ return await request.get({ url: `/system/ware/house-area/page`, params })
+}
+//删除仓库点位地图
+export const deleteWareHouseArea = async (id: number) => {
+ return await request.delete({ url: `/system/ware/house-area/delete?id=` + id })
+}
+//获得线库分页
+export const getWareHouseLanePage = async (params) => {
+ return await request.get({ url: `/system/ware/house-lane/page`, params })
+}
+//删除仓库点位地图
+export const deleteWareLaneArea = async (id: number) => {
+ return await request.delete({ url: `/system/ware/house-area/delete?id=` + id })
+}
diff --git a/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue b/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue
index c4c2ec37..c99936d2 100644
--- a/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue
+++ b/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue
@@ -224,17 +224,21 @@ const submit = async (formEl) => {
})
}
-const open = (item) => {
+const equipmentList = ref([]) //用过的设备列表
+const open = (item, list) => {
+ console.log(item)
form.value = item
form.value.layersNumber = item.dataList.length || ''
- form.value.deviceId = item.dataObj.id || ''
+ form.value.deviceId = item.deviceId || item.dataObj.id || ''
form.value.positionMapId = props.positionMapId
- if (item.deviceType) {
- deviceInfo.value.deviceType = item.deviceType
+ equipmentList.value = list
+ if (item.dataObj.deviceType) {
+ deviceInfo.value.deviceType = item.dataObj.deviceType || ''
getDeviceList()
+ } else {
+ deviceInfo.value.deviceType = ''
}
dialogFormVisible.value = true
- console.log(form.value)
}
//类型改变
@@ -287,7 +291,10 @@ const deviceList = ref([])
//获取设备列表
const getDeviceList = async () => {
deviceInfo.value.positionMapId = props.positionMapId
- deviceList.value = await MapApi.getDeviceInformationList(deviceInfo.value)
+ let list = await MapApi.getDeviceInformationList(deviceInfo.value)
+
+ const deviceIds = equipmentList.value.map((item) => item.deviceId)
+ deviceList.value = list.filter((item) => !deviceIds.includes(item.id))
}
//设备类型切换
const deviceTypeChange = () => {
diff --git a/src/views/mapPage/realTimeMap/components-tool/itemAreaManagementDialog.vue b/src/views/mapPage/realTimeMap/components-tool/itemAreaManagementDialog.vue
new file mode 100644
index 00000000..fdfa98c4
--- /dev/null
+++ b/src/views/mapPage/realTimeMap/components-tool/itemAreaManagementDialog.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
diff --git a/src/views/mapPage/realTimeMap/components-tool/itemAreaSettingDialog.vue b/src/views/mapPage/realTimeMap/components-tool/itemAreaSettingDialog.vue
index 049f5b3f..bc6a6ba6 100644
--- a/src/views/mapPage/realTimeMap/components-tool/itemAreaSettingDialog.vue
+++ b/src/views/mapPage/realTimeMap/components-tool/itemAreaSettingDialog.vue
@@ -60,6 +60,8 @@ const open = (list) => {
dialogFormVisible.value = true
form.value.mapItemIds = list.map((item) => item.id)
form.value.areaNumber = form.value.mapItemIds.length
+ form.value.areaName = ''
+ form.value.skuInfo = ''
}
const submitForm = async (formEl) => {
diff --git a/src/views/mapPage/realTimeMap/components-tool/lineLibraryManagementDialog.vue b/src/views/mapPage/realTimeMap/components-tool/lineLibraryManagementDialog.vue
new file mode 100644
index 00000000..8fcf6fc9
--- /dev/null
+++ b/src/views/mapPage/realTimeMap/components-tool/lineLibraryManagementDialog.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
diff --git a/src/views/mapPage/realTimeMap/components-tool/lineLibrarySettingDialog.vue b/src/views/mapPage/realTimeMap/components-tool/lineLibrarySettingDialog.vue
index abbb2450..a7572ac1 100644
--- a/src/views/mapPage/realTimeMap/components-tool/lineLibrarySettingDialog.vue
+++ b/src/views/mapPage/realTimeMap/components-tool/lineLibrarySettingDialog.vue
@@ -1,11 +1,6 @@
-