From d0d34aee2f06ceca61af69efd4143a00b9bf9359 Mon Sep 17 00:00:00 2001
From: zhang1106 <849185023@qq.com>
Date: Mon, 9 Feb 2026 16:55:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=9C=BA=E6=9E=B6=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E7=AB=AF=E7=AD=9B=E9=80=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 后端路由添加对房间ID、状态和关键字的筛选支持
- 前端移除本地筛选逻辑，改为使用后端筛选参数
- 添加筛选条件变化时自动重置分页并重新加载数据
---
 backend/routes/racks.js               | 27 ++++++++++++++++++++----
 frontend/src/pages/RackManagement.jsx | 30 ++++++++++++++-------------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/backend/routes/racks.js b/backend/routes/racks.js
index 8e59432..3649612 100644
--- a/backend/routes/racks.js
+++ b/backend/routes/racks.js
@@ -17,11 +17,30 @@ router.get('/', async (req, res) => {
     const pageSize = parseInt(req.query.pageSize) || 10;
     const offset = (page - 1) * pageSize;
 
-    // 获取总记录数
-    const total = await Rack.count();
-    
+    // 筛选参数
+    const { roomId, status, keyword } = req.query;
+
+    // 构建查询条件
+    const where = {};
+    if (roomId && roomId !== 'all') {
+      where.roomId = roomId;
+    }
+    if (status && status !== 'all') {
+      where.status = status;
+    }
+    if (keyword) {
+      where[require('sequelize').Op.or] = [
+        { rackId: { [require('sequelize').Op.like]: `%${keyword}%` } },
+        { name: { [require('sequelize').Op.like]: `%${keyword}%` } }
+      ];
+    }
+
+    // 获取总记录数（带筛选条件）
+    const total = await Rack.count({ where });
+
     // 获取分页数据
     const racks = await Rack.findAll({
+      where,
       include: [
         { model: Room },
         { model: Device }
@@ -29,7 +48,7 @@ router.get('/', async (req, res) => {
       limit: pageSize,
       offset: offset
     });
-    
+
     // 返回带分页信息的响应
     res.json({
       racks,
diff --git a/frontend/src/pages/RackManagement.jsx b/frontend/src/pages/RackManagement.jsx
index 5ee9f3f..ef81eba 100644
--- a/frontend/src/pages/RackManagement.jsx
+++ b/frontend/src/pages/RackManagement.jsx
@@ -283,7 +283,13 @@ function RackManagement() {
     try {
       setLoading(true);
       const response = await axios.get('/api/racks', {
-        params: { page, pageSize }
+        params: {
+          page,
+          pageSize,
+          roomId: roomFilter,
+          status: statusFilter,
+          keyword: searchKeyword || undefined
+        }
       });
       const { racks: data, total } = response.data;
       setRacks(data);
@@ -294,7 +300,7 @@ function RackManagement() {
     } finally {
       setLoading(false);
     }
-  }, []);
+  }, [roomFilter, statusFilter, searchKeyword]);
 
   const fetchRooms = useCallback(async () => {
     try {
@@ -311,6 +317,12 @@ function RackManagement() {
     fetchRooms();
   }, [fetchRacks, fetchRooms]);
 
+  // 当筛选条件变化时，重置到第一页并重新加载
+  useEffect(() => {
+    setPagination(prev => ({ ...prev, current: 1 }));
+    fetchRacks(1, pagination.pageSize);
+  }, [roomFilter, statusFilter, searchKeyword]);
+
   const handleTableChange = useCallback((pagination) => {
     fetchRacks(pagination.current, pagination.pageSize);
   }, [fetchRacks]);
@@ -482,18 +494,8 @@ function RackManagement() {
     }
   }, [fetchRacks]);
 
-  const filteredRacks = useMemo(() => {
-    return racks.filter(rack => {
-      const matchKeyword = !searchKeyword ||
-        rack.name?.toLowerCase().includes(searchKeyword.toLowerCase()) ||
-        rack.rackId?.toLowerCase().includes(searchKeyword.toLowerCase());
-
-      const matchStatus = statusFilter === 'all' || rack.status === statusFilter;
-      const matchRoom = roomFilter === 'all' || rack.roomId === roomFilter;
-
-      return matchKeyword && matchStatus && matchRoom;
-    });
-  }, [racks, searchKeyword, statusFilter, roomFilter]);
+  // 后端已过滤，直接使用 racks 数据
+  const filteredRacks = racks;
 
   const stats = useMemo(() => ({
     total: racks.length,