设备管理修改

src/views/govern/device/manage.vue

@@ -42,7 +42,7 @@
                     v-for="item in deviceData.dataSetList"
                     :key="item.id"
                 ></el-tab-pane>
-                <div :style="{ height: tableHeight }">
+                <div :style="{ height: tableHeight }" v-loading="tableLoading">
                     <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
                         <vxe-column type="seq" title="序号" width="80"></vxe-column>
                         <vxe-column field="name" title="数据名称"></vxe-column>
@@ -75,10 +75,8 @@ import { ElMessage } from 'element-plus'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 const pageHeight = mainHeight(20)
 const loading = ref(false)
-const selectAll = ref(false)
-const dialogFormVisible = ref(false)
+const tableLoading = ref(false)
 const getGroupLoading = ref(false)
-const newGroupVisible = ref(false)
 const deviceData = ref<any>(null)
 const dataSet = ref('')
 const devTypeOptions = ref([])
@@ -103,9 +101,11 @@ const nodeClick = (e: anyObj) => {
     }
 }
 const handleClick = () => {
+    tableLoading.value = true
     tableData.value = []
     getTargetById(dataSet.value).then(res => {
         tableData.value = res.data
+        tableLoading.value = false
     })
 }
 queryByCode('Device_Type').then(res => {
@@ -148,7 +148,12 @@ const openGroup = () => {
         }
         call(res.data)
         getGroupLoading.value = false
-        mangePopup.value.open(res.data, dataSet.value)
+        mangePopup.value.open({
+            deviceData: deviceData.value,
+            dataSetName: deviceData.value.dataSetList.filter((item: any) => item.id == dataSet.value)[0]?.name,
+            dataSet: dataSet.value,
+            tree: res.data
+        })
     })
 }
 </script>