修复部分问题

src/views/tower/model/index.vue

@@ -4,17 +4,14 @@
       <!-- 表格 -->
       <ele-pro-table
         ref="tableRef"
-        row-key="categoryId"
+        row-key="modelId"
         :columns="columns"
         :datasource="datasource"
-        :parse-data="parseData"
+        :customRow="customRow"
         :need-page="false"
         :expand-icon-column-index="1"
-        :expanded-row-keys="expandedRowKeys"
         :scroll="{ x: 1200 }"
-        cache-key="proGoodsCategoryTable"
-        @done="onDone"
-        @expand="onExpand"
+        cache-key="towerModel"
       >
         <template #toolbar>
           <a-space>
@@ -24,12 +21,6 @@
               </template>
               <span>新建</span>
             </a-button>
-            <a-button type="dashed" class="ele-btn-icon" @click="expandAll">
-              展开全部
-            </a-button>
-            <a-button type="dashed" class="ele-btn-icon" @click="foldAll">
-              折叠全部
-            </a-button>
             <!-- 搜索表单 -->
             <a-input-search
               allow-clear
@@ -41,39 +32,13 @@
           </a-space>
         </template>
         <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'menuType'">
-            <a-tag v-if="isExternalLink(record.path)" color="red">外链</a-tag>
-            <a-tag v-else-if="isExternalLink(record.component)" color="orange">
-              内链
-            </a-tag>
-            <a-tag v-else-if="isDirectory(record)" color="blue">目录</a-tag>
-            <a-tag v-else-if="record.menuType === 0" color="green">分类</a-tag>
-            <a-tag v-else-if="record.menuType === 1">按钮</a-tag>
-          </template>
-          <template v-else-if="column.key === 'title'">
-            <a-avatar
-              :size="20"
-              v-if="record.image"
-              shape="square"
-              :src="`${record.image}`"
-            />
-            <a-tooltip :title="`分类ID：${record.categoryId}`">
-              <span>{{ record.title }}</span>
-            </a-tooltip>
-          </template>
-          <template v-if="column.key === 'status'">
-            <a-tag v-if="record.status === 0" color="green">显示</a-tag>
-            <a-tag v-if="record.status === 1" color="orange">隐藏</a-tag>
-          </template>
-          <template v-else-if="column.key === 'action'">
+          <template v-if="column.key === 'action'">
             <a-space>
-              <a @click="openEdit(null, record.categoryId)">添加</a>
-              <a-divider type="vertical" />
               <a @click="openEdit(record)">修改</a>
               <a-divider type="vertical" />
               <a-popconfirm
                 placement="topRight"
-                title="确定要删除此分类吗？"
+                title="确定要删除此记录吗？"
                 @confirm="remove(record)"
               >
                 <a class="ele-text-danger">删除</a>
@@ -84,13 +49,7 @@
       </ele-pro-table>
     </a-card>
     <!-- 编辑弹窗 -->
-    <category-edit
-      v-model:visible="showEdit"
-      :data="current"
-      :parent-id="parentId"
-      :category-list="categoryData"
-      @done="reload"
-    />
+    <ModelEdit v-model:visible="showEdit" :data="current" @done="reload" />
   </div>
 </template>
 
@@ -100,20 +59,14 @@
   import { PlusOutlined } from '@ant-design/icons-vue';
   import type {
     DatasourceFunction,
-    ColumnItem,
-    EleProTableDone
+    ColumnItem
   } from 'ele-admin-pro/es/ele-pro-table/types';
-  import {
-    messageLoading,
-    toDateString,
-    isExternalLink,
-    toTreeData,
-    eachTreeData
-  } from 'ele-admin-pro/es';
+  import { messageLoading, toDateString } from 'ele-admin-pro/es';
   import type { EleProTable } from 'ele-admin-pro/es';
-  import CategoryEdit from './components/category-edit.vue';
   import type { TowerModel, TowerModelParam } from '@/api/tower/model/model';
   import { listTowerModel, removeTowerModel } from '@/api/tower/model';
