diff --git a/API.md b/API.md
index 6807ef0..3655223 100644
--- a/API.md
+++ b/API.md
@@ -188,6 +188,42 @@
 - **参数**:
   - `file` (file, 必填): 图片文件
 
+#### 4.15 获取教室选座列表
+- **URL**: `GET /api/admin/classroom/getSeatList`
+- **说明**: 获取教室的选座列表，以座位号排序
+- **需要登录**: 是
+- **参数**:
+  - `id` (int, 必填): 教室ID
+- **返回数据**:
+  ```json
+  {
+    "code": 200,
+    "message": "获取成功",
+    "data": [
+      {
+        "seat_number": "1",
+        "is_selected": 1,
+        "student_name": "张三",
+        "student_mobile": "13800138000",
+        "select_time": "2024-03-20 10:00:00"
+      },
+      {
+        "seat_number": "2",
+        "is_selected": 0,
+        "student_name": "",
+        "student_mobile": "",
+        "select_time": ""
+      }
+    ]
+  }
+  ```
+- **字段说明**:
+  - `seat_number` (string): 座位号
+  - `is_selected` (int): 是否选座（1已选，0未选）
+  - `student_name` (string): 学员姓名（未选座时为空）
+  - `student_mobile` (string): 学员手机号（未选座时为空）
+  - `select_time` (string): 选座时间（未选座时为空）
+
 ### 5. 预订管理
 
 #### 5.1 获取预订列表
diff --git a/apps/web-antd/.env.production b/apps/web-antd/.env.production
index 869d031..e84c54f 100644
--- a/apps/web-antd/.env.production
+++ b/apps/web-antd/.env.production
@@ -1,6 +1,6 @@
 # 生产环境配置
 VITE_BASE=/super/
-VITE_GLOB_API_URL=https://xuanzuo.dhdjy.com
+VITE_GLOB_API_URL=http://xz.dhdjy.com
 VITE_ROUTER_HISTORY=history
 VITE_COMPRESS=gzip
 VITE_PWA=false
diff --git a/apps/web-antd/src/api/admin/classroom.ts b/apps/web-antd/src/api/admin/classroom.ts
index 6ed1b8b..7e13de9 100644
--- a/apps/web-antd/src/api/admin/classroom.ts
+++ b/apps/web-antd/src/api/admin/classroom.ts
@@ -22,10 +22,13 @@ export namespace ClassroomApi {
   export interface ClassroomLayoutCell {
     col: number;
     row: number;
-    type: 'empty' | 'pillar' | 'aisle' | 'seat' | 'door';
+    type: 'empty' | 'pillar' | 'aisle' | 'seat' | 'door' | 'projector';
     number?: string;
-    status?: number;
+    status?: number; // 座位状态：1=可用, 0=禁坐
     name?: string;
+    colspan?: number; // 合并列数（默认1）
+    rowspan?: number; // 合并行数（默认1）
+    merged?: boolean; // 是否为被合并的单元格（用于标记被主单元格合并的单元格）
   }
 
   /** 教室座位布局 */
@@ -107,6 +110,20 @@ export namespace ClassroomApi {
   export interface CancelBookingAutoParams {
     ids: number[];
   }
+
+  /** 获取教室选座列表参数 */
+  export interface GetSeatListParams {
+    id: number;
+  }
+
+  /** 座位信息 */
+  export interface SeatInfo {
+    seat_number: string;
+    is_selected: number; // 1已选，0未选
+    student_name: string;
+    student_mobile: string;
+    select_time: string;
+  }
 }
 
 /**
@@ -235,3 +252,15 @@ export async function uploadClassroomImageApi(file: File) {
   });
 }
 
+/**
+ * 获取教室选座列表
+ * GET /api/admin/classroom/getSeatList
+ */
+export async function getClassroomSeatListApi(params: ClassroomApi.GetSeatListParams) {
+  // 使用 responseReturn: 'body' 获取完整响应体
+  return requestClient.get<any>('/api/admin/classroom/getSeatList', {
+    params,
+    responseReturn: 'body',
+  });
+}
+
diff --git a/apps/web-antd/src/api/admin/index-page.ts b/apps/web-antd/src/api/admin/index-page.ts
index d16928a..8d56c02 100644
--- a/apps/web-antd/src/api/admin/index-page.ts
+++ b/apps/web-antd/src/api/admin/index-page.ts
@@ -1,6 +1,17 @@
 import { requestClient } from '#/api/request';
 
 export namespace IndexApi {
+  /** 统计数据 */
+  export interface Statistics {
+    school_count?: number;
+    classroom_count?: number;
+    class_count?: number;
+    student_count?: number;
+    teacher_count?: number;
+    booking_count?: number;
+    selected_seat_count?: number;
+  }
+
   /** 系统信息 */
   export interface SystemInfo {
     os?: string;
@@ -14,6 +25,7 @@ export namespace IndexApi {
     disk_usage?: string;
     runtime_path?: string;
     framework_version?: string;
+    statistics?: Statistics;
     [key: string]: any;
   }
 }
diff --git a/apps/web-antd/src/api/admin/setting.ts b/apps/web-antd/src/api/admin/setting.ts
index 26775a0..b0d04b4 100644
--- a/apps/web-antd/src/api/admin/setting.ts
+++ b/apps/web-antd/src/api/admin/setting.ts
@@ -56,10 +56,12 @@ export async function saveSettingApi(data: SettingApi.SaveParams) {
 export async function uploadSettingImageApi(file: File) {
   const formData = new FormData();
   formData.append('file', file);
-  return requestClient.post<string>('/api/admin/setting/upload', formData, {
+  // 使用 responseReturn: 'body' 获取完整响应体
+  return requestClient.post<any>('/api/admin/setting/upload', formData, {
     headers: {
       'Content-Type': 'multipart/form-data',
     },
+    responseReturn: 'body',
   });
 }
 
diff --git a/apps/web-antd/src/components/classroom/SeatLayoutEditor.vue b/apps/web-antd/src/components/classroom/SeatLayoutEditor.vue
index 2f56e25..544a11d 100644
--- a/apps/web-antd/src/components/classroom/SeatLayoutEditor.vue
+++ b/apps/web-antd/src/components/classroom/SeatLayoutEditor.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import { ref, computed, watch, onMounted, onUnmounted } from 'vue';
-import { Button, Input, Select, Space, message, Modal, Radio, Divider, Card } from 'ant-design-vue';
+import { ref, computed, watch, onMounted, onUnmounted, shallowRef } from 'vue';
+import { Button, Input, Space, message, Modal, Radio, Divider, Card } from 'ant-design-vue';
 import type { ClassroomApi } from '#/api';
 import { saveClassroomLayoutApi } from '#/api';
 
@@ -19,20 +19,66 @@ const emit = defineEmits<{
   saved: [layout: ClassroomApi.ClassroomLayout];
 }>();
 
+type CellSelectableType = ClassroomApi.ClassroomLayoutCell['type'] | 'merge';
+
 const loading = ref(false);
 const cols = ref(10);
 const rows = ref(8);
-const selectedCellType = ref<ClassroomApi.ClassroomLayoutCell['type']>('seat');
+const selectedCellType = ref<CellSelectableType>('seat');
 const editingCell = ref<{ col: number; row: number } | null>(null);
 const seatNumber = ref('');
 const isDrawing = ref(false);
 const autoNumbering = ref(true);
 const seatNumberStart = ref(1);
-const lastDrawnCell = ref<{ col: number; row: number } | null>(null);
+const drawStartCell = ref<{ col: number; row: number } | null>(null); // 绘制起始单元格
+const drawCurrentCell = ref<{ col: number; row: number } | null>(null); // 绘制当前单元格
+const drawnCells = ref<Set<string>>(new Set()); // 记录本次绘制操作中已绘制的单元格（用于避免重复）
 const hasChangesInDrawing = ref(false); // 标记当前绘制操作是否有变化
+const mergeStartCell = ref<{ col: number; row: number } | null>(null); // 合并起始单元格
+const mergeCurrentCell = ref<{ col: number; row: number } | null>(null); // 合并当前滑动到的单元格
+const editingSeatStatus = ref<{ col: number; row: number } | null>(null); // 正在编辑座位状态的单元格
 
-// 初始化布局数据
-const cells = ref<ClassroomApi.ClassroomLayoutCell[]>([]);
+// 初始化布局数据 - 使用 shallowRef 优化性能
+const cells = shallowRef<ClassroomApi.ClassroomLayoutCell[]>([]);
+
+// 单元格查找缓存 Map: key = "col,row", value = cell
+const cellMapCache = ref<Map<string, ClassroomApi.ClassroomLayoutCell>>(new Map());
+
+// 合并单元格主单元格映射: key = "col,row" (被合并的单元格), value = "col,row" (主单元格)
+const mergeMasterMapCache = ref<Map<string, string>>(new Map());
+
+// 更新单元格缓存
+const updateCellMapCache = () => {
+  const map = new Map<string, ClassroomApi.ClassroomLayoutCell>();
+  const mergeMap = new Map<string, string>();
+
+  // 先建立单元格映射
+  cells.value.forEach((cell) => {
+    const key = `${cell.col},${cell.row}`;
+    map.set(key, cell);
+  });
+
+  // 建立合并单元格映射
+  cells.value.forEach((cell) => {
+    if (cell.merged) return;
+    const colspan = cell.colspan || 1;
+    const rowspan = cell.rowspan || 1;
+
+    if (colspan > 1 || rowspan > 1) {
+      const masterKey = `${cell.col},${cell.row}`;
+      for (let r = cell.row; r < cell.row + rowspan; r++) {
+        for (let c = cell.col; c < cell.col + colspan; c++) {
+          if (c === cell.col && r === cell.row) continue; // 跳过主单元格
+          const key = `${c},${r}`;
+          mergeMap.set(key, masterKey);
+        }
+      }
+    }
+  });
+
+  cellMapCache.value = map;
+  mergeMasterMapCache.value = mergeMap;
+};
 
 // 历史记录（用于撤销）
 interface HistoryState {
@@ -63,11 +109,12 @@ const handleUndo = () => {
     message.warning('没有可撤销的操作');
     return;
   }
-  
+
   const lastState = history.value.pop()!;
   cols.value = lastState.cols;
   rows.value = lastState.rows;
   cells.value = JSON.parse(JSON.stringify(lastState.cells));
+  updateCellMapCache();
   message.success('已撤销');
 };
 
@@ -80,9 +127,13 @@ const initLayout = () => {
         col,
         row,
         type: 'empty',
+        colspan: 1,
+        rowspan: 1,
+        merged: false,
       });
     }
   }
+  updateCellMapCache();
 };
 
 // 从现有布局加载
@@ -92,12 +143,47 @@ const loadLayout = () => {
     rows.value = props.layout.rows || 8;
     if (props.layout.cells && props.layout.cells.length > 0) {
       cells.value = JSON.parse(JSON.stringify(props.layout.cells));
+      // 确保所有单元格都有默认的合并属性，并修复类型字段
+      cells.value.forEach((cell) => {
+        if (cell.colspan === undefined) cell.colspan = 1;
+        if (cell.rowspan === undefined) cell.rowspan = 1;
+        if (cell.merged === undefined) cell.merged = false;
+        // 将 monitor 类型转换为 projector（兼容后端数据）
+        if ((cell.type as any) === 'monitor') {
+          cell.type = 'projector';
+        }
+      });
+
+      // 确保所有位置都有单元格数据（补充缺失的空白单元格）
+      const cellMap = new Map<string, ClassroomApi.ClassroomLayoutCell>();
+      cells.value.forEach((cell) => {
+        const key = `${cell.col},${cell.row}`;
+        cellMap.set(key, cell);
+      });
+
+      // 检查并补充缺失的单元格
+      for (let row = 0; row < rows.value; row++) {
+        for (let col = 0; col < cols.value; col++) {
+          const key = `${col},${row}`;
+          if (!cellMap.has(key)) {
+            cells.value.push({
+              col,
+              row,
+              type: 'empty',
+              colspan: 1,
+              rowspan: 1,
+              merged: false,
+            });
+          }
+        }
+      }
     } else {
       initLayout();
     }
   } else {
     initLayout();
   }
+  updateCellMapCache();
 };
 
 // 监听布局变化
