From 86119b60007ed08d3c1f3f7c91fd81b0c5927822 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 18 Jan 2024 09:16:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/tableStore.ts                 | 2 +-
 src/views/govern/manage/engineering.vue | 8 +++++++-
 src/views/govern/manage/factory.vue     | 3 +--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/utils/tableStore.ts b/src/utils/tableStore.ts
index 2928f0c..cf6a226 100644
--- a/src/utils/tableStore.ts
+++ b/src/utils/tableStore.ts
@@ -74,7 +74,7 @@ export default class TableStore {
             )
         ).then((res: any) => {
             this.table.data = res.data.records || res.data
-            this.table.total = res.data.total || res.data.length
+            this.table.total = res.data.total || res.data.length||0
             if (this.isWebPaging) {
                 this.table.webPagingData = window.XEUtils.chunk(this.table.data, this.table.params.pageSize)
                 this.table.data = this.table.webPagingData[this.table.params.pageNum - 1]
diff --git a/src/views/govern/manage/engineering.vue b/src/views/govern/manage/engineering.vue
index f9b2dfc..429cbd4 100644
--- a/src/views/govern/manage/engineering.vue
+++ b/src/views/govern/manage/engineering.vue
@@ -4,6 +4,7 @@
             v-loading="tableStore.table.loading"
             height="auto"
             auto-resize
+            ref="tableRef"
             v-bind="defaultAttribute"
             :data="tableStore.table.data"
             :column-config="{ resizable: true }"
@@ -24,13 +25,15 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide } from 'vue'
+import { ref, onMounted, provide, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { mainHeight } from '@/utils/layout'
 defineOptions({
     name: 'govern/manage/engineering'
 })
+const tableRef = ref()
+
 const pageHeight = mainHeight(20)
 const tableStore = new TableStore({
     url: '/cs-device-boot/csLedger/getProjectTree',
@@ -44,6 +47,9 @@ provide('tableStore', tableStore)
 
 onMounted(() => {
     tableStore.index()
+    setTimeout(() => {
+        tableRef.value.setAllTreeExpand(true)
+    }, 100)
 })
 
 const addMenu = () => {}
diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue
index ba15735..0a1ca96 100644
--- a/src/views/govern/manage/factory.vue
+++ b/src/views/govern/manage/factory.vue
@@ -91,7 +91,7 @@
                     </template>
                 </vxe-column>
                 <vxe-column field="createTime" title="录入时间"></vxe-column>
-                <vxe-column field="createTime" title="网络设备ID"></vxe-column>
+                <vxe-column field="ndid" title="网络设备ID"></vxe-column>
                 <vxe-column field="status" title="状态">
                     <template #default="{ row }">
                         {{ row.status == 1 ? '未注册' : row.status == 2 ? '注册' : '接入' }}
@@ -196,7 +196,6 @@ import {
     addEquipmentDelivery,
     deleteEquipmentDelivery,
     editEquipmentDelivery,
-    uploadTopo,
     batchImportDevice,
     resetEquipmentDelivery
 } from '@/api/cs-system-boot/device'