diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index 94ee2f79..7924a50a 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -6,9 +6,10 @@
                 <el-main class="treeMain">
                     <el-tree
                         style="max-width: 600px; margin-top: 2.2%"
+                        ref="treeRef"
                         :data="userData"
                         :props="defaultProps"
-                        node-key="id"
+                        node-key="equipmentTypeId"
                         @node-click="handleNodeClick"
                     />
                 </el-main>
@@ -123,8 +124,7 @@
                     </el-row>
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="用户登录管理部门:" prop="madeinFactory">
-                                <!-- <el-input v-model="editDeviceData.orgId" placeholder="请输入用户登录管理部门" clearable /> -->
+                            <el-form-item label="管理部门:" prop="madeinFactory">
                                 <el-tree-select
                                     v-model="editDeviceData.orgId"
                                     lazy
@@ -137,7 +137,13 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="所属设备:">
-                                <el-input v-model="editDeviceData.parentEquipmentId" disabled placeholder="请输入所属设备" clearable />
+                                <el-tree-select
+                                    v-model="editDeviceData.parentEquipmentId"
+                                    :data="belongingEquipment"
+                                    :props="defaultEquipmentProps"
+                                    :render-after-expand="false"
+                                    style="width: 200px"
+                                />
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -161,7 +167,7 @@
                         </el-col>
                     </el-row>
                     <el-row>
-                        <el-col :span="8">
+                        <el-col>
                             <el-form-item label="安装日期:">
                                 <el-date-picker
                                     v-model="editDeviceData.installDate"
@@ -174,11 +180,13 @@
                                 />
                             </el-form-item>
                         </el-col>
-                        <el-col :span="16">
+                    </el-row>
+                    <el-row>
+                        <el-col>
                             <el-form-item label="备注:">
                                 <el-input
                                     v-model="editDeviceData.remarks"
-                                    style="width: 295px"
+                                    style="width: 370px"
                                     :rows="2"
                                     type="textarea"
                                     placeholder="请输入备注"
@@ -246,8 +254,7 @@
                     </el-row>
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="用户登录管理部门:" prop="madeinFactory">
-                                <!-- <el-input v-model="editAddDeviceData.orgId" placeholder="请输入用户登录管理部门" clearable /> -->
+                            <el-form-item label="管理部门:" prop="madeinFactory">
                                 <el-tree-select
                                     v-model="editAddDeviceData.orgId"
                                     lazy
@@ -260,7 +267,13 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="所属设备:">
-                                <el-input v-model="editAddDeviceData.parentEquipmentId" disabled placeholder="请输入所属设备" clearable />
+                                <el-tree-select
+                                    v-model="editAddDeviceData.parentEquipmentId"
+                                    :data="belongingEquipment"
+                                    :props="defaultEquipmentProps"
+                                    :render-after-expand="false"
+                                    style="width: 200px"
+                                />
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -284,7 +297,7 @@
                         </el-col>
                     </el-row>
                     <el-row>
-                        <el-col :span="8">
+                        <el-col>
                             <el-form-item label="安装日期:">
                                 <el-date-picker
                                     v-model="editAddDeviceData.installDate"
@@ -297,11 +310,13 @@
                                 />
                             </el-form-item>
                         </el-col>
-                        <el-col :span="16">
+                    </el-row>
+                    <el-row>
+                        <el-col>
                             <el-form-item label="备注:">
                                 <el-input
                                     v-model="editAddDeviceData.remarks"
-                                    style="width: 295px"
+                                    style="width: 370px"
                                     :rows="2"
                                     type="textarea"
                                     placeholder="请输入备注"
@@ -334,7 +349,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, nextTick } from 'vue'
 import { Search, CirclePlusFilled, Upload, Download } from '@element-plus/icons-vue'
 import {
     equipTree,
@@ -361,25 +376,27 @@ interface Tree {
 }
 
 // 设备左边树
-const treeQuery = reactive({
-    orgId: adminInfo.orgid,
-})
-
 const userData = ref()
-
-const getTree = () => {
-    console.log(treeQuery, 'treeQuery')
-
-    equipTree(treeQuery).then((res) => {
-        console.log(res, '树')
-        userData.value = res.data
-    })
-}
+const treeRef = ref()
 // 设备类型
 const deviceTypeList = ref()
 const equipTypeList = () => {
     equipType().then((res) => {
+        console.log(res, '')
+
+        userData.value = res.data
         deviceTypeList.value = res.data
+        nextTick(() => {
+            treeRef.value?.setCurrentKey(res.data[0]?.equipmentTypeId!, false)
+            formQuery.pageSize = currentPageSize.value
+            formQuery.pageNum = currentPage.value
+            formQuery.objectType = res.data[0].equipmentTypeId
+            equipQuery(formQuery).then((res) => {
+                deviceList.value = res.rows
+                pageTotal.value = res.total
+            })
+            queryParameter.value = res.data[0]
+        })
     })
 }
 
@@ -404,6 +421,15 @@ const equipOrgList = () => {
     })
 }
 