@@ -109,6 +195,18 @@ watch(
   { immediate: true },
 );
 
+// 切换类型时，如果离开合并模式，重置合并选区与绘制状态
+watch(
+  () => selectedCellType.value,
+  (val) => {
+    if (val !== 'merge') {
+      mergeStartCell.value = null;
+      mergeCurrentCell.value = null;
+      isDrawing.value = false;
+    }
+  },
+);
+
 // 在左侧添加列
 const addColumnLeft = () => {
   saveHistory();
@@ -122,9 +220,13 @@ const addColumnLeft = () => {
       col: 0,
       row,
       type: 'empty',
+      colspan: 1,
+      rowspan: 1,
+      merged: false,
     });
   }
   cols.value += 1;
+  updateCellMapCache();
   message.success('已在左侧添加一列');
 };
 
@@ -137,9 +239,13 @@ const addColumnRight = () => {
       col: cols.value,
       row,
       type: 'empty',
+      colspan: 1,
+      rowspan: 1,
+      merged: false,
     });
   }
   cols.value += 1;
+  updateCellMapCache();
   message.success('已在右侧添加一列');
 };
 
@@ -156,9 +262,13 @@ const addRowTop = () => {
       col,
       row: 0,
       type: 'empty',
+      colspan: 1,
+      rowspan: 1,
+      merged: false,
     });
   }
   rows.value += 1;
+  updateCellMapCache();
   message.success('已在上方添加一行');
 };
 
@@ -171,15 +281,20 @@ const addRowBottom = () => {
       col,
       row: rows.value,
       type: 'empty',
+      colspan: 1,
+      rowspan: 1,
+      merged: false,
     });
   }
   rows.value += 1;
+  updateCellMapCache();
   message.success('已在下方添加一行');
 };
 
-// 获取单元格
+// 获取单元格 - 使用缓存优化性能
 const getCell = (col: number, row: number) => {
-  return cells.value.find((c) => c.col === col && c.row === row);
+  const key = `${col},${row}`;
+  return cellMapCache.value.get(key);
 };
 
 // 获取下一个座位编号
