diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 7e47972..8bcfa0b 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -540,35 +540,29 @@ declare namespace Api {
   namespace Device {
     interface ApDevice {
       id: number;
-      deviceName: string;
-      deviceIp: string;
-      deviceMac: string;
-      deviceModel: string;
-      delFlag: boolean;
+      mac: string;
+      publicIp: string;
+      name: string;
+      status: number;
+      model: string;
+      uptime: string;
       createBy: string | null;
       createTime: string;
       updateBy: string | null;
       updateTime: string | null;
-      userId: number | null;
+      operate?: string;
     }
 
-    interface ApDeviceResponse {
-      code: number;
-      msg: string;
-      data: {
-        rows: ApDevice[];
-        total: number;
-      };
-    }
+    type ApDeviceResponse = App.Service.Response<Api.Common.PaginatingQueryRecord<ApDevice>>;
 
     interface ApDeviceParams {
       pageNum: number;
       pageSize: number;
-      deviceName?: string;
-      deviceIp?: string;
-      deviceMac?: string;
+      name?: string;
+      mac?: string;
     }
 
+
     interface TerminalDevice {
       id: number;
       clientName: string;
diff --git a/src/views/device/apdevice/index.vue b/src/views/device/apdevice/index.vue
index 803f931..289703a 100644
--- a/src/views/device/apdevice/index.vue
+++ b/src/views/device/apdevice/index.vue
@@ -16,11 +16,9 @@
         <template #extra>
           <TableHeaderOperation
             v-model:columns="columnChecks"
-            :disabled-delete="selectedRowKeys.length === 0"
             :loading="loading"
-            :show-delete="true"
             :not-show-add="true"
-            @delete="handleBatchDelete"
+            :show-delete="false"
             @refresh="getData"
           />
         </template>
@@ -32,10 +30,6 @@
           :loading="loading"
           row-key="id"
           size="small"
-          :row-selection="{
-            selectedRowKeys,
-            onChange: onSelectChange
-          }"
           :pagination="{
             ...mobilePagination,
             total: mobilePagination.total,
@@ -52,10 +46,10 @@
           }"
         >
           <template #bodyCell="{ column, record }">
-            <template v-if="column.key === 'action'">
-              <ASpace>
-                <AButton type="primary" danger @click="handleDelete(record)">删除</AButton>
-              </ASpace>
+            <template v-if="column.key === 'status'">
+              <ATag :color="record.status === 1 ? 'success' : 'error'">
+                {{ record.status === 1 ? '在线' : '离线' }}
+              </ATag>
             </template>
           </template>
         </ATable>
@@ -65,14 +59,15 @@
 </template>
 
 <script setup lang="ts">
-import { useTable, useTableOperate } from '@/hooks/common/table';
+import { useTable } from '@/hooks/common/table';
 import { SimpleScrollbar } from '~/packages/materials/src';
 import { computed, shallowRef } from 'vue';
 import { useElementSize } from '@vueuse/core';
-import { fetchApDeviceList, deleteApDevices } from '@/service/api/auth';
-import { Card as ACard, Table as ATable, Button as AButton, Space as ASpace, Modal, message } from 'ant-design-vue';
+import { fetchApDeviceList } from '@/service/api/auth';
+import { Card as ACard, Table as ATable, Tag as ATag } from 'ant-design-vue';
 import DeviceSearch from './modules/device-search.vue';
 
+
 const wrapperEl = shallowRef<HTMLElement | null>(null);
 const { height: wrapperElHeight } = useElementSize(wrapperEl);
 
@@ -96,12 +91,10 @@ const {
       console.log('Fetching with params:', JSON.stringify(params, null, 2));
       const response = await fetchApDeviceList(params);
       console.log('API Response:', response);
-      const rows = response.data || [];
-      const total = Array.isArray(response.data) ? response.data.length : 0;
       return {
         data: {
-          rows,
-          total
+          rows: response.data || [],
+          total: Array.isArray(response.data) ? response.data.length : 0
         }
       };
     } catch (error) {
@@ -119,100 +112,57 @@ const {
   apiParams: {
     pageNum: 1,
     pageSize: 10,
-    deviceName: '',
-    deviceMac: ''
+    name: '',
+    mac: ''
   } as Api.Device.ApDeviceParams,
   rowKey: 'id',
   pagination: true,
   columns: (): AntDesign.TableColumn<Api.Device.ApDevice>[] => [
     {
-      key: 'deviceName',
-      dataIndex: 'deviceName',
+      key: 'name',
+      dataIndex: 'name',
       title: '设备名称',
       align: 'center',
       width: 150
     },
     {
-      key: 'deviceIp',
-      dataIndex: 'deviceIp',
+      key: 'publicIp',
+      dataIndex: 'publicIp',
       title: 'IP地址',
       align: 'center',
       width: 150
     },
     {
-      key: 'deviceMac',
-      dataIndex: 'deviceMac',
+      key: 'mac',
+      dataIndex: 'mac',
       title: 'MAC地址',
       align: 'center',
       width: 180
     },
     {
-      key: 'deviceModel',
-      dataIndex: 'deviceModel',
-      title: '设备型号',
+      key: 'model',
+      dataIndex: 'model',
+      title: '型号',
       align: 'center',
       width: 150
+    },
+    {
+      key: 'uptime',
+      dataIndex: 'uptime',
+      title: '在线时间',
+      align: 'center',
+      width: 180
+    },
+    {
+      key: 'status',
+      dataIndex: 'status',
+      title: '状态',
+      align: 'center',
+      width: 100
     }
   ]
 });
 
-const {
-  checkedRowKeys: selectedRowKeys,
-  onBatchDeleted
-} = useTableOperate(data, { getData, idKey: 'id' });
-
-// 处理选择变化
-const onSelectChange = (keys: (string | number)[]) => {
-  selectedRowKeys.value = keys.map(key => Number(key));
-};
-
-// 处理单个删除
-const handleDelete = async (record: Api.Device.ApDevice) => {
-  try {
-    await Modal.confirm({
-      title: '确认删除',
-      content: '确定要删除该设备吗？',
-      okText: '确定',
-      cancelText: '取消',
-      okButtonProps: { danger: true }
-    });
-
-    await deleteApDevices(record.id.toString());
-    message.success('删除成功');
-    getData();
-  } catch (error) {
-    if (error) {
-      console.error('删除失败:', error);
-      message.error('删除失败');
-    }
-  }
-};
-
-// 处理批量删除
-const handleBatchDelete = async () => {
-  if (selectedRowKeys.value.length === 0) return;
-
-  try {
-    await Modal.confirm({
-      title: '确认删除',
-      content: '确定要删除选中的设备吗？',
-      okText: '确定',
-      cancelText: '取消',
-      okButtonProps: { danger: true }
-    });
-
-    const ids = selectedRowKeys.value.join(',');
-    await deleteApDevices(ids);
-    message.success('删除成功');
-    onBatchDeleted();
-  } catch (error) {
-    if (error) {
-      console.error('删除失败:', error);
-      message.error('删除失败');
-    }
-  }
-};
-
 // 监听搜索参数变化并打印日志
 watch(
   () => searchParams,
diff --git a/src/views/device/apdevice/modules/device-search.vue b/src/views/device/apdevice/modules/device-search.vue
index 948958f..ba498f5 100644
--- a/src/views/device/apdevice/modules/device-search.vue
+++ b/src/views/device/apdevice/modules/device-search.vue
@@ -3,7 +3,7 @@
     <AForm layout="inline">
       <AFormItem label="设备名称">
         <AInput
-          v-model:value="model.deviceName"
+          v-model:value="model.name"
           placeholder="请输入设备名称"
           allow-clear
           class="w-200px"
@@ -12,7 +12,7 @@
       </AFormItem>
       <AFormItem label="MAC地址">
         <AInput
-          v-model:value="model.deviceMac"
+          v-model:value="model.mac"
           placeholder="请输入MAC地址"
           allow-clear
           class="w-200px"
@@ -44,8 +44,8 @@ import { Form as AForm, FormItem as AFormItem, Input as AInput, Button as AButto
 
 interface Props {
   model: {
-    deviceName?: string;
-    deviceMac?: string;
+    name?: string;
+    mac?: string;
     pageNum: number;
     pageSize: number;
   };
@@ -65,8 +65,8 @@ const search = () => {
 const reset = () => {
   emit('update:model', {
     ...props.model,
-    deviceName: '',
-    deviceMac: '',
+    name: '',
+    mac: '',
     pageNum: 1
   });
   emit('reset');