diff --git a/backend/routes/racks.js b/backend/routes/racks.js
index 7ca3e70..3190140 100644
--- a/backend/routes/racks.js
+++ b/backend/routes/racks.js
@@ -39,16 +39,34 @@ router.get('/', async (req, res) => {
     // 获取总记录数（带筛选条件）
     const total = await Rack.count({ where });
 
-    // 获取分页数据 - 优化：使用 JOIN 避免 N+1 查询问题
+    // 获取分页数据 - 先查询机柜基本信息
     const racks = await Rack.findAll({
       where,
       include: [
-        { model: Room, separate: false },
-        { model: Device, separate: false }
+        { model: Room, separate: false }
       ],
       limit: pageSize,
-      offset: offset,
-      subQuery: false  // 避免子查询导致的性能问题
+      offset: offset
+    });
+
+    // 单独查询每个机柜的设备信息（避免 JOIN 导致的数据重复问题）
+    const rackIds = racks.map(r => r.rackId);
+    const devices = await Device.findAll({
+      where: { rackId: rackIds },
+      attributes: ['deviceId', 'rackId', 'name', 'powerConsumption']
+    });
+
+    // 将设备信息关联到对应的机柜
+    const deviceMap = {};
+    devices.forEach(d => {
+      if (!deviceMap[d.rackId]) {
+        deviceMap[d.rackId] = [];
+      }
+      deviceMap[d.rackId].push(d);
+    });
+
+    racks.forEach(rack => {
+      rack.dataValues.Devices = deviceMap[rack.rackId] || [];
     });
 
     // 返回带分页信息的响应
diff --git a/frontend/src/pages/RackManagement.jsx b/frontend/src/pages/RackManagement.jsx
index 528db84..66fbcd8 100644
--- a/frontend/src/pages/RackManagement.jsx
+++ b/frontend/src/pages/RackManagement.jsx
@@ -25,6 +25,7 @@ import {
   Statistic,
   Upload,
   Spin,
+  Pagination,
 } from 'antd';
 import {
   PlusOutlined,
@@ -947,6 +948,23 @@ function RackManagement() {
             )}
           </Row>
         )}
+
+        {/* 卡片视图分页 - 始终显示当总数据大于0时 */}
+        {viewMode === 'card' && (
+          <div style={{ display: 'flex', justifyContent: 'center', marginTop: '24px' }}>
+            <Pagination
+              current={pagination.current}
+              pageSize={pagination.pageSize}
+              total={pagination.total}
+              pageSizeOptions={pagination.pageSizeOptions}
+              showSizeChanger={pagination.showSizeChanger}
+              showTotal={pagination.showTotal}
+              onChange={(page, pageSize) => {
+                handleTableChange({ current: page, pageSize });
+              }}
+            />
+          </div>
+        )}
       </Card>
 
       <Modal