+// 所属设备
+const belongingEquipment = ref()
+const equipOrgBelonging = () => {
+    equipTree().then((res) => {
+        console.log(res, '设备详情所属设备列表')
+        belongingEquipment.value = res.data
+    })
+}
+
 const treeSelectLoad = (node: any, resolve: any) => {
     console.log(node, 'treeSelectLoad')
     if (node.level === 0) {
@@ -436,16 +462,19 @@ const treeSelectProps = {
     children: 'children',
 }
 
+const defaultEquipmentProps = {
+    label: 'name',
+    value: 'id',
+}
+
 onMounted(() => {
-    getTree()
     equipTypeList()
     equipModeList()
     equipOrgList()
+    equipOrgBelonging()
 })
 
 const formQuery = reactive({
-    parentEquipmentId: '',
-    iotModelId: '',
     pageSize: 0,
     pageNum: 0,
     objectType: '',
@@ -453,14 +482,11 @@ const formQuery = reactive({
 const queryParameter = ref()
 const handleNodeClick = (data: any) => {
     console.log(data, '设备树data')
-
     queryParameter.value = data
-    formQuery.parentEquipmentId = data.id
     formQuery.pageSize = currentPageSize.value
     formQuery.pageNum = currentPage.value
-    formQuery.objectType = data.objectType
+    formQuery.objectType = data.equipmentTypeId
     equipQuery(formQuery).then((res) => {
-        console.log(res)
         deviceList.value = res.rows
         pageTotal.value = res.total
     })
@@ -480,43 +506,34 @@ const deviceQuery = (data: any) => {
 // 查询按钮
 // 名字
 const nameQuery = reactive({
-    parentEquipmentId: '',
-    iotModelId: '',
+    objectType: '',
     pageSize: 0,
     pageNum: 0,
     name: '',
 })
 // 编号
 const nameQuery2 = reactive({
-    parentEquipmentId: '',
-    iotModelId: '',
+    objectType: '',
     pageSize: 0,
     pageNum: 0,
     code: '',
 })
 const deviceTypeQuery = () => {
-    if (queryParameter.value) {
-        // 名称查询
-        if (headerForm.resource === '1') {
-            nameQuery.name = headerForm.searchFor
-            nameQuery.parentEquipmentId = queryParameter.value.id
-            nameQuery.pageSize = currentPageSize.value
-            nameQuery.pageNum = currentPage.value
-            deviceQuery(nameQuery)
-        }
-        // 编码查询
-        if (headerForm.resource === '2') {
-            nameQuery2.code = headerForm.searchFor
-            nameQuery2.parentEquipmentId = queryParameter.value.id
-            nameQuery2.pageSize = currentPageSize.value
-            nameQuery2.pageNum = currentPage.value
-            deviceQuery(nameQuery2)
-        }
-    } else {
-        ElMessage.error({
-            message: '无设备节点搜索,请选择！',
-            type: 'error',
-        })
+    // 名称查询
+    if (headerForm.resource === '1') {
+        nameQuery.objectType = queryParameter.value.equipmentTypeId
+        nameQuery.pageSize = currentPageSize.value
+        nameQuery.pageNum = currentPage.value
+        nameQuery.name = headerForm.searchFor
+        deviceQuery(nameQuery)
+    }
+    // 编码查询
+    if (headerForm.resource === '2') {
+        nameQuery.objectType = queryParameter.value.equipmentTypeId
+        nameQuery2.pageSize = currentPageSize.value
+        nameQuery2.pageNum = currentPage.value
+        nameQuery2.code = headerForm.searchFor
+        deviceQuery(nameQuery2)
     }
 }
 
@@ -534,8 +551,7 @@ const handleCurrentChange = (val: number) => {
 }
 const pageTotal = ref(0)
 const defaultProps = {
-    children: 'equipChildren',
-    label: 'name',
+    label: 'equipmentTypeName',
 }
 
 // 头部搜索框按钮功能
@@ -546,31 +562,20 @@ const headerForm = reactive({
 
 // 新增按钮
 const addDeviceList = () => {
-    if (queryParameter.value) {
-        editAddDeviceDialog.value = true
-        deviceTypeList.value.forEach((ele: any) => {
-            if (String(ele.equipmentTypeId) === queryParameter.value.code) {
-                editAddDeviceData.objectType = ele.equipmentTypeName
-            }
-        })
-        editAddDeviceData.code = ''
-        editAddDeviceData.name = ''
-        editAddDeviceData.madeinFactory = ''
-        editAddDeviceData.model = ''
-        editAddDeviceData.location = ''
-        editAddDeviceData.longitude = ''
-        editAddDeviceData.latitude = ''
-        editAddDeviceData.installDate = ''
-        editAddDeviceData.remarks = ''
-        editAddDeviceData.orgId = ''
-        editAddDeviceData.parentEquipmentId = queryParameter.value.id
-        editAddDeviceData.iotModelId = ''
-    } else {
-        ElMessage.error({
-            message: '无设备节点添加,请选择！',
-            type: 'error',
-        })
-    }
+    editAddDeviceDialog.value = true
+    editAddDeviceData.objectType = queryParameter.value.equipmentTypeName
+    editAddDeviceData.code = ''
+    editAddDeviceData.name = ''
+    editAddDeviceData.madeinFactory = ''
+    editAddDeviceData.model = ''
+    editAddDeviceData.location = ''
+    editAddDeviceData.longitude = ''
+    editAddDeviceData.latitude = ''
+    editAddDeviceData.installDate = ''
+    editAddDeviceData.remarks = ''
+    editAddDeviceData.orgId = ''
+    editAddDeviceData.parentEquipmentId = ''
+    editAddDeviceData.iotModelId = ''
 }
 
 // 查看设备详情
@@ -605,13 +610,7 @@ const viewDeviceDetails = (data: any) => {
     modifyDeviceDetails.value?.resetFields()
     editDeviceDialog.value = true
     editDeviceData.id = data.row.id
-    deviceTypeList.value.forEach((ele: any) => {
-        if (ele.equipmentTypeId === data.row.objectType) {
-            editDeviceData.objectType = ele.equipmentTypeName
-        }
-    })
-
-    // editDeviceData.objectType = data.row.objectType
+    editDeviceData.objectType = data.row.equipmentTypeName
     editDeviceData.code = data.row.code
     editDeviceData.name = data.row.name
     editDeviceData.madeinFactory = data.row.madeinFactory
@@ -650,7 +649,6 @@ const dialogDeviceDeletion1 = () => {
             })
             dialogDeviceDeletion.value = false
             deviceQuery(formQuery)
-            getTree()
         } else {
             ElMessage.error({
                 message: res.msg,
@@ -703,15 +701,15 @@ const editDeviceRules = reactive({
 })
 const modifyDeviceDetails = ref()
 const saveData = () => {
-    console.log(editDeviceData, 'editDeviceData')
-
     modifyDeviceDetails.value.validate((valid: any) => {
         if (valid) {
             deviceTypeList.value.forEach((ele: any) => {
-                if (ele.equipmentTypeName === editDeviceData.objectType) {
-                    editDeviceData.objectType = ele.equipmentTypeId
+                if (ele.equipmentTypeName === editAddDeviceData.objectType) {
+                    editAddDeviceData.objectType = ele.equipmentTypeId
                 }
             })
+            console.log(editDeviceData, 'editDeviceData')
+
             equipUpdate(editDeviceData).then((res: any) => {
                 if (res.code == 200) {
                     ElMessage({
@@ -719,7 +717,6 @@ const saveData = () => {
                         type: 'success',
                     })
                     deviceQuery(formQuery)
-                    getTree()
                 } else {
                     ElMessage.error({
                         message: res.msg,
@@ -779,11 +776,10 @@ const saveAddData = () => {
         if (valid) {
             deviceTypeList.value.forEach((ele: any) => {
                 if (ele.equipmentTypeName === editAddDeviceData.objectType) {
-                    editAddDeviceData.objectType = String(ele.equipmentTypeId)
+                    editAddDeviceData.objectType = ele.equipmentTypeId
                 }
             })
             console.log(editAddDeviceData, 'editAddDeviceData')
-
             equipAdd(editAddDeviceData).then((res) => {
                 if (res.code == 200) {
                     ElMessage({
@@ -791,7 +787,6 @@ const saveAddData = () => {
                         type: 'success',
                     })
                     deviceQuery(formQuery)
-                    getTree()
                 } else {
                     ElMessage.error({
                         message: res.msg,
@@ -829,7 +824,7 @@ const upLoadModel = (file: any) => {
 
 // 导出
 const Export = () => {
-    equipExport({ id: queryParameter.value.id }).then((res: any) => {
+    equipExport({ id: queryParameter.value.equipmentTypeId }).then((res: any) => {
         const downloadUrl = window.URL.createObjectURL(res)
         const a = document.createElement('a')
         a.href = downloadUrl