diff --git a/src/views/mapPage/components/locationSelectionDialog.vue b/src/views/mapPage/components/locationSelectionDialog.vue new file mode 100644 index 00000000..731c04f2 --- /dev/null +++ b/src/views/mapPage/components/locationSelectionDialog.vue @@ -0,0 +1,212 @@ + + + + + diff --git a/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue b/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue index a735ecea..5b7ac522 100644 --- a/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue +++ b/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue @@ -77,6 +77,7 @@ @change="deviceChange" > { form.value.outDirection = undefined } } - //设备信息 const deviceInfo = ref({ positionMapId: '', @@ -341,7 +341,12 @@ const getDeviceList = async () => { let list = await MapApi.getDeviceInformationList(deviceInfo.value) const deviceIds = equipmentList.value.map((item) => item.deviceId) - deviceList.value = list.filter((item) => !deviceIds.includes(item.id)) + deviceList.value = list.map((item) => { + return { + ...item, + idDisabled: deviceIds.includes(item.id) + } + }) } //设备类型切换 const deviceTypeChange = () => { diff --git a/src/views/mapPage/realTimeMap/components/createTaskDialog.vue b/src/views/mapPage/realTimeMap/components/createTaskDialog.vue index a4897526..67265359 100644 --- a/src/views/mapPage/realTimeMap/components/createTaskDialog.vue +++ b/src/views/mapPage/realTimeMap/components/createTaskDialog.vue @@ -16,32 +16,36 @@ - - - - +
+ + + + + +
@@ -51,32 +55,35 @@ - - - - +
+ + + + + +
diff --git a/src/views/mapPage/taskManagement/createTask.vue b/src/views/mapPage/taskManagement/createTask.vue index b4389afc..8cfaa375 100644 --- a/src/views/mapPage/taskManagement/createTask.vue +++ b/src/views/mapPage/taskManagement/createTask.vue @@ -661,6 +661,8 @@ + + @@ -668,6 +670,7 @@ import { reactive } from 'vue' import { RefreshRight, Position } from '@element-plus/icons-vue' import * as MapTaskAPi from '@/api/map/mapTask' +import locationSelectionDialog from '../components/locationSelectionDialog.vue' defineOptions({ name: 'taskManagementCreateTask' })