+  import ModelEdit from '@/views/tower/model/components/model-edit.vue';
+  import { TowerEquipment } from "@/api/tower/equipment/model";
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -128,9 +81,17 @@
       hideInSetting: true,
       customRender: ({ index }) => index + (tableRef.value?.tableIndex ?? 0)
     },
+    {
+      title: '设备名称',
+      dataIndex: 'name',
+      key: 'name',
+      showSorterTooltip: false,
+      ellipsis: true
+    },
     {
       title: '设备型号',
-      key: 'title',
+      dataIndex: 'model',
+      key: 'model',
       showSorterTooltip: false,
       ellipsis: true
     },
@@ -141,22 +102,6 @@
       showSorterTooltip: false,
       ellipsis: true
     },
-    {
-      title: '排序',
-      dataIndex: 'sortNumber',
-      sorter: true,
-      width: 180,
-      showSorterTooltip: false
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      key: 'status',
-      sorter: true,
-      width: 180,
-      showSorterTooltip: false,
-      customRender: ({ text }) => ['显示', '隐藏'][text]
-    },
     {
       title: '创建时间',
       dataIndex: 'createTime',
@@ -176,40 +121,18 @@
 
   // 当前编辑数据
   const current = ref<TowerModel | null>(null);
-
+  const searchText = ref('');
   // 是否显示编辑弹窗
   const showEdit = ref(false);
 
-  // 上级分类id
-  const parentId = ref<number>();
-
-  // 分类数据
-  const categoryData = ref<TowerModel[]>([]);
-
-  // 表格展开的行
-  const expandedRowKeys = ref<number[]>([]);
-
   // 表格数据源
   const datasource: DatasourceFunction = ({ where }) => {
+    if (searchText.value) {
+      where.keywords = searchText.value;
+    }
     return listTowerModel({ ...where });
   };
 
-  /* 数据转为树形结构 */
-  const parseData = (data: TowerModel[]) => {
-    return toTreeData({
-      data: data.map((d) => {
-        return { ...d, key: d.categoryId, value: d.categoryId };
-      }),
-      idField: 'categoryId',
-      parentIdField: 'parentId'
-    });
-  };
-
-  /* 表格渲染完成回调 */
-  const onDone: EleProTableDone<TowerModel> = ({ data }) => {
-    categoryData.value = data;
-  };
-
   /* 刷新表格 */
   const reload = (where?: TowerModelParam) => {
     tableRef?.value?.reload({ where });
@@ -218,22 +141,17 @@
   /* 打开编辑弹窗 */
   const openEdit = (row?: TowerModel | null, id?: number) => {
     current.value = row ?? null;
-    parentId.value = id;
     showEdit.value = true;
   };
 
   const search = (searchText) => {
-    reload({ title: searchText });
+    reload({ keywords: searchText });
   };
 
   /* 删除单个 */
   const remove = (row: TowerModel) => {
-    if (row.children?.length) {
-      message.error('请先删除子节点');
-      return;
-    }
     const hide = messageLoading('请求中..', 0);
-    removeTowerModel(row.categoryId)
+    removeTowerModel(row.modelId)
       .then((msg) => {
         hide();
         message.success(msg);
@@ -245,39 +163,18 @@
       });
   };
 
-  /* 展开全部 */
-  const expandAll = () => {
-    let keys: number[] = [];
-    eachTreeData(categoryData.value, (d) => {
-      if (d.children && d.children.length && d.categoryId) {
-        keys.push(d.categoryId);
+  /* 自定义行属性 */
+  const customRow = (record: TowerModel) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
       }
-    });
-    expandedRowKeys.value = keys;
-  };
-
-  /* 折叠全部 */
-  const foldAll = () => {
-    expandedRowKeys.value = [];
-  };
-
-  /* 点击展开图标时触发 */
-  const onExpand = (expanded: boolean, record: TowerModel) => {
-    if (expanded) {
-      expandedRowKeys.value = [
-        ...expandedRowKeys.value,
-        record.categoryId as number
-      ];
-    } else {
-      expandedRowKeys.value = expandedRowKeys.value.filter(
-        (d) => d !== record.categoryId
-      );
-    }
-  };
-
-  /* 判断是否是目录 */
-  const isDirectory = (d: TowerModel) => {
-    return !!d.children?.length;
+    };
   };
 </script>