From 4ed8065851f6c05b1e4714bd4b77ce9c81882edd Mon Sep 17 00:00:00 2001
From: betaqi <3188864257@qq.com>
Date: Wed, 30 Jul 2025 17:17:08 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=BE=E5=A4=87=E5=BA=93=E5=AD=98):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=80=BB=E6=9D=A1=E6=95=B0=20=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=B7=20=E5=BA=93=E5=AD=98=E8=AE=BE=E5=A4=87=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dashboard/Edfs-table/index.vue |  2 +-
 src/pages/deviceInfo/index.vue                |  5 ++++
 .../deviceStorage/components/data-filter.vue  | 30 ++++++++++++++++++-
 src/pages/deviceStorage/index.vue             |  5 ++++
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/components/dashboard/Edfs-table/index.vue b/src/components/dashboard/Edfs-table/index.vue
index 9d2b539..80a8aff 100644
--- a/src/components/dashboard/Edfs-table/index.vue
+++ b/src/components/dashboard/Edfs-table/index.vue
@@ -26,7 +26,7 @@
           v-model:current-page="currentPage"
           v-model:page-size="pageSize"
           :width-type="1"
-          layout="prev, pager, next, jumper"
+          layout="total,prev, pager, next, jumper"
           :total="pageTotal"
           background
           @current-change="onPageCurrentChange"
diff --git a/src/pages/deviceInfo/index.vue b/src/pages/deviceInfo/index.vue
index ed5cb0d..428f3d9 100644
--- a/src/pages/deviceInfo/index.vue
+++ b/src/pages/deviceInfo/index.vue
@@ -24,6 +24,11 @@
         row-class-name="row"
         @pageCurrentChange="handleJump"
       >
+        <el-table-column type="index" label="序号" align="center" width="80">
+          <template #default="scope">
+            <span>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
         <template v-for="(col, idx) in deviceTableCol" :key="idx">
           <el-table-column
             v-if="col.prop.endsWith('Time')"
diff --git a/src/pages/deviceStorage/components/data-filter.vue b/src/pages/deviceStorage/components/data-filter.vue
index be0cd98..1eb83b8 100644
--- a/src/pages/deviceStorage/components/data-filter.vue
+++ b/src/pages/deviceStorage/components/data-filter.vue
@@ -58,6 +58,21 @@
       </el-select>
       <el-checkbox v-model="checkbox.status" size="large" disabled />
     </div>
+    <div class="item">
+      <el-cascader
+        v-model="filterData.categoryId"
+        :options="categoryTreeData"
+        placeholder="请选择设备分类"
+        style="width: 100%"
+        :props="{
+          checkStrictly: true,
+          value: 'id',
+          label: 'name',
+          emitPath: false,
+        }"
+      />
+      <el-checkbox v-model="checkbox.categoryId" size="large" />
+    </div>
     <div class="item item-btn">
       <EdfsButton
         inner-text="搜索"
@@ -79,6 +94,7 @@ import { isResError } from '@/hooks/useMessage'
 import type { CustomerVO } from '@/api/module/eam/customer'
 import { statusList } from '../utils'
 import { useMessage } from '@/hooks/useMessage'
+import { getCategoryTree, ICategoryTree } from "@/api/module/eam/device/category";
 
 const locale = zhCn
 const msg = useMessage()
@@ -99,6 +115,7 @@ type FilterKeys = keyof typeof filterData.value
 const filterData = ref({
   // startDay: dayjs().subtract(15, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
   // endDay: dayjs().add(1, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+  categoryId: '',
   startDay: '',
   endDay: '',
   status: 3,
@@ -108,6 +125,7 @@ const filterData = ref({
 
 const checkbox = ref<Record<FilterKeys, boolean>>({
   startDay: false,
+  categoryId: false,
   endDay: false,
   status: true,
   sn: false,
@@ -138,6 +156,7 @@ const placeholderMap = {
   endDay: '终止时间',
   sn: '设备SN',
   customerId: '客户',
+  categoryId: '设备分类',
 }
 
 function validate() {
@@ -176,6 +195,7 @@ function onReset() {
     status: 3,
     sn: '',
     customerId: '',
+    categoryId: '',
   }
   checkbox.value = {
     startDay: false,
@@ -183,11 +203,19 @@ function onReset() {
     status: true,
     sn: false,
     customerId: false,
+    categoryId: false,
   }
   onSearch()
 }
-
+const categoryTreeData = ref<ICategoryTree[]>([])
+async function loadDeviceTypeTree() {
+  const res = await getCategoryTree()
+  if (!isResError(res)) {
+    categoryTreeData.value = res.data
+  }
+}
 onMounted(() => {
+  loadDeviceTypeTree()
   onSearch()
 })
 </script>
diff --git a/src/pages/deviceStorage/index.vue b/src/pages/deviceStorage/index.vue
index 4c9d3a3..10da64f 100644
--- a/src/pages/deviceStorage/index.vue
+++ b/src/pages/deviceStorage/index.vue
@@ -21,6 +21,11 @@
         row-class-name="row"
         @pageCurrentChange="handleJump"
       >
+        <el-table-column type="index" label="序号" align="center" width="80">
+          <template #default="scope">
+            <span>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
         <template v-for="(col, idx) in tableCol" :key="idx">
           <el-table-column
             v-if="col.prop.endsWith('Time')"