|
|
@@ -160,7 +160,7 @@
|
|
|
v-for="device in selectedDevices"
|
|
|
:key="device.id"
|
|
|
:label="device.label"
|
|
|
- :value="device.id"
|
|
|
+ :value="isEdit ? device.deviceId : device.id"
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -189,7 +189,6 @@ import DeptTree from '@/views/system/user/DeptTree.vue'
|
|
|
import { defaultProps, handleTree } from '@/utils/tree'
|
|
|
import * as DeptApi from '@/api/system/dept'
|
|
|
import { ElMessageBox } from 'element-plus'
|
|
|
-import { is } from 'bpmn-js/lib/util/ModelUtil'
|
|
|
const deptList = ref<Tree[]>([]) // 树形结构
|
|
|
|
|
|
defineOptions({ name: 'IotDeviceComplete' })
|
|
|
@@ -358,7 +357,7 @@ const setMainDevice = (val) => {
|
|
|
deviceName: item.deviceName,
|
|
|
deviceCode: item.deviceCode,
|
|
|
deptId: item.deptId,
|
|
|
- ifMaster: item.id === mainDeviceId.value ? true : false
|
|
|
+ ifMaster: item.deviceId === mainDeviceId.value ? true : false
|
|
|
}))
|
|
|
} else {
|
|
|
formData.value.details = selectedDevices.value.map((item) => ({
|