@@ -201,40 +316,55 @@ const getNextSeatNumber = () => {
 // 设置单元格类型
 const setCellType = (col: number, row: number, type: ClassroomApi.ClassroomLayoutCell['type']) => {
   const cell = getCell(col, row);
-  if (!cell) return;
+  if (!cell || cell.merged) return; // 被合并的单元格不能直接设置类型
 
   const wasSeat = cell.type === 'seat';
-  const oldType = cell.type;
 
   cell.type = type;
-  
+
   if (type !== 'seat') {
     delete cell.number;
     delete cell.status;
   }
-  
+
   if (type === 'empty') {
     delete cell.name;
-  } else if (type === 'pillar' || type === 'aisle' || type === 'door') {
-    cell.name = type === 'pillar' ? '柱子' : type === 'aisle' ? '过道' : '门';
+  } else if (type === 'pillar' || type === 'aisle' || type === 'door' || type === 'projector') {
+    const nameMap: Record<ClassroomApi.ClassroomLayoutCell['type'], string> = {
+      pillar: '柱子',
+      aisle: '过道',
+      door: '门',
+      projector: '投影仪',
+      seat: '座位',
+      empty: '',
+    };
+    cell.name = nameMap[type];
   } else if (type === 'seat') {
     // 如果是座位类型
     if (autoNumbering.value) {
       // 自动编号：只有从非座位类型变为座位类型时才分配新编号
       if (!wasSeat || !cell.number) {
         cell.number = getNextSeatNumber();
-        cell.status = 1;
+        cell.status = 1; // 默认可用
       }
-      // 如果已经是座位类型，保持原有编号不变
+      // 如果已经是座位类型，保持原有编号和状态不变
     } else if (!cell.number) {
       // 手动输入模式，如果没有编号，设置为空
-      cell.status = 1;
+      cell.status = 1; // 默认可用
     }
   }
+  // 更新缓存（单元格对象引用未变，但内容变了，需要更新 Map）
+  const key = `${col},${row}`;
+  cellMapCache.value.set(key, cell);
 };
 
 // 处理单元格设置（用于点击和拖动）
 const applyCellType = (col: number, row: number, skipSameType = false) => {
+  // 合并模式下不做类型绘制，交给合并逻辑处理
+  if (selectedCellType.value === 'merge') {
+    return;
+  }
+
   const cell = getCell(col, row);
   if (!cell) return;
 
@@ -250,9 +380,13 @@ const applyCellType = (col: number, row: number, skipSameType = false) => {
     return;
   }
 
-  // 记录最后绘制的单元格，避免重复绘制
-  if (lastDrawnCell.value && lastDrawnCell.value.col === col && lastDrawnCell.value.row === row) {
-    return;
+  // 在绘制模式下，检查是否已经绘制过（避免重复）
+  if (isDrawing.value) {
+    const cellKey = `${col},${row}`;
+    if (drawnCells.value.has(cellKey)) {
+      return;
+    }
+    drawnCells.value.add(cellKey);
   }
 
   if (selectedCellType.value === 'seat' && !autoNumbering.value && !isDrawing.value) {
@@ -262,7 +396,6 @@ const applyCellType = (col: number, row: number, skipSameType = false) => {
   } else {
     // 其他情况直接设置
     setCellType(col, row, selectedCellType.value);
-    lastDrawnCell.value = { col, row };
     // 标记有变化
     if (oldType !== selectedCellType.value) {
       hasChangesInDrawing.value = true;
@@ -270,8 +403,42 @@ const applyCellType = (col: number, row: number, skipSameType = false) => {
   }
 };
 
+// 填充从起点到终点之间的所有单元格
+const fillCellsBetween = (startCol: number, startRow: number, endCol: number, endRow: number) => {
+  const minCol = Math.min(startCol, endCol);
+  const maxCol = Math.max(startCol, endCol);
+  const minRow = Math.min(startRow, endRow);
+  const maxRow = Math.max(startRow, endRow);
+
+  // 合并模式下不填充
+  if (selectedCellType.value === 'merge') {
+    return;
+  }
+
+  // 按顺序填充所有单元格
+  for (let row = minRow; row <= maxRow; row++) {
+    for (let col = minCol; col <= maxCol; col++) {
+      const cellKey = `${col},${row}`;
+      if (!drawnCells.value.has(cellKey)) {
+        drawnCells.value.add(cellKey);
+        const cell = getCell(col, row);
+        if (cell) {
+          const oldType = cell.type;
+          setCellType(col, row, selectedCellType.value as ClassroomApi.ClassroomLayoutCell['type']);
+          if (oldType !== selectedCellType.value) {
+            hasChangesInDrawing.value = true;
+          }
+        }
+      }
+    }
+  }
+};
+
 // 点击单元格
 const handleCellClick = (col: number, row: number) => {
+  // 合并模式下，点击交给拖拽流程处理，这里不做处理
+  if (selectedCellType.value === 'merge') return;
+
   if (!isDrawing.value) {
     // 点击操作前保存历史记录
     const cell = getCell(col, row);
@@ -282,35 +449,120 @@ const handleCellClick = (col: number, row: number) => {
   }
 };
 
-// 鼠标按下开始绘制
+// 鼠标按下开始绘制/合并
 const handleCellMouseDown = (col: number, row: number, event: MouseEvent) => {
+  // 右键点击不触发绘制
+  if (event.button === 2) {
+    return;
+  }
+
   event.preventDefault();
   isDrawing.value = true;
   hasChangesInDrawing.value = false; // 重置变化标记
-  lastDrawnCell.value = null; // 重置最后绘制的单元格
+  drawnCells.value.clear(); // 清空已绘制单元格记录
+
+  if (selectedCellType.value === 'merge') {
+    mergeStartCell.value = { col, row };
+    mergeCurrentCell.value = { col, row };
+    return;
+  }
+
+  // 记录绘制起始位置
+  drawStartCell.value = { col, row };
+  drawCurrentCell.value = { col, row };
+
   // 拖动操作开始前保存历史记录
   saveHistory();
   applyCellType(col, row, false);
 };
 
-// 鼠标移动绘制
+// 鼠标移动绘制（使用 requestAnimationFrame 优化性能）
+let rafId: number | null = null;
 const handleCellMouseEnter = (col: number, row: number) => {
-  if (isDrawing.value) {
+  if (!isDrawing.value) return;
+
+  if (selectedCellType.value === 'merge') {
+    mergeCurrentCell.value = { col, row };
+    return;
+  }
+
+  // 更新当前绘制位置
+  if (drawStartCell.value) {
+    drawCurrentCell.value = { col, row };
+
+    // 使用 requestAnimationFrame 优化性能，避免过于频繁的更新
+    if (rafId !== null) {
+      cancelAnimationFrame(rafId);
+    }
+
+    rafId = requestAnimationFrame(() => {
+      // 填充从起点到当前点的所有单元格
+      if (drawStartCell.value && drawCurrentCell.value) {
+        fillCellsBetween(
+          drawStartCell.value.col,
+          drawStartCell.value.row,
+          drawCurrentCell.value.col,
+          drawCurrentCell.value.row
+        );
+      }
+      rafId = null;
+    });
+  } else {
+    // 如果没有起始点，直接应用（兼容旧逻辑）
     applyCellType(col, row, false);
   }
 };
 
-// 鼠标释放停止绘制
+// 鼠标释放停止绘制/合并
 const handleCellMouseUp = () => {
-  if (isDrawing.value) {
-    isDrawing.value = false;
-    lastDrawnCell.value = null;
-    // 如果拖动过程中没有实际变化，撤销刚才保存的历史记录
-    if (!hasChangesInDrawing.value && history.value.length > 0) {
-      history.value.pop();
-    }
-    hasChangesInDrawing.value = false;
+  if (!isDrawing.value) return;
+
+  // 清除 requestAnimationFrame
+  if (rafId !== null) {
+    cancelAnimationFrame(rafId);
+    rafId = null;
   }
+
+  if (selectedCellType.value === 'merge') {
+    const start = mergeStartCell.value;
+    const end = mergeCurrentCell.value;
+    if (start && end) {
+      const colspan = Math.abs(end.col - start.col) + 1;
+      const rowspan = Math.abs(end.row - start.row) + 1;
+      if (colspan === 1 && rowspan === 1) {
+        message.warning('请选择至少两个单元格进行合并');
+      } else {
+        saveHistory();
+        mergeCells(start.col, start.row, end.col, end.row);
+      }
+    }
+    mergeStartCell.value = null;
+    mergeCurrentCell.value = null;
+    isDrawing.value = false;
+    return;
+  }
+
+  // 确保填充到最终位置
+  if (drawStartCell.value && drawCurrentCell.value) {
+    fillCellsBetween(
+      drawStartCell.value.col,
+      drawStartCell.value.row,
+      drawCurrentCell.value.col,
+      drawCurrentCell.value.row
+    );
+  }
+
+  isDrawing.value = false;
+  drawStartCell.value = null;
+  drawCurrentCell.value = null;
+  drawnCells.value.clear();
+
+  // 如果拖动过程中没有实际变化，撤销刚才保存的历史记录
+  if (!hasChangesInDrawing.value && history.value.length > 0) {
+    history.value.pop();
+  }
+  hasChangesInDrawing.value = false;
+  updateCellMapCache();
 };
 
 // 全局鼠标事件处理（确保即使鼠标移出单元格也能停止绘制）
@@ -341,6 +593,9 @@ const confirmSeatNumber = () => {
     cell.type = 'seat';
     cell.number = seatNumber.value;
     cell.status = 1; // 默认可用
+    // 更新缓存
+    const key = `${editingCell.value.col},${editingCell.value.row}`;
+    cellMapCache.value.set(key, cell);
   }
   editingCell.value = null;
   seatNumber.value = '';
@@ -348,33 +603,42 @@ const confirmSeatNumber = () => {
 
 // 批量填充
 const handleFillAll = () => {
+  if (selectedCellType.value === 'merge') {
+    message.warning('合并模式下无法批量填充');
+    return;
+  }
   if (selectedCellType.value === 'empty') {
     message.warning('不能批量填充为空白类型');
     return;
   }
-  
+
   Modal.confirm({
     title: '确认批量填充',
     content: `确定要将所有空白单元格填充为"${getTypeName(selectedCellType.value)}"吗？`,
     onOk: () => {
+      saveHistory();
       // 如果是座位类型且自动编号，先获取当前最大编号
-      const emptyCells = cells.value.filter((cell) => cell.type === 'empty');
+      const emptyCells = cells.value.filter((cell) => cell.type === 'empty' && !cell.merged);
+      const cellType = selectedCellType.value as ClassroomApi.ClassroomLayoutCell['type'];
       emptyCells.forEach((cell) => {
-        setCellType(cell.col, cell.row, selectedCellType.value);
+        setCellType(cell.col, cell.row, cellType);
       });
+      updateCellMapCache();
       message.success(`批量填充完成，共填充 ${emptyCells.length} 个单元格`);
     },
   });
 };
 
 // 获取类型名称
-const getTypeName = (type: ClassroomApi.ClassroomLayoutCell['type']) => {
+const getTypeName = (type: CellSelectableType) => {
   const typeMap: Record<string, string> = {
     empty: '空白',
     seat: '座位',
     pillar: '柱子',
     aisle: '过道',
     door: '门',
+    projector: '投影仪',
+    merge: '合并',
   };
   return typeMap[type] || type;
 };
@@ -390,23 +654,52 @@ const cancelEdit = () => {
   seatNumber.value = '';
 };
 
-// 获取单元格样式
+// 获取单元格样式 - 优化性能，使用缓存
 const getCellClass = (col: number, row: number) => {
   const cell = getCell(col, row);
   if (!cell) return 'cell-empty';
-  
+
+  // 如果是被合并的单元格，不显示
+  if (cell.merged) {
+    return 'cell cell-merged';
+  }
+
+  // 使用缓存检查是否被其他合并单元格覆盖
+  const key = `${col},${row}`;
+  if (mergeMasterMapCache.value.has(key)) {
+    return 'cell cell-merged';
+  }
+
   const classes = ['cell', `cell-${cell.type}`];
+
+  // 如果是座位且禁坐，添加禁坐样式
+  if (cell.type === 'seat' && cell.status === 0) {
+    classes.push('cell-disabled');
+  }
+
   if (editingCell.value && editingCell.value.col === col && editingCell.value.row === row) {
     classes.push('cell-editing');
   }
+
+  // 合并拖动预览：当前选择合并类型，且在选择矩形范围内
+  if (selectedCellType.value === 'merge' && mergeStartCell.value && mergeCurrentCell.value) {
+    const minCol = Math.min(mergeStartCell.value.col, mergeCurrentCell.value.col);
+    const maxCol = Math.max(mergeStartCell.value.col, mergeCurrentCell.value.col);
+    const minRow = Math.min(mergeStartCell.value.row, mergeCurrentCell.value.row);
+    const maxRow = Math.max(mergeStartCell.value.row, mergeCurrentCell.value.row);
+    if (col >= minCol && col <= maxCol && row >= minRow && row <= maxRow) {
+      classes.push('cell-merge-selected');
+    }
+  }
+
   return classes.join(' ');
 };
 
 // 获取单元格显示文本
 const getCellText = (col: number, row: number) => {
   const cell = getCell(col, row);
-  if (!cell) return '';
-  
+  if (!cell || cell.merged) return '';
+
   if (cell.type === 'seat' && cell.number) {
     return cell.number;
   }
@@ -416,6 +709,73 @@ const getCellText = (col: number, row: number) => {
   return '';
 };
 
+// 获取单元格的 Grid 样式属性（用于合并单元格）
+const getCellGridStyle = (col: number, row: number) => {
+  const cell = getCell(col, row);
+
+  // 使用 CSS Grid 的 grid-column 和 grid-row 来实现合并
+  // grid 布局中，列从1开始（第1列是行号），行从1开始
+  // 传入的 col 和 row 是数组索引（从0开始），需要转换为Grid位置（从1开始）
+  const gridColumn = col + 2; // +2 因为第1列是行号，数据列从第2列开始
+  const gridRow = row + 1; // row 是数组索引（0开始），Grid行号从1开始，所以+1
+
+  const style: Record<string, string> = {};
+
+  // 如果单元格不存在或被合并，仍然需要设置基本位置（用于空白单元格显示）
+  if (!cell || cell.merged) {
+    // 被合并的单元格不设置 grid 位置，由主单元格占据
+    // 但如果单元格不存在（空白），需要设置位置以便显示
+    if (!cell) {
+      style.gridColumn = `${gridColumn} / span 1`;
+      style.gridRow = `${gridRow} / span 1`;
+    }
+    return style;
+  }
+
+  const colspan = cell.colspan || 1;
+  const rowspan = cell.rowspan || 1;
+
+  if (colspan > 1 || rowspan > 1) {
+    // 合并单元格：使用 span 语法
+    style.gridColumn = `${gridColumn} / span ${colspan}`;
+    style.gridRow = `${gridRow} / span ${rowspan}`;
+  } else {
+    // 普通单元格：只设置位置（也可以显式设置span 1）
+    style.gridColumn = `${gridColumn} / span 1`;
+    style.gridRow = `${gridRow} / span 1`;
+  }
+
+  return style;
+};
+
+// 检查单元格是否应该渲染（用于合并单元格，Grid布局中只渲染主单元格）- 优化性能
+const shouldRenderCell = (col: number, row: number) => {
+  // 首先检查是否在有效范围内
+  if (col < 0 || col >= cols.value || row < 0 || row >= rows.value) {
+    return false;
+  }
+
+  const cell = getCell(col, row);
+
+  // 如果单元格不存在，应该渲染（作为空白单元格）
+  if (!cell) {
+    return true;
+  }
+
+  // 被合并的单元格不渲染
+  if (cell.merged) {
+    return false;
+  }
+
+  // 使用缓存检查是否被其他合并单元格覆盖
+  const key = `${col},${row}`;
+  if (mergeMasterMapCache.value.has(key)) {
+    return false;
+  }
+
+  return true;
+};
+
 // 保存布局
 const handleSave = async () => {
   if (!props.classroomId) {
@@ -425,19 +785,33 @@ const handleSave = async () => {
 
   loading.value = true;
   try {
+    // 保存前将 projector 转换为 monitor（兼容后端）
+    const cellsToSave = cells.value.map((cell) => {
+      const cellCopy = { ...cell };
+      if (cellCopy.type === 'projector') {
+        (cellCopy as any).type = 'monitor';
+      }
+      return cellCopy;
+    });
+
     const layout: ClassroomApi.ClassroomLayout = {
       cols: cols.value,
       rows: rows.value,
-      cells: cells.value,
+      cells: cellsToSave as any,
     };
-    
+
     await saveClassroomLayoutApi({
       id: props.classroomId,
       layout,
     });
-    
+
     message.success('座位布局保存成功');
-    emit('saved', layout);
+    // 发送保存后的布局（使用前端类型）
+    emit('saved', {
+      cols: cols.value,
+      rows: rows.value,
+      cells: cells.value,
+    });
   } catch (error) {
     console.error('保存座位布局失败:', error);
     message.error('保存座位布局失败');
@@ -458,6 +832,161 @@ const handleClear = () => {
     },
   });
 };
+
+// 检查单元格是否是合并的主单元格
+const isMergeMaster = (col: number, row: number) => {
+  const cell = getCell(col, row);
+  return cell && (cell.colspan && cell.colspan > 1 || cell.rowspan && cell.rowspan > 1);
+};
+
+// 获取合并的主单元格
+const getMergeMaster = (col: number, row: number) => {
+  // 遍历所有单元格，找到包含该单元格的合并主单元格
+  for (const cell of cells.value) {
+    if (cell.merged) continue;
+    const colspan = cell.colspan || 1;
+    const rowspan = cell.rowspan || 1;
+    if (
+      col >= cell.col &&
+      col < cell.col + colspan &&
+      row >= cell.row &&
+      row < cell.row + rowspan
+    ) {
+      return cell;
+    }
+  }
+  return null;
+};
+
+// 取消合并单元格
+const unmergeCell = (col: number, row: number) => {
+  const cell = getCell(col, row);
+  if (!cell) return;
+
+  const colspan = cell.colspan || 1;
+  const rowspan = cell.rowspan || 1;
+
+  // 清除被合并的单元格标记
+  for (let r = cell.row; r < cell.row + rowspan; r++) {
+    for (let c = cell.col; c < cell.col + colspan; c++) {
+      if (c === col && r === row) continue; // 跳过主单元格
+      const mergedCell = getCell(c, r);
+      if (mergedCell) {
+        mergedCell.merged = false;
+        // 恢复为空白类型
+        if (mergedCell.type === 'empty') {
+          mergedCell.colspan = 1;
+          mergedCell.rowspan = 1;
+        }
+      }
+    }
+  }
+
+  // 重置主单元格的合并属性
+  cell.colspan = 1;
+  cell.rowspan = 1;
+  updateCellMapCache();
+};
+
+// 合并单元格
+const mergeCells = (startCol: number, startRow: number, endCol: number, endRow: number) => {
+  // 确保起始位置在左上角
+  const minCol = Math.min(startCol, endCol);
+  const maxCol = Math.max(startCol, endCol);
+  const minRow = Math.min(startRow, endRow);
+  const maxRow = Math.max(startRow, endRow);
+
+  const colspan = maxCol - minCol + 1;
+  const rowspan = maxRow - minRow + 1;
+
+  // 如果只选择一个单元格，不进行合并
+  if (colspan === 1 && rowspan === 1) {
+    message.warning('请选择至少两个单元格进行合并');
+    return;
+  }
+
+  // 检查范围内是否有已合并的单元格
+  for (let r = minRow; r <= maxRow; r++) {
+    for (let c = minCol; c <= maxCol; c++) {
+      const cell = getCell(c, r);
+      if (!cell) continue;
+
+      // 如果单元格是合并的主单元格，先取消合并
+      if (isMergeMaster(c, r)) {
+        unmergeCell(c, r);
+      }
+
+      // 如果单元格是被合并的单元格，需要找到主单元格并取消合并
+      if (cell.merged) {
+        const master = getMergeMaster(c, r);
+        if (master) {
+          unmergeCell(master.col, master.row);
+        }
+      }
+    }
+  }
+
+  // 获取主单元格（左上角的单元格）
+  const masterCell = getCell(minCol, minRow);
+  if (!masterCell) return;
+
+  // 设置主单元格的合并属性
+  masterCell.colspan = colspan;
+  masterCell.rowspan = rowspan;
+
+  // 标记其他单元格为被合并
+  for (let r = minRow; r <= maxRow; r++) {
+    for (let c = minCol; c <= maxCol; c++) {
+      if (c === minCol && r === minRow) continue; // 跳过主单元格
+      const cell = getCell(c, r);
+      if (cell) {
+        cell.merged = true;
+        // 保持单元格的类型和属性，但标记为被合并
+      }
+    }
+  }
+
+  updateCellMapCache();
+  message.success(`已合并 ${colspan}×${rowspan} 的单元格`);
+};
+
+// 设置座位禁坐状态
+const setSeatDisabled = (col: number, row: number) => {
+  const cell = getCell(col, row);
+  if (!cell || cell.type !== 'seat') {
+    message.warning('只能对座位设置禁坐状态');
+    return;
+  }
+
+  saveHistory();
+  cell.status = cell.status === 0 ? 1 : 0; // 切换状态
+  // 更新缓存
+  const key = `${col},${row}`;
+  cellMapCache.value.set(key, cell);
+  message.success(cell.status === 0 ? '座位已设置为禁坐' : '座位已设置为可用');
+};
+
+// 右键菜单处理（用于设置座位禁坐）
+const handleCellContextMenu = (col: number, row: number, event: MouseEvent) => {
+  event.preventDefault();
+  const cell = getCell(col, row);
+  if (cell && cell.type === 'seat') {
+    editingSeatStatus.value = { col, row };
+    Modal.confirm({
+      title: '设置座位状态',
+      content: `当前状态：${cell.status === 0 ? '禁坐' : '可用'}`,
+      okText: cell.status === 0 ? '设为可用' : '设为禁坐',
+      cancelText: '取消',
+      onOk: () => {
+        setSeatDisabled(col, row);
+        editingSeatStatus.value = null;
+      },
+      onCancel: () => {
+        editingSeatStatus.value = null;
+      },
+    });
+  }
+};
 </script>
 
 <template>
@@ -502,6 +1031,14 @@ const handleClear = () => {
                 <span class="type-icon type-door"></span>
                 门
               </Radio.Button>
+              <Radio.Button value="projector">
+                <span class="type-icon type-projector"></span>
+                投影仪
+              </Radio.Button>
+              <Radio.Button value="merge">
+                <span class="type-icon type-merge"></span>
+                合并
+              </Radio.Button>
             </Radio.Group>
           </div>
         </div>
@@ -543,18 +1080,19 @@ const handleClear = () => {
         </div>
       </div>
     </Card>
-    
+
     <Card class="layout-card">
       <div class="editor-hint">
         <p>
           <strong>操作提示：</strong>
-          选择类型后，<strong>点击</strong>单元格即可设置类型。<strong>按住鼠标左键拖动</strong>可以连续绘制多个单元格。
+         <strong>按住鼠标左键拖动</strong>可以连续绘制多个单元格。
           {{ autoNumbering ? '座位将自动编号。' : '选择"座位"时需要手动输入座位号。' }}
+          <strong>右键点击座位</strong>可以设置禁坐状态。
           <span v-if="isDrawing" class="drawing-indicator">正在绘制中...</span>
         </p>
       </div>
 
-      <div class="layout-container">
+      <div class="layout-container" :style="{ '--cols': cols, '--rows': rows }">
         <div class="layout-header">
           <div class="header-cell"></div>
           <div
@@ -566,23 +1104,23 @@ const handleClear = () => {
           </div>
         </div>
         <div class="layout-body">
-          <div
-            v-for="row in rows"
-            :key="`row-${row}`"
-            class="layout-row"
-          >
-            <div class="header-cell header-row">{{ row }}</div>
-            <div
-              v-for="col in cols"
-              :key="`cell-${col}-${row}`"
-              :class="getCellClass(col - 1, row - 1)"
-              @click="handleCellClick(col - 1, row - 1)"
-              @mousedown="(e) => handleCellMouseDown(col - 1, row - 1, e)"
-              @mouseenter="handleCellMouseEnter(col - 1, row - 1)"
-            >
-              {{ getCellText(col - 1, row - 1) }}
-            </div>
-          </div>
+          <template v-for="row in rows" :key="`row-${row}`">
+            <div class="header-cell header-row" :style="{ gridColumn: '1', gridRow: String(row) }">{{ row }}</div>
+            <template v-for="col in cols" :key="`cell-${row}-${col}`">
+              <div
+                v-if="shouldRenderCell(col - 1, row - 1)"
+                :class="getCellClass(col - 1, row - 1)"
+                :style="getCellGridStyle(col - 1, row - 1)"
+                @click="handleCellClick(col - 1, row - 1)"
+                @mousedown="(e) => handleCellMouseDown(col - 1, row - 1, e)"
+                @mouseenter="handleCellMouseEnter(col - 1, row - 1)"
+                @contextmenu="(e) => handleCellContextMenu(col - 1, row - 1, e)"
+              >
+                {{ getCellText(col - 1, row - 1) }}
+                <span v-if="getCell(col - 1, row - 1)?.type === 'seat' && getCell(col - 1, row - 1)?.status === 0" class="disabled-icon">🚫</span>
+              </div>
+            </template>
+          </template>
         </div>
       </div>
     </Card>
@@ -697,6 +1235,14 @@ const handleClear = () => {
   background: #1890ff;
 }
 
+.type-projector {
+  background: #13c2c2;
+}
+
+.type-merge {
+  background: #722ed1;
+}
+
 .layout-card {
   margin-top: 16px;
 }
@@ -728,6 +1274,18 @@ const handleClear = () => {
   animation: blink 1s infinite;
 }
 
+.merge-indicator {
+  display: inline-block;
+  margin-left: 12px;
+  padding: 2px 8px;
+  background: #1890ff;
+  color: #fff;
+  border-radius: 4px;
+  font-size: 12px;
+  font-weight: 600;
+  animation: blink 1s infinite;
+}
+
 @keyframes blink {
   0%, 100% {
     opacity: 1;
@@ -755,14 +1313,17 @@ const handleClear = () => {
 }
 
 .layout-body {
-  display: flex;
-  flex-direction: column;
+  display: grid;
+  grid-template-columns: 45px repeat(var(--cols, 10), 45px);
+  grid-template-rows: repeat(var(--rows, 8), 45px);
   gap: 4px;
+  grid-auto-flow: row;
+  align-items: stretch;
+  justify-items: stretch;
 }
 
 .layout-row {
-  display: flex;
-  gap: 4px;
+  display: contents; /* 让行容器不参与布局，直接使用 grid */
 }
 
 .header-cell {
@@ -796,11 +1357,7 @@ const handleClear = () => {
 }
 
 .cell {
-  width: 45px;
-  min-width: 45px;
-  min-height: 45px;
-  height: 45px;
-  flex-shrink: 0;
+  /* Grid布局中，宽度和高度由grid自动控制，不设置固定值 */
   display: flex;
   align-items: center;
   justify-content: center;
@@ -814,13 +1371,15 @@ const handleClear = () => {
   position: relative;
   line-height: 1;
   box-sizing: border-box;
+  min-width: 0; /* 允许grid控制宽度 */
+  min-height: 0; /* 允许grid控制高度 */
 }
 
 .cell:hover {
   border-color: #40a9ff;
   box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.1);
-  transform: scale(1.05);
   z-index: 1;
+  /* 移除 transform: scale，避免影响合并单元格的布局 */
 }
 
 .seat-layout-editor.drawing .cell {
@@ -839,6 +1398,7 @@ const handleClear = () => {
   border-color: #389e0d;
   font-weight: 700;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  position: relative;
 }
 
 .cell-seat:hover {
@@ -847,6 +1407,44 @@ const handleClear = () => {
   box-shadow: 0 0 0 3px rgba(82, 196, 26, 0.2);
 }
 
+.cell-seat.cell-disabled {
+  background: #ff7875;
+  border-color: #ff4d4f;
+  opacity: 0.7;
+  position: relative;
+}
+
+.cell-seat.cell-disabled:hover {
+  background: #ff9c9a;
+  border-color: #ff7875;
+  box-shadow: 0 0 0 3px rgba(255, 77, 79, 0.2);
+}
+
+.cell-seat.cell-disabled::after {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: repeating-linear-gradient(
+    45deg,
+    transparent,
+    transparent 5px,
+    rgba(0, 0, 0, 0.1) 5px,
+    rgba(0, 0, 0, 0.1) 10px
+  );
+  pointer-events: none;
+}
+
+.disabled-icon {
+  position: absolute;
+  top: 2px;
+  right: 2px;
+  font-size: 10px;
+  line-height: 1;
+}
+
 .cell-pillar {
   background: #595959;
   color: #ffffff;
@@ -886,12 +1484,36 @@ const handleClear = () => {
   box-shadow: 0 0 0 3px rgba(24, 144, 255, 0.2);
 }
 
+.cell-projector {
+  background: #13c2c2;
+  color: #ffffff;
+  border-color: #08979c;
+  font-weight: 600;
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+
+.cell-projector:hover {
+  background: #36cfc9;
+  border-color: #13c2c2;
+  box-shadow: 0 0 0 3px rgba(19, 194, 194, 0.2);
+}
+
 .cell-editing {
   border-color: #ff4d4f !important;
   box-shadow: 0 0 0 3px rgba(255, 77, 79, 0.2) !important;
   animation: pulse 1s infinite;
 }
 
+.cell-merged {
+  display: none !important; /* Grid 布局中，被合并的单元格完全隐藏，由主单元格占据空间 */
+}
+
+.cell-merge-selected {
+  border-color: #1890ff !important;
+  box-shadow: 0 0 0 3px rgba(24, 144, 255, 0.3) !important;
+  animation: pulse 1s infinite;
+}
+
 @keyframes pulse {
   0%, 100% {
     opacity: 1;
diff --git a/apps/web-antd/src/components/profile/ProfileInfoModal.vue b/apps/web-antd/src/components/profile/ProfileInfoModal.vue
index 35bc1c7..88bdcf9 100644
--- a/apps/web-antd/src/components/profile/ProfileInfoModal.vue
+++ b/apps/web-antd/src/components/profile/ProfileInfoModal.vue
@@ -54,7 +54,6 @@ async function loadProfileInfo() {
   try {
     loading.value = true;
     const res = await getProfileInfoApi();
-    console.log('获取个人信息成功:', res);
 
     // 检查返回的数据
     if (!res) {
@@ -80,12 +79,6 @@ async function loadProfileInfo() {
       fileList.value = [];
     }
   } catch (error: any) {
-    console.error('获取个人信息失败:', error);
-    console.error('错误详情:', {
-      message: error?.message,
-      response: error?.response,
-      data: error?.response?.data,
-    });
     const errorMessage = error?.response?.data?.message || error?.message || '获取个人信息失败';
     message.error(errorMessage);
   } finally {
diff --git a/apps/web-antd/src/router/routes/modules/booking.ts b/apps/web-antd/src/router/routes/modules/booking.ts
index beda1dc..bb2cc33 100644
--- a/apps/web-antd/src/router/routes/modules/booking.ts
+++ b/apps/web-antd/src/router/routes/modules/booking.ts
@@ -4,25 +4,14 @@ import { $t } from '#/locales';
 
 const routes: RouteRecordRaw[] = [
   {
+    name: 'BookingList',
+    path: '/booking/list',
+    component: () => import('#/views/booking/list.vue'),
     meta: {
       icon: 'lucide:calendar-check',
       order: 2,
       title: $t('page.booking.title'),
     },
-    name: 'Booking',
-    path: '/booking',
-    redirect: '/booking/list',
-    children: [
-      {
-        name: 'BookingList',
-        path: 'list',
-        component: () => import('#/views/booking/list.vue'),
-        meta: {
-          icon: 'lucide:list',
-          title: $t('page.booking.list'),
-        },
-      },
-    ],
   },
 ];
 
diff --git a/apps/web-antd/src/router/routes/modules/class.ts b/apps/web-antd/src/router/routes/modules/class.ts
index 7c45814..bd3f8c6 100644
--- a/apps/web-antd/src/router/routes/modules/class.ts
+++ b/apps/web-antd/src/router/routes/modules/class.ts
@@ -4,34 +4,23 @@ import { $t } from '#/locales';
 
 const routes: RouteRecordRaw[] = [
   {
+    name: 'ClassList',
+    path: '/class/list',
+    component: () => import('#/views/class/list.vue'),
     meta: {
       icon: 'lucide:graduation-cap',
       order: 4,
       title: $t('page.class.title'),
     },
-    name: 'Class',
-    path: '/class',
-    redirect: '/class/list',
-    children: [
-      {
-        name: 'ClassList',
-        path: 'list',
-        component: () => import('#/views/class/list.vue'),
-        meta: {
-          icon: 'lucide:list',
-          title: $t('page.class.list'),
-        },
-      },
-      {
-        name: 'ClassDetail',
-        path: 'detail/:id?',
-        component: () => import('#/views/class/detail.vue'),
-        meta: {
-          hideInMenu: true,
-          title: $t('page.class.detail'),
-        },
-      },
-    ],
+  },
+  {
+    name: 'ClassDetail',
+    path: '/class/detail/:id?',
+    component: () => import('#/views/class/detail.vue'),
+    meta: {
+      hideInMenu: true,
+      title: $t('page.class.detail'),
+    },
   },
 ];
 
diff --git a/apps/web-antd/src/router/routes/modules/classroom.ts b/apps/web-antd/src/router/routes/modules/classroom.ts
index f2a435a..01580a6 100644
--- a/apps/web-antd/src/router/routes/modules/classroom.ts
+++ b/apps/web-antd/src/router/routes/modules/classroom.ts
@@ -4,34 +4,23 @@ import { $t } from '#/locales';
 
 const routes: RouteRecordRaw[] = [
   {
+    name: 'ClassroomList',
+    path: '/classroom/list',
+    component: () => import('#/views/classroom/list.vue'),
     meta: {
       icon: 'lucide:school',
       order: 1,
       title: $t('page.classroom.title'),
     },
-    name: 'Classroom',
-    path: '/classroom',
-    redirect: '/classroom/list',
-    children: [
-      {
-        name: 'ClassroomList',
-        path: 'list',
-        component: () => import('#/views/classroom/list.vue'),
-        meta: {
-          icon: 'lucide:list',
-          title: $t('page.classroom.list'),
-        },
-      },
-      {
-        name: 'ClassroomDetail',
-        path: 'detail/:id?',
-        component: () => import('#/views/classroom/detail.vue'),
-        meta: {
-          hideInMenu: true,
-          title: $t('page.classroom.detail'),
-        },
-      },
-    ],
+  },
+  {
+    name: 'ClassroomDetail',
+    path: '/classroom/detail/:id?',
+    component: () => import('#/views/classroom/detail.vue'),
+    meta: {
+      hideInMenu: true,
+      title: $t('page.classroom.detail'),
+    },
   },
 ];
 
diff --git a/apps/web-antd/src/router/routes/modules/dashboard.ts b/apps/web-antd/src/router/routes/modules/dashboard.ts
index a58f92c..dae84c2 100644
--- a/apps/web-antd/src/router/routes/modules/dashboard.ts
+++ b/apps/web-antd/src/router/routes/modules/dashboard.ts
@@ -4,26 +4,15 @@ import { $t } from '#/locales';
 
 const routes: RouteRecordRaw[] = [
   {
+    name: 'Analytics',
+    path: '/dashboard/analytics',
+    component: () => import('#/views/dashboard/index.vue'),
     meta: {
-      icon: 'lucide:layout-dashboard',
+      affixTab: true,
+      icon: 'lucide:area-chart',
       order: -1,
-      title: $t('page.dashboard.title'),
+      title: $t('page.dashboard.analytics'),
     },
-    name: 'Dashboard',
-    path: '/dashboard',
-    redirect: '/dashboard/analytics',
-    children: [
-      {
-        name: 'Analytics',
-        path: 'analytics',
-        component: () => import('#/views/dashboard/index.vue'),
-        meta: {
-          affixTab: true,
-          icon: 'lucide:area-chart',
-          title: $t('page.dashboard.analytics'),
-        },
-      },
-    ],
   },
 ];
 
diff --git a/apps/web-antd/src/router/routes/modules/school.ts b/apps/web-antd/src/router/routes/modules/school.ts
index 72a4227..b95bb9c 100644
--- a/apps/web-antd/src/router/routes/modules/school.ts
+++ b/apps/web-antd/src/router/routes/modules/school.ts
@@ -4,35 +4,24 @@ import { $t } from '#/locales';
 
 const routes: RouteRecordRaw[] = [
   {
+    name: 'SchoolList',
+    path: '/school/list',
+    component: () => import('#/views/school/list.vue'),
     meta: {
       icon: 'lucide:building-2',
       order: 7,
+      authority: ['super_admin'], // 仅超级管理员可见
       title: $t('page.school.title'),
-      roles: ['super_admin'], // 仅超级管理员可见
     },
-    name: 'School',
-    path: '/school',
-    redirect: '/school/list',
-    children: [
-      {
-        name: 'SchoolList',
-        path: 'list',
-        component: () => import('#/views/school/list.vue'),
-        meta: {
-          icon: 'lucide:list',
-          title: $t('page.school.list'),
-        },
-      },
-      {
-        name: 'SchoolDetail',
-        path: 'detail/:id?',
-        component: () => import('#/views/school/detail.vue'),
-        meta: {
-          hideInMenu: true,
-          title: $t('page.school.detail'),
-        },
-      },
-    ],
+  },
+  {
+    name: 'SchoolDetail',
+    path: '/school/detail/:id?',
+    component: () => import('#/views/school/detail.vue'),
+    meta: {
+      hideInMenu: true,
+      title: $t('page.school.detail'),
+    },
   },
 ];
 
diff --git a/apps/web-antd/src/router/routes/modules/setting.ts b/apps/web-antd/src/router/routes/modules/setting.ts
index 1a922db..774a635 100644
--- a/apps/web-antd/src/router/routes/modules/setting.ts
+++ b/apps/web-antd/src/router/routes/modules/setting.ts
@@ -4,26 +4,15 @@ import { $t } from '#/locales';
 
 const routes: RouteRecordRaw[] = [
   {
+    name: 'SettingIndex',
+    path: '/setting/index',
+    component: () => import('#/views/setting/index.vue'),
     meta: {
       icon: 'lucide:settings',
       order: 99,
+      authority: ['super_admin'], // 仅超级管理员可见
       title: $t('page.setting.title'),
-      roles: ['super_admin'], // 仅超级管理员可见
     },
-    name: 'Setting',
-    path: '/setting',
-    redirect: '/setting/index',
-    children: [
-      {
-        name: 'SettingIndex',
-        path: 'index',
-        component: () => import('#/views/setting/index.vue'),
-        meta: {
-          icon: 'lucide:settings',
-          title: $t('page.setting.index'),
-        },
-      },
-    ],
   },
 ];
 
diff --git a/apps/web-antd/src/router/routes/modules/student.ts b/apps/web-antd/src/router/routes/modules/student.ts
index 273d04a..c360865 100644
--- a/apps/web-antd/src/router/routes/modules/student.ts
+++ b/apps/web-antd/src/router/routes/modules/student.ts
@@ -4,34 +4,23 @@ import { $t } from '#/locales';
 
 const routes: RouteRecordRaw[] = [
   {
+    name: 'StudentList',
+    path: '/student/list',
+    component: () => import('#/views/student/list.vue'),
     meta: {
       icon: 'lucide:users',
       order: 3,
       title: $t('page.student.title'),
     },
-    name: 'Student',
-    path: '/student',
-    redirect: '/student/list',
-    children: [
-      {
-        name: 'StudentList',
-        path: 'list',
-        component: () => import('#/views/student/list.vue'),
-        meta: {
-          icon: 'lucide:list',
-          title: $t('page.student.list'),
-        },
-      },
-      {
-        name: 'StudentDetail',
-        path: 'detail/:id?',
-        component: () => import('#/views/student/detail.vue'),
-        meta: {
-          hideInMenu: true,
-          title: $t('page.student.detail'),
-        },
-      },
-    ],
+  },
+  {
+    name: 'StudentDetail',
+    path: '/student/detail/:id?',
+    component: () => import('#/views/student/detail.vue'),
+    meta: {
+      hideInMenu: true,
+      title: $t('page.student.detail'),
+    },
   },
 ];
 
diff --git a/apps/web-antd/src/router/routes/modules/teacher.ts b/apps/web-antd/src/router/routes/modules/teacher.ts
index 7fbc354..9120b0e 100644
--- a/apps/web-antd/src/router/routes/modules/teacher.ts
+++ b/apps/web-antd/src/router/routes/modules/teacher.ts
@@ -4,34 +4,23 @@ import { $t } from '#/locales';
 
 const routes: RouteRecordRaw[] = [
   {
+    name: 'TeacherList',
+    path: '/teacher/list',
+    component: () => import('#/views/teacher/list.vue'),
     meta: {
       icon: 'lucide:user-check',
       order: 5,
       title: $t('page.teacher.title'),
     },
-    name: 'Teacher',
-    path: '/teacher',
-    redirect: '/teacher/list',
-    children: [
-      {
-        name: 'TeacherList',
-        path: 'list',
-        component: () => import('#/views/teacher/list.vue'),
-        meta: {
-          icon: 'lucide:list',
-          title: $t('page.teacher.list'),
-        },
-      },
-      {
-        name: 'TeacherDetail',
-        path: 'detail/:id?',
-        component: () => import('#/views/teacher/detail.vue'),
-        meta: {
-          hideInMenu: true,
-          title: $t('page.teacher.detail'),
-        },
-      },
-    ],
+  },
+  {
+    name: 'TeacherDetail',
+    path: '/teacher/detail/:id?',
+    component: () => import('#/views/teacher/detail.vue'),
+    meta: {
+      hideInMenu: true,
+      title: $t('page.teacher.detail'),
+    },
   },
 ];
 
diff --git a/apps/web-antd/src/store/auth.ts b/apps/web-antd/src/store/auth.ts
index 436e60e..d1444e4 100644
--- a/apps/web-antd/src/store/auth.ts
+++ b/apps/web-antd/src/store/auth.ts
@@ -10,7 +10,7 @@ import { resetAllStores, useAccessStore, useUserStore } from '@vben/stores';
 import { notification } from 'ant-design-vue';
 import { defineStore } from 'pinia';
 
-import { getAccessCodesApi, getUserInfoApi, loginApi, logoutApi } from '#/api';
+import { getUserInfoApi, loginApi, logoutApi } from '#/api';
 import { $t } from '#/locales';
 
 export const useAuthStore = defineStore('auth', () => {
@@ -44,24 +44,14 @@ export const useAuthStore = defineStore('auth', () => {
 
       // 获取用户信息并存储到 accessStore 中
       try {
-        const [fetchUserInfoResult, accessCodesResult] = await Promise.allSettled([
-          fetchUserInfo(),
-          getAccessCodesApi().catch(() => []), // 如果接口不存在，返回空数组
-        ]);
-
-        userInfo = fetchUserInfoResult.status === 'fulfilled'
-          ? fetchUserInfoResult.value
-          : null;
+        userInfo = await fetchUserInfo();
 
         if (userInfo) {
           userStore.setUserInfo(userInfo);
         }
 
-        if (accessCodesResult.status === 'fulfilled') {
-          accessStore.setAccessCodes(accessCodesResult.value);
-        } else {
-          accessStore.setAccessCodes([]);
-        }
+        // 设置权限码为空数组（不使用权限码接口）
+        accessStore.setAccessCodes([]);
 
         // 重置路由检查状态，让路由守卫重新生成路由
         accessStore.setIsAccessChecked(false);
@@ -132,7 +122,28 @@ export const useAuthStore = defineStore('auth', () => {
 
   async function fetchUserInfo() {
     let userInfo: null | UserInfo = null;
-    userInfo = await getUserInfoApi();
+    const rawUserInfo = await getUserInfoApi();
+    
+    // 将后端的 role 字段转换为 roles 数组
+    if (rawUserInfo) {
+      const role = (rawUserInfo as any).role;
+      if (role) {
+        // 将 role: 'super' 转换为 roles: ['super_admin']
+        // 将 role: 'branch' 转换为 roles: ['branch']
+        const roleMap: Record<string, string> = {
+          super: 'super_admin',
+          branch: 'branch',
+        };
+        const mappedRole = roleMap[role] || role;
+        userInfo = {
+          ...rawUserInfo,
+          roles: [mappedRole],
+        } as UserInfo;
+      } else {
+        userInfo = rawUserInfo;
+      }
+    }
+    
     userStore.setUserInfo(userInfo);
     return userInfo;
   }
diff --git a/apps/web-antd/src/views/_core/authentication/code-login.vue b/apps/web-antd/src/views/_core/authentication/code-login.vue
index acfd1fd..6b76017 100644
--- a/apps/web-antd/src/views/_core/authentication/code-login.vue
+++ b/apps/web-antd/src/views/_core/authentication/code-login.vue
@@ -55,8 +55,7 @@ const formSchema = computed((): VbenFormSchema[] => {
  * @param values 登录表单数据
  */
 async function handleLogin(values: Recordable<any>) {
-  // eslint-disable-next-line no-console
-  console.log(values);
+  // 处理验证码登录
 }
 </script>
 
diff --git a/apps/web-antd/src/views/_core/authentication/forget-password.vue b/apps/web-antd/src/views/_core/authentication/forget-password.vue
index fef0d42..7fcf644 100644
--- a/apps/web-antd/src/views/_core/authentication/forget-password.vue
+++ b/apps/web-antd/src/views/_core/authentication/forget-password.vue
@@ -29,8 +29,7 @@ const formSchema = computed((): VbenFormSchema[] => {
 });
 
 function handleSubmit(value: Recordable<any>) {
-  // eslint-disable-next-line no-console
-  console.log('reset email:', value);
+  // 处理重置密码提交
 }
 </script>
 
diff --git a/apps/web-antd/src/views/_core/authentication/register.vue b/apps/web-antd/src/views/_core/authentication/register.vue
index b1a5de7..181d9cf 100644
--- a/apps/web-antd/src/views/_core/authentication/register.vue
+++ b/apps/web-antd/src/views/_core/authentication/register.vue
@@ -82,8 +82,7 @@ const formSchema = computed((): VbenFormSchema[] => {
 });
 
 function handleSubmit(value: Recordable<any>) {
-  // eslint-disable-next-line no-console
-  console.log('register submit:', value);
+  // 处理注册提交
 }
 </script>
 
diff --git a/apps/web-antd/src/views/classroom/detail.vue b/apps/web-antd/src/views/classroom/detail.vue
index 4612393..283e3f4 100644
--- a/apps/web-antd/src/views/classroom/detail.vue
+++ b/apps/web-antd/src/views/classroom/detail.vue
@@ -12,7 +12,6 @@ import {
   type SchoolApi,
   type TeacherApi
 } from '#/api';
-import SeatLayoutEditor from '#/components/classroom/SeatLayoutEditor.vue';
 
 defineOptions({ name: 'ClassroomDetail' });
 
@@ -37,7 +36,6 @@ const formData = ref<ClassroomApi.SaveParams>({
   description: '',
   status: 1,
 });
-const layout = ref<ClassroomApi.ClassroomLayout | null>(null);
 
 const isEdit = computed(() => !!route.params.id);
 const classroomId = computed(() => (isEdit.value ? Number(route.params.id) : 0));
@@ -96,10 +94,6 @@ const fetchDetail = async () => {
         description: data.description || '',
         status: data.status !== undefined ? data.status : 1,
       };
-      // 加载布局数据
-      if (data.layout) {
-        layout.value = data.layout;
-      }
     } else {
       message.error(res?.message || res?.msg || '获取教室详情失败');
     }
@@ -147,15 +141,6 @@ const fetchTeacherList = async () => {
   }
 };
 
-const handleLayoutSaved = (newLayout: ClassroomApi.ClassroomLayout) => {
-  layout.value = newLayout;
-  // 更新容量（座位数量）
-  const seatCount = newLayout.cells.filter((cell) => cell.type === 'seat').length;
-  if (seatCount > 0) {
-    formData.value.capacity = seatCount;
-  }
-};
-
 onMounted(() => {
   fetchSchoolList();
   fetchTeacherList();
@@ -275,13 +260,6 @@ onMounted(() => {
             </Form.Item>
           </Form>
         </Tabs.TabPane>
-        <Tabs.TabPane v-if="isEdit" key="layout" tab="座位布局">
-          <SeatLayoutEditor
-            :classroom-id="classroomId"
-            :layout="layout"
-            @saved="handleLayoutSaved"
-          />
-        </Tabs.TabPane>
       </Tabs>
     </Card>
   </Page>
diff --git a/apps/web-antd/src/views/classroom/list.vue b/apps/web-antd/src/views/classroom/list.vue
index 0625e36..3cdc6ff 100644
--- a/apps/web-antd/src/views/classroom/list.vue
+++ b/apps/web-antd/src/views/classroom/list.vue
@@ -2,14 +2,17 @@
 import { ref, reactive, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { Page } from '@vben/common-ui';
-import { Button, Card, Table, Space, message, Modal, Input, Select } from 'ant-design-vue';
+import { Button, Card, Table, Space, message, Modal, Input, Select, Tag } from 'ant-design-vue';
 import {
   getClassroomListApi,
   deleteClassroomApi,
   batchDeleteClassroomApi,
+  getClassroomSeatListApi,
+  getClassroomDetailApi,
   type ClassroomApi
 } from '#/api';
-import { $t } from '#/locales';
+import SeatLayoutEditor from '#/components/classroom/SeatLayoutEditor.vue';
+
 
 defineOptions({ name: 'ClassroomList' });
 
@@ -30,6 +33,18 @@ const searchForm = reactive({
 });
 
 const selectedRowKeys = ref<number[]>([]);
+const seatListVisible = ref(false);
+const seatListLoading = ref(false);
+const seatListData = ref<ClassroomApi.SeatInfo[]>([]);
+const currentClassroomName = ref('');
+const seatListPagination = reactive({
+  current: 1,
+  pageSize: 10,
+});
+const layoutVisible = ref(false);
+const layoutLoading = ref(false);
+const currentClassroomId = ref<number | null>(null);
+const currentLayout = ref<ClassroomApi.ClassroomLayout | null>(null);
 
 const columns = [
   {
@@ -88,7 +103,7 @@ const columns = [
   {
     title: '操作',
     key: 'action',
-    width: 200,
+    width: 300,
   },
 ];
 
@@ -178,9 +193,156 @@ const handleBatchDelete = () => {
 };
 
 const handleTableChange = (pag: any) => {
-  pagination.current = pag.current;
-  pagination.pageSize = pag.pageSize;
-  fetchData();
+  if (pag) {
+    pagination.current = pag.current || pagination.current;
+    pagination.pageSize = pag.pageSize || pagination.pageSize;
+    fetchData();
+  }
+};
+
+// 处理行选择变化
+const handleRowSelectionChange = (keys: (string | number)[]) => {
+  selectedRowKeys.value = keys.map(key => typeof key === 'string' ? Number(key) : key);
+};
+
+// 查看使用状态
+const handleViewStatus = async (record: ClassroomApi.ClassroomInfo) => {
+  if (!record.id) {
+    message.error('教室ID不存在');
+    return;
+  }
+
+  seatListVisible.value = true;
+  currentClassroomName.value = record.name || '';
+  seatListLoading.value = true;
+  seatListData.value = [];
+
+  try {
+    const res = await getClassroomSeatListApi({ id: record.id });
+    if (res && (res.code === 0 || res.code === 200)) {
+      seatListData.value = Array.isArray(res.data) ? res.data : [];
+    } else {
+      message.error(res?.message || res?.msg || '获取座位列表失败');
+      seatListData.value = [];
+    }
+  } catch (error: any) {
+    console.error('获取座位列表失败:', error);
+    message.error(error?.response?.data?.message || error?.message || '获取座位列表失败');
+    seatListData.value = [];
+  } finally {
+    seatListLoading.value = false;
+  }
+};
+
+// 关闭使用状态弹窗
+const handleCloseSeatList = () => {
+  seatListVisible.value = false;
+  seatListData.value = [];
+  currentClassroomName.value = '';
+  seatListPagination.current = 1;
+  seatListPagination.pageSize = 10;
+};
+
+// 查看座位布局
+const handleViewLayout = async (record: ClassroomApi.ClassroomInfo) => {
+  if (!record.id) {
+    message.error('教室ID不存在');
+    return;
+  }
+
+  layoutVisible.value = true;
+  currentClassroomId.value = record.id;
+  currentClassroomName.value = record.name || '';
+  layoutLoading.value = true;
+  currentLayout.value = null;
+
+  try {
+    const res = await getClassroomDetailApi({ id: record.id });
+    if (res && (res.code === 0 || res.code === 200)) {
+      const data = res.data || res;
+      currentLayout.value = data.layout || null;
+    } else {
+      message.error(res?.message || res?.msg || '获取教室详情失败');
+    }
+  } catch (error: any) {
+    console.error('获取教室详情失败:', error);
+    message.error(error?.response?.data?.message || error?.message || '获取教室详情失败');
+  } finally {
+    layoutLoading.value = false;
+  }
+};
+
+// 关闭座位布局弹窗
+const handleCloseLayout = () => {
+  layoutVisible.value = false;
+  currentClassroomId.value = null;
+  currentLayout.value = null;
+  currentClassroomName.value = '';
+};
+
+// 座位布局保存成功回调
+const handleLayoutSaved = (layout: ClassroomApi.ClassroomLayout) => {
+  currentLayout.value = layout;
+  message.success('座位布局保存成功');
+  // 可以选择关闭弹窗或保持打开
+  // handleCloseLayout();
+};
+
+// 处理座位列表分页变化
+const handleSeatListTableChange = (pag: any) => {
+  if (pag) {
+    seatListPagination.current = pag.current || seatListPagination.current;
+    seatListPagination.pageSize = pag.pageSize || seatListPagination.pageSize;
+  }
+};
+
+// 导出座位列表
+const handleExportSeatList = () => {
+  if (seatListData.value.length === 0) {
+    message.warning('没有数据可导出');
+    return;
+  }
+
+  // CSV表头
+  const headers = ['座位号', '状态', '学员姓名', '学员手机号', '选座时间'];
+
+  // 转换数据
+  const csvData = seatListData.value.map((item) => {
+    const status = item.is_selected === 1 ? '已选' : '未选';
+    const studentName = item.student_name || '';
+    const studentMobile = item.student_mobile || '';
+    const selectTime = item.select_time || '';
+    return [
+      item.seat_number || '',
+      status,
+      studentName,
+      studentMobile,
+      selectTime,
+    ];
+  });
+
+  // 组合CSV内容
+  const csvContent = [
+    headers.join(','),
+    ...csvData.map((row) => row.map((cell) => `"${String(cell).replace(/"/g, '""')}"`).join(',')),
+  ].join('\n');
+
+  // 添加BOM以支持中文
+  const BOM = '\uFEFF';
+  const blob = new Blob([BOM + csvContent], { type: 'text/csv;charset=utf-8;' });
+
+  // 创建下载链接
+  const link = document.createElement('a');
+  const url = URL.createObjectURL(blob);
+  link.setAttribute('href', url);
+  link.setAttribute('download', `${currentClassroomName.value || '教室'}_座位使用状态_${new Date().toISOString().slice(0, 10)}.csv`);
+  link.style.visibility = 'hidden';
+  document.body.appendChild(link);
+  link.click();
+  document.body.removeChild(link);
+  URL.revokeObjectURL(url);
+
+  message.success('导出成功');
 };
 
 onMounted(() => {
@@ -233,12 +395,11 @@ onMounted(() => {
           total: total,
           showSizeChanger: true,
           showTotal: (total) => `共 ${total} 条`,
+          pageSizeOptions: ['10', '20', '50', '100'],
         }"
         :row-selection="{
           selectedRowKeys: selectedRowKeys,
-          onChange: (keys: number[]) => {
-            selectedRowKeys = keys;
-          },
+          onChange: handleRowSelectionChange,
         }"
         row-key="id"
         @change="handleTableChange"
@@ -247,12 +408,88 @@ onMounted(() => {
           <template v-if="column.key === 'action'">
             <Space>
               <Button type="link" size="small" @click="handleEdit(record)">编辑</Button>
+              <Button type="link" size="small" @click="handleViewLayout(record)">座位布局</Button>
+              <Button type="link" size="small" @click="handleViewStatus(record)">使用状态</Button>
               <Button type="link" danger size="small" @click="handleDelete(record)">删除</Button>
             </Space>
           </template>
         </template>
       </Table>
     </Card>
+
+    <!-- 使用状态弹窗 -->
+    <Modal
+      v-model:open="seatListVisible"
+      :title="`${currentClassroomName} - 使用状态`"
+      width="800px"
+      :footer="null"
+      @cancel="handleCloseSeatList"
+    >
+      <div style="margin-bottom: 16px; text-align: right;">
+        <Button type="primary" @click="handleExportSeatList">
+          导出
+        </Button>
+      </div>
+      <Table
+        :columns="[
+          { title: '座位号', dataIndex: 'seat_number', key: 'seat_number', width: 100 },
+          { title: '状态', key: 'status', width: 100 },
+          { title: '学员姓名', dataIndex: 'student_name', key: 'student_name' },
+          { title: '学员手机号', dataIndex: 'student_mobile', key: 'student_mobile' },
+          { title: '选座时间', dataIndex: 'select_time', key: 'select_time' },
+        ]"
+        :data-source="seatListData"
+        :loading="seatListLoading"
+        :pagination="{
+          current: seatListPagination.current,
+          pageSize: seatListPagination.pageSize,
+          total: seatListData.length,
+          showSizeChanger: true,
+          showTotal: (total) => `共 ${total} 条`,
+          pageSizeOptions: ['10', '20', '50', '100'],
+        }"
+        row-key="seat_number"
+        size="small"
+        @change="handleSeatListTableChange"
+      >
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'status'">
+            <Tag :color="record.is_selected === 1 ? 'red' : 'green'">
+              {{ record.is_selected === 1 ? '已选' : '未选' }}
+            </Tag>
+          </template>
+          <template v-else-if="column.key === 'student_name'">
+            {{ record.student_name || '-' }}
+          </template>
+          <template v-else-if="column.key === 'student_mobile'">
+            {{ record.student_mobile || '-' }}
+          </template>
+          <template v-else-if="column.key === 'select_time'">
+            {{ record.select_time || '-' }}
+          </template>
+        </template>
+      </Table>
+    </Modal>
+
+    <!-- 座位布局弹窗 -->
+    <Modal
+      v-model:open="layoutVisible"
+      :title="`${currentClassroomName} - 座位布局`"
+      width="90%"
+      :footer="null"
+      :mask-closable="false"
+      @cancel="handleCloseLayout"
+    >
+      <div v-if="layoutLoading" style="text-align: center; padding: 40px;">
+        <span>加载中...</span>
+      </div>
+      <SeatLayoutEditor
+        v-else-if="currentClassroomId"
+        :classroom-id="currentClassroomId"
+        :layout="currentLayout"
+        @saved="handleLayoutSaved"
+      />
+    </Modal>
   </Page>
 </template>
 
diff --git a/apps/web-antd/src/views/dashboard/index.vue b/apps/web-antd/src/views/dashboard/index.vue
index 7c0c704..30ce165 100644
--- a/apps/web-antd/src/views/dashboard/index.vue
+++ b/apps/web-antd/src/views/dashboard/index.vue
@@ -17,11 +17,9 @@ const fetchSystemInfo = async () => {
     if (res && (res.code === 0 || res.code === 200)) {
       // 根据实际返回格式，数据在 res.data 中
       systemInfo.value = res.data || {};
-    } else {
-      console.error('获取系统信息失败:', res?.message || res?.msg);
     }
   } catch (error) {
-    console.error('获取系统信息失败:', error);
+    // 静默处理错误
   } finally {
     loading.value = false;
   }
@@ -34,45 +32,75 @@ onMounted(() => {
 
 <template>
   <Page title="系统概览">
-    <Card title="系统信息">
-      <Spin :spinning="loading">
-        <Descriptions :column="2" bordered>
-          <Descriptions.Item label="操作系统">
-            {{ systemInfo.os || '-' }}
-          </Descriptions.Item>
-          <Descriptions.Item label="PHP版本">
-            {{ systemInfo.php || '-' }}
-          </Descriptions.Item>
-          <Descriptions.Item label="Web服务器">
-            {{ systemInfo.server || '-' }}
-          </Descriptions.Item>
-          <Descriptions.Item label="MySQL版本">
-            {{ systemInfo.mysql || '-' }}
-          </Descriptions.Item>
-          <Descriptions.Item label="框架版本">
-            {{ systemInfo.framework_version || '-' }}
-          </Descriptions.Item>
-          <Descriptions.Item label="上传限制">
-            {{ systemInfo.upload_max || '-' }}
-          </Descriptions.Item>
-          <Descriptions.Item label="最大执行时间">
-            {{ systemInfo.max_execution_time || '-' }}
-          </Descriptions.Item>
-          <Descriptions.Item label="运行目录">
-            {{ systemInfo.runtime_path || '-' }}
-          </Descriptions.Item>
-          <Descriptions.Item label="磁盘总空间" :span="2">
-            {{ systemInfo.disk_total_space || '-' }}
-          </Descriptions.Item>
-          <Descriptions.Item label="磁盘可用空间">
-            {{ systemInfo.disk_free_space || '-' }}
-          </Descriptions.Item>
-          <Descriptions.Item label="磁盘使用率">
-            {{ systemInfo.disk_usage || '-' }}
-          </Descriptions.Item>
-        </Descriptions>
-      </Spin>
-    </Card>
+    <div style="display: flex; flex-direction: column; gap: 16px;">
+      <Card title="系统信息">
+        <Spin :spinning="loading">
+          <Descriptions :column="2" bordered>
+            <Descriptions.Item label="操作系统">
+              {{ systemInfo.os || '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="PHP版本">
+              {{ systemInfo.php || '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="Web服务器">
+              {{ systemInfo.server || '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="MySQL版本">
+              {{ systemInfo.mysql || '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="框架版本">
+              {{ systemInfo.framework_version || '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="上传限制">
+              {{ systemInfo.upload_max || '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="最大执行时间">
+              {{ systemInfo.max_execution_time || '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="运行目录">
+              {{ systemInfo.runtime_path || '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="磁盘总空间" :span="2">
+              {{ systemInfo.disk_total_space || '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="磁盘可用空间">
+              {{ systemInfo.disk_free_space || '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="磁盘使用率">
+              {{ systemInfo.disk_usage || '-' }}
+            </Descriptions.Item>
+          </Descriptions>
+        </Spin>
+      </Card>
+
+      <Card title="数据统计">
+        <Spin :spinning="loading">
+          <Descriptions :column="2" bordered>
+            <Descriptions.Item label="学校数量">
+              {{ systemInfo.statistics?.school_count ?? '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="教室数量">
+              {{ systemInfo.statistics?.classroom_count ?? '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="班级数量">
+              {{ systemInfo.statistics?.class_count ?? '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="学生数量">
+              {{ systemInfo.statistics?.student_count ?? '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="教师数量">
+              {{ systemInfo.statistics?.teacher_count ?? '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="预订数量">
+              {{ systemInfo.statistics?.booking_count ?? '-' }}
+            </Descriptions.Item>
+            <Descriptions.Item label="已选座位数量" :span="2">
+              {{ systemInfo.statistics?.selected_seat_count ?? '-' }}
+            </Descriptions.Item>
+          </Descriptions>
+        </Spin>
+      </Card>
+    </div>
   </Page>
 </template>
 
diff --git a/apps/web-antd/src/views/setting/index.vue b/apps/web-antd/src/views/setting/index.vue
index d51f887..59fd5b4 100644
--- a/apps/web-antd/src/views/setting/index.vue
+++ b/apps/web-antd/src/views/setting/index.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup>
 import { ref, onMounted } from 'vue';
 import { Page } from '@vben/common-ui';
-import { Card, Form, Input, Button, message, Tabs, InputNumber } from 'ant-design-vue';
+import { Card, Form, Input, Button, message, Tabs, InputNumber, Upload } from 'ant-design-vue';
+import { useAppConfig } from '@vben/hooks';
 import { 
   getSettingApi, 
   saveSettingApi,
+  uploadSettingImageApi,
   type SettingApi 
 } from '#/api';
 
@@ -12,7 +14,11 @@ defineOptions({ name: 'SettingIndex' });
 
 const formRef = ref();
 const loading = ref(false);
+const uploading = ref(false);
 const activeTab = ref('basic');
+const { apiURL } = useAppConfig(import.meta.env, import.meta.env.PROD);
+const fileList = ref<any[]>([]);
+
 const formData = ref<Partial<SettingApi.SettingInfo>>({
   site_name: '',
   site_desc: '',
@@ -33,6 +39,23 @@ const formData = ref<Partial<SettingApi.SettingInfo>>({
   wxapp_original: '',
 });
 
+// 获取完整的头像URL
+const getAvatarUrl = (avatarPath?: string | null): string => {
+  if (!avatarPath) return '';
+  // 如果已经是完整URL，直接返回
+  if (avatarPath.startsWith('http://') || avatarPath.startsWith('https://')) {
+    return avatarPath;
+  }
+  // 拼接完整的URL
+  if (!apiURL) {
+    console.warn('apiURL is not configured');
+    return avatarPath;
+  }
+  const baseUrl = apiURL.replace(/\/$/, '');
+  const path = avatarPath.startsWith('/') ? avatarPath : `/${avatarPath}`;
+  return `${baseUrl}${path}`;
+};
+
 const fetchData = async () => {
   loading.value = true;
   try {
@@ -61,6 +84,20 @@ const fetchData = async () => {
         wxapp_name: data.wxapp_name || '',
         wxapp_original: data.wxapp_original || '',
       };
+      // 初始化头像文件列表
+      if (formData.value.default_avatar) {
+        const avatarUrl = getAvatarUrl(formData.value.default_avatar);
+        fileList.value = [
+          {
+            uid: '-1',
+            name: 'avatar',
+            status: 'done',
+            url: avatarUrl,
+          },
+        ];
+      } else {
+        fileList.value = [];
+      }
     } else {
       message.error(res?.message || res?.msg || '获取系统设置失败');
     }
@@ -72,6 +109,94 @@ const fetchData = async () => {
   }
 };
 
+// 处理头像上传前
+const beforeUpload = (file: File) => {
+  const isImage = file.type.startsWith('image/');
+  if (!isImage) {
+    message.error('只能上传图片文件！');
+    return false;
+  }
+  const isLt10M = file.size / 1024 / 1024 < 10;
+  if (!isLt10M) {
+    message.error('图片大小不能超过 10MB！');
+    return false;
+  }
+  
+  // 立即上传
+  handleUpload(file);
+  
+  return false; // 阻止自动上传
+};
+
+// 上传图片
+const handleUpload = async (file: File) => {
+  try {
+    uploading.value = true;
+    const res = await uploadSettingImageApi(file);
+    
+    // 处理响应，获取图片路径
+    // 支持多种响应格式：
+    // 1. { code: 200, data: "path" } 或 { code: 200, data: { src: "path" } }
+    // 2. { code: 200, data: { url: "path" } } 或 { code: 200, data: { path: "path" } }
+    // 3. 直接返回字符串路径
+    // 4. { url: "path" } 或 { path: "path" }
+    let imagePath = '';
+    if (res && (res.code === 0 || res.code === 200)) {
+      // 标准响应格式
+      if (typeof res.data === 'string') {
+        imagePath = res.data;
+      } else if (res.data?.src) {
+        // 优先使用 src 字段
+        imagePath = res.data.src;
+      } else if (res.data?.url || res.data?.path) {
+        imagePath = res.data.url || res.data.path;
+      }
+    } else if (typeof res === 'string') {
+      // 直接返回字符串
+      imagePath = res;
+    } else if (res?.data) {
+      // 嵌套的 data 字段
+      if (typeof res.data === 'string') {
+        imagePath = res.data;
+      } else {
+        imagePath = res.data.src || res.data.url || res.data.path || '';
+      }
+    } else if (res?.src || res?.url || res?.path) {
+      // 直接包含 src、url 或 path
+      imagePath = res.src || res.url || res.path;
+    }
+    
+    if (imagePath) {
+      formData.value.default_avatar = imagePath;
+      // 更新文件列表
+      const avatarUrl = getAvatarUrl(imagePath);
+      fileList.value = [
+        {
+          uid: Date.now().toString(),
+          name: file.name,
+          status: 'done',
+          url: avatarUrl,
+        },
+      ];
+      message.success('头像上传成功');
+    } else {
+      message.error('上传失败：未获取到图片路径');
+    }
+  } catch (error: any) {
+    message.error(error?.response?.data?.message || error?.message || '上传头像失败');
+  } finally {
+    uploading.value = false;
+  }
+};
+
+// 处理头像上传变化
+const handleAvatarChange = (info: any) => {
+  if (info.file.status === 'removed') {
+    fileList.value = [];
+    formData.value.default_avatar = '';
+  }
+};
+
 const handleSubmit = async () => {
   try {
     await formRef.value.validate();
@@ -111,7 +236,21 @@ onMounted(() => {
               <Input v-model:value="formData.site_icp" placeholder="请输入ICP备案号" />
             </Form.Item>
             <Form.Item label="默认头像" name="default_avatar">
-              <Input v-model:value="formData.default_avatar" placeholder="默认头像路径" />
+              <Upload
+                v-model:file-list="fileList"
+                list-type="picture-card"
+                :max-count="1"
+                :before-upload="beforeUpload"
+                :disabled="uploading"
+                @change="handleAvatarChange"
+                accept="image/*"
+              >
+                <div v-if="fileList.length < 1">
+                  <div style="margin-top: 8px">
+                    <span>上传</span>
+                  </div>
+                </div>
+              </Upload>
             </Form.Item>
           </Tabs.TabPane>
           <Tabs.TabPane key="upload" tab="上传设置">
diff --git a/apps/web-antd/src/views/student/list.vue b/apps/web-antd/src/views/student/list.vue
index 6bec4fd..d3878a1 100644
--- a/apps/web-antd/src/views/student/list.vue
+++ b/apps/web-antd/src/views/student/list.vue
@@ -105,28 +105,21 @@ const fetchData = async () => {
       ...searchForm,
     };
     const res = await getStudentListApi(params);
-    console.log('学生列表API返回:', res); // 调试用
     // 根据实际返回格式，code 为 0 表示成功
     if (res && (res.code === 0 || res.code === 200)) {
       const data = res.data;
-      console.log('学生列表数据:', data); // 调试用
-      console.log('学生列表总数:', res.count); // 调试用
       if (Array.isArray(data)) {
         tableData.value = data;
         total.value = res.count || data.length;
-        console.log('设置学生列表，数量:', tableData.value.length, '总数:', total.value); // 调试用
       } else {
-        console.warn('学生列表数据不是数组:', data);
         tableData.value = [];
         total.value = 0;
       }
     } else {
-      console.warn('获取学生列表失败，响应码:', res?.code, res);
       tableData.value = [];
       total.value = 0;
     }
   } catch (error) {
-    console.error('获取学生列表失败:', error);
     tableData.value = [];
     total.value = 0;
   } finally {
@@ -191,24 +184,18 @@ const fileList = ref<any[]>([]);
 const fetchClassList = async () => {
   try {
     const res = await getClassListApi({ page: 1, limit: 1000 });
-    console.log('导入对话框-班级列表API返回:', res); // 调试用
     if (res && (res.code === 0 || res.code === 200)) {
       // 根据实际返回格式，data 是数组
       const data = res.data;
-      console.log('导入对话框-班级列表数据:', data); // 调试用
       if (Array.isArray(data)) {
         classList.value = data;
-        console.log('导入对话框-设置班级列表，数量:', classList.value.length); // 调试用
       } else {
-        console.warn('导入对话框-班级列表数据不是数组:', data);
         classList.value = [];
       }
     } else {
-      console.warn('导入对话框-获取班级列表失败:', res);
       classList.value = [];
     }
   } catch (error) {
-    console.error('导入对话框-获取班级列表失败:', error);
     classList.value = [];
   }
 };
diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts
index 2c4d640..3486612 100644
--- a/apps/web-antd/vite.config.mts
+++ b/apps/web-antd/vite.config.mts
@@ -7,7 +7,7 @@ export default defineConfig(async () => {
       server: {
         proxy: {
           '/api': {
-            target: 'https://xuanzuo.dhdjy.com',
+            target: 'http://xz.dhdjy.com',
             changeOrigin: true,
             secure: true, // https 接口设为 true
             ws: true,
diff --git a/doc/座位布局性能优化说明.md b/doc/座位布局性能优化说明.md
new file mode 100644
index 0000000..974ad94
--- /dev/null
+++ b/doc/座位布局性能优化说明.md
@@ -0,0 +1,142 @@
+# 座位布局性能优化说明
+
+## 问题描述
+
+当座位布局节点数量很大时（例如 50x50 = 2500 个单元格），会出现明显的卡顿现象。主要原因是：
+
+1. **大量 DOM 节点**：双重循环渲染所有单元格，创建大量 DOM 元素
+2. **重复计算**：每次渲染时，`getCellClass`、`getCellText`、`shouldRenderCell` 等函数都会被调用，且内部包含循环遍历
+3. **查找性能**：使用 `Array.find()` 查找单元格，时间复杂度为 O(n)
+4. **事件处理**：鼠标移动事件触发频繁，没有有效节流
+
+## 优化方案
+
+### 1. 使用 Map 缓存单元格查找
+
+**优化前：**
+```typescript
+const getCell = (col: number, row: number) => {
+  return cells.value.find((c) => c.col === col && c.row === row);
+};
+```
+
+**优化后：**
+```typescript
+// 单元格查找缓存 Map: key = "col,row", value = cell
+const cellMapCache = ref<Map<string, ClassroomApi.ClassroomLayoutCell>>(new Map());
+
+const getCell = (col: number, row: number) => {
+  const key = `${col},${row}`;
+  return cellMapCache.value.get(key);
+};
+```
+
+**效果：** 查找时间复杂度从 O(n) 降低到 O(1)
+
+### 2. 缓存合并单元格映射关系
+
+**优化前：**
+```typescript
+// 每次都要遍历所有单元格检查是否被合并
+for (const otherCell of cells.value) {
+  // ... 检查逻辑
+}
+```
+
+**优化后：**
+```typescript
+// 合并单元格主单元格映射: key = "col,row" (被合并的单元格), value = "col,row" (主单元格)
+const mergeMasterMapCache = ref<Map<string, string>>(new Map());
+
+// 使用缓存检查
+const key = `${col},${row}`;
+if (mergeMasterMapCache.value.has(key)) {
+  return 'cell cell-merged';
+}
+```
+
+**效果：** 避免了每次渲染时的 O(n²) 循环嵌套
+
+### 3. 使用 shallowRef 优化响应式性能
+
+**优化前：**
+```typescript
+const cells = ref<ClassroomApi.ClassroomLayoutCell[]>([]);
+```
+
+**优化后：**
+```typescript
+const cells = shallowRef<ClassroomApi.ClassroomLayoutCell[]>([]);
+```
+
+**效果：** 减少深度响应式监听，提升性能
+
+### 4. 使用 requestAnimationFrame 优化鼠标移动事件
+
+**优化前：**
+```typescript
+mouseEnterTimer = window.setTimeout(() => {
+  // 填充逻辑
+}, 16);
+```
+
+**优化后：**
+```typescript
+rafId = requestAnimationFrame(() => {
+  // 填充逻辑
+});
+```
+
+**效果：** 与浏览器渲染周期同步，更流畅
+
+### 5. 使用 v-memo 指令缓存单元格渲染
+
+**优化后：**
+```vue
+<div
+  v-if="shouldRenderCell(col - 1, row - 1)"
+  v-memo="[getCell(col - 1, row - 1)?.type, getCell(col - 1, row - 1)?.status, ...]"
+  :class="getCellClass(col - 1, row - 1)"
+  ...
+>
+```
+
+**效果：** 只有当依赖项变化时才重新渲染，减少不必要的 DOM 更新
+
+### 6. 统一更新缓存机制
+
+在所有修改单元格的操作后，统一调用 `updateCellMapCache()` 更新缓存：
+
+- `initLayout()` - 初始化布局
+- `loadLayout()` - 加载布局
+- `addColumnLeft/Right()` - 添加列
+- `addRowTop/Bottom()` - 添加行
+- `mergeCells()` - 合并单元格
+- `unmergeCell()` - 取消合并
+- `handleUndo()` - 撤销操作
+- `handleCellMouseUp()` - 鼠标释放
+
+## 性能提升
+
+经过优化后，预期性能提升：
+
+1. **单元格查找**：从 O(n) 降低到 O(1)，查找速度提升 100-1000 倍（取决于单元格数量）
+2. **合并检查**：从 O(n²) 降低到 O(1)，检查速度提升 10000 倍以上
+3. **渲染性能**：使用 v-memo 后，只有变化的单元格才会重新渲染
+4. **鼠标交互**：使用 requestAnimationFrame 后，交互更流畅，帧率更稳定
+
+## 注意事项
+
+1. **缓存一致性**：所有修改单元格的操作都必须调用 `updateCellMapCache()` 保持缓存同步
+2. **内存占用**：Map 缓存会占用额外内存，但对于性能提升是值得的
+3. **兼容性**：`v-memo` 是 Vue 3.2+ 的特性，确保项目使用 Vue 3.2 或更高版本
+
+## 后续优化建议
+
+如果性能仍然不够理想，可以考虑：
+
+1. **虚拟滚动**：只渲染可见区域的单元格（对 Grid 布局实现较复杂）
+2. **Canvas 渲染**：使用 Canvas 替代 DOM 渲染（需要重写交互逻辑）
+3. **Web Worker**：将复杂计算移到 Web Worker 中
+4. **分块渲染**：将大布局分成多个块，按需加载
+
diff --git a/scripts/deploy/nginx-location.conf b/scripts/deploy/nginx-location.conf
index aec242d..00f7c4d 100644
--- a/scripts/deploy/nginx-location.conf
+++ b/scripts/deploy/nginx-location.conf
@@ -5,13 +5,13 @@ location /super {
     alias /www/wwwroot/你的网站目录/dist;  # 请修改为实际的网站目录路径
     try_files $uri $uri/ /super/index.html;
     index index.html;
-    
+
     # 静态资源缓存
     location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
         expires 1y;
         add_header Cache-Control "public, immutable";
     }
-    
+
     # Enable CORS (如果需要)
     # add_header 'Access-Control-Allow-Origin' '*';
     # add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';