修改布局，修复BUG

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',
+  });
+}
+

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;
   }
 }

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',
   });
 }