From ef55e801ee57e5c1cd2facebd1656289b33f4f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 24 Apr 2026 17:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=B9=E6=AC=A1=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A8=E6=A0=BC=E5=86=85=E9=83=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=AB=96=E5=90=91=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/manager/DeviceManagerList.vue   | 16 ++++---
 .../components/preview/DevicePreviewList.vue  | 43 +++++++++++++------
 src/views/iot/manager/manager.data.ts         |  4 +-
 3 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/views/iot/manager/DeviceManagerList.vue b/src/views/iot/manager/DeviceManagerList.vue
index cfa88fc..d2a460c 100644
--- a/src/views/iot/manager/DeviceManagerList.vue
+++ b/src/views/iot/manager/DeviceManagerList.vue
@@ -4,13 +4,19 @@
       <a-form ref="formRef" :model="queryParam" :label-col="labelCol"
               :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="6">
+          <a-col :lg="5">
+            <a-form-item name="batchNo">
+              <template #label><span title="设备批次">设备批次</span></template>
+              <a-input v-model:value="queryParam.batchNo" placeholder="请输入设备批次" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="5">
             <a-form-item name="nuName">
               <template #label><span title="区域名称">区域名称</span></template>
               <a-input v-model:value="queryParam.nuName" placeholder="请输入区域名称" allow-clear />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col :lg="5">
             <a-form-item name="dimension">
               <template #label><span title="设备维度">设备维度</span></template>
               <a-select v-model:value="queryParam.dimension" placeholder="请选择设备维度" allow-clear>
@@ -19,19 +25,17 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col :lg="5">
             <a-form-item name="deviceType">
               <template #label><span title="设备类型">设备类型</span></template>
               <j-dict-select-tag v-model:value="queryParam.deviceType" :showLabel="false" dictCode="tplink_device_type" placeholder="请选择设备类型"  allow-clear />
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :lg="4">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
-              <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
                           style="margin-left: 8px">重置</a-button>
-              </a-col>
             </span>
           </a-col>
         </a-row>
diff --git a/src/views/iot/manager/components/preview/DevicePreviewList.vue b/src/views/iot/manager/components/preview/DevicePreviewList.vue
index 4f5728f..1a11492 100644
--- a/src/views/iot/manager/components/preview/DevicePreviewList.vue
+++ b/src/views/iot/manager/components/preview/DevicePreviewList.vue
@@ -5,6 +5,12 @@
       <a-form ref="formRef" :model="queryParam" :label-col="labelCol"
               :wrapper-col="wrapperCol">
         <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="batchNo">
+              <template #label><span title="设备批次">设备批次</span></template>
+              <a-input v-model:value="queryParam.batchNo" placeholder="请输入设备批次" allow-clear />
+            </a-form-item>
+          </a-col>
           <a-col :lg="6">
             <a-form-item name="dimension">
               <template #label><span title="设备维度">设备维度</span></template>
@@ -35,24 +41,23 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-      </template>
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)"/>
-      </template>
-      <template v-slot:bodyCell="{ column, record, index, text }">
-      </template>
-    </BasicTable>
+    <div class="container-height">
+      <BasicTable @register="registerTable" >
+        <!--操作栏-->
+        <template #action="{ record }">
+          <TableAction :actions="getTableAction(record)"/>
+        </template>
+        <template v-slot:bodyCell="{ column, record, index, text }">
+        </template>
+      </BasicTable>
+    </div>
     <!-- 表单区域 -->
     <DevicePreviewFormModal ref="formDrawer" @success="handleSuccess" />
   </div>
 </template>
 
 <script lang="ts" name="iotManager-areaList" setup>
-import {ref, reactive, defineExpose, nextTick, createVNode} from 'vue';
+import {ref, reactive, defineExpose, nextTick, createVNode, computed} from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { useListPage } from '/@/hooks/system/useListPage';
 import { previewColumns } from '../../manager.data';
@@ -63,6 +68,7 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT
 import {Modal} from "ant-design-vue";
 import {ExclamationCircleOutlined} from "@ant-design/icons-vue";
 import {useMethods} from "@/hooks/system/useMethods";
+import {useResponsive} from "@/hooks/web/useResponsive";
 
 const { handleExportXls} = useMethods();
 const formRef = ref();
@@ -70,16 +76,23 @@ const queryParam = reactive<any>({});
 const formDrawer = ref();
 const orgCode = ref<any>('');
 const userStore = useUserStore();
+const { screenEnum, screenWidth } = useResponsive();
+// 计算动态高度
+const scrollY = computed(() => {
+  // 大屏幕（≥1600px）使用 71vh，否则使用 66.5vh
+  return screenWidth.value >= screenEnum.XXL ? '60.8vh' : '58.5vh';
+});
 //注册table数据
 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
-    title: '设备清单',
     api: previewList,
     columns: previewColumns,
     canResize: false,
     useSearchForm: false,
     showIndexColumn: true,
+    showTableSetting: false,
     immediate: false,
+    scroll: { y: scrollY.value },
     pagination: {
       current: 1,
       pageSize: 15,
@@ -174,6 +187,10 @@ defineExpose({
 
 <style lang="less" scoped>
 
+.container-height {
+  height: 57vh;
+}
+
 .jeecg-basic-table-form-container {
   padding: 0;
   .table-page-search-submitButtons {
diff --git a/src/views/iot/manager/manager.data.ts b/src/views/iot/manager/manager.data.ts
index 5a354dd..88957f4 100644
--- a/src/views/iot/manager/manager.data.ts
+++ b/src/views/iot/manager/manager.data.ts
@@ -4,7 +4,7 @@ import {FormSchema} from '/@/components/Table';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '批次',
+    title: '设备批次',
     align: "center",
     dataIndex: 'batchNo',
   },
@@ -79,7 +79,7 @@ export const columns: BasicColumn[] = [
 //列表数据
 export const previewColumns: BasicColumn[] = [
   {
-    title: '批次',
+    title: '设备批次',
     align: "center",
     dataIndex: 'batchNo',
   },