Upload 51 files

components/ConfirmModal.tsx

@@ -0,0 +1,53 @@
+
+import React from 'react';
+import { X, AlertTriangle } from 'lucide-react';
+
+interface ConfirmModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onConfirm: () => void;
+  title?: string;
+  message: string;
+  confirmText?: string;
+  cancelText?: string;
+  isDanger?: boolean;
+}
+
+export const ConfirmModal: React.FC<ConfirmModalProps> = ({ 
+  isOpen, onClose, onConfirm, title = "确认操作", message, 
+  confirmText = "确定", cancelText = "取消", isDanger = false 
+}) => {
+  if (!isOpen) return null;
+
+  return (
+    <div className="fixed inset-0 bg-black/60 z-[9999] flex items-center justify-center p-4 backdrop-blur-sm animate-in fade-in">
+      <div className="bg-white rounded-xl shadow-2xl max-w-sm w-full overflow-hidden animate-in zoom-in-95">
+        <div className="p-5">
+          <div className="flex items-start gap-4">
+            <div className={`p-3 rounded-full shrink-0 ${isDanger ? 'bg-red-100 text-red-600' : 'bg-blue-100 text-blue-600'}`}>
+              <AlertTriangle size={24} />
+            </div>
+            <div>
+              <h3 className="text-lg font-bold text-gray-900 mb-1">{title}</h3>
+              <p className="text-sm text-gray-500 leading-relaxed">{message}</p>
+            </div>
+          </div>
+        </div>
+        <div className="bg-gray-50 px-5 py-3 flex justify-end gap-3">
+          <button 
+            onClick={onClose}
+            className="px-4 py-2 rounded-lg text-sm font-medium text-gray-700 hover:bg-gray-200 transition-colors"
+          >
+            {cancelText}
+          </button>
+          <button 
+            onClick={() => { onConfirm(); onClose(); }}
+            className={`px-4 py-2 rounded-lg text-sm font-bold text-white shadow-sm transition-colors ${isDanger ? 'bg-red-600 hover:bg-red-700' : 'bg-blue-600 hover:bg-blue-700'}`}
+          >
+            {confirmText}
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};

components/Sidebar.tsx

@@ -1,6 +1,6 @@
 
-import React from 'react';
-import { LayoutDashboard, Users, BookOpen, GraduationCap, Settings, LogOut, FileText, School, UserCog, Palette, X, Building, Gamepad2, CalendarCheck, UserCircle, MessageSquare, Bot } from 'lucide-react';
+import React, { useState, useEffect } from 'react';
+import { LayoutDashboard, Users, BookOpen, GraduationCap, Settings, LogOut, FileText, School, UserCog, Palette, X, Building, Gamepad2, CalendarCheck, UserCircle, MessageSquare, Bot, ArrowUp, ArrowDown, Save } from 'lucide-react';
 import { UserRole } from '../types';
 import { api } from '../services/api';
 
@@ -14,24 +14,19 @@ interface SidebarProps {
 }
 
 export const Sidebar: React.FC<SidebarProps> = ({ currentView, onChangeView, userRole, onLogout, isOpen, onClose }) => {
-  // Get full user object to check aiAccess flag
   const currentUser = api.auth.getCurrentUser();
-  
-  // Logic: Admin sees it to manage it. Teachers see it only if granted. Students/Principal see nothing.
   const canSeeAI = userRole === UserRole.ADMIN || (userRole === UserRole.TEACHER && currentUser?.aiAccess);
 
-  // Define menu items with explicit roles
-  // PRINCIPAL has access to almost everything ADMIN has, except 'schools' management
-  const menuItems = [
+  // Default Items
+  const defaultItems = [
     { id: 'dashboard', label: '工作台', icon: LayoutDashboard, roles: [UserRole.ADMIN, UserRole.PRINCIPAL, UserRole.TEACHER, UserRole.STUDENT] },
-    // AI Assistant: Only if hasAIAccess is true
     { id: 'ai-assistant', label: 'AI 智能助教', icon: Bot, roles: canSeeAI ? [UserRole.ADMIN, UserRole.TEACHER] : [] }, 
     { id: 'attendance', label: '考勤管理', icon: CalendarCheck, roles: [UserRole.TEACHER, UserRole.PRINCIPAL] }, 
-    { id: 'games', label: '互动教学', icon: Gamepad2, roles: [UserRole.TEACHER, UserRole.STUDENT] }, // Removed PRINCIPAL
-    { id: 'wishes', label: '心愿与反馈', icon: MessageSquare, roles: [UserRole.ADMIN, UserRole.PRINCIPAL, UserRole.TEACHER, UserRole.STUDENT] }, // NEW
+    { id: 'games', label: '互动教学', icon: Gamepad2, roles: [UserRole.TEACHER, UserRole.STUDENT] }, 
+    { id: 'wishes', label: '心愿与反馈', icon: MessageSquare, roles: [UserRole.ADMIN, UserRole.PRINCIPAL, UserRole.TEACHER, UserRole.STUDENT] }, 
     { id: 'students', label: '学生管理', icon: Users, roles: [UserRole.ADMIN, UserRole.PRINCIPAL, UserRole.TEACHER] },
     { id: 'classes', label: '班级管理', icon: School, roles: [UserRole.ADMIN, UserRole.PRINCIPAL] },
-    { id: 'schools', label: '学校管理', icon: Building, roles: [UserRole.ADMIN] }, // Only Super Admin can manage schools
+    { id: 'schools', label: '学校管理', icon: Building, roles: [UserRole.ADMIN] }, 
     { id: 'courses', label: '课程管理', icon: BookOpen, roles: [UserRole.ADMIN, UserRole.PRINCIPAL, UserRole.TEACHER] },
     { id: 'grades', label: '成绩管理', icon: GraduationCap, roles: [UserRole.ADMIN, UserRole.PRINCIPAL, UserRole.TEACHER] },
     { id: 'reports', label: '报表统计', icon: FileText, roles: [UserRole.ADMIN, UserRole.PRINCIPAL, UserRole.TEACHER, UserRole.STUDENT] },
@@ -41,6 +36,48 @@ export const Sidebar: React.FC<SidebarProps> = ({ currentView, onChangeView, use
     { id: 'settings', label: '系统设置', icon: Settings, roles: [UserRole.ADMIN, UserRole.PRINCIPAL] },
   ];
 
+  const [menuItems, setMenuItems] = useState(defaultItems);
+  const [isEditing, setIsEditing] = useState(false);
+
+  useEffect(() => {
+      // Load saved order
+      if (currentUser?.menuOrder && currentUser.menuOrder.length > 0) {
+          const ordered = [];
+          const map = new Map(defaultItems.map(i => [i.id, i]));
+          // Add saved items in order
+          currentUser.menuOrder.forEach(id => {
+              if (map.has(id)) {
+                  ordered.push(map.get(id)!);
+                  map.delete(id);
+              }
+          });
+          // Append any new/remaining items
+          map.forEach(item => ordered.push(item));
+          setMenuItems(ordered);
+      }
+  }, []);
+
+  const handleMove = (index: number, direction: -1 | 1) => {
+      const newItems = [...menuItems];
+      const targetIndex = index + direction;
+      if (targetIndex < 0 || targetIndex >= newItems.length) return;
+      [newItems[index], newItems[targetIndex]] = [newItems[targetIndex], newItems[index]];
+      setMenuItems(newItems);
+  };
+
+  const saveOrder = async () => {
+      setIsEditing(false);
+      const orderIds = menuItems.map(i => i.id);
+      if (currentUser && currentUser._id) {
+          try {
+              await api.users.saveMenuOrder(currentUser._id, orderIds);
+              // Update local user object
+              const updatedUser = { ...currentUser, menuOrder: orderIds };
+              localStorage.setItem('user', JSON.stringify(updatedUser));
+          } catch(e) { console.error("Failed to save menu order"); }
+      }
+  };
+
   const sidebarClasses = `
     fixed inset-y-0 left-0 z-50 w-64 bg-slate-900 text-white transition-transform duration-300 ease-in-out transform 
     ${isOpen ? 'translate-x-0' : '-translate-x-full'} 
@@ -62,25 +99,45 @@ export const Sidebar: React.FC<SidebarProps> = ({ currentView, onChangeView, use
           <button onClick={onClose} className="lg:hidden text-slate-400 hover:text-white"><X size={24} /></button>
         </div>
 
-        <div className="flex-1 overflow-y-auto py-4">
+        <div className="flex-1 overflow-y-auto py-4 custom-scrollbar">
+          <div className="px-4 mb-2 flex justify-between items-center">
+              <span className="text-xs text-slate-500 font-bold uppercase">主菜单</span>
+              <button 
+                onClick={() => isEditing ? saveOrder() : setIsEditing(true)} 
+                className={`text-xs px-2 py-1 rounded hover:bg-slate-800 ${isEditing ? 'text-green-400' : 'text-slate-600'}`}
+              >
+                  {isEditing ? '完成' : '调整'}
+              </button>
+          </div>
           <nav className="space-y-1 px-2">
-            {menuItems.map((item) => {
+            {menuItems.map((item, idx) => {
               if (!item.roles.includes(userRole)) return null;
+              if (item.id === 'ai-assistant' && !canSeeAI) return null;
+              
               const Icon = item.icon;
               const isActive = currentView === item.id;
+              
               return (
-                <button
-                  key={item.id}
-                  onClick={() => onChangeView(item.id)}
-                  className={`w-full flex items-center space-x-3 px-4 py-3 rounded-lg transition-colors duration-200 ${
-                    isActive
-                      ? 'bg-blue-600 text-white shadow-lg shadow-blue-900/50'
-                      : 'text-slate-300 hover:bg-slate-800 hover:text-white'
-                  }`}
-                >
-                  <Icon size={20} />
-                  <span className="font-medium">{item.label}</span>
-                </button>
+                <div key={item.id} className="flex items-center gap-1 group">
+                    <button
+                      onClick={() => !isEditing && onChangeView(item.id)}
+                      disabled={isEditing}
+                      className={`flex-1 flex items-center space-x-3 px-4 py-3 rounded-lg transition-colors duration-200 ${
+                        isActive
+                          ? 'bg-blue-600 text-white shadow-lg shadow-blue-900/50'
+                          : 'text-slate-300 hover:bg-slate-800 hover:text-white'
+                      } ${isEditing ? 'opacity-70 cursor-grab' : ''}`}
+                    >
+                      <Icon size={20} />
+                      <span className="font-medium">{item.label}</span>
+                    </button>
+                    {isEditing && (
+                        <div className="flex flex-col gap-1 pr-1">
+                            <button onClick={()=>handleMove(idx, -1)} className="p-1 hover:bg-slate-700 rounded text-slate-400 hover:text-white"><ArrowUp size={12}/></button>
+                            <button onClick={()=>handleMove(idx, 1)} className="p-1 hover:bg-slate-700 rounded text-slate-400 hover:text-white"><ArrowDown size={12}/></button>
+                        </div>
+                    )}
+                </div>
               );
             })}
           </nav>

components/TodoList.tsx

@@ -0,0 +1,94 @@
+
+import React, { useState, useEffect } from 'react';
+import { api } from '../services/api';
+import { Todo } from '../types';
+import { Plus, CheckCircle, Circle, Trash2, CalendarCheck } from 'lucide-react';
+
+export const TodoList: React.FC = () => {
+  const [todos, setTodos] = useState<Todo[]>([]);
+  const [inputValue, setInputValue] = useState('');
+  const [loading, setLoading] = useState(false);
+
+  useEffect(() => {
+    loadTodos();
+  }, []);
+
+  const loadTodos = async () => {
+    try {
+      const list = await api.todos.getAll();
+      setTodos(list);
+    } catch (e) { console.error(e); }
+  };
+
+  const handleAdd = async (e?: React.FormEvent) => {
+    e?.preventDefault();
+    if (!inputValue.trim()) return;
+    setLoading(true);
+    await api.todos.add(inputValue);
+    setInputValue('');
+    setLoading(false);
+    loadTodos();
+  };
+
+  const handleToggle = async (t: Todo) => {
+    // Optimistic update
+    const newStatus = !t.isCompleted;
+    setTodos(todos.map(item => item._id === t._id ? { ...item, isCompleted: newStatus } : item));
+    await api.todos.update(t._id!, { isCompleted: newStatus });
+  };
+
+  const handleDelete = async (id: string) => {
+    setTodos(todos.filter(t => t._id !== id));
+    await api.todos.delete(id);
+  };
+
+  return (
+    <div className="bg-white rounded-xl shadow-sm border border-gray-100 flex flex-col h-full">
+      <div className="p-4 border-b border-gray-100 bg-gradient-to-r from-blue-50 to-indigo-50 rounded-t-xl">
+        <h3 className="font-bold text-gray-800 flex items-center text-sm">
+          <CalendarCheck size={16} className="mr-2 text-indigo-600"/> 个人备忘录
+        </h3>
+      </div>
+      
+      <div className="flex-1 overflow-y-auto p-2 custom-scrollbar min-h-[200px]">
+        {todos.length === 0 ? (
+          <div className="text-center text-gray-400 py-10 text-xs">
+            <p>暂无待办事项</p>
+            <p>记录今天的教学/学习任务吧！</p>
+          </div>
+        ) : (
+          <ul className="space-y-1">
+            {todos.map(t => (
+              <li key={t._id} className="group flex items-start gap-2 p-2 hover:bg-gray-50 rounded transition-colors text-sm">
+                <button onClick={() => handleToggle(t)} className={`mt-0.5 shrink-0 ${t.isCompleted ? 'text-green-500' : 'text-gray-400 hover:text-blue-500'}`}>
+                  {t.isCompleted ? <CheckCircle size={16}/> : <Circle size={16}/>}
+                </button>
+                <span className={`flex-1 break-all ${t.isCompleted ? 'text-gray-400 line-through' : 'text-gray-700'}`}>
+                  {t.content}
+                </span>
+                <button onClick={() => handleDelete(t._id!)} className="text-gray-300 hover:text-red-500 opacity-0 group-hover:opacity-100 transition-opacity">
+                  <Trash2 size={14}/>
+                </button>
+              </li>
+            ))}
+          </ul>
+        )}
+      </div>
+
+      <div className="p-3 border-t border-gray-100 bg-gray-50 rounded-b-xl">
+        <form onSubmit={handleAdd} className="flex gap-2">
+          <input 
+            className="flex-1 border border-gray-200 rounded-lg px-3 py-1.5 text-sm outline-none focus:ring-2 focus:ring-indigo-200 focus:border-indigo-400 bg-white"
+            placeholder="添加新任务..."
+            value={inputValue}
+            onChange={e => setInputValue(e.target.value)}
+            disabled={loading}
+          />
+          <button type="submit" disabled={!inputValue.trim() || loading} className="bg-indigo-600 text-white p-1.5 rounded-lg hover:bg-indigo-700 disabled:opacity-50">
+            <Plus size={18}/>
+          </button>
+        </form>
+      </div>
+    </div>
+  );
+};

models.js

@@ -1,7 +1,7 @@
 
 const mongoose = require('mongoose');
 
-// ... (Previous Models: School, User, Student, Course, Score, ClassModel, SubjectModel, ExamModel, ScheduleModel)
+// ... (Previous Models)
 
 const SchoolSchema = new mongoose.Schema({ name: String, code: String });
 const School = mongoose.model('School', SchoolSchema);
@@ -26,8 +26,8 @@ const UserSchema = new mongoose.Schema({
     gender: String, 
     seatNo: String, 
     idCard: String,
-    // NEW: Control AI feature access for teachers
     aiAccess: { type: Boolean, default: false },
+    menuOrder: [String], // NEW
     classApplication: { 
         type: { type: String }, 
         targetClass: String, 
@@ -36,7 +36,7 @@ const UserSchema = new mongoose.Schema({
 });
 const User = mongoose.model('User', UserSchema);
 
-// ... (Rest of the file remains unchanged until ConfigSchema)
+// ... (Student, Course, Score, Class, Subject, Exam Models - No Change)
 const StudentSchema = new mongoose.Schema({ 
     schoolId: String, 
     studentNo: String, 
@@ -90,7 +90,15 @@ const SubjectModel = mongoose.model('Subject', SubjectSchema);
 const ExamSchema = new mongoose.Schema({ schoolId: String, name: String, date: String, type: String, semester: String });
 const ExamModel = mongoose.model('Exam', ExamSchema);
 
-const ScheduleSchema = new mongoose.Schema({ schoolId: String, className: String, teacherName: String, subject: String, dayOfWeek: Number, period: Number });
+const ScheduleSchema = new mongoose.Schema({ 
+    schoolId: String, 
+    className: String, 
+    teacherName: String, 
+    subject: String, 
+    dayOfWeek: Number, 
+    period: Number,
+    weekType: { type: String, default: 'ALL' } // ALL, ODD, EVEN
+});
 const ScheduleModel = mongoose.model('Schedule', ScheduleSchema);
 
 const ConfigSchema = new mongoose.Schema({ 
@@ -104,16 +112,17 @@ const ConfigSchema = new mongoose.Schema({
     allowStudentRegister: Boolean, 
     maintenanceMode: Boolean, 
     emailNotify: Boolean,
-    // NEW: AI Global Config
     enableAI: { type: Boolean, default: true },
-    aiTotalCalls: { type: Number, default: 0 }
+    aiTotalCalls: { type: Number, default: 0 },
+    periodConfig: [{ period: Number, name: String, startTime: String, endTime: String }] // NEW
 });
 const ConfigModel = mongoose.model('Config', ConfigSchema);
 
+// ... (Notification, GameSession, StudentReward, LuckyDrawConfig, etc.)
 const NotificationSchema = new mongoose.Schema({ schoolId: String, targetRole: String, targetUserId: String, title: String, content: String, type: String, createTime: { type: Date, default: Date.now } });
 const NotificationModel = mongoose.model('Notification', NotificationSchema);
 
-const GameSessionSchema = new mongoose.Schema({ schoolId: String, className: String, isEnabled: Boolean, maxSteps: Number, teams: [{ id: String, name: String, score: Number, avatar: String, color: String, members: [String] }], rewardsConfig: [{ scoreThreshold: Number, rewardType: String, rewardName: String, rewardValue: Number, achievementId: String }] });
+const GameSessionSchema = new mongoose.Schema({ schoolId: String, className: String, isEnabled: Boolean, maxSteps: Number, teams: [{ id: String, name: String, score: Number, avatar: String, color: String, members: [String] }], rewardsConfig: [{ scoreThreshold: Number, rewardType: String, rewardName: String, rewardValue: { type: Number, default: 1 }, achievementId: String }] }); // Added rewardValue default
 const GameSessionModel = mongoose.model('GameSession', GameSessionSchema);
 
 const StudentRewardSchema = new mongoose.Schema({ schoolId: String, studentId: String, studentName: String, rewardType: String, name: String, count: { type: Number, default: 1 }, status: String, source: String, createTime: { type: Date, default: Date.now }, ownerId: String });
@@ -155,7 +164,6 @@ const GameZenConfigSchema = new mongoose.Schema({
 });
 const GameZenConfigModel = mongoose.model('GameZenConfig', GameZenConfigSchema);
 
-// Updated Achievement Schema with addedBy
 const AchievementConfigSchema = new mongoose.Schema({ 
     schoolId: String, 
     className: String, 
@@ -168,12 +176,10 @@ const AchievementConfigSchema = new mongoose.Schema({
         addedBy: String,
         addedByName: String
     }], 
-    // Legacy support, rules now moving to TeacherExchangeConfig
     exchangeRules: [{ id: String, cost: Number, rewardType: String, rewardName: String, rewardValue: Number }] 
 });
 const AchievementConfigModel = mongoose.model('AchievementConfig', AchievementConfigSchema);
 
-// NEW: Independent Teacher Exchange Rules
 const TeacherExchangeConfigSchema = new mongoose.Schema({
     schoolId: String,
     teacherId: String,
@@ -194,8 +200,6 @@ const LeaveRequestModel = mongoose.model('LeaveRequest', LeaveRequestSchema);
 const SchoolCalendarSchema = new mongoose.Schema({ schoolId: String, className: String, type: String, startDate: String, endDate: String, name: String });
 const SchoolCalendarModel = mongoose.model('SchoolCalendar', SchoolCalendarSchema);
 
-// --- NEW SCHEMAS FOR WISH AND FEEDBACK ---
-
 const WishSchema = new mongoose.Schema({
     schoolId: String,
     studentId: String,
@@ -204,7 +208,7 @@ const WishSchema = new mongoose.Schema({
     teacherId: String,
     teacherName: String,
     content: String,
-    status: { type: String, default: 'PENDING' }, // PENDING, FULFILLED
+    status: { type: String, default: 'PENDING' },
     createTime: { type: Date, default: Date.now },
     fulfillTime: Date
 });
@@ -215,20 +219,29 @@ const FeedbackSchema = new mongoose.Schema({
     creatorId: String,
     creatorName: String,
     creatorRole: String,
-    targetId: String, // Teacher ID or 'ADMIN'
+    targetId: String, 
     targetName: String,
     content: String,
-    type: String, // ACADEMIC, SYSTEM
-    status: { type: String, default: 'PENDING' }, // PENDING, ACCEPTED, PROCESSED, IGNORED
+    type: String, 
+    status: { type: String, default: 'PENDING' }, 
     reply: String,
     createTime: { type: Date, default: Date.now },
     updateTime: Date
 });
 const FeedbackModel = mongoose.model('Feedback', FeedbackSchema);
 
+// NEW: Todo Model
+const TodoSchema = new mongoose.Schema({
+    userId: String,
+    content: String,
+    isCompleted: { type: Boolean, default: false },
+    createTime: { type: Date, default: Date.now }
+});
+const TodoModel = mongoose.model('Todo', TodoSchema);
+
 module.exports = {
     School, User, Student, Course, Score, ClassModel, SubjectModel, ExamModel, ScheduleModel,
     ConfigModel, NotificationModel, GameSessionModel, StudentRewardModel, LuckyDrawConfigModel, GameMonsterConfigModel, GameZenConfigModel,
     AchievementConfigModel, TeacherExchangeConfigModel, StudentAchievementModel, AttendanceModel, LeaveRequestModel, SchoolCalendarModel,
-    WishModel, FeedbackModel
+    WishModel, FeedbackModel, TodoModel
 };

pages/AchievementTeacher.tsx

@@ -4,6 +4,7 @@ import { api } from '../services/api';
 import { AchievementConfig, AchievementItem, ExchangeRule, Student, TeacherExchangeConfig } from '../types';
 import { Plus, Trash2, Edit, Save, Gift, Award, Coins, Users, Search, Loader2, CheckCircle, Filter } from 'lucide-react';
 import { Emoji } from '../components/Emoji';
+import { ConfirmModal } from '../components/ConfirmModal';
 
 const PRESET_ICONS = [
     { icon: '🏆', label: '冠军杯' }, { icon: '🥇', label: '金牌' }, { icon: '🥈', label: '银牌' }, { icon: '🥉', label: '铜牌' },
@@ -19,141 +20,88 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
     const [myExchangeConfig, setMyExchangeConfig] = useState<TeacherExchangeConfig | null>(null);
     const [students, setStudents] = useState<Student[]>([]);
     const [semester, setSemester] = useState('');
-    
-    // Tab State
     const [activeTab, setActiveTab] = useState<'manage' | 'grant' | 'exchange' | 'balance'>('manage');
-
-    // Forms
     const [newAchieve, setNewAchieve] = useState<AchievementItem>({ id: '', name: '', icon: '🏆', points: 1 });
     const [newRule, setNewRule] = useState<ExchangeRule>({ id: '', cost: 10, rewardType: 'DRAW_COUNT', rewardName: '抽奖券x1', rewardValue: 1 });
-    
-    // Filters
-    const [filterCreator, setFilterCreator] = useState('ALL'); // For Manage
-    const [filterGrantCreator, setFilterGrantCreator] = useState('ALL'); // For Grant
-    
-    // Grant State
+    const [filterCreator, setFilterCreator] = useState('ALL');
+    const [filterGrantCreator, setFilterGrantCreator] = useState('ALL');
     const [selectedStudents, setSelectedStudents] = useState<Set<string>>(new Set());
     const [selectedAchieveId, setSelectedAchieveId] = useState('');
+    const [confirmModal, setConfirmModal] = useState<{isOpen: boolean, title: string, message: string, onConfirm: () => void}>({ isOpen: false, title: '', message: '', onConfirm: () => {} });
 
     const currentUser = api.auth.getCurrentUser();
     const homeroomClass = className || currentUser?.homeroomClass;
-    
-    // Permissions
-    const isHomeroom = currentUser?.homeroomClass === homeroomClass; // Is this the HT?
+    const isHomeroom = currentUser?.homeroomClass === homeroomClass;
     const isPrincipal = currentUser?.role === 'PRINCIPAL';
-    const canManageAll = isHomeroom || isPrincipal; // HT has full control
+    const canManageAll = isHomeroom || isPrincipal;
 
-    useEffect(() => {
-        loadData();
-    }, [homeroomClass]); 
+    useEffect(() => { loadData(); }, [homeroomClass]); 
 
     const loadData = async () => {
         if (!homeroomClass) return;
         setLoading(true);
-        
         try {
-            // 1. Students
             const stus = await api.students.getAll();
-            const sortedStudents = stus
-                .filter((s: Student) => s.className.trim() === homeroomClass.trim())
-                .sort((a: Student, b: Student) => {
-                    const seatA = parseInt(a.seatNo || '99999');
-                    const seatB = parseInt(b.seatNo || '99999');
-                    if (seatA !== seatB) return seatA - seatB;
-                    return a.name.localeCompare(b.name, 'zh-CN');
-                });
+            const sortedStudents = stus.filter((s: Student) => s.className.trim() === homeroomClass.trim()).sort((a: Student, b: Student) => { const seatA = parseInt(a.seatNo || '99999'); const seatB = parseInt(b.seatNo || '99999'); if (seatA !== seatB) return seatA - seatB; return a.name.localeCompare(b.name, 'zh-CN'); });
             setStudents(sortedStudents);
-
-            // 2. Shared Config (Achievements) & System
             const [cfg, sysCfg, myRules] = await Promise.all([
                 api.achievements.getConfig(homeroomClass).catch(() => null),
                 api.config.getPublic().catch(() => ({ semester: '当前学期' })),
-                api.achievements.getMyRules().catch(() => ({ rules: [] })) // Fetch Teacher's OWN rules
+                api.achievements.getMyRules().catch(() => ({ rules: [] }))
             ]);
-            
-            const defaultConfig: AchievementConfig = { 
-                schoolId: currentUser?.schoolId || '', 
-                className: homeroomClass, 
-                achievements: [], 
-                exchangeRules: [] // Legacy, ignored for display now
-            };
-            
+            const defaultConfig: AchievementConfig = { schoolId: currentUser?.schoolId || '', className: homeroomClass, achievements: [], exchangeRules: [] };
             setConfig(cfg || defaultConfig);
-            setMyExchangeConfig(myRules); // Set independent teacher rules
-            
+            setMyExchangeConfig(myRules);
             // @ts-ignore
             setSemester(sysCfg?.semester || '当前学期');
-
-        } catch (e) { 
-            console.error("Failed to load data", e); 
-        } finally { setLoading(false); }
+        } catch (e) { console.error("Failed to load data", e); } finally { setLoading(false); }
     };
 
-    // --- Shared Achievement Config ---
     const handleSaveConfig = async (newConfig: AchievementConfig) => {
         setConfig(newConfig);
-        try {
-            await api.achievements.saveConfig(newConfig);
-        } catch (e) { 
-            alert('保存失败'); loadData(); 
-        }
+        try { await api.achievements.saveConfig(newConfig); } catch (e) { alert('保存失败'); loadData(); }
     };
 
-    // --- Independent Teacher Rules ---
     const handleSaveMyRules = async (newRules: ExchangeRule[]) => {
-        const payload = {
-            ...myExchangeConfig,
-            rules: newRules
-        } as TeacherExchangeConfig;
-        
-        setMyExchangeConfig(payload); // Optimistic
-        try {
-            await api.achievements.saveMyRules(payload);
-        } catch(e) { alert('保存失败'); loadData(); }
+        const payload = { ...myExchangeConfig, rules: newRules } as TeacherExchangeConfig;
+        setMyExchangeConfig(payload);
+        try { await api.achievements.saveMyRules(payload); } catch(e) { alert('保存失败'); loadData(); }
     };
 
-    // --- Manage Achievements ---
     const addAchievement = () => {
         if (!config) return;
         if (!newAchieve.name) return alert('请输入成就名称');
-        
-        const newItem: AchievementItem = { 
-            ...newAchieve, 
-            id: Date.now().toString(),
-            addedBy: currentUser?._id,
-            addedByName: currentUser?.trueName || currentUser?.username
-        };
+        const newItem: AchievementItem = { ...newAchieve, id: Date.now().toString(), addedBy: currentUser?._id, addedByName: currentUser?.trueName || currentUser?.username };
         const updated = { ...config, achievements: [...config.achievements, newItem] };
-        
         handleSaveConfig(updated);
         setNewAchieve({ id: '', name: '', icon: '🏆', points: 1 });
     };
 
     const deleteAchievement = (item: AchievementItem) => {
         if (!config) return;
-        // Permission Check: HT/Principal can delete all. Teacher can only delete own.
         if (!canManageAll && item.addedBy !== currentUser?._id) return alert('权限不足：只能删除自己添加的成就');
-        
-        if (!confirm('确认删除？')) return;
-        const updated = { ...config, achievements: config.achievements.filter(a => a.id !== item.id) };
-        handleSaveConfig(updated);
+        setConfirmModal({
+            isOpen: true,
+            title: '删除成就',
+            message: `确定要删除 "${item.name}" 吗？`,
+            onConfirm: () => {
+                const updated = { ...config, achievements: config.achievements.filter(a => a.id !== item.id) };
+                handleSaveConfig(updated);
+            }
+        });
     };
 
-    // --- Grant ---
     const handleGrant = async () => {
         if (selectedStudents.size === 0 || !selectedAchieveId) return alert('请选择学生和奖状');
         try {
-            const promises = Array.from(selectedStudents).map(sid => 
-                api.achievements.grant({ studentId: sid, achievementId: selectedAchieveId, semester })
-            );
+            const promises = Array.from(selectedStudents).map(sid => api.achievements.grant({ studentId: sid, achievementId: selectedAchieveId, semester }));
             await Promise.all(promises);
             alert(`成功发放给 ${selectedStudents.size} 位学生`);
             setSelectedStudents(new Set());
-            loadData(); // Refresh
+            loadData();
         } catch (e) { alert('部分发放失败'); }
     };
 
-    // --- Independent Rules ---
     const addRule = () => {
         if (!newRule.rewardName) return alert('请输入奖励名称');
         const newItem = { ...newRule, id: Date.now().toString() };
@@ -163,19 +111,30 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
     };
     
     const deleteRule = (id: string) => {
-        if (!confirm('确认删除？')) return;
-        const currentRules = myExchangeConfig?.rules || [];
-        handleSaveMyRules(currentRules.filter(r => r.id !== id));
+        setConfirmModal({
+            isOpen: true,
+            title: '删除规则',
+            message: '确定要删除这条兑换规则吗？',
+            onConfirm: () => {
+                const currentRules = myExchangeConfig?.rules || [];
+                handleSaveMyRules(currentRules.filter(r => r.id !== id));
+            }
+        });
     };
     
-    // Proxy Exchange (Using current teacher's rules)
     const handleProxyExchange = async (studentId: string, ruleId: string) => {
-        if (!confirm('确认代学生兑换？将扣除对应小红花并记录。')) return;
-        try {
-            await api.achievements.exchange({ studentId, ruleId, teacherId: currentUser?._id });
-            alert('兑换成功');
-            loadData(); 
-        } catch (e: any) { alert(e.message || '兑换失败，余额不足？'); }
+        setConfirmModal({
+            isOpen: true,
+            title: '代兑换',
+            message: '确认代学生兑换？将扣除对应小红花并记录。',
+            onConfirm: async () => {
+                try {
+                    await api.achievements.exchange({ studentId, ruleId, teacherId: currentUser?._id });
+                    alert('兑换成功');
+                    loadData(); 
+                } catch (e: any) { alert(e.message || '兑换失败，余额不足？'); }
+            }
+        });
     };
 
     if (!homeroomClass) return <div className="p-10 text-center text-gray-500">您不是班主任，无法使用成就管理功能。</div>;
@@ -183,64 +142,30 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
 
     const safeConfig = config || { achievements: [], exchangeRules: [] };
     const myRules = myExchangeConfig?.rules || [];
-
-    // Filter Logic
     const uniqueCreators = Array.from(new Set(safeConfig.achievements.map(a => a.addedByName || '未知'))).filter(Boolean);
     const filteredAchievements = safeConfig.achievements.filter(a => filterCreator === 'ALL' || a.addedByName === filterCreator);
     const filteredGrantAchievements = safeConfig.achievements.filter(a => filterGrantCreator === 'ALL' || a.addedByName === filterGrantCreator);
 
     return (
         <div className="h-full flex flex-col bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
-            {/* Header / Tabs */}
+            <ConfirmModal isOpen={confirmModal.isOpen} title={confirmModal.title} message={confirmModal.message} onClose={()=>setConfirmModal({...confirmModal, isOpen: false})} onConfirm={confirmModal.onConfirm}/>
             <div className="flex border-b border-gray-100 bg-gray-50/50 overflow-x-auto">
-                <button onClick={() => setActiveTab('manage')} className={`px-6 py-4 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 whitespace-nowrap ${activeTab === 'manage' ? 'border-blue-500 text-blue-600 bg-white' : 'border-transparent text-gray-500 hover:text-gray-700'}`}>
-                    <Award size={18}/> 成就库管理
-                </button>
-                <button onClick={() => setActiveTab('grant')} className={`px-6 py-4 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 whitespace-nowrap ${activeTab === 'grant' ? 'border-blue-500 text-blue-600 bg-white' : 'border-transparent text-gray-500 hover:text-gray-700'}`}>
-                    <Gift size={18}/> 发放成就
-                </button>
-                <button onClick={() => setActiveTab('exchange')} className={`px-6 py-4 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 whitespace-nowrap ${activeTab === 'exchange' ? 'border-blue-500 text-blue-600 bg-white' : 'border-transparent text-gray-500 hover:text-gray-700'}`}>
-                    <Coins size={18}/> 兑换规则 (我的)
-                </button>
-                <button onClick={() => setActiveTab('balance')} className={`px-6 py-4 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 whitespace-nowrap ${activeTab === 'balance' ? 'border-blue-500 text-blue-600 bg-white' : 'border-transparent text-gray-500 hover:text-gray-700'}`}>
-                    <Users size={18}/> 学生积分
-                </button>
+                <button onClick={() => setActiveTab('manage')} className={`px-6 py-4 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 whitespace-nowrap ${activeTab === 'manage' ? 'border-blue-500 text-blue-600 bg-white' : 'border-transparent text-gray-500 hover:text-gray-700'}`}><Award size={18}/> 成就库管理</button>
+                <button onClick={() => setActiveTab('grant')} className={`px-6 py-4 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 whitespace-nowrap ${activeTab === 'grant' ? 'border-blue-500 text-blue-600 bg-white' : 'border-transparent text-gray-500 hover:text-gray-700'}`}><Gift size={18}/> 发放成就</button>
+                <button onClick={() => setActiveTab('exchange')} className={`px-6 py-4 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 whitespace-nowrap ${activeTab === 'exchange' ? 'border-blue-500 text-blue-600 bg-white' : 'border-transparent text-gray-500 hover:text-gray-700'}`}><Coins size={18}/> 兑换规则 (我的)</button>
+                <button onClick={() => setActiveTab('balance')} className={`px-6 py-4 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 whitespace-nowrap ${activeTab === 'balance' ? 'border-blue-500 text-blue-600 bg-white' : 'border-transparent text-gray-500 hover:text-gray-700'}`}><Users size={18}/> 学生积分</button>
             </div>
-
             <div className="flex-1 overflow-y-auto p-6">
-                {/* 1. Manage Achievements */}
                 {activeTab === 'manage' && (
                     <div className="space-y-6 max-w-4xl mx-auto">
-                        {/* Creator Filter */}
-                        <div className="flex justify-end items-center gap-2">
-                            <span className="text-xs font-bold text-gray-500"><Filter size={14} className="inline mr-1"/>筛选添加者:</span>
-                            <select className="border rounded text-xs p-1" value={filterCreator} onChange={e=>setFilterCreator(e.target.value)}>
-                                <option value="ALL">全部老师</option>
-                                {uniqueCreators.map(c => <option key={c} value={c}>{c}</option>)}
-                            </select>
-                        </div>
-
+                        <div className="flex justify-end items-center gap-2"><span className="text-xs font-bold text-gray-500"><Filter size={14} className="inline mr-1"/>筛选添加者:</span><select className="border rounded text-xs p-1" value={filterCreator} onChange={e=>setFilterCreator(e.target.value)}><option value="ALL">全部老师</option>{uniqueCreators.map(c => <option key={c} value={c}>{c}</option>)}</select></div>
                         <div className="bg-blue-50 p-4 rounded-xl border border-blue-100 flex flex-col md:flex-row gap-4 items-end">
-                            <div className="flex-1 w-full">
-                                <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">成就名称</label>
-                                <input className="w-full border rounded p-2 text-sm" placeholder="如: 劳动小能手" value={newAchieve.name} onChange={e => setNewAchieve({...newAchieve, name: e.target.value})} />
-                            </div>
-                            <div className="w-full md:w-32">
-                                <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">分值 (小红花)</label>
-                                <input type="number" min={1} className="w-full border rounded p-2 text-sm" value={newAchieve.points} onChange={e => setNewAchieve({...newAchieve, points: Number(e.target.value)})} />
-                            </div>
-                            <div className="w-full md:w-auto">
-                                <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">图标预设</label>
-                                <select className="w-full border rounded p-2 min-w-[100px] text-sm bg-white" value={newAchieve.icon} onChange={e => setNewAchieve({...newAchieve, icon: e.target.value})}>
-                                    {PRESET_ICONS.map(p => <option key={p.label} value={p.icon}>{p.icon} {p.label}</option>)}
-                                </select>
-                            </div>
+                            <div className="flex-1 w-full"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">成就名称</label><input className="w-full border rounded p-2 text-sm" placeholder="如: 劳动小能手" value={newAchieve.name} onChange={e => setNewAchieve({...newAchieve, name: e.target.value})} /></div>
+                            <div className="w-full md:w-32"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">分值 (小红花)</label><input type="number" min={1} className="w-full border rounded p-2 text-sm" value={newAchieve.points} onChange={e => setNewAchieve({...newAchieve, points: Number(e.target.value)})} /></div>
+                            <div className="w-full md:w-auto"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">图标预设</label><select className="w-full border rounded p-2 min-w-[100px] text-sm bg-white" value={newAchieve.icon} onChange={e => setNewAchieve({...newAchieve, icon: e.target.value})}>{PRESET_ICONS.map(p => <option key={p.label} value={p.icon}>{p.icon} {p.label}</option>)}</select></div>
                             <button onClick={addAchievement} className="bg-blue-600 text-white px-4 py-2 rounded-lg font-bold hover:bg-blue-700 whitespace-nowrap text-sm">添加成就</button>
                         </div>
-
-                        {filteredAchievements.length === 0 ? (
-                            <div className="text-center text-gray-400 py-10">暂无成就，请添加</div>
-                        ) : (
+                        {filteredAchievements.length === 0 ? <div className="text-center text-gray-400 py-10">暂无成就，请添加</div> : (
                             <div className="grid grid-cols-2 md:grid-cols-4 gap-4">
                                 {filteredAchievements.map(ach => {
                                     const isMine = ach.addedBy === currentUser?._id;
@@ -249,49 +174,24 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                                     <div key={ach.id} className="border border-gray-200 rounded-xl p-4 flex flex-col items-center relative group hover:shadow-md transition-all bg-white">
                                         <div className="text-4xl mb-2"><Emoji symbol={ach.icon} /></div>
                                         <div className="font-bold text-gray-800 text-center">{ach.name}</div>
-                                        <div className="text-xs text-amber-600 font-bold bg-amber-50 px-2 py-0.5 rounded-full mt-1 border border-amber-100">
-                                            {ach.points} <Emoji symbol="🌺" size={14}/>
-                                        </div>
-                                        <div className="mt-2 text-[10px] text-gray-400 bg-gray-50 px-1.5 py-0.5 rounded">
-                                            {ach.addedByName || '未知'}
-                                        </div>
-                                        {canDelete && (
-                                            <button onClick={() => deleteAchievement(ach)} className="absolute top-2 right-2 text-gray-300 hover:text-red-500 opacity-0 group-hover:opacity-100 transition-opacity">
-                                                <Trash2 size={16}/>
-                                            </button>
-                                        )}
+                                        <div className="text-xs text-amber-600 font-bold bg-amber-50 px-2 py-0.5 rounded-full mt-1 border border-amber-100">{ach.points} <Emoji symbol="🌺" size={14}/></div>
+                                        <div className="mt-2 text-[10px] text-gray-400 bg-gray-50 px-1.5 py-0.5 rounded">{ach.addedByName || '未知'}</div>
+                                        {canDelete && <button onClick={() => deleteAchievement(ach)} className="absolute top-2 right-2 text-gray-300 hover:text-red-500 opacity-0 group-hover:opacity-100 transition-opacity"><Trash2 size={16}/></button>}
                                     </div>
                                 )})}
                             </div>
                         )}
                     </div>
                 )}
-
-                {/* 2. Grant Achievements */}
                 {activeTab === 'grant' && (
                     <div className="flex flex-col md:flex-row gap-6 h-full">
-                        {/* Student Selector */}
                         <div className="w-full md:w-1/3 border-r border-gray-100 pr-4 flex flex-col min-h-[400px]">
                             <h3 className="font-bold text-gray-700 mb-2">1. 选择学生 ({selectedStudents.size})</h3>
-                            <button onClick={() => setSelectedStudents(new Set(selectedStudents.size === students.length ? [] : students.map(s => s._id || String(s.id))))} className="text-xs text-blue-600 mb-2 text-left hover:underline">
-                                {selectedStudents.size === students.length ? '取消全选' : '全选所有'}
-                            </button>
-                            {students.length === 0 ? (
-                                <div className="text-sm text-gray-400">班级暂无学生数据</div>
-                            ) : (
+                            <button onClick={() => setSelectedStudents(new Set(selectedStudents.size === students.length ? [] : students.map(s => s._id || String(s.id))))} className="text-xs text-blue-600 mb-2 text-left hover:underline">{selectedStudents.size === students.length ? '取消全选' : '全选所有'}</button>
+                            {students.length === 0 ? <div className="text-sm text-gray-400">班级暂无学生数据</div> : (
                                 <div className="flex-1 overflow-y-auto space-y-2 pr-2 custom-scrollbar max-h-[500px]">
                                     {students.map(s => (
-                                        <div 
-                                            key={s._id} 
-                                            onClick={() => {
-                                                const newSet = new Set(selectedStudents);
-                                                const sid = s._id || String(s.id);
-                                                if (newSet.has(sid)) newSet.delete(sid);
-                                                else newSet.add(sid);
-                                                setSelectedStudents(newSet);
-                                            }}
-                                            className={`p-2 rounded border cursor-pointer flex items-center justify-between transition-colors ${selectedStudents.has(s._id || String(s.id)) ? 'bg-blue-50 border-blue-400' : 'bg-white border-gray-200 hover:bg-gray-50'}`}
-                                        >
+                                        <div key={s._id} onClick={() => { const newSet = new Set(selectedStudents); const sid = s._id || String(s.id); if (newSet.has(sid)) newSet.delete(sid); else newSet.add(sid); setSelectedStudents(newSet); }} className={`p-2 rounded border cursor-pointer flex items-center justify-between transition-colors ${selectedStudents.has(s._id || String(s.id)) ? 'bg-blue-50 border-blue-400' : 'bg-white border-gray-200 hover:bg-gray-50'}`}>
                                             <span className="text-sm font-medium">{s.seatNo ? s.seatNo+'.':''}{s.name}</span>
                                             {selectedStudents.has(s._id || String(s.id)) && <CheckCircle size={16} className="text-blue-500"/>}
                                         </div>
@@ -299,30 +199,12 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                                 </div>
                             )}
                         </div>
-
-                        {/* Achievement Selector */}
                         <div className="flex-1 flex flex-col">
-                            <div className="flex justify-between items-center mb-4">
-                                <h3 className="font-bold text-gray-700">2. 选择要颁发的奖状</h3>
-                                <div className="flex items-center gap-2">
-                                    <span className="text-xs text-gray-500">来自:</span>
-                                    <select className="border rounded text-xs p-1" value={filterGrantCreator} onChange={e=>setFilterGrantCreator(e.target.value)}>
-                                        <option value="ALL">全部老师</option>
-                                        {uniqueCreators.map(c => <option key={c} value={c}>{c}</option>)}
-                                    </select>
-                                </div>
-                            </div>
-                            
-                            {filteredGrantAchievements.length === 0 ? (
-                                <div className="text-gray-400 text-sm mb-6">暂无成就，请先去“成就库管理”添加。</div>
-                            ) : (
+                            <div className="flex justify-between items-center mb-4"><h3 className="font-bold text-gray-700">2. 选择要颁发的奖状</h3><div className="flex items-center gap-2"><span className="text-xs text-gray-500">来自:</span><select className="border rounded text-xs p-1" value={filterGrantCreator} onChange={e=>setFilterGrantCreator(e.target.value)}><option value="ALL">全部老师</option>{uniqueCreators.map(c => <option key={c} value={c}>{c}</option>)}</select></div></div>
+                            {filteredGrantAchievements.length === 0 ? <div className="text-gray-400 text-sm mb-6">暂无成就，请先去“成就库管理”添加。</div> : (
                                 <div className="grid grid-cols-2 sm:grid-cols-3 gap-3 mb-6 max-h-[400px] overflow-y-auto custom-scrollbar p-1">
                                     {filteredGrantAchievements.map(ach => (
-                                        <div 
-                                            key={ach.id} 
-                                            onClick={() => setSelectedAchieveId(ach.id)}
-                                            className={`p-4 rounded-xl border cursor-pointer text-center transition-all ${selectedAchieveId === ach.id ? 'bg-amber-50 border-amber-400 ring-2 ring-amber-200' : 'bg-white border-gray-200 hover:bg-gray-50'}`}
-                                        >
+                                        <div key={ach.id} onClick={() => setSelectedAchieveId(ach.id)} className={`p-4 rounded-xl border cursor-pointer text-center transition-all ${selectedAchieveId === ach.id ? 'bg-amber-50 border-amber-400 ring-2 ring-amber-200' : 'bg-white border-gray-200 hover:bg-gray-50'}`}>
                                             <div className="text-3xl mb-1"><Emoji symbol={ach.icon} /></div>
                                             <div className="font-bold text-sm text-gray-800">{ach.name}</div>
                                             <div className="text-xs text-gray-500">+{ach.points} <Emoji symbol="🌺" size={12}/></div>
@@ -330,117 +212,37 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                                     ))}
                                 </div>
                             )}
-                            
                             <div className="mt-auto bg-gray-50 p-4 rounded-xl border border-gray-200">
-                                <div className="flex justify-between items-center mb-2">
-                                    <span className="text-sm text-gray-600">当前学期: <b>{semester}</b></span>
-                                    <span className="text-sm text-gray-600">已选: <b>{selectedStudents.size}</b> 人</span>
-                                </div>
-                                <button onClick={handleGrant} disabled={!selectedAchieveId || selectedStudents.size===0} className="w-full bg-blue-600 text-white py-3 rounded-lg font-bold hover:bg-blue-700 disabled:opacity-50 disabled:cursor-not-allowed shadow-md">
-                                    确认发放
-                                </button>
+                                <div className="flex justify-between items-center mb-2"><span className="text-sm text-gray-600">当前学期: <b>{semester}</b></span><span className="text-sm text-gray-600">已选: <b>{selectedStudents.size}</b> 人</span></div>
+                                <button onClick={handleGrant} disabled={!selectedAchieveId || selectedStudents.size===0} className="w-full bg-blue-600 text-white py-3 rounded-lg font-bold hover:bg-blue-700 disabled:opacity-50 disabled:cursor-not-allowed shadow-md">确认发放</button>
                             </div>
                         </div>
                     </div>
                 )}
-
-                {/* 3. Independent Teacher Exchange Rules */}
                 {activeTab === 'exchange' && (
                     <div className="space-y-6 max-w-4xl mx-auto">
-                        <div className="bg-purple-50 p-4 rounded-lg border border-purple-100 text-sm text-purple-800 mb-4">
-                            <span className="font-bold">提示：</span> 这里的兑换规则是您个人专属的，对您教的所有班级学生可见。学生兑换后，只有您能看到待处理的申请。
-                        </div>
-
+                        <div className="bg-purple-50 p-4 rounded-lg border border-purple-100 text-sm text-purple-800 mb-4"><span className="font-bold">提示：</span> 这里的兑换规则是您个人专属的，对您教的所有班级学生可见。学生兑换后，只有您能看到待处理的申请。</div>
                         <div className="bg-green-50 p-4 rounded-xl border border-green-100 flex flex-col md:flex-row gap-4 items-end">
-                            <div className="w-full md:w-32">
-                                <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">消耗小红花</label>
-                                <input type="number" min={1} className="w-full border rounded p-2 text-sm" value={newRule.cost} onChange={e => setNewRule({...newRule,cost: Number(e.target.value)})}/>
-                            </div>
-                            <div className="w-full md:w-32">
-                                <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">奖励类型</label>
-                                <select className="w-full border rounded p-2 text-sm bg-white" value={newRule.rewardType} onChange={e => setNewRule({...newRule, rewardType: e.target.value as any})}>
-                                    <option value="DRAW_COUNT">🎲 抽奖券</option>
-                                    <option value="ITEM">🎁 实物/特权</option>
-                                </select>
-                            </div>
-                            <div className="flex-1 w-full">
-                                <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">奖励名称</label>
-                                <input className="w-full border rounded p-2 text-sm" placeholder="如: 免作业券" value={newRule.rewardName} onChange={e => setNewRule({...newRule, rewardName: e.target.value})}/>
-                            </div>
-                            <div className="w-24">
-                                <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">数量</label>
-                                <input type="number" min={1} className="w-full border rounded p-2 text-sm" value={newRule.rewardValue} onChange={e => setNewRule({...newRule, rewardValue: Number(e.target.value)})}/>
-                            </div>
+                            <div className="w-full md:w-32"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">消耗小红花</label><input type="number" min={1} className="w-full border rounded p-2 text-sm" value={newRule.cost} onChange={e => setNewRule({...newRule,cost: Number(e.target.value)})}/></div>
+                            <div className="w-full md:w-32"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">奖励类型</label><select className="w-full border rounded p-2 text-sm bg-white" value={newRule.rewardType} onChange={e => setNewRule({...newRule, rewardType: e.target.value as any})}><option value="DRAW_COUNT">🎲 抽奖券</option><option value="ITEM">🎁 实物/特权</option></select></div>
+                            <div className="flex-1 w-full"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">奖励名称</label><input className="w-full border rounded p-2 text-sm" placeholder="如: 免作业券" value={newRule.rewardName} onChange={e => setNewRule({...newRule, rewardName: e.target.value})}/></div>
+                            <div className="w-24"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">数量</label><input type="number" min={1} className="w-full border rounded p-2 text-sm" value={newRule.rewardValue} onChange={e => setNewRule({...newRule, rewardValue: Number(e.target.value)})}/></div>
                             <button onClick={addRule} className="bg-green-600 text-white px-4 py-2 rounded-lg font-bold hover:bg-green-700 whitespace-nowrap text-sm">添加规则</button>
                         </div>
-
-                        <div className="space-y-3">
-                            {myRules.length === 0 ? (
-                                <div className="text-center text-gray-400 py-4">暂无个人兑换规则</div>
-                            ) : myRules.map(rule => (
-                                <div key={rule.id} className="flex items-center justify-between p-4 bg-white border border-gray-200 rounded-xl hover:shadow-sm">
-                                    <div className="flex items-center gap-4">
-                                        <div className="bg-amber-100 text-amber-700 font-bold px-3 py-1 rounded-lg border border-amber-200">
-                                            {rule.cost} <Emoji symbol="🌺" size={14}/>
-                                        </div>
-                                        <div className="text-gray-400">➡️</div>
-                                        <div className="flex items-center gap-2">
-                                            <span className="text-2xl"><Emoji symbol={rule.rewardType === 'DRAW_COUNT' ? '🎲' : '🎁'} /></span>
-                                            <div>
-                                                <div className="font-bold text-gray-800">{rule.rewardName}</div>
-                                                <div className="text-xs text-gray-500">x{rule.rewardValue}</div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <button onClick={() => deleteRule(rule.id)} className="text-gray-300 hover:text-red-500 p-2"><Trash2 size={18}/></button>
+                        <div className="space-y-3">{myRules.length === 0 ? <div className="text-center text-gray-400 py-4">暂无个人兑换规则</div> : myRules.map(rule => (
+                            <div key={rule.id} className="flex items-center justify-between p-4 bg-white border border-gray-200 rounded-xl hover:shadow-sm">
+                                <div className="flex items-center gap-4">
+                                    <div className="bg-amber-100 text-amber-700 font-bold px-3 py-1 rounded-lg border border-amber-200">{rule.cost} <Emoji symbol="🌺" size={14}/></div>
+                                    <div className="text-gray-400">➡️</div>
+                                    <div className="flex items-center gap-2"><span className="text-2xl"><Emoji symbol={rule.rewardType === 'DRAW_COUNT' ? '🎲' : '🎁'} /></span><div><div className="font-bold text-gray-800">{rule.rewardName}</div><div className="text-xs text-gray-500">x{rule.rewardValue}</div></div></div>
                                 </div>
-                            ))}
-                        </div>
+                                <button onClick={() => deleteRule(rule.id)} className="text-gray-300 hover:text-red-500 p-2"><Trash2 size={18}/></button>
+                            </div>
+                        ))}</div>
                     </div>
                 )}
-
-                {/* 4. Balance List (Only showing MY Rules for Proxy) */}
                 {activeTab === 'balance' && (
-                    <div className="overflow-x-auto">
-                        <table className="w-full text-left border-collapse">
-                            <thead className="bg-gray-50 text-gray-500 text-xs uppercase">
-                                <tr>
-                                    <th className="p-4">学生姓名</th>
-                                    <th className="p-4">小红花余额</th>
-                                    <th className="p-4 text-right">操作 (使用我的规则兑换)</th>
-                                </tr>
-                            </thead>
-                            <tbody className="divide-y divide-gray-100">
-                                {students.length === 0 ? (
-                                    <tr><td colSpan={3} className="p-4 text-center text-gray-400">暂无学生数据</td></tr>
-                                ) : students.map(s => (
-                                    <tr key={s._id} className="hover:bg-gray-50">
-                                        <td className="p-4 font-bold text-gray-700">{s.seatNo ? s.seatNo+'.':''}{s.name}</td>
-                                        <td className="p-4">
-                                            <span className="text-amber-600 font-bold bg-amber-50 px-2 py-1 rounded border border-amber-100">
-                                                {s.flowerBalance || 0} <Emoji symbol="🌺" size={14}/>
-                                            </span>
-                                        </td>
-                                        <td className="p-4 text-right">
-                                            <div className="flex justify-end gap-2">
-                                                {myRules.length > 0 ? myRules.map(r => (
-                                                    <button 
-                                                        key={r.id}
-                                                        disabled={(s.flowerBalance || 0) < r.cost}
-                                                        onClick={() => handleProxyExchange(s._id || String(s.id), r.id)}
-                                                        className="text-xs border border-gray-200 px-2 py-1 rounded hover:bg-blue-50 hover:text-blue-600 hover:border-blue-200 disabled:opacity-30 disabled:cursor-not-allowed"
-                                                        title={`消耗 ${r.cost} 花兑换 ${r.rewardName}`}
-                                                    >
-                                                        兑换 {r.rewardName} (-{r.cost})
-                                                    </button>
-                                                )) : <span className="text-gray-300 text-xs">您没有设置规则</span>}
-                                            </div>
-                                        </td>
-                                    </tr>
-                                ))}
-                            </tbody>
-                        </table>
-                    </div>
+                    <div className="overflow-x-auto"><table className="w-full text-left border-collapse"><thead className="bg-gray-50 text-gray-500 text-xs uppercase"><tr><th className="p-4">学生姓名</th><th className="p-4">小红花余额</th><th className="p-4 text-right">操作 (使用我的规则兑换)</th></tr></thead><tbody className="divide-y divide-gray-100">{students.length === 0 ? <tr><td colSpan={3} className="p-4 text-center text-gray-400">暂无学生数据</td></tr> : students.map(s => (<tr key={s._id} className="hover:bg-gray-50"><td className="p-4 font-bold text-gray-700">{s.seatNo ? s.seatNo+'.':''}{s.name}</td><td className="p-4"><span className="text-amber-600 font-bold bg-amber-50 px-2 py-1 rounded border border-amber-100">{s.flowerBalance || 0} <Emoji symbol="🌺" size={14}/></span></td><td className="p-4 text-right"><div className="flex justify-end gap-2">{myRules.length > 0 ? myRules.map(r => (<button key={r.id} disabled={(s.flowerBalance || 0) < r.cost} onClick={() => handleProxyExchange(s._id || String(s.id), r.id)} className="text-xs border border-gray-200 px-2 py-1 rounded hover:bg-blue-50 hover:text-blue-600 hover:border-blue-200 disabled:opacity-30 disabled:cursor-not-allowed" title={`消耗 ${r.cost} 花兑换 ${r.rewardName}`}>兑换 {r.rewardName} (-{r.cost})</button>)) : <span className="text-gray-300 text-xs">您没有设置规则</span>}</div></td></tr>))}</tbody></table></div>
                 )}
             </div>
         </div>

pages/Attendance.tsx

@@ -2,7 +2,7 @@
 import React, { useState, useEffect } from 'react';
 import { api } from '../services/api';
 import { Student, Attendance, SchoolCalendarEntry } from '../types';
-import { Calendar, CheckCircle, Clock, AlertCircle, Loader2, UserX, CalendarOff, Settings, Plus, Trash2, Sun } from 'lucide-react';
+import { Calendar, CheckCircle, Clock, AlertCircle, Loader2, UserX, CalendarOff, Settings, Plus, Trash2, Sun, Briefcase } from 'lucide-react';
 
 export const AttendancePage: React.FC = () => {
   const [students, setStudents] = useState<Student[]>([]);
@@ -10,14 +10,12 @@ export const AttendancePage: React.FC = () => {
   const [loading, setLoading] = useState(true);
   const [date, setDate] = useState(new Date().toISOString().split('T')[0]);
   
-  // Calendar State
   const [calendarEntries, setCalendarEntries] = useState<SchoolCalendarEntry[]>([]);
   const [isHoliday, setIsHoliday] = useState(false);
   const [holidayName, setHolidayName] = useState('');
   
-  // Settings Modal
   const [isSettingsOpen, setIsSettingsOpen] = useState(false);
-  const [excludeWeekends, setExcludeWeekends] = useState(true); // Default to exclude
+  const [excludeWeekends, setExcludeWeekends] = useState(true); 
   const [newHoliday, setNewHoliday] = useState({ name: '', startDate: '', endDate: '' });
 
   const currentUser = api.auth.getCurrentUser();
@@ -33,15 +31,12 @@ export const AttendancePage: React.FC = () => {
          api.calendar.get(targetClass)
       ]);
       const classStudents = stus.filter((s: Student) => s.className === targetClass);
-      
-      // SORTING LOGIC: Seat No > Name
       classStudents.sort((a: Student, b: Student) => {
           const seatA = parseInt(a.seatNo || '99999');
           const seatB = parseInt(b.seatNo || '99999');
           if (seatA !== seatB) return seatA - seatB;
           return a.name.localeCompare(b.name, 'zh-CN');
       });
-
       setStudents(classStudents);
       setCalendarEntries(cals);
       
@@ -55,40 +50,39 @@ export const AttendancePage: React.FC = () => {
     finally { setLoading(false); }
   };
 
-  useEffect(() => {
-    loadData();
-  }, [date]);
+  useEffect(() => { loadData(); }, [date]);
 
-  // Check if selected date is a holiday or weekend
   const checkIsHoliday = (checkDate: string, entries: SchoolCalendarEntry[]) => {
       const d = new Date(checkDate);
-      const day = d.getDay(); // 0 is Sunday, 6 is Saturday
+      const day = d.getDay(); 
       
-      // 1. Check Weekend
-      if (excludeWeekends && (day === 0 || day === 6)) {
-          setIsHoliday(true);
-          setHolidayName(day === 0 ? '周日' : '周六');
-          return;
-      }
-
-      // 2. Check Calendar Entries
+      // 1. Check for Explicit Calendar Entries (High Priority)
       const entry = entries.find(e => {
           return checkDate >= e.startDate && checkDate <= e.endDate;
       });
 
       if (entry) {
-          setIsHoliday(true);
-          setHolidayName(entry.name);
+          // If WORKDAY, it is NOT a holiday, even if weekend
+          if (entry.type === 'WORKDAY') {
+              setIsHoliday(false);
+              setHolidayName('');
+          } else {
+              setIsHoliday(true);
+              setHolidayName(entry.name);
+          }
       } else {
-          setIsHoliday(false);
-          setHolidayName('');
+          // 2. Fallback to Weekend Check
+          if (excludeWeekends && (day === 0 || day === 6)) {
+              setIsHoliday(true);
+              setHolidayName(day === 0 ? '周日' : '周六');
+          } else {
+              setIsHoliday(false);
+              setHolidayName('');
+          }
       }
   };
 
-  // Re-check when excludeWeekends toggles
-  useEffect(() => {
-      checkIsHoliday(date, calendarEntries);
-  }, [excludeWeekends]);
+  useEffect(() => { checkIsHoliday(date, calendarEntries); }, [excludeWeekends]);
 
   const handleBatchCheckIn = async () => {
       if (isHoliday) return alert('当前是非考勤日，无法执行全勤操作');
@@ -98,16 +92,13 @@ export const AttendancePage: React.FC = () => {
   };
 
   const toggleStatus = async (studentId: string) => {
-      if (isHoliday) return; // Disable toggling on holidays
+      if (isHoliday) return; 
       const current = attendanceMap[studentId]?.status;
       let nextStatus = 'Present';
       if (current === 'Present') nextStatus = 'Leave';
       else if (current === 'Leave') nextStatus = 'Absent';
       else if (current === 'Absent') nextStatus = 'Present';
-      
-      // If no record, create as Present first
       if (!current) nextStatus = 'Present';
-
       await api.attendance.update({ studentId, date, status: nextStatus });
       loadData();
   };
@@ -116,33 +107,47 @@ export const AttendancePage: React.FC = () => {
       if (!newHoliday.name || !newHoliday.startDate || !newHoliday.endDate) return alert('请填写完整');
       await api.calendar.add({
           schoolId: currentUser?.schoolId!,
-          className: targetClass, // Class specific holiday
+          className: targetClass,
           type: 'HOLIDAY',
           ...newHoliday
       });
       setNewHoliday({ name: '', startDate: '', endDate: '' });
-      loadData(); // Reload to refresh calendar entries
+      loadData();
   };
 
   const handleDeleteHoliday = async (id: string) => {
-      if(confirm('删除此假期设置？')) {
+      if(confirm('删除此设置？')) {
           await api.calendar.delete(id);
           loadData();
       }
   };
 
-  const markTodayExempt = async () => {
-      if(confirm('确定将今天标记为“临时停课/免打卡”吗？')) {
+  // Toggle Day Type (Workday <-> Holiday/Off)
+  const toggleDayType = async () => {
+      if (isHoliday) {
+          // Current is Holiday -> Set to Workday
+          if (!confirm(`确定将 ${date} 设为“工作日”并开启考勤吗？`)) return;
+          await api.calendar.add({
+              schoolId: currentUser?.schoolId!,
+              className: targetClass,
+              type: 'WORKDAY',
+              startDate: date,
+              endDate: date,
+              name: '补班/工作日'
+          });
+      } else {
+          // Current is Workday -> Set to Off
+          if (!confirm(`确定将 ${date} 标记为“休息日”并免除考勤吗？`)) return;
           await api.calendar.add({
               schoolId: currentUser?.schoolId!,
               className: targetClass,
               type: 'OFF',
               startDate: date,
               endDate: date,
-              name: '临时停课'
+              name: '休息/停课'
           });
-          loadData();
       }
+      loadData();
   };
 
   if (!targetClass) return <div className="p-10 text-center text-gray-500">您不是班主任，无法管理考勤。</div>;
@@ -157,7 +162,6 @@ export const AttendancePage: React.FC = () => {
 
   return (
     <div className="space-y-6">
-       {/* Top Bar */}
        <div className="flex flex-col md:flex-row justify-between items-center bg-white p-4 rounded-xl shadow-sm border border-gray-100 gap-4">
           <div className="flex items-center gap-4 w-full md:w-auto">
              <h2 className="text-xl font-bold text-gray-800">考勤管理</h2>
@@ -173,43 +177,34 @@ export const AttendancePage: React.FC = () => {
 
           <div className="flex gap-2 items-center w-full md:w-auto">
              <input type="date" className="border rounded-lg px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-blue-500" value={date} onChange={e => setDate(e.target.value)} max={new Date().toISOString().split('T')[0]}/>
-             {!isHoliday ? (
-                 <>
-                    <button onClick={handleBatchCheckIn} className="bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-blue-700 transition-colors shadow-sm whitespace-nowrap">
-                        一键全勤
-                    </button>
-                    <button onClick={markTodayExempt} className="bg-gray-100 text-gray-600 px-3 py-2 rounded-lg hover:bg-gray-200 text-sm whitespace-nowrap" title="标记今日停课">
-                        <CalendarOff size={18}/>
-                    </button>
-                 </>
-             ) : (
-                 <span className="text-xs text-gray-400">免打卡模式</span>
+             
+             {/* Dynamic Toggle Button */}
+             <button 
+                onClick={toggleDayType} 
+                className={`px-3 py-2 rounded-lg text-sm whitespace-nowrap flex items-center ${isHoliday ? 'bg-green-100 text-green-700 hover:bg-green-200' : 'bg-orange-100 text-orange-700 hover:bg-orange-200'}`}
+                title={isHoliday ? "设为工作日 (开启考勤)" : "设为休息日 (免打卡)"}
+             >
+                 {isHoliday ? <Briefcase size={18}/> : <CalendarOff size={18}/>}
+             </button>
+
+             {!isHoliday && (
+                <button onClick={handleBatchCheckIn} className="bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-blue-700 transition-colors shadow-sm whitespace-nowrap">
+                    一键全勤
+                </button>
              )}
+             
              <button onClick={() => setIsSettingsOpen(true)} className="bg-gray-100 text-gray-600 px-3 py-2 rounded-lg hover:bg-gray-200 text-sm whitespace-nowrap">
                 <Settings size={18}/>
              </button>
           </div>
        </div>
 
-       {/* Stats Cards */}
        {!isHoliday && (
        <div className="grid grid-cols-2 md:grid-cols-4 gap-4 animate-in slide-in-from-top-2">
-          <div className="bg-green-50 p-4 rounded-lg border border-green-100 flex flex-col items-center">
-             <span className="text-green-600 font-bold text-2xl">{stats.present}</span>
-             <span className="text-xs text-green-700">出勤</span>
-          </div>
-          <div className="bg-orange-50 p-4 rounded-lg border border-orange-100 flex flex-col items-center">
-             <span className="text-orange-500 font-bold text-2xl">{stats.leave}</span>
-             <span className="text-xs text-orange-700">请假</span>
-          </div>
-          <div className="bg-red-50 p-4 rounded-lg border border-red-100 flex flex-col items-center">
-             <span className="text-red-500 font-bold text-2xl">{stats.absent}</span>
-             <span className="text-xs text-red-700">缺勤</span>
-          </div>
-          <div className="bg-gray-50 p-4 rounded-lg border border-gray-200 flex flex-col items-center">
-             <span className="text-gray-500 font-bold text-2xl">{missing}</span>
-             <span className="text-xs text-gray-600">未记录</span>
-          </div>
+          <div className="bg-green-50 p-4 rounded-lg border border-green-100 flex flex-col items-center"><span className="text-green-600 font-bold text-2xl">{stats.present}</span><span className="text-xs text-green-700">出勤</span></div>
+          <div className="bg-orange-50 p-4 rounded-lg border border-orange-100 flex flex-col items-center"><span className="text-orange-500 font-bold text-2xl">{stats.leave}</span><span className="text-xs text-orange-700">请假</span></div>
+          <div className="bg-red-50 p-4 rounded-lg border border-red-100 flex flex-col items-center"><span className="text-red-500 font-bold text-2xl">{stats.absent}</span><span className="text-xs text-red-700">缺勤</span></div>
+          <div className="bg-gray-50 p-4 rounded-lg border border-gray-200 flex flex-col items-center"><span className="text-gray-500 font-bold text-2xl">{missing}</span><span className="text-xs text-gray-600">未记录</span></div>
        </div>
        )}
 
@@ -218,7 +213,6 @@ export const AttendancePage: React.FC = () => {
               {students.map(s => {
                  const record = attendanceMap[s._id || String(s.id)];
                  const status = record?.status || 'None';
-                 
                  let bg = 'bg-white border-gray-200';
                  let icon = <Clock size={20} className="text-gray-300"/>;
                  let text = '未打卡';
@@ -247,71 +241,31 @@ export const AttendancePage: React.FC = () => {
                  }
 
                  return (
-                    <div 
-                        key={s._id} 
-                        onClick={() => toggleStatus(s._id || String(s.id))}
-                        className={`p-4 rounded-xl border cursor-pointer transition-all hover:shadow-md flex flex-col items-center justify-center space-y-2 select-none relative group ${bg} ${isHoliday ? 'cursor-default' : ''}`}
-                    >
-                        <div className={`w-12 h-12 rounded-full flex items-center justify-center text-lg font-bold text-white ${s.gender==='Female'?'bg-pink-400':'bg-blue-400'} ${isHoliday ? 'grayscale opacity-50' : ''}`}>
-                            {s.name[0]}
-                        </div>
-                        <div className="text-center">
-                            <p className="font-bold text-gray-800 text-sm">{s.name}</p>
-                            <p className="text-[10px] text-gray-400">{s.seatNo ? `${s.seatNo}号` : s.studentNo}</p>
-                        </div>
-                        <div className={`flex items-center gap-1 text-xs font-bold ${textColor}`}>
-                            {icon} {text}
-                        </div>
-                        {!isHoliday && (
-                            <div className="absolute inset-0 bg-black/5 opacity-0 group-hover:opacity-100 rounded-xl transition-opacity flex items-center justify-center text-xs text-gray-600 font-bold">
-                                点击切换
-                            </div>
-                        )}
+                    <div key={s._id} onClick={() => toggleStatus(s._id || String(s.id))} className={`p-4 rounded-xl border cursor-pointer transition-all hover:shadow-md flex flex-col items-center justify-center space-y-2 select-none relative group ${bg} ${isHoliday ? 'cursor-default' : ''}`}>
+                        <div className={`w-12 h-12 rounded-full flex items-center justify-center text-lg font-bold text-white ${s.gender==='Female'?'bg-pink-400':'bg-blue-400'} ${isHoliday ? 'grayscale opacity-50' : ''}`}>{s.name[0]}</div>
+                        <div className="text-center"><p className="font-bold text-gray-800 text-sm">{s.name}</p><p className="text-[10px] text-gray-400">{s.seatNo ? `${s.seatNo}号` : s.studentNo}</p></div>
+                        <div className={`flex items-center gap-1 text-xs font-bold ${textColor}`}>{icon} {text}</div>
+                        {!isHoliday && <div className="absolute inset-0 bg-black/5 opacity-0 group-hover:opacity-100 rounded-xl transition-opacity flex items-center justify-center text-xs text-gray-600 font-bold">点击切换</div>}
                     </div>
                  );
               })}
            </div>
        )}
 
-       {/* Calendar Settings Modal */}
        {isSettingsOpen && (
            <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
                <div className="bg-white rounded-xl w-full max-w-lg p-6 shadow-2xl animate-in zoom-in-95">
                    <h3 className="font-bold text-lg mb-4 flex items-center"><Calendar className="mr-2"/> 考勤日历设置</h3>
-                   
                    <div className="space-y-6">
-                       <div className="bg-blue-50 p-4 rounded-lg flex justify-between items-center">
-                           <div>
-                               <p className="font-bold text-blue-800 text-sm">周末自动免打卡</p>
-                               <p className="text-xs text-blue-600">开启后，周六和周日将自动标记为休息日</p>
-                           </div>
-                           <input type="checkbox" checked={excludeWeekends} onChange={e => setExcludeWeekends(e.target.checked)} className="w-5 h-5"/>
-                       </div>
-
+                       <div className="bg-blue-50 p-4 rounded-lg flex justify-between items-center"><div><p className="font-bold text-blue-800 text-sm">周末自动免打卡</p><p className="text-xs text-blue-600">开启后，周六和周日将自动标记为休息日</p></div><input type="checkbox" checked={excludeWeekends} onChange={e => setExcludeWeekends(e.target.checked)} className="w-5 h-5"/></div>
                        <div>
-                           <label className="text-sm font-bold text-gray-700 mb-2 block">自定义假期 / 停课时段</label>
-                           <div className="flex gap-2 mb-3">
-                               <input className="border rounded p-2 text-xs flex-1" placeholder="假期名称 (如: 国庆节)" value={newHoliday.name} onChange={e=>setNewHoliday({...newHoliday, name:e.target.value})}/>
-                               <input type="date" className="border rounded p-2 text-xs" value={newHoliday.startDate} onChange={e=>setNewHoliday({...newHoliday, startDate:e.target.value})}/>
-                               <span className="self-center text-gray-400">-</span>
-                               <input type="date" className="border rounded p-2 text-xs" value={newHoliday.endDate} onChange={e=>setNewHoliday({...newHoliday, endDate:e.target.value})}/>
-                               <button onClick={handleAddHoliday} className="bg-green-600 text-white p-2 rounded hover:bg-green-700"><Plus size={16}/></button>
-                           </div>
-                           
+                           <label className="text-sm font-bold text-gray-700 mb-2 block">自定义日程调整 (假期/调休)</label>
+                           <div className="flex gap-2 mb-3"><input className="border rounded p-2 text-xs flex-1" placeholder="名称 (如: 国庆)" value={newHoliday.name} onChange={e=>setNewHoliday({...newHoliday, name:e.target.value})}/><input type="date" className="border rounded p-2 text-xs" value={newHoliday.startDate} onChange={e=>setNewHoliday({...newHoliday, startDate:e.target.value})}/><span className="self-center text-gray-400">-</span><input type="date" className="border rounded p-2 text-xs" value={newHoliday.endDate} onChange={e=>setNewHoliday({...newHoliday, endDate:e.target.value})}/><button onClick={handleAddHoliday} className="bg-green-600 text-white p-2 rounded hover:bg-green-700"><Plus size={16}/></button></div>
                            <div className="max-h-40 overflow-y-auto border rounded bg-gray-50 custom-scrollbar">
-                               {calendarEntries.length > 0 ? calendarEntries.map(c => (
-                                   <div key={c._id} className="flex justify-between items-center p-2 border-b last:border-0 hover:bg-white text-sm">
-                                       <div>
-                                           <span className="font-bold text-gray-800 mr-2">{c.name}</span>
-                                           <span className="text-xs text-gray-500">{c.startDate} ~ {c.endDate}</span>
-                                       </div>
-                                       <button onClick={() => handleDeleteHoliday(c._id!)} className="text-gray-400 hover:text-red-500"><Trash2 size={14}/></button>
-                                   </div>
-                               )) : <p className="text-center text-gray-400 text-xs py-4">暂无自定义假期</p>}
+                               {calendarEntries.length > 0 ? calendarEntries.map(c => (<div key={c._id} className="flex justify-between items-center p-2 border-b last:border-0 hover:bg-white text-sm"><div><span className={`font-bold mr-2 ${c.type==='WORKDAY'?'text-blue-600':'text-gray-800'}`}>{c.type==='WORKDAY' ? '[班]' : c.type==='OFF' ? '[休]' : ''} {c.name}</span><span className="text-xs text-gray-500">{c.startDate} ~ {c.endDate}</span></div><button onClick={() => handleDeleteHoliday(c._id!)} className="text-gray-400 hover:text-red-500"><Trash2 size={14}/></button></div>)) : <p className="text-center text-gray-400 text-xs py-4">暂无自定义设置</p>}
                            </div>
                        </div>
                    </div>
-
                    <button onClick={() => setIsSettingsOpen(false)} className="mt-6 w-full py-2 bg-gray-100 hover:bg-gray-200 rounded-lg text-gray-700 font-bold">关闭</button>
                </div>
            </div>

pages/Dashboard.tsx

@@ -5,6 +5,8 @@ import { api } from '../services/api';
 import { Score, ClassInfo, Subject, Schedule, User } from '../types';
 import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer } from 'recharts';
 import { StudentDashboard } from './StudentDashboard';
+import { TeacherDashboard } from './TeacherDashboard';
+import { TodoList } from '../components/TodoList';
 
 interface DashboardProps {
   onNavigate: (view: string) => void;
@@ -18,34 +20,20 @@ export const gradeOrder: Record<string, number> = {
 
 export const sortGrades = (a: string, b: string) => (gradeOrder[a] || 99) - (gradeOrder[b] || 99);
 
-// Helper to extract grade from class string (e.g. "一年级(1)班" -> "一年级")
 const extractGrade = (s: string) => {
     if (!s) return '';
     const keys = Object.keys(gradeOrder);
     return keys.find(g => s.startsWith(g)) || '';
 };
 
-// Robust sort function
 export const sortClasses = (a: ClassInfo | string, b: ClassInfo | string) => {
-    // Handle both ClassInfo objects and string names
     const nameA = typeof a === 'string' ? a : (a.grade + a.className);
     const nameB = typeof b === 'string' ? b : (b.grade + b.className);
-    
     if (!nameA || !nameB) return 0;
-
-    // 1. Sort by Grade First
     const gradeA = extractGrade(nameA);
     const gradeB = extractGrade(nameB);
-    
-    if (gradeA && gradeB && gradeA !== gradeB) {
-        return sortGrades(gradeA, gradeB);
-    }
-
-    // 2. Sort by Class Number
-    const getNum = (str: string) => {
-        const match = str.match(/(\d+)/);
-        return match ? parseInt(match[1]) : 0;
-    };
+    if (gradeA && gradeB && gradeA !== gradeB) { return sortGrades(gradeA, gradeB); }
+    const getNum = (str: string) => { const match = str.match(/(\d+)/); return match ? parseInt(match[1]) : 0; };
     return getNum(nameA) - getNum(nameB);
 };
 
@@ -54,394 +42,126 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
   const [warnings, setWarnings] = useState<string[]>([]);
   const [loading, setLoading] = useState(true);
   
-  // Timetable Data
-  const [showSchedule, setShowSchedule] = useState(false);
-  const [showStatus, setShowStatus] = useState(false);
-  const [schedules, setSchedules] = useState<Schedule[]>([]);
-  const [classList, setClassList] = useState<ClassInfo[]>([]);
-  const [subjects, setSubjects] = useState<Subject[]>([]);
-  const [teachers, setTeachers] = useState<User[]>([]);
-  
-  const [viewGrade, setViewGrade] = useState(''); 
-  const [editingCell, setEditingCell] = useState<{day: number, period: number} | null>(null);
-  const [editForm, setEditForm] = useState({ className: '', subject: '', teacherName: '' });
-
   const [trendData, setTrendData] = useState<any[]>([]);
 
   const currentUser = api.auth.getCurrentUser();
-  const isAdmin = currentUser?.role === 'ADMIN';
+  const isAdmin = currentUser?.role === 'ADMIN' || currentUser?.role === 'PRINCIPAL';
   const isTeacher = currentUser?.role === 'TEACHER';
   const isStudent = currentUser?.role === 'STUDENT';
 
-  // If Student, Render Student Dashboard
-  if (isStudent) {
-    return <StudentDashboard />;
-  }
-
-  // --- Admin/Teacher Logic Below ---
-
   useEffect(() => {
-    const loadData = async () => {
-      setLoading(true);
+    if (isStudent || isTeacher) {
+        setLoading(false);
+        return;
+    }
+    const loadStats = async () => {
       try {
-        const [summary, scores, classes, subs, userList] = await Promise.all([
-          api.stats.getSummary(),
-          api.scores.getAll(),
-          api.classes.getAll(),
-          api.subjects.getAll(),
-          api.users.getAll({ role: 'TEACHER' })
-        ]);
-        setStats(summary);
+        const data = await api.stats.getSummary();
+        setStats(data);
         
-        // Safety check for classes
-        const safeClasses = Array.isArray(classes) ? classes : [];
-        setClassList(safeClasses);
+        // Mock trend data for admin view
+        setTrendData([
+            { name: '9月', score: 75 },
+            { name: '10月', score: 78 },
+            { name: '11月', score: 82 },
+            { name: '12月', score: 80 },
+            { name: '1月', score: 85 }
+        ]);
         
-        setSubjects(subs);
-        setTeachers(userList);
-
-        if (isAdmin && safeClasses.length > 0) {
-            const grades = Array.from(new Set(safeClasses.map((c: ClassInfo) => c.grade))).sort(sortGrades);
-            if (grades.length > 0) {
-                setViewGrade(grades[0] as string);
-            }
-        }
-
-        const newWarnings: string[] = [];
-        subs.forEach((sub: Subject) => {
-           const subScores = (scores as Score[]).filter((s: Score) => s.courseName === sub.name && s.status === 'Normal');
-           if (subScores.length > 0) {
-              const avg = subScores.reduce((a: number, b: Score) => a + b.score, 0) / subScores.length;
-              if (avg < 60) newWarnings.push(`全校 ${sub.name} 学科平均分过低 (${avg.toFixed(1)}分)`);
-           }
-        });
-        setWarnings(newWarnings);
-
-        const examGroups: Record<string, number[]> = {};
-        (scores as Score[]).filter((s: Score) => s.status==='Normal').forEach((s: Score) => {
-           const key = s.examName || s.type;
-           if(!examGroups[key]) examGroups[key] = [];
-           examGroups[key].push(s.score);
-        });
-        const chartData = Object.keys(examGroups).map(k => ({
-           name: k,
-           avg: Math.round(examGroups[k].reduce((a,b)=>a+b,0)/examGroups[k].length)
-        })).slice(0, 6);
-        setTrendData(chartData);
-
-      } catch (error) { console.error(error); } 
-      finally { setLoading(false); }
+      } catch (e) {
+        console.error(e);
+      } finally {
+        setLoading(false);
+      }
     };
-    loadData();
-  }, []);
-
-  useEffect(() => {
-     // Fetch schedules whenever showSchedule opens OR viewGrade changes
-     if (showSchedule || viewGrade) fetchSchedules();
-  }, [showSchedule, viewGrade]);
-
-  const fetchSchedules = async () => {
-     try {
-        const params: any = {};
-        if (isAdmin) {
-           if (!viewGrade) return; 
-           // Sending grade parameter which backend will now treat as a regex filter for className
-           params.grade = viewGrade;
-        } else {
-           if (currentUser?.role === 'TEACHER') {
-              params.teacherName = currentUser.trueName || currentUser.username;
-           }
-        }
-        const data = await api.schedules.get(params);
-        setSchedules(data);
-     } catch(e) { console.error(e); }
-  };
-
-  const handleOpenAddModal = (day: number, period: number) => {
-      setEditingCell({ day, period });
-      setEditForm({ 
-         className: '',
-         subject: isTeacher ? (currentUser?.teachingSubject || '') : '', 
-         teacherName: isTeacher ? (currentUser?.trueName || currentUser?.username || '') : '' 
-      });
-  };
-
-  const handleSaveSchedule = async () => {
-     if (!editingCell) return;
-     if (!editForm.className) return alert('请选择班级');
-     if (!editForm.subject) return alert('请选择科目');
-     if (!editForm.teacherName) return alert('请选择任课教师');
-
-     try {
-       await api.schedules.save({
-          className: editForm.className,
-          dayOfWeek: editingCell.day,
-          period: editingCell.period,
-          subject: editForm.subject,
-          teacherName: editForm.teacherName
-       });
-       setEditingCell(null);
-       fetchSchedules();
-     } catch (err: any) {
-       alert('排课失败：' + (err.message || '未知错误'));
-     }
-  };
-
-  const handleDeleteSchedule = async (schedule: Schedule) => {
-     if (!confirm(`确定删除 ${schedule.className} 的 ${schedule.subject} 课？`)) return;
-     await api.schedules.delete({
-        className: schedule.className,
-        dayOfWeek: schedule.dayOfWeek,
-        period: schedule.period
-     });
-     fetchSchedules();
-  };
-
-  const uniqueGrades = Array.from(new Set(classList.map(c => c.grade))).sort(sortGrades);
-  
-  // Robust class mapping for modal
-  const modalClassOptions = classList
-      .filter(c => !isAdmin || !viewGrade || c.grade === viewGrade)
-      .map(c => ({
-          id: c._id,
-          name: (c.className.startsWith(c.grade) ? c.className : c.grade + c.className)
-      }))
-      .sort((a,b) => sortClasses(a.name, b.name))
-      .map(c => c.name);
+    loadStats();
+  }, [isStudent, isTeacher]);
 
-  const cards = [
-    { label: '在校学生', value: stats.studentCount, icon: Users, color: 'bg-blue-500', trend: '实时' },
-    { label: '开设课程', value: stats.courseCount, icon: BookOpen, color: 'bg-emerald-500', trend: '实时' },
-    { label: '平均成绩', value: stats.avgScore, icon: GraduationCap, color: 'bg-violet-500', trend: '全校' },
-    { label: '优秀率', value: stats.excellentRate, icon: TrendingUp, color: 'bg-orange-500', trend: '>=90分' },
-  ];
+  if (isStudent) return <StudentDashboard />;
+  if (isTeacher) return <TeacherDashboard />;
 
+  // Admin Dashboard View
   return (
     <div className="space-y-6">
-      <div className="flex flex-col md:flex-row justify-between items-start md:items-center">
-        <div>
-          <h2 className="text-2xl font-bold text-gray-800">教务工作台</h2>
-          <p className="text-gray-500 mt-1">欢迎回来，{currentUser?.trueName || currentUser?.username}</p>
+      <h1 className="text-2xl font-bold text-gray-800">全校概览</h1>
+      
+      <div className="grid grid-cols-1 md:grid-cols-4 gap-6">
+        <div className="bg-white p-6 rounded-xl shadow-sm border border-gray-100 flex items-center">
+            <div className="p-3 bg-blue-100 rounded-full text-blue-600 mr-4">
+                <Users size={24} />
+            </div>
+            <div>
+                <p className="text-gray-500 text-sm">在校学生</p>
+                <p className="text-2xl font-bold text-gray-800">{stats.studentCount}</p>
+            </div>
         </div>
-        <div className="flex space-x-3 mt-4 md:mt-0">
-           <button onClick={() => setShowSchedule(true)} className="flex items-center space-x-2 px-4 py-2 bg-white border border-gray-200 rounded-lg text-sm font-medium text-gray-600 hover:bg-gray-50 shadow-sm transition-colors">
-              <Calendar size={16}/><span>智能课程表</span>
-           </button>
-           <button onClick={() => setShowStatus(true)} className="flex items-center space-x-2 px-4 py-2 bg-blue-600 text-white rounded-lg text-sm font-medium hover:bg-blue-700 shadow-sm shadow-blue-200 transition-colors">
-              <Activity size={16}/><span>系统状态</span>
-           </button>
+        <div className="bg-white p-6 rounded-xl shadow-sm border border-gray-100 flex items-center">
+            <div className="p-3 bg-green-100 rounded-full text-green-600 mr-4">
+                <BookOpen size={24} />
+            </div>
+            <div>
+                <p className="text-gray-500 text-sm">开设课程</p>
+                <p className="text-2xl font-bold text-gray-800">{stats.courseCount}</p>
+            </div>
         </div>
-      </div>
-
-      <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6">
-        {cards.map((card, index) => (
-          <div key={index} className="bg-white rounded-xl shadow-sm border border-gray-100 p-6 flex items-start justify-between hover:shadow-md transition-shadow relative overflow-hidden group">
-            <div className="relative z-10">
-              <p className="text-sm font-medium text-gray-500 mb-1">{card.label}</p>
-              <h3 className="text-3xl font-bold text-gray-800">{card.value}</h3>
-              <div className={`flex items-center mt-2 text-xs font-medium text-gray-400`}>
-                 <span className={`px-1.5 py-0.5 rounded bg-gray-100 text-gray-600 mr-2`}>{card.trend}</span>
-                 统计数据
-              </div>
+        <div className="bg-white p-6 rounded-xl shadow-sm border border-gray-100 flex items-center">
+            <div className="p-3 bg-yellow-100 rounded-full text-yellow-600 mr-4">
+                <GraduationCap size={24} />
             </div>
-            <div className={`p-3 rounded-xl ${card.color} bg-opacity-10 text-white shadow-sm group-hover:scale-110 transition-transform`}>
-              <card.icon className={`h-6 w-6 ${card.color.replace('bg-', 'text-')}`} />
+            <div>
+                <p className="text-gray-500 text-sm">平均分</p>
+                <p className="text-2xl font-bold text-gray-800">{stats.avgScore}</p>
             </div>
-          </div>
-        ))}
-      </div>
-
-      <div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
-        <div className="lg:col-span-2 bg-white rounded-xl shadow-sm border border-gray-100 p-6">
-           <div className="flex items-center justify-between mb-6">
-              <h3 className="text-lg font-bold text-gray-800">全校考试成绩走势</h3>
-              <button onClick={() => onNavigate('reports')} className="text-sm text-blue-600 hover:text-blue-700 font-medium">查看详情 &rarr;</button>
-           </div>
-           <div className="h-64">
-              {trendData.length > 0 ? (
-                 <ResponsiveContainer width="100%" height="100%">
-                    <LineChart data={trendData}>
-                       <CartesianGrid strokeDasharray="3 3" vertical={false} stroke="#f0f0f0"/>
-                       <XAxis dataKey="name" axisLine={false} tickLine={false} tick={{fontSize:12}}/>
-                       <YAxis axisLine={false} tickLine={false} domain={[0, 100]}/>
-                       <Tooltip contentStyle={{borderRadius: '8px', border:'none', boxShadow:'0 4px 6px -1px rgba(0,0,0,0.1)'}}/>
-                       <Line type="monotone" dataKey="avg" stroke="#3b82f6" strokeWidth={3} dot={{r:4}} name="平均分"/>
-                    </LineChart>
-                 </ResponsiveContainer>
-              ) : <div className="h-full flex items-center justify-center text-gray-400">暂无考试数据</div>}
-           </div>
         </div>
-
-        <div className="space-y-6">
-           <div className="bg-white rounded-xl shadow-sm border border-gray-100 p-6">
-             <div className="flex items-center justify-between mb-4">
-               <h3 className="font-bold text-gray-800 flex items-center"><AlertTriangle className="text-amber-500 mr-2" size={18}/>教学预警</h3>
-               <span className="bg-amber-100 text-amber-700 text-xs px-2 py-0.5 rounded-full">{warnings.length}</span>
-             </div>
-             <div className="space-y-3 max-h-48 overflow-y-auto custom-scrollbar">
-                {warnings.length > 0 ? warnings.map((w, i) => (
-                   <div key={i} className="text-xs text-gray-600 bg-amber-50 p-2 rounded border border-amber-100">{w}</div>
-                )) : <div className="text-center text-xs text-gray-400">运行平稳</div>}
-             </div>
-           </div>
-
-           <div className="bg-gradient-to-br from-indigo-600 to-blue-700 rounded-xl shadow-lg p-5 text-white">
-              <h3 className="font-bold mb-4">快捷操作</h3>
-              <div className="grid grid-cols-2 gap-3">
-                 <button onClick={() => onNavigate('grades')} className="bg-white/10 hover:bg-white/20 p-2 rounded flex flex-col items-center text-xs transition-colors">
-                    <Plus size={20} className="mb-1"/> 录入成绩
-                 </button>
-                 <button onClick={() => onNavigate('students')} className="bg-white/10 hover:bg-white/20 p-2 rounded flex flex-col items-center text-xs transition-colors">
-                    <Users size={20} className="mb-1"/> 新增学生
-                 </button>
-              </div>
-           </div>
+        <div className="bg-white p-6 rounded-xl shadow-sm border border-gray-100 flex items-center">
+            <div className="p-3 bg-purple-100 rounded-full text-purple-600 mr-4">
+                <Activity size={24} />
+            </div>
+            <div>
+                <p className="text-gray-500 text-sm">优秀率</p>
+                <p className="text-2xl font-bold text-gray-800">{stats.excellentRate}</p>
+            </div>
         </div>
       </div>
 
-      {showSchedule && (
-         <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
-            <div className="bg-white rounded-xl w-full max-w-6xl h-[90vh] p-6 relative animate-in fade-in flex flex-col shadow-2xl">
-               <div className="flex justify-between items-center mb-6">
-                  <div className="flex flex-wrap items-center gap-4">
-                     <h3 className="text-xl font-bold flex items-center"><Calendar className="mr-2 text-blue-600"/> 智能课程表</h3>
-                     
-                     {isAdmin && (
-                        <div className="flex bg-gray-100 rounded-lg p-1">
-                           <select 
-                             className="bg-transparent border-none text-sm p-2 focus:ring-0 font-medium text-gray-700 cursor-pointer outline-none"
-                             value={viewGrade}
-                             onChange={e => setViewGrade(e.target.value)}
-                           >
-                              {uniqueGrades.length > 0 ? uniqueGrades.map(g => <option key={g} value={g}>{g}</option>) : <option value="">无年级数据</option>}
-                           </select>
-                        </div>
-                     )}
-
-                     {!isAdmin && isTeacher && (
-                        <div className="text-sm text-gray-500">
-                           查看: <span className="font-bold text-gray-800">{currentUser.trueName || currentUser.username}</span> 的课表
-                        </div>
-                     )}
-                  </div>
-                  <button onClick={()=>setShowSchedule(false)} className="text-gray-400 hover:text-gray-600 hover:bg-gray-100 rounded-full p-2 transition-all"><X size={24}/></button>
-               </div>
-
-               <div className="flex-1 overflow-auto border rounded-xl shadow-inner bg-gray-50/30">
-                  <table className="w-full border-collapse text-center table-fixed min-w-[800px]">
-                     <thead className="sticky top-0 bg-white z-10 shadow-sm">
-                        <tr className="text-gray-500 uppercase text-sm">
-                           <th className="p-4 border-b border-r w-20 bg-gray-50">节次</th>
-                           {['周一','周二','周三','周四','周五'].map(d=><th key={d} className="p-4 border-b font-bold text-gray-700">{d}</th>)}
-                        </tr>
-                     </thead>
-                     <tbody className="text-sm bg-white">
-                        {[1,2,3,4,5,6,7,8].map(period => (
-                           <tr key={period} className="divide-x divide-gray-100">
-                              <td className="p-4 border-b border-r font-bold text-gray-400 bg-gray-50/50">第{period}节</td>
-                              {[1,2,3,4,5].map(day => {
-                                 const slotItems = schedules.filter(s => s.dayOfWeek === day && s.period === period);
-                                 const canAdd = isAdmin || isTeacher;
-                                 
-                                 return (
-                                    <td key={day} className="p-2 border-b h-28 align-top transition-colors relative group">
-                                       <div className="flex flex-wrap gap-2 content-start h-full overflow-y-auto custom-scrollbar pb-6">
-                                          {slotItems.map(item => {
-                                             const canDelete = isAdmin || (isTeacher && (item.teacherName === currentUser.trueName || item.teacherName === currentUser.username));
-                                             return (
-                                                <div key={item._id} className="text-xs text-left bg-white border border-blue-200 rounded-md p-2 w-full shadow-sm relative group/item hover:border-blue-400 hover:shadow-md transition-all">
-                                                   <div className="font-bold text-blue-700 flex justify-between items-center mb-1">
-                                                      <span className="truncate mr-1">{item.subject}</span>
-                                                      {canDelete && (
-                                                         <button 
-                                                            onClick={(e)=>{ e.stopPropagation(); handleDeleteSchedule(item); }}
-                                                            className="text-gray-300 hover:text-red-500 transition-colors p-0.5"
-                                                            title="删除课程"
-                                                         >
-                                                            <X size={14}/>
-                                                         </button>
-                                                      )}
-                                                   </div>
-                                                   <div className="flex justify-between items-center text-gray-600">
-                                                      <span className="bg-blue-50 text-blue-600 px-1.5 rounded font-mono text-[10px] font-bold">
-                                                         {item.className.replace(viewGrade, '')}
-                                                      </span>
-                                                      <span className="text-[10px] truncate max-w-[50%]">{item.teacherName}</span>
-                                                   </div>
-                                                </div>
-                                             );
-                                          })}
-                                          {canAdd && (
-                                             <div className="absolute bottom-1 right-1 left-1 flex justify-center opacity-0 group-hover:opacity-100 transition-opacity">
-                                                 <button onClick={() => handleOpenAddModal(day, period)} className="w-full bg-blue-50 border border-blue-200 text-blue-500 rounded py-1 hover:bg-blue-100 flex items-center justify-center shadow-sm">
-                                                    <Plus size={14}/>
-                                                 </button>
-                                             </div>
-                                          )}
-                                       </div>
-                                    </td>
-                                 );
-                              })}
-                           </tr>
-                        ))}
-                     </tbody>
-                  </table>
-               </div>
-            </div>
-            
-            {editingCell && (
-               <div className="absolute inset-0 bg-black/20 flex items-center justify-center backdrop-blur-[1px] z-50">
-                  <div className="bg-white p-6 rounded-xl shadow-2xl w-80 animate-in zoom-in-95 border border-gray-100">
-                     <h4 className="font-bold mb-4 text-gray-800 border-b pb-2">
-                        {isTeacher ? '我的排课' : '排课管理'} <br/>
-                        <span className="text-sm font-normal text-gray-500">周{['一','二','三','四','五'][editingCell.day-1]} 第{editingCell.period}节</span>
-                     </h4>
-                     <div className="space-y-4">
-                        <div>
-                           <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">班级</label>
-                           <select className="w-full border border-gray-300 rounded-lg p-2.5 text-sm focus:ring-2 focus:ring-blue-500 outline-none" value={editForm.className} onChange={e=>setEditForm({...editForm, className: e.target.value})}>
-                              <option value="">-- 请选择班级 --</option>
-                              {modalClassOptions.map(c => <option key={c} value={c}>{c}</option>)}
-                           </select>
-                        </div>
-                        <div>
-                           <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">科目</label>
-                           <select className="w-full border border-gray-300 rounded-lg p-2.5 text-sm focus:ring-2 focus:ring-blue-500 outline-none disabled:bg-gray-100 disabled:text-gray-500" value={editForm.subject} onChange={e=>setEditForm({...editForm, subject: e.target.value})} disabled={isTeacher && !!currentUser?.teachingSubject}>
-                              <option value="">-- 请选择科目 --</option>
-                              {subjects.map(s=><option key={s._id} value={s.name}>{s.name}</option>)}
-                           </select>
-                        </div>
-                        <div>
-                           <label className="text-xs font-bold text-gray-500 uppercase mb-1 block">任课教师</label>
-                           <select className="w-full border border-gray-300 rounded-lg p-2.5 text-sm focus:ring-2 focus:ring-blue-500 outline-none disabled:bg-gray-100 disabled:text-gray-500" value={editForm.teacherName} onChange={e=>setEditForm({...editForm, teacherName: e.target.value})} disabled={isTeacher}>
-                              <option value="">-- 请选择教师 --</option>
-                              {teachers.map(t=><option key={t._id} value={t.trueName || t.username}>{t.trueName} ({t.teachingSubject || '无科目'})</option>)}
-                           </select>
-                        </div>
-                        <div className="flex gap-3 pt-2">
-                           <button onClick={handleSaveSchedule} className="flex-1 bg-blue-600 text-white py-2 rounded-lg text-sm font-medium hover:bg-blue-700 transition-colors">确认添加</button>
-                           <button onClick={()=>setEditingCell(null)} className="flex-1 bg-gray-100 text-gray-700 py-2 rounded-lg text-sm font-medium hover:bg-gray-200 transition-colors">取消</button>
-                        </div>
-                     </div>
-                  </div>
-               </div>
-            )}
-         </div>
-      )}
+      <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
+          <div className="bg-white p-6 rounded-xl shadow-sm border border-gray-100">
+              <h3 className="font-bold text-gray-800 mb-4 flex items-center"><TrendingUp size={20} className="mr-2 text-blue-600"/> 成绩走势</h3>
+              <div className="h-64">
+                  <ResponsiveContainer width="100%" height="100%">
+                      <LineChart data={trendData}>
+                          <CartesianGrid strokeDasharray="3 3" vertical={false}/>
+                          <XAxis dataKey="name" />
+                          <YAxis domain={[0, 100]} />
+                          <Tooltip />
+                          <Line type="monotone" dataKey="score" stroke="#3b82f6" strokeWidth={3} dot={{r: 4}} />
+                      </LineChart>
+                  </ResponsiveContainer>
+              </div>
+          </div>
 
-      {showStatus && (
-         <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
-            <div className="bg-white rounded-xl w-full max-w-sm p-6 relative animate-in fade-in zoom-in-95">
-               <button onClick={()=>setShowStatus(false)} className="absolute top-4 right-4 text-gray-400 hover:text-gray-600"><X size={20}/></button>
-               <h3 className="text-xl font-bold mb-6 flex items-center"><Activity className="mr-2 text-green-600"/>系统运行状态</h3>
-               <div className="space-y-4">
-                  <div className="flex justify-between items-center"><span className="text-gray-600">数据库</span><span className="text-green-600 font-bold flex items-center"><CheckCircle size={14} className="mr-1"/> 正常</span></div>
-                  <div className="flex justify-between items-center"><span className="text-gray-600">API 延迟</span><span className="text-green-600 font-bold">24ms</span></div>
-               </div>
-               <button onClick={()=>setShowStatus(false)} className="w-full mt-6 bg-blue-600 text-white py-2 rounded-lg">确认</button>
-            </div>
-         </div>
-      )}
+          <div className="bg-white p-6 rounded-xl shadow-sm border border-gray-100">
+              <h3 className="font-bold text-gray-800 mb-4">快捷入口</h3>
+              <div className="grid grid-cols-2 gap-4">
+                  <button onClick={() => onNavigate('students')} className="p-4 bg-gray-50 rounded-lg hover:bg-gray-100 transition-colors flex flex-col items-center justify-center text-gray-700">
+                      <Users className="mb-2 text-blue-500" />
+                      <span>学生管理</span>
+                  </button>
+                  <button onClick={() => onNavigate('classes')} className="p-4 bg-gray-50 rounded-lg hover:bg-gray-100 transition-colors flex flex-col items-center justify-center text-gray-700">
+                      <BookOpen className="mb-2 text-green-500" />
+                      <span>班级管理</span>
+                  </button>
+                  <button onClick={() => onNavigate('reports')} className="p-4 bg-gray-50 rounded-lg hover:bg-gray-100 transition-colors flex flex-col items-center justify-center text-gray-700">
+                      <Activity className="mb-2 text-purple-500" />
+                      <span>报表统计</span>
+                  </button>
+                  <button onClick={() => onNavigate('settings')} className="p-4 bg-gray-50 rounded-lg hover:bg-gray-100 transition-colors flex flex-col items-center justify-center text-gray-700">
+                      <Activity className="mb-2 text-gray-500" />
+                      <span>系统设置</span>
+                  </button>
+              </div>
+          </div>
+      </div>
     </div>
   );
 };

pages/GameMountain.tsx

@@ -6,31 +6,13 @@ import { GameSession, GameTeam, Student, GameRewardConfig, AchievementConfig, Cl
 import { Settings, Plus, Minus, Users, CheckSquare, Loader2, Trash2, X, Flag, Gift, Star, Trophy, Maximize, Minimize, Lock } from 'lucide-react';
 import { Emoji } from '../components/Emoji';
 
-// ... (Keep CSS styles unchanged) ...
+// ... (Styles and Animations kept same)
 const styles = `
-@keyframes float-cloud {
-  0% { transform: translateX(0); }
-  50% { transform: translateX(20px); }
-  100% { transform: translateX(0); }
-}
-@keyframes drift {
-  from { transform: translateX(-100%); }
-  to { transform: translateX(100vw); }
-}
-@keyframes bounce-avatar {
-  0%, 100% { transform: translateY(0) scale(1); }
-  50% { transform: translateY(-10px) scale(1.1); }
-}
-@keyframes wave {
-  0% { transform: rotate(0deg); }
-  25% { transform: rotate(-10deg); }
-  75% { transform: rotate(10deg); }
-  100% { transform: rotate(0deg); }
-}
-@keyframes confetti-fall {
-  0% { transform: translateY(-10px) rotate(0deg); opacity: 1; }
-  100% { transform: translateY(60px) rotate(360deg); opacity: 0; }
-}
+@keyframes float-cloud { 0% { transform: translateX(0); } 50% { transform: translateX(20px); } 100% { transform: translateX(0); } }
+@keyframes drift { from { transform: translateX(-100%); } to { transform: translateX(100vw); } }
+@keyframes bounce-avatar { 0%, 100% { transform: translateY(0) scale(1); } 50% { transform: translateY(-10px) scale(1.1); } }
+@keyframes wave { 0% { transform: rotate(0deg); } 25% { transform: rotate(-10deg); } 75% { transform: rotate(10deg); } 100% { transform: rotate(0deg); } }
+@keyframes confetti-fall { 0% { transform: translateY(-10px) rotate(0deg); opacity: 1; } 100% { transform: translateY(60px) rotate(360deg); opacity: 0; } }
 .animate-drift-slow { animation: drift 60s linear infinite; }
 .animate-drift-medium { animation: drift 40s linear infinite; }
 .animate-drift-fast { animation: drift 25s linear infinite; }
@@ -39,7 +21,7 @@ const styles = `
 .animate-confetti { animation: confetti-fall 2s ease-out forwards; }
 `;
 
-// ... (Keep calculatePathPoint and generatePathString unchanged) ...
+// ... (Keep calculatePathPoint and generatePathString unchanged)
 const calculatePathPoint = (progress: number) => {
     const y = 8 + (progress * 80); 
     const amplitude = 15 * (1 - (progress * 0.3)); 
@@ -71,6 +53,7 @@ const CelebrationEffects = () => (
     </div>
 );
 
+// ... (MountainStage Component - Keep mostly same, update display for count)
 const MountainStage = ({ team, index, rewardsConfig, maxSteps, onScoreChange, isFullscreen }: { 
     team: GameTeam, 
     index: number, 
@@ -87,8 +70,6 @@ const MountainStage = ({ team, index, rewardsConfig, maxSteps, onScoreChange, is
 
   return (
     <div className={`relative flex flex-col items-center justify-end h-[95%] ${widthClass} mx-2 flex-shrink-0 select-none group perspective-1000 transition-all duration-300`}>
-      
-      {/* Team Name Cloud Tag */}
       <div className="absolute top-[2%] z-20 transition-transform duration-300 hover:-translate-y-2 hover:scale-105 cursor-pointer w-full flex justify-center">
         <div className="relative bg-white/90 backdrop-blur-md px-3 py-1.5 rounded-xl shadow-md border-2 border-white text-center max-w-[90%]">
             <h3 className="text-sm md:text-base font-black text-slate-800 truncate">{team.name}</h3>
@@ -98,7 +79,6 @@ const MountainStage = ({ team, index, rewardsConfig, maxSteps, onScoreChange, is
         </div>
       </div>
       
-      {/* Mountain SVG */}
       <div className="absolute bottom-0 left-0 w-full h-[90%] z-0 filter drop-shadow-lg transition-all duration-500 group-hover:drop-shadow-xl">
          <svg viewBox="0 0 200 300" preserveAspectRatio="none" className="w-full h-full overflow-visible">
             <defs>
@@ -120,7 +100,6 @@ const MountainStage = ({ team, index, rewardsConfig, maxSteps, onScoreChange, is
          </svg>
       </div>
 
-      {/* Rewards */}
       <div className="absolute bottom-0 left-0 w-full h-[90%] z-10 pointer-events-none">
          {rewardsConfig.map((reward, i) => {
             const rPct = reward.scoreThreshold / maxSteps;
@@ -137,14 +116,13 @@ const MountainStage = ({ team, index, rewardsConfig, maxSteps, onScoreChange, is
                       {isUnlocked && <div className="absolute inset-0 bg-yellow-400 rounded-full blur-sm opacity-50 animate-pulse"></div>}
                   </div>
                   <div className={`mt-1 px-2 py-0.5 rounded text-[10px] font-bold shadow-sm whitespace-nowrap border max-w-[100px] truncate transition-colors ${isUnlocked ? 'bg-yellow-50 text-yellow-700 border-yellow-200' : 'bg-white/90 text-gray-500 border-gray-200'}`}>
-                      {reward.rewardName}
+                      {reward.rewardName} {reward.rewardValue > 1 ? `x${reward.rewardValue}` : ''}
                   </div>
                </div>
             );
          })}
       </div>
 
-      {/* Climber */}
       <div className="absolute z-30 transition-all duration-700 ease-in-out flex flex-col items-center -translate-x-1/2 transform translate-y-1/2" style={{ bottom: `${currentPos.y}%`, left: `${currentPos.x}%` }}>
          <div className={`w-12 h-12 md:w-14 md:h-14 bg-white rounded-full border-4 shadow-xl flex items-center justify-center transition-transform relative ${isFinished ? 'animate-bounce border-yellow-400' : 'hover:scale-110'}`} style={{ borderColor: isFinished ? '#facc15' : team.color }}>
             <span className="text-2xl md:text-3xl"><Emoji symbol={team.avatar || '🧗'} /></span>
@@ -153,7 +131,6 @@ const MountainStage = ({ team, index, rewardsConfig, maxSteps, onScoreChange, is
          </div>
       </div>
 
-      {/* Control Panel */}
       {onScoreChange && (
         <div className="absolute bottom-6 left-1/2 -translate-x-1/2 flex items-center gap-2 opacity-0 group-hover:opacity-100 transition-all z-40 bg-white/90 backdrop-blur px-2 py-1 rounded-full shadow-lg border border-gray-200 hover:scale-105">
             <button onClick={() => onScoreChange(team.id, -1)} className="p-1 rounded-full bg-slate-100 text-slate-500 hover:bg-red-100 hover:text-red-600"><Minus size={14}/></button>
@@ -164,7 +141,7 @@ const MountainStage = ({ team, index, rewardsConfig, maxSteps, onScoreChange, is
   );
 };
 
-// Toast
+// ... (GameToast - Keep same)
 const GameToast = ({ title, message, type, onClose }: { title: string, message: string, type: 'success' | 'info', onClose: () => void }) => {
     useEffect(() => { const timer = setTimeout(onClose, 3000); return () => clearTimeout(timer); }, [onClose]);
     return (
@@ -178,37 +155,29 @@ const GameToast = ({ title, message, type, onClose }: { title: string, message:
 };
 
 export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
+  // ... (State - Keep same)
   const [session, setSession] = useState<GameSession | null>(null);
   const [loading, setLoading] = useState(true);
   const [students, setStudents] = useState<Student[]>([]);
-  
   const [isSettingsOpen, setIsSettingsOpen] = useState(false);
   const [isFullscreen, setIsFullscreen] = useState(false);
   const [selectedTeamId, setSelectedTeamId] = useState<string | null>(null);
   const [achConfig, setAchConfig] = useState<AchievementConfig | null>(null);
-  const [canEdit, setCanEdit] = useState(false); // New: Read-only check
-  
+  const [canEdit, setCanEdit] = useState(false);
   const [toast, setToast] = useState<{title: string, message: string, type: 'success' | 'info'} | null>(null);
 
   const currentUser = api.auth.getCurrentUser();
   const isTeacher = currentUser?.role === 'TEACHER';
   const isAdmin = currentUser?.role === 'ADMIN';
-
-  // Use prop className or fallback to homeroom (for legacy)
   const targetClass = className || currentUser?.homeroomClass || (currentUser?.role === 'STUDENT' ? 'MY_CLASS' : '');
 
   useEffect(() => { loadData(); }, [targetClass]);
 
   const loadData = async () => {
-    // FIX: Check for currentUser
     if (!targetClass || targetClass === 'MY_CLASS' && !currentUser?.homeroomClass && currentUser?.role !== 'STUDENT') return; 
     setLoading(true);
-    
-    // Resolve "MY_CLASS" for students
     let resolvedClass = targetClass;
     if (targetClass === 'MY_CLASS' && currentUser?.role === 'STUDENT') {
-        // We need to fetch student's class first? Actually dashboard loads it.
-        // Assuming passed prop is correct or we fetch student
         const stus = await api.students.getAll();
         const me = stus.find((s: Student) => s.name === (currentUser?.trueName || currentUser?.username));
         if(me) resolvedClass = me.className;
@@ -221,8 +190,6 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
       ]);
       
       const filteredStudents = allStudents.filter((s: Student) => s.className === resolvedClass);
-      // Sort
-      // FIX: Add explicit types for sort arguments
       filteredStudents.sort((a: Student, b: Student) => {
           const seatA = parseInt(a.seatNo || '99999');
           const seatB = parseInt(b.seatNo || '99999');
@@ -234,7 +201,6 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
       if (sess) {
           setSession(sess);
       } else if (isTeacher && currentUser?.schoolId) {
-          // Initialize if empty
           const newSess: GameSession = {
              schoolId: currentUser.schoolId,
              className: resolvedClass,
@@ -247,31 +213,23 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
                 { id: '3', name: '飞龙队', score: 0, avatar: '🐉', color: '#10b981', members: [] }
              ],
              rewardsConfig: [
-                { scoreThreshold: 5, rewardType: 'DRAW_COUNT', rewardName: '抽奖券x1', rewardValue: 1 },
+                { scoreThreshold: 5, rewardType: 'DRAW_COUNT', rewardName: '抽奖券', rewardValue: 1 },
                 { scoreThreshold: 10, rewardType: 'ITEM', rewardName: '神秘大礼', rewardValue: 1 }
              ]
           };
           setSession(newSess);
       }
 
-      // Permissions Check
       if (isAdmin) setCanEdit(true);
       else if (isTeacher && currentUser) {
-          // Fetch class info to check homeroomTeacherIds
           const clsList = await api.classes.getAll() as ClassInfo[];
-          // FIX: Add type for find callback parameter
           const cls = clsList.find((c: ClassInfo) => c.grade + c.className === resolvedClass);
           if (cls && (cls.homeroomTeacherIds?.includes(currentUser._id || '') || cls.teacherName?.includes(currentUser.trueName || currentUser.username))) {
               setCanEdit(true);
-              // Only load Ach config if can edit
               const ac = await api.achievements.getConfig(resolvedClass);
               setAchConfig(ac);
-          } else {
-              setCanEdit(false);
-          }
-      } else {
-          setCanEdit(false);
-      }
+          } else { setCanEdit(false); }
+      } else { setCanEdit(false); }
 
     } catch (e) { console.error(e); } 
     finally { setLoading(false); }
@@ -291,7 +249,7 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
           if (newScore === session.maxSteps) {
               setToast({ title: `🏆 巅峰时刻!`, message: `恭喜 [${t.name}] 成功登顶！`, type: 'success' });
           } else if (reward) {
-              setToast({ title: `🎉 触发奖励!`, message: `[${t.name}] 获得：${reward.rewardName}`, type: 'info' });
+              setToast({ title: `🎉 触发奖励!`, message: `[${t.name}] 获得：${reward.rewardName} x${reward.rewardValue || 1}`, type: 'info' });
           }
 
           if (reward) {
@@ -311,6 +269,7 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
                           studentName: stu.name,
                           rewardType: reward.rewardType as any,
                           name: reward.rewardName,
+                          count: reward.rewardValue || 1, // USE REWARD VALUE
                           status: 'PENDING',
                           source: `群岳争锋 - ${t.name} ${newScore}步`
                        });
@@ -329,7 +288,7 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
         await api.games.saveMountainSession(newSession);
     } catch(e) {
         alert('保存失败：您可能没有权限修改此班级数据');
-        loadData(); // Revert
+        loadData();
     }
   };
 
@@ -363,51 +322,29 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
   const GameContent = (
     <div className={`${isFullscreen ? 'fixed inset-0 z-[9999] w-screen h-screen' : 'h-full w-full relative'} flex flex-col bg-gradient-to-b from-sky-300 via-sky-100 to-emerald-50 overflow-hidden`}>
         <style>{styles}</style>
-        
-        {/* Background Elements */}
+        {/* Background */}
         <div className="absolute inset-0 pointer-events-none overflow-hidden">
             <div className="absolute top-10 right-20 w-24 h-24 bg-yellow-300 rounded-full blur-xl opacity-60 animate-pulse"></div>
             <div className="absolute top-16 -left-20 text-white/60 text-9xl select-none animate-drift-slow opacity-80" style={{filter: 'blur(2px)'}}><Emoji symbol="☁️"/></div>
             <div className="absolute top-32 -left-40 text-white/40 text-8xl select-none animate-drift-medium opacity-60" style={{animationDelay: '5s'}}><Emoji symbol="☁️"/></div>
         </div>
-
-        {/* Toast Overlay */}
         {toast && <GameToast title={toast.title} message={toast.message} type={toast.type} onClose={() => setToast(null)} />}
-
         {/* Toolbar */}
         <div className="absolute top-4 right-4 z-50 flex gap-2">
-            {!canEdit && isTeacher && (
-                <div className="px-3 py-1.5 bg-gray-100/80 backdrop-blur rounded-full text-xs font-bold text-gray-500 flex items-center border border-gray-200">
-                    <Lock size={14} className="mr-1"/> 只读模式 (非班主任)
-                </div>
-            )}
+            {!canEdit && isTeacher && <div className="px-3 py-1.5 bg-gray-100/80 backdrop-blur rounded-full text-xs font-bold text-gray-500 flex items-center border border-gray-200"><Lock size={14} className="mr-1"/> 只读模式 (非班主任)</div>}
             <button onClick={() => setIsFullscreen(!isFullscreen)} className="p-2 bg-white/80 backdrop-blur rounded-full hover:bg-white shadow-sm border border-white/50 transition-colors">
                 {isFullscreen ? <Minimize size={20} className="text-gray-700"/> : <Maximize size={20} className="text-gray-700"/>}
             </button>
-            {canEdit && (
-                <button onClick={() => setIsSettingsOpen(true)} className="flex items-center text-xs font-bold text-slate-700 bg-white/90 backdrop-blur px-4 py-2 rounded-2xl border border-white/50 hover:bg-white shadow-md transition-all hover:scale-105 active:scale-95">
-                    <Settings size={16} className="mr-2"/> 设置
-                </button>
-            )}
+            {canEdit && <button onClick={() => setIsSettingsOpen(true)} className="flex items-center text-xs font-bold text-slate-700 bg-white/90 backdrop-blur px-4 py-2 rounded-2xl border border-white/50 hover:bg-white shadow-md transition-all hover:scale-105 active:scale-95"><Settings size={16} className="mr-2"/> 设置</button>}
         </div>
-
-        {/* Scrollable Game Area */}
+        {/* Game Area */}
         <div className="flex-1 overflow-x-auto overflow-y-hidden relative custom-scrollbar z-10 w-full min-w-0">
             <div className="h-full flex items-end px-10 pb-4 gap-2 mx-auto w-max min-w-full justify-center">
                 {session.teams.map((team, idx) => (
-                    <MountainStage 
-                        key={team.id} 
-                        team={team} 
-                        index={idx} 
-                        rewardsConfig={session.rewardsConfig} 
-                        maxSteps={session.maxSteps} 
-                        onScoreChange={canEdit ? handleScoreChange : undefined}
-                        isFullscreen={isFullscreen}
-                    />
+                    <MountainStage key={team.id} team={team} index={idx} rewardsConfig={session.rewardsConfig} maxSteps={session.maxSteps} onScoreChange={canEdit ? handleScoreChange : undefined} isFullscreen={isFullscreen} />
                 ))}
             </div>
         </div>
-
         {/* SETTINGS MODAL */}
         {isSettingsOpen && canEdit && (
             <div className="fixed inset-0 bg-black/60 z-[100000] flex items-center justify-center p-4 backdrop-blur-sm">
@@ -416,7 +353,6 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
                         <h3 className="text-xl font-bold text-gray-800 flex items-center"><Settings className="mr-2 text-blue-600"/> 游戏控制台</h3>
                         <button onClick={() => setIsSettingsOpen(false)}><X size={24} className="text-gray-400 hover:text-gray-600"/></button>
                     </div>
-                    
                     <div className="flex-1 overflow-y-auto p-6 space-y-8 bg-gray-50/50">
                         <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
                             {/* Basic Config */}
@@ -429,8 +365,7 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
                                     </div>
                                 </div>
                             </section>
-
-                            {/* Rewards Config */}
+                            {/* Rewards Config - ADDED QUANTITY INPUT */}
                             <section className="bg-white p-5 rounded-xl border border-gray-200 shadow-sm row-span-2">
                                 <h4 className="font-bold text-gray-700 mb-4 flex items-center text-sm uppercase tracking-wide"><Gift size={16} className="mr-2 text-amber-500"/> 奖励节点</h4>
                                 <div className="space-y-2 max-h-64 overflow-y-auto pr-1 custom-scrollbar">
@@ -451,11 +386,17 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
                                                     <option value="ITEM">🎁 实物</option>
                                                     <option value="ACHIEVEMENT">🏆 奖状/成就</option>
                                                 </select>
+                                                {/* QUANTITY INPUT */}
+                                                <div className="flex items-center gap-1 bg-white border px-2 py-1 rounded">
+                                                    <span className="text-xs text-gray-400">x</span>
+                                                    <input type="number" min={1} className="w-8 text-center font-bold text-sm outline-none" value={rc.rewardValue || 1} onChange={e => {
+                                                        const newArr = [...session.rewardsConfig]; newArr[idx].rewardValue = Number(e.target.value); setSession({...session, rewardsConfig: newArr});
+                                                    }}/>
+                                                </div>
                                                 <button onClick={() => {
                                                     const newArr = session.rewardsConfig.filter((_, i) => i !== idx); setSession({...session, rewardsConfig: newArr});
                                                 }} className="text-gray-300 hover:text-red-500 opacity-0 group-hover:opacity-100 transition-opacity"><Trash2 size={16}/></button>
                                             </div>
-                                            
                                             {rc.rewardType === 'ACHIEVEMENT' ? (
                                                 <select className="w-full text-xs border border-gray-200 rounded p-1 bg-white" value={rc.achievementId || ''} onChange={e => {
                                                     const newArr = [...session.rewardsConfig];
@@ -477,7 +418,6 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
                                 </div>
                                 <button onClick={() => setSession({...session, rewardsConfig: [...session.rewardsConfig, { scoreThreshold: session.maxSteps, rewardType: 'DRAW_COUNT', rewardName: '奖励', rewardValue: 1 }]})} className="mt-3 w-full py-2 border border-dashed border-gray-300 rounded-lg text-sm text-gray-500 hover:border-blue-400 hover:text-blue-600 transition-colors">+ 添加节点</button>
                             </section>
-
                             {/* Team Management */}
                             <section className="bg-white p-5 rounded-xl border border-gray-200 shadow-sm md:col-span-2">
                                 <div className="flex justify-between items-center mb-4">
@@ -487,9 +427,7 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
                                         setSession({ ...session, teams: [...session.teams, newTeam] });
                                     }} className="text-xs bg-emerald-50 text-emerald-600 px-3 py-1.5 rounded-lg hover:bg-emerald-100 border border-emerald-200 font-bold transition-colors">+ 新建队伍</button>
                                 </div>
-                                
                                 <div className="flex flex-col md:flex-row gap-6 h-[400px]">
-                                    {/* Team List */}
                                     <div className="w-full md:w-1/3 space-y-3 overflow-y-auto pr-2 custom-scrollbar">
                                         {session.teams.map(t => (
                                             <div key={t.id} 
@@ -521,8 +459,6 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
                                             </div>
                                         ))}
                                     </div>
-
-                                    {/* Member Shuttle */}
                                     <div className="flex-1 bg-gray-50 rounded-xl border border-gray-200 p-4 flex flex-col shadow-inner">
                                         {selectedTeamId ? (
                                             <>
@@ -539,7 +475,6 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
                                                         const isInCurrent = currentTeamId === selectedTeamId;
                                                         const isInOther = currentTeamId && !isInCurrent;
                                                         const otherTeam = isInOther ? session.teams.find(t => t.id === currentTeamId) : null;
-                                                        
                                                         return (
                                                             <div key={s._id} 
                                                                 onClick={() => toggleTeamMember(s._id || String(s.id), selectedTeamId)}
@@ -557,18 +492,12 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
                                                     })}
                                                 </div>
                                             </>
-                                        ) : (
-                                            <div className="flex flex-col items-center justify-center h-full text-gray-400">
-                                                <Users size={48} className="mb-2 opacity-20"/>
-                                                <p>请先在左侧选择一个队伍</p>
-                                            </div>
-                                        )}
+                                        ) : <div className="flex flex-col items-center justify-center h-full text-gray-400"><Users size={48} className="mb-2 opacity-20"/><p>请先在左侧选择一个队伍</p></div>}
                                     </div>
                                 </div>
                             </section>
                         </div>
                     </div>
-
                     <div className="p-4 border-t border-gray-100 bg-white rounded-b-2xl flex justify-end gap-3 shrink-0">
                         <button onClick={() => setIsSettingsOpen(false)} className="px-5 py-2.5 text-gray-600 hover:bg-gray-100 rounded-xl transition-colors font-medium">取消</button>
                         <button onClick={saveSettings} className="px-8 py-2.5 bg-blue-600 text-white rounded-xl hover:bg-blue-700 shadow-lg shadow-blue-200 font-bold transition-all hover:scale-105 active:scale-95">保存配置</button>
@@ -578,9 +507,6 @@ export const GameMountain: React.FC<{className?: string}> = ({ className }) => {
         )}
     </div>
   );
-
-  if (isFullscreen) {
-      return createPortal(GameContent, document.body);
-  }
+  if (isFullscreen) { return createPortal(GameContent, document.body); }
   return GameContent;
 };

pages/GameRewards.tsx

@@ -3,6 +3,7 @@ import React, { useState, useEffect } from 'react';
 import { api } from '../services/api';
 import { StudentReward, Student } from '../types';
 import { Gift, Loader2, Search, Filter, Trash2, Edit, Save, X, ChevronLeft, ChevronRight } from 'lucide-react';
+import { ConfirmModal } from '../components/ConfirmModal';
 
 export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
   const [rewards, setRewards] = useState<StudentReward[]>([]);
@@ -10,7 +11,6 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
   const [page, setPage] = useState(1);
   const [loading, setLoading] = useState(true);
   
-  // Grant Modal
   const [isGrantModalOpen, setIsGrantModalOpen] = useState(false);
   const [students, setStudents] = useState<Student[]>([]);
   const [grantForm, setGrantForm] = useState({ 
@@ -20,54 +20,47 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
       name: '' 
   });
 
-  // Filters
-  const [filterType, setFilterType] = useState('ALL'); // ALL, ITEM, DRAW_COUNT
-  const [filterStatus, setFilterStatus] = useState('ALL'); // ALL, PENDING, REDEEMED
+  const [filterType, setFilterType] = useState('ALL'); 
+  const [filterStatus, setFilterStatus] = useState('ALL'); 
   const [searchText, setSearchText] = useState('');
 
-  // Edit State
   const [editingId, setEditingId] = useState<string | null>(null);
   const [editForm, setEditForm] = useState({ name: '', count: 1 });
 
+  // Modal State
+  const [confirmModal, setConfirmModal] = useState<{isOpen: boolean, title: string, message: string, onConfirm: () => void, isDanger?: boolean}>({
+      isOpen: false, title: '', message: '', onConfirm: () => {}
+  });
+
   const currentUser = api.auth.getCurrentUser();
   const isStudent = currentUser?.role === 'STUDENT';
   const isTeacher = currentUser?.role === 'TEACHER';
   
-  // Use prop className or fallback to legacy homeroom
   const homeroomClass = className || currentUser?.homeroomClass;
-
   const PAGE_SIZE = 15;
 
   const loadData = async () => {
     setLoading(true);
     try {
       if (isStudent) {
-         // Student View
          const stus = await api.students.getAll();
          const me = stus.find((s: Student) => s.name === (currentUser.trueName || currentUser.username));
          if (me) {
             const res = await api.rewards.getMyRewards(me._id || String(me.id), page, PAGE_SIZE);
-            setRewards(res.list || res); // Handle both old array and new object return
+            setRewards(res.list || res); 
             setTotal(res.total || (Array.isArray(res) ? res.length : 0));
          }
       } else {
-         // Teacher View
          const allStus = await api.students.getAll();
-         
          let targetClass = '';
          let filteredStudents = allStus;
-         
          if (isTeacher && homeroomClass) {
              targetClass = homeroomClass;
              filteredStudents = allStus.filter((s: Student) => s.className === homeroomClass);
          }
-         
          const res = await api.rewards.getClassRewards(page, PAGE_SIZE, targetClass);
-         
          setRewards(res.list || []);
          setTotal(res.total || 0);
-         
-         // Sort students: Seat No > Name
          filteredStudents.sort((a: Student, b: Student) => {
              const seatA = parseInt(a.seatNo || '99999');
              const seatB = parseInt(b.seatNo || '99999');
@@ -80,12 +73,11 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
     finally { setLoading(false); }
   };
 
-  useEffect(() => { loadData(); }, [page, className]); // Reload when page or className prop changes
+  useEffect(() => { loadData(); }, [page, className]);
 
   const handleGrant = async () => {
      if(!grantForm.studentId) return alert('请选择学生');
      if(grantForm.rewardType === 'ITEM' && !grantForm.name) return alert('请输入奖品名称');
-     
      try {
         await api.games.grantReward(grantForm);
         setIsGrantModalOpen(false);
@@ -95,21 +87,31 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
      } catch(e) { alert('发放失败'); }
   };
 
-  const handleRedeem = async (id: string) => {
-     if(confirm('确认标记为已核销/已兑换？')) {
-        await api.rewards.redeem(id);
-        loadData();
-     }
+  const openRedeemConfirm = (id: string) => {
+      setConfirmModal({
+          isOpen: true,
+          title: '确认核销',
+          message: '确定要将此奖励标记为“已核销/已兑换”吗？此操作不可撤销。',
+          onConfirm: async () => {
+              await api.rewards.redeem(id);
+              loadData();
+          }
+      });
   };
 
-  const handleDelete = async (r: StudentReward) => {
-      if (!confirm(`确定要撤回这条奖励吗？\n如果学生已经使用了抽奖券，撤回将失败。`)) return;
-      try {
-          await api.rewards.delete(r._id!);
-          loadData();
-      } catch (e: any) {
-          alert(e.message || '撤回��败，可能学生已使用部分次数');
-      }
+  const openDeleteConfirm = (r: StudentReward) => {
+      setConfirmModal({
+          isOpen: true,
+          title: '撤回奖励',
+          message: `确定要撤回 "${r.name}" 吗？如果学生已经使用了抽奖券，撤回将失败。`,
+          isDanger: true,
+          onConfirm: async () => {
+              try {
+                  await api.rewards.delete(r._id!);
+                  loadData();
+              } catch(e: any) { alert(e.message || '撤回失败'); }
+          }
+      });
   };
 
   const handleUpdate = async (id: string) => {
@@ -123,7 +125,6 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
       setEditForm({ name: r.name, count: r.count || 1 });
   };
 
-  // Client-side Filtering
   const displayRewards = rewards.filter(r => {
       if (filterType !== 'ALL' && r.rewardType !== filterType) return false;
       if (filterStatus !== 'ALL' && r.status !== filterStatus) return false;
@@ -140,13 +141,18 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
 
   return (
     <div className="flex flex-col h-full bg-white rounded-2xl shadow-sm border border-gray-100 overflow-hidden">
+        <ConfirmModal 
+            isOpen={confirmModal.isOpen} 
+            title={confirmModal.title} 
+            message={confirmModal.message} 
+            onClose={()=>setConfirmModal({...confirmModal, isOpen: false})} 
+            onConfirm={confirmModal.onConfirm}
+            isDanger={confirmModal.isDanger}
+        />
+
         <div className="p-4 md:p-6 border-b border-gray-100 flex flex-col md:flex-row justify-between items-start md:items-center gap-4 shrink-0">
-            <h3 className="text-xl font-bold text-gray-800">
-                {isStudent ? '我的战利品清单' : `${homeroomClass || '全校'} 奖励核销台`}
-            </h3>
-            
+            <h3 className="text-xl font-bold text-gray-800">{isStudent ? '我的战利品清单' : `${homeroomClass || '全校'} 奖励核销台`}</h3>
             <div className="flex flex-wrap items-center gap-3 w-full md:w-auto">
-                {/* Filters */}
                 <div className="flex items-center bg-gray-100 rounded-lg p-1">
                     <select className="bg-transparent text-xs p-1.5 rounded outline-none text-gray-600" value={filterType} onChange={e=>setFilterType(e.target.value)}>
                         <option value="ALL">全部类型</option>
@@ -165,7 +171,6 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
                     <input className="pl-8 pr-3 py-1.5 text-xs border rounded-lg bg-gray-50 focus:bg-white transition-colors outline-none w-32" placeholder="搜索..." value={searchText} onChange={e=>setSearchText(e.target.value)}/>
                     <Search className="absolute left-2.5 top-2 text-gray-400" size={12}/>
                 </div>
-
                 {!isStudent && (
                     <button onClick={() => setIsGrantModalOpen(true)} className="flex items-center px-4 py-2 bg-amber-100 text-amber-700 rounded-lg font-bold hover:bg-amber-200 text-sm ml-auto md:ml-0">
                         <Gift size={16} className="mr-2"/> 发放奖励
@@ -174,7 +179,6 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
             </div>
         </div>
 
-        {/* Scrollable List Container */}
         <div className="flex-1 overflow-y-auto p-0 min-h-0">
             <table className="w-full text-left border-collapse">
                 <thead className="bg-gray-50 text-gray-500 text-xs uppercase sticky top-0 z-10 shadow-sm">
@@ -201,32 +205,12 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
                                         <span className="text-xs text-gray-400">x</span>
                                         <input type="number" min={1} className="border rounded px-1 py-0.5 text-xs w-12" value={editForm.count} onChange={e=>setEditForm({...editForm, count:Number(e.target.value)})}/>
                                     </div>
-                                ) : (
-                                    <span>{r.name} <span className="text-gray-400 text-xs ml-1">x{r.count || 1}</span></span>
-                                )}
-                            </td>
-                            <td className="p-4">
-                                <span className={`text-xs px-2 py-1 rounded border ${
-                                    r.rewardType === 'DRAW_COUNT' ? 'bg-purple-50 text-purple-700 border-purple-100' : 
-                                    r.rewardType === 'CONSOLATION' ? 'bg-gray-100 text-gray-500 border-gray-200' :
-                                    'bg-blue-50 text-blue-700 border-blue-100'
-                                }`}>
-                                    {r.rewardType==='DRAW_COUNT' ? '抽奖券' : r.rewardType==='CONSOLATION' ? '未中奖' : '实物'}
-                                </span>
+                                ) : <span>{r.name} <span className="text-gray-400 text-xs ml-1">x{r.count || 1}</span></span>}
                             </td>
+                            <td className="p-4"><span className={`text-xs px-2 py-1 rounded border ${r.rewardType === 'DRAW_COUNT' ? 'bg-purple-50 text-purple-700 border-purple-100' : r.rewardType === 'CONSOLATION' ? 'bg-gray-100 text-gray-500 border-gray-200' : 'bg-blue-50 text-blue-700 border-blue-100'}`}>{r.rewardType==='DRAW_COUNT' ? '抽奖券' : r.rewardType==='CONSOLATION' ? '未中奖' : '实物'}</span></td>
                             <td className="p-4 text-gray-500 text-xs">{r.source}</td>
                             <td className="p-4 text-gray-500 text-xs">{new Date(r.createTime).toLocaleDateString()}</td>
-                            <td className="p-4">
-                                {r.rewardType === 'DRAW_COUNT' ? (
-                                    <span className="text-xs bg-purple-100 text-purple-700 px-2 py-1 rounded border border-purple-200">系统入账</span>
-                                ) : r.rewardType === 'CONSOLATION' ? (
-                                    <span className="text-xs text-gray-400">已结束</span>
-                                ) : (
-                                    r.status === 'REDEEMED' 
-                                    ? <span className="text-xs bg-green-100 text-green-700 px-2 py-1 rounded border border-green-200">已兑换</span>
-                                    : <span className="text-xs bg-amber-100 text-amber-700 px-2 py-1 rounded border border-amber-200 animate-pulse">待核销</span>
-                                )}
-                            </td>
+                            <td className="p-4">{r.rewardType === 'DRAW_COUNT' ? <span className="text-xs bg-purple-100 text-purple-700 px-2 py-1 rounded border border-purple-200">系统入账</span> : r.rewardType === 'CONSOLATION' ? <span className="text-xs text-gray-400">已结束</span> : (r.status === 'REDEEMED' ? <span className="text-xs bg-green-100 text-green-700 px-2 py-1 rounded border border-green-200">已兑换</span> : <span className="text-xs bg-amber-100 text-amber-700 px-2 py-1 rounded border border-amber-200 animate-pulse">待核销</span>)}</td>
                             {!isStudent && (
                                 <td className="p-4 text-right flex justify-end gap-2">
                                     {isEditing ? (
@@ -237,12 +221,10 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
                                     ) : (
                                         <>
                                             {r.status !== 'REDEEMED' && r.rewardType === 'ITEM' && (
-                                                <button onClick={() => handleRedeem(r._id!)} className="text-xs bg-green-600 text-white px-3 py-1 rounded hover:bg-green-700 shadow-sm transition-colors mr-2">
-                                                    核销
-                                                </button>
+                                                <button onClick={() => openRedeemConfirm(r._id!)} className="text-xs bg-green-600 text-white px-3 py-1 rounded hover:bg-green-700 shadow-sm transition-colors mr-2">核销</button>
                                             )}
                                             <button onClick={()=>startEdit(r)} className="text-blue-400 hover:text-blue-600 p-1" title="编辑"><Edit size={16}/></button>
-                                            <button onClick={()=>handleDelete(r)} className="text-gray-400 hover:text-red-500 p-1" title="撤回"><Trash2 size={16}/></button>
+                                            <button onClick={()=>openDeleteConfirm(r)} className="text-gray-400 hover:text-red-500 p-1" title="撤回"><Trash2 size={16}/></button>
                                         </>
                                     )}
                                 </td>
@@ -250,14 +232,10 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
                         </tr>
                         );
                     })}
-                    {displayRewards.length === 0 && (
-                    <tr><td colSpan={7} className="text-center py-10 text-gray-400">暂无记录</td></tr>
-                    )}
+                    {displayRewards.length === 0 && <tr><td colSpan={7} className="text-center py-10 text-gray-400">暂无记录</td></tr>}
                 </tbody>
             </table>
         </div>
-
-        {/* Pagination Footer */}
         <div className="p-3 border-t border-gray-100 flex items-center justify-between shrink-0 bg-gray-50">
             <span className="text-xs text-gray-500">共 {total} 条记录</span>
             <div className="flex items-center gap-2">
@@ -266,8 +244,6 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
                 <button onClick={()=>setPage(Math.min(totalPages, page+1))} disabled={page>=totalPages} className="p-1 rounded hover:bg-gray-200 disabled:opacity-30"><ChevronRight size={16}/></button>
             </div>
         </div>
-
-        {/* Grant Modal */}
         {isGrantModalOpen && (
             <div className="fixed inset-0 bg-black/50 z-[100] flex items-center justify-center p-4">
             <div className="bg-white rounded-xl p-6 w-full max-w-sm animate-in fade-in zoom-in-95 shadow-2xl">
@@ -287,19 +263,16 @@ export const GameRewards: React.FC<{className?: string}> = ({ className }) => {
                             <button onClick={()=>setGrantForm({...grantForm, rewardType: 'ITEM'})} className={`flex-1 py-2 text-sm rounded border ${grantForm.rewardType==='ITEM' ? 'bg-blue-50 border-blue-500 text-blue-700 font-bold' : 'border-gray-200 text-gray-600'}`}>实物奖品</button>
                         </div>
                     </div>
-                    
                     {grantForm.rewardType === 'ITEM' && (
                         <div>
                             <label className="block text-xs font-bold text-gray-500 uppercase mb-1">奖品名称</label>
                             <input className="w-full border border-gray-300 p-2 rounded-lg text-sm" placeholder="如: 笔记本、铅笔" value={grantForm.name} onChange={e=>setGrantForm({...grantForm, name: e.target.value})}/>
                         </div>
                     )}
-
                     <div>
                         <label className="block text-xs font-bold text-gray-500 uppercase mb-1">发放数量</label>
                         <input type="number" min={1} className="w-full border border-gray-300 p-2 rounded-lg outline-none" value={grantForm.count} onChange={e=>setGrantForm({...grantForm, count: Number(e.target.value)})}/>
                     </div>
-
                     <div className="flex gap-2 pt-2">
                         <button onClick={() => setIsGrantModalOpen(false)} className="flex-1 bg-gray-100 text-gray-700 py-2 rounded-lg hover:bg-gray-200 transition-colors">取消</button>
                         <button onClick={handleGrant} className="flex-1 bg-amber-500 text-white py-2 rounded-lg font-bold hover:bg-amber-600 shadow-md transition-colors">确认发放</button>

pages/TeacherDashboard.tsx

@@ -0,0 +1,283 @@
+
+import React, { useEffect, useState } from 'react';
+import { api } from '../services/api';
+import { Schedule, Student, Attendance } from '../types';
+import { Calendar, UserX, AlertTriangle, Activity, Coffee, Plus, X, PaintBucket, ToggleLeft } from 'lucide-react';
+import { TodoList } from '../components/TodoList';
+
+const COLORS = ['#dbeafe', '#dcfce7', '#fef9c3', '#fee2e2', '#f3e8ff', '#ffedd5', '#e0e7ff', '#ecfccb'];
+const stringToColor = (str: string) => {
+    let hash = 0;
+    for (let i = 0; i < str.length; i++) hash = str.charCodeAt(i) + ((hash << 5) - hash);
+    return COLORS[Math.abs(hash) % COLORS.length];
+};
+
+export const TeacherDashboard: React.FC = () => {
+  const [loading, setLoading] = useState(true);
+  const [schedules, setSchedules] = useState<Schedule[]>([]);
+  const [students, setStudents] = useState<Student[]>([]);
+  const [attendance, setAttendance] = useState<Attendance[]>([]);
+  
+  // Schedule State
+  const [showSchedule, setShowSchedule] = useState(false);
+  const [weekType, setWeekType] = useState<'ALL' | 'ODD' | 'EVEN'>('ALL'); // Currently displaying
+  const [editingCell, setEditingCell] = useState<{day: number, period: number} | null>(null);
+  const [editForm, setEditForm] = useState({ subject: '', teacherName: '', weekType: 'ALL' });
+  const [periodCount, setPeriodCount] = useState(8); // Default, could be config
+
+  const currentUser = api.auth.getCurrentUser();
+  const homeroomClass = currentUser?.homeroomClass;
+
+  useEffect(() => {
+    loadData();
+  }, []);
+
+  const loadData = async () => {
+    setLoading(true);
+    try {
+        const todayStr = new Date().toISOString().split('T')[0];
+        
+        const [stus, scheds, atts] = await Promise.all([
+            api.students.getAll(),
+            homeroomClass ? api.schedules.get({ className: homeroomClass }) : Promise.resolve([]),
+            homeroomClass ? api.attendance.get({ className: homeroomClass, date: todayStr }) : Promise.resolve([])
+        ]);
+
+        if (homeroomClass) {
+            setStudents(stus.filter((s: Student) => s.className === homeroomClass));
+            setSchedules(scheds);
+            setAttendance(atts);
+        } else {
+            // Non-homeroom teacher view logic could be added here
+        }
+    } catch (e) { console.error(e); } 
+    finally { setLoading(false); }
+  };
+
+  const handleSaveSchedule = async () => {
+      if (!homeroomClass || !editingCell) return;
+      if (!editForm.subject) return alert('请输入科目');
+      try {
+          await api.schedules.save({
+              className: homeroomClass,
+              dayOfWeek: editingCell.day,
+              period: editingCell.period,
+              subject: editForm.subject,
+              teacherName: editForm.teacherName,
+              weekType: editForm.weekType as any
+          });
+          setEditingCell(null);
+          // Refresh
+          const updated = await api.schedules.get({ className: homeroomClass });
+          setSchedules(updated);
+      } catch(e) { alert('保存失败'); }
+  };
+
+  const handleDeleteSchedule = async (s: Schedule) => {
+      if(!confirm('确定删除此课程？')) return;
+      await api.schedules.delete({ className: s.className, dayOfWeek: s.dayOfWeek, period: s.period });
+      const updated = await api.schedules.get({ className: homeroomClass });
+      setSchedules(updated);
+  };
+
+  // Stats
+  const absentCount = attendance.filter(a => a.status === 'Absent').length;
+  const leaveCount = attendance.filter(a => a.status === 'Leave').length;
+  const presentCount = attendance.filter(a => a.status === 'Present').length;
+  const unknownCount = students.length - presentCount - leaveCount - absentCount;
+
+  const absentNames = attendance.filter(a => a.status === 'Absent').map(a => a.studentName);
+  const leaveNames = attendance.filter(a => a.status === 'Leave').map(a => a.studentName);
+
+  return (
+    <div className="space-y-6">
+        <div className="flex flex-col md:flex-row justify-between items-center bg-white p-6 rounded-xl shadow-sm border border-gray-100">
+            <div>
+                <h1 className="text-2xl font-bold text-gray-800">你好，{currentUser?.trueName || currentUser?.username} 老师</h1>
+                <p className="text-gray-500 mt-1">{homeroomClass ? `${homeroomClass} 班主任` : '科任教师'}</p>
+            </div>
+            {homeroomClass && (
+                <button onClick={() => setShowSchedule(true)} className="mt-4 md:mt-0 flex items-center px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 shadow-md transition-colors">
+                    <Calendar className="mr-2" size={18}/> 班级课表管理
+                </button>
+            )}
+        </div>
+
+        <div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
+            {/* Left Column: Stats & Todo */}
+            <div className="lg:col-span-2 space-y-6">
+                {/* Attendance Stats */}
+                {homeroomClass && (
+                    <div className="bg-white p-6 rounded-xl border border-gray-100 shadow-sm">
+                        <h3 className="font-bold text-gray-800 mb-4 flex items-center"><Activity className="mr-2 text-blue-500"/> 今日考勤概览</h3>
+                        <div className="grid grid-cols-4 gap-4 text-center">
+                            <div className="bg-green-50 p-3 rounded-lg border border-green-100">
+                                <div className="text-2xl font-black text-green-600">{presentCount}</div>
+                                <div className="text-xs text-green-700">出勤</div>
+                            </div>
+                            <div className="bg-orange-50 p-3 rounded-lg border border-orange-100">
+                                <div className="text-2xl font-black text-orange-500">{leaveCount}</div>
+                                <div className="text-xs text-orange-700">请假</div>
+                            </div>
+                            <div className="bg-red-50 p-3 rounded-lg border border-red-100">
+                                <div className="text-2xl font-black text-red-500">{absentCount}</div>
+                                <div className="text-xs text-red-700">旷课</div>
+                            </div>
+                            <div className="bg-gray-50 p-3 rounded-lg border border-gray-200">
+                                <div className="text-2xl font-black text-gray-400">{unknownCount}</div>
+                                <div className="text-xs text-gray-500">未打卡</div>
+                            </div>
+                        </div>
+                    </div>
+                )}
+
+                {/* Warnings */}
+                {homeroomClass && (absentCount > 0 || leaveCount > 0) && (
+                    <div className="bg-white p-6 rounded-xl border border-gray-100 shadow-sm">
+                        <h3 className="font-bold text-gray-800 mb-4 flex items-center"><AlertTriangle className="mr-2 text-amber-500"/> 缺勤/请假名单</h3>
+                        <div className="space-y-3">
+                            {absentCount > 0 && (
+                                <div className="flex gap-2 items-start bg-red-50 p-3 rounded-lg border border-red-100">
+                                    <div className="font-bold text-red-600 text-sm whitespace-nowrap">旷课人员:</div>
+                                    <div className="text-sm text-red-800 flex flex-wrap gap-2">
+                                        {absentNames.map(n => <span key={n} className="bg-white px-2 py-0.5 rounded border border-red-200">{n}</span>)}
+                                    </div>
+                                </div>
+                            )}
+                            {leaveCount > 0 && (
+                                <div className="flex gap-2 items-start bg-orange-50 p-3 rounded-lg border border-orange-100">
+                                    <div className="font-bold text-orange-600 text-sm whitespace-nowrap">请假人员:</div>
+                                    <div className="text-sm text-orange-800 flex flex-wrap gap-2">
+                                        {leaveNames.map(n => <span key={n} className="bg-white px-2 py-0.5 rounded border border-orange-200">{n}</span>)}
+                                    </div>
+                                </div>
+                            )}
+                        </div>
+                    </div>
+                )}
+            </div>
+
+            {/* Right Column: Todo List */}
+            <div className="h-[500px]">
+                <TodoList />
+            </div>
+        </div>
+
+        {/* Schedule Modal */}
+        {showSchedule && homeroomClass && (
+            <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
+                <div className="bg-white rounded-xl w-full max-w-6xl h-[90vh] flex flex-col shadow-2xl animate-in zoom-in-95">
+                    <div className="p-4 border-b flex justify-between items-center">
+                        <div className="flex items-center gap-4">
+                            <h3 className="text-xl font-bold flex items-center"><Calendar className="mr-2 text-blue-600"/> 智能课表 ({homeroomClass})</h3>
+                            <div className="flex bg-gray-100 p-1 rounded-lg text-xs font-bold">
+                                {['ALL','ODD','EVEN'].map(t => (
+                                    <button 
+                                        key={t}
+                                        onClick={() => setWeekType(t as any)} 
+                                        className={`px-3 py-1.5 rounded transition-all ${weekType === t ? 'bg-white shadow text-blue-600' : 'text-gray-500'}`}
+                                    >
+                                        {t === 'ALL' ? '全周' : t === 'ODD' ? '单周' : '双周'}
+                                    </button>
+                                ))}
+                            </div>
+                        </div>
+                        <button onClick={() => setShowSchedule(false)}><X size={24} className="text-gray-400 hover:text-gray-600"/></button>
+                    </div>
+
+                    <div className="flex-1 overflow-auto bg-gray-50 p-4">
+                        <table className="w-full border-collapse bg-white shadow-sm rounded-lg overflow-hidden">
+                            <thead>
+                                <tr className="bg-gray-100 text-gray-500 text-sm">
+                                    <th className="p-3 border w-20">节次</th>
+                                    {['周一','周二','周三','周四','周五'].map(d=><th key={d} className="p-3 border w-[18%]">{d}</th>)}
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {Array.from({length: periodCount}).map((_, idx) => {
+                                    const period = idx + 1;
+                                    return (
+                                        <tr key={period}>
+                                            <td className="border p-3 text-center text-sm font-bold text-gray-600 bg-gray-50">第{period}节</td>
+                                            {[1,2,3,4,5].map(day => {
+                                                // Filter relevant schedules based on week type
+                                                const slotItems = schedules.filter(s => 
+                                                    s.dayOfWeek === day && 
+                                                    s.period === period && 
+                                                    (s.weekType === 'ALL' || s.weekType === weekType || weekType === 'ALL')
+                                                );
+                                                
+                                                return (
+                                                    <td key={day} className="border p-1 align-top h-24 relative group hover:bg-blue-50 transition-colors" onClick={() => {
+                                                        setEditingCell({day, period});
+                                                        setEditForm({subject:'', teacherName:'', weekType: weekType === 'ALL' ? 'ALL' : weekType});
+                                                    }}>
+                                                        <div className="flex flex-col gap-1 h-full">
+                                                            {slotItems.map(item => (
+                                                                <div 
+                                                                    key={item._id} 
+                                                                    className="p-1 rounded text-xs border relative group/item"
+                                                                    style={{backgroundColor: stringToColor(item.subject), borderColor: 'rgba(0,0,0,0.1)'}}
+                                                                    onClick={(e) => { e.stopPropagation(); }}
+                                                                >
+                                                                    <div className="font-bold text-gray-800">{item.subject}</div>
+                                                                    <div className="flex justify-between items-center text-[10px] text-gray-600 mt-0.5">
+                                                                        <span>{item.teacherName}</span>
+                                                                        {item.weekType !== 'ALL' && <span className="bg-white/50 px-1 rounded">{item.weekType==='ODD'?'单':'双'}</span>}
+                                                                    </div>
+                                                                    <button 
+                                                                        onClick={(e) => { e.stopPropagation(); handleDeleteSchedule(item); }}
+                                                                        className="absolute top-0 right-0 p-0.5 text-red-500 opacity-0 group-hover/item:opacity-100"
+                                                                    >
+                                                                        <X size={12}/>
+                                                                    </button>
+                                                                </div>
+                                                            ))}
+                                                            {slotItems.length === 0 && <div className="h-full flex items-center justify-center opacity-0 group-hover:opacity-50"><Plus size={20} className="text-blue-300"/></div>}
+                                                        </div>
+                                                    </td>
+                                                );
+                                            })}
+                                        </tr>
+                                    );
+                                })}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        )}
+
+        {/* Edit Modal */}
+        {editingCell && (
+            <div className="fixed inset-0 bg-black/20 z-[100] flex items-center justify-center p-4 backdrop-blur-sm">
+                <div className="bg-white p-6 rounded-xl shadow-2xl w-80 animate-in zoom-in-95">
+                    <h4 className="font-bold mb-4 text-gray-800">编辑课程</h4>
+                    <div className="space-y-3">
+                        <div>
+                            <label className="text-xs font-bold text-gray-500">科目</label>
+                            <input className="w-full border rounded p-2 text-sm" value={editForm.subject} onChange={e=>setEditForm({...editForm, subject: e.target.value})} autoFocus/>
+                        </div>
+                        <div>
+                            <label className="text-xs font-bold text-gray-500">教师 (可选)</label>
+                            <input className="w-full border rounded p-2 text-sm" value={editForm.teacherName} onChange={e=>setEditForm({...editForm, teacherName: e.target.value})}/>
+                        </div>
+                        <div>
+                            <label className="text-xs font-bold text-gray-500">周次类型</label>
+                            <select className="w-full border rounded p-2 text-sm" value={editForm.weekType} onChange={e=>setEditForm({...editForm, weekType: e.target.value})}>
+                                <option value="ALL">每周</option>
+                                <option value="ODD">单周</option>
+                                <option value="EVEN">双周</option>
+                            </select>
+                        </div>
+                        <div className="flex gap-2 pt-2">
+                            <button onClick={handleSaveSchedule} className="flex-1 bg-blue-600 text-white py-2 rounded font-bold">保存</button>
+                            <button onClick={()=>setEditingCell(null)} className="flex-1 bg-gray-100 text-gray-700 py-2 rounded">取消</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        )}
+    </div>
+  );
+};

pages/WishesAndFeedback.tsx

@@ -3,27 +3,18 @@ import React, { useState, useEffect } from 'react';
 import { api } from '../services/api';
 import { Student, User, Wish, Feedback } from '../types';
 import { Loader2, Send, Heart, MessageSquare, Check, X, Filter, Trash2, Shuffle, CheckCircle, Mail } from 'lucide-react';
-import { Emoji } from '../components/Emoji';
+import { ConfirmModal } from '../components/ConfirmModal';
 
-// --- SUB-COMPONENTS ---
-
-// 1. Wish Note Card
 const WishNote = ({ wish, onFulfill }: { wish: Wish, onFulfill?: (id: string) => void }) => {
     return (
         <div className={`relative p-4 w-40 h-40 md:w-48 md:h-48 shadow-lg flex flex-col justify-between transition-transform hover:scale-105 hover:z-10 rotate-${Math.floor(Math.random()*6)-3} ${wish.status === 'FULFILLED' ? 'bg-gray-100 grayscale opacity-70' : 'bg-yellow-100'}`} style={{fontFamily: '"Comic Sans MS", cursive, sans-serif'}}>
-            {/* Pin */}
             <div className="absolute -top-3 left-1/2 -translate-x-1/2 w-4 h-4 rounded-full bg-red-500 shadow-sm border-2 border-red-700 z-20"></div>
-            
             <div className="text-xs text-gray-500 font-bold mb-1">{new Date(wish.createTime).toLocaleDateString()}</div>
-            <div className="flex-1 overflow-hidden text-sm text-gray-800 leading-relaxed font-medium break-words">
-                {wish.content}
-            </div>
+            <div className="flex-1 overflow-hidden text-sm text-gray-800 leading-relaxed font-medium break-words">{wish.content}</div>
             <div className="mt-2 pt-2 border-t border-black/10 flex justify-between items-end">
                 <div className="text-xs font-bold text-gray-600 truncate max-w-[80px]">{wish.studentName}</div>
                 {onFulfill && wish.status === 'PENDING' && (
-                    <button onClick={() => onFulfill(wish._id!)} className="bg-green-500 text-white p-1 rounded-full hover:bg-green-600 shadow-sm" title="实现愿望">
-                        <Check size={14}/>
-                    </button>
+                    <button onClick={() => onFulfill(wish._id!)} className="bg-green-500 text-white p-1 rounded-full hover:bg-green-600 shadow-sm" title="实现愿望"><Check size={14}/></button>
                 )}
                 {wish.status === 'FULFILLED' && <CheckCircle size={16} className="text-green-600"/>}
             </div>
@@ -31,79 +22,20 @@ const WishNote = ({ wish, onFulfill }: { wish: Wish, onFulfill?: (id: string) =>
     );
 };
 
-// 2. Feedback Item
 const FeedbackItem = ({ fb, onStatusChange }: { fb: Feedback, onStatusChange?: (id: string, status: string, reply?: string) => void }) => {
     const [replyText, setReplyText] = useState(fb.reply || '');
     const [isReplying, setIsReplying] = useState(false);
-
-    const handleAction = (status: string) => {
-        if (onStatusChange) {
-            onStatusChange(fb._id!, status, isReplying ? replyText : undefined);
-            setIsReplying(false);
-        }
-    };
-
+    const handleAction = (status: string) => { if (onStatusChange) { onStatusChange(fb._id!, status, isReplying ? replyText : undefined); setIsReplying(false); } };
     return (
         <div className="bg-white p-4 rounded-xl border border-gray-100 shadow-sm hover:shadow-md transition-shadow">
             <div className="flex justify-between items-start mb-2">
-                <div className="flex items-center gap-2">
-                    <div className="w-8 h-8 rounded-full bg-blue-100 text-blue-600 flex items-center justify-center font-bold text-xs">
-                        {fb.creatorName[0]}
-                    </div>
-                    <div>
-                        <div className="font-bold text-sm text-gray-800">{fb.creatorName} <span className="text-xs font-normal text-gray-400">({fb.creatorRole === 'STUDENT' ? '学生' : '老师'})</span></div>
-                        <div className="text-[10px] text-gray-400">{new Date(fb.createTime).toLocaleString()}</div>
-                    </div>
-                </div>
-                <div className={`px-2 py-1 rounded text-xs font-bold ${
-                    fb.status === 'PENDING' ? 'bg-gray-100 text-gray-500' :
-                    fb.status === 'ACCEPTED' ? 'bg-blue-100 text-blue-600' :
-                    fb.status === 'PROCESSED' ? 'bg-green-100 text-green-600' : 'bg-red-50 text-red-400'
-                }`}>
-                    {fb.status === 'PENDING' ? '待处理' : fb.status === 'ACCEPTED' ? '已接受' : fb.status === 'PROCESSED' ? '已处理' : '已忽略'}
-                </div>
-            </div>
-            
-            <div className="bg-gray-50 p-3 rounded-lg text-sm text-gray-700 mb-3 whitespace-pre-wrap border border-gray-100">
-                {fb.content}
+                <div className="flex items-center gap-2"><div className="w-8 h-8 rounded-full bg-blue-100 text-blue-600 flex items-center justify-center font-bold text-xs">{fb.creatorName[0]}</div><div><div className="font-bold text-sm text-gray-800">{fb.creatorName} <span className="text-xs font-normal text-gray-400">({fb.creatorRole === 'STUDENT' ? '学生' : '老师'})</span></div><div className="text-[10px] text-gray-400">{new Date(fb.createTime).toLocaleString()}</div></div></div>
+                <div className={`px-2 py-1 rounded text-xs font-bold ${fb.status === 'PENDING' ? 'bg-gray-100 text-gray-500' : fb.status === 'ACCEPTED' ? 'bg-blue-100 text-blue-600' : fb.status === 'PROCESSED' ? 'bg-green-100 text-green-600' : 'bg-red-50 text-red-400'}`}>{fb.status === 'PENDING' ? '待处理' : fb.status === 'ACCEPTED' ? '已接受' : fb.status === 'PROCESSED' ? '已处理' : '已忽略'}</div>
             </div>
-
-            {fb.reply && !isReplying && (
-                <div className="bg-blue-50 p-3 rounded-lg text-sm text-blue-800 mb-3 border border-blue-100">
-                    <span className="font-bold mr-1">回复:</span> {fb.reply}
-                </div>
-            )}
-
-            {isReplying && (
-                <div className="mb-3">
-                    <textarea 
-                        className="w-full border rounded p-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none" 
-                        placeholder="请输入回复内容..."
-                        value={replyText}
-                        onChange={e => setReplyText(e.target.value)}
-                    />
-                </div>
-            )}
-
-            {onStatusChange && (
-                <div className="flex gap-2 justify-end">
-                    {fb.status === 'PENDING' && (
-                        <>
-                            <button onClick={() => handleAction('IGNORED')} className="text-xs text-gray-400 hover:text-red-500 px-2 py-1">忽略</button>
-                            <button onClick={() => handleAction('ACCEPTED')} className="text-xs bg-blue-100 text-blue-600 px-3 py-1 rounded hover:bg-blue-200 font-bold">接受</button>
-                            <button onClick={() => { setIsReplying(true); if(isReplying && replyText) handleAction('PROCESSED'); }} className="text-xs bg-green-100 text-green-600 px-3 py-1 rounded hover:bg-green-200 font-bold">
-                                {isReplying ? '提交回复并完成' : '回复并处理'}
-                            </button>
-                        </>
-                    )}
-                    {/* Allow replying to accepted feedback */}
-                    {fb.status === 'ACCEPTED' && (
-                         <button onClick={() => { setIsReplying(true); if(isReplying && replyText) handleAction('PROCESSED'); }} className="text-xs bg-green-100 text-green-600 px-3 py-1 rounded hover:bg-green-200 font-bold">
-                            {isReplying ? '提交回复并完成' : '处理'}
-                        </button>
-                    )}
-                </div>
-            )}
+            <div className="bg-gray-50 p-3 rounded-lg text-sm text-gray-700 mb-3 whitespace-pre-wrap border border-gray-100">{fb.content}</div>
+            {fb.reply && !isReplying && <div className="bg-blue-50 p-3 rounded-lg text-sm text-blue-800 mb-3 border border-blue-100"><span className="font-bold mr-1">回复:</span> {fb.reply}</div>}
+            {isReplying && <div className="mb-3"><textarea className="w-full border rounded p-2 text-sm focus:ring-2 focus:ring-blue-500 outline-none" placeholder="请输入回复内容..." value={replyText} onChange={e => setReplyText(e.target.value)}/></div>}
+            {onStatusChange && (<div className="flex gap-2 justify-end">{fb.status === 'PENDING' && (<><button onClick={() => handleAction('IGNORED')} className="text-xs text-gray-400 hover:text-red-500 px-2 py-1">忽略</button><button onClick={() => handleAction('ACCEPTED')} className="text-xs bg-blue-100 text-blue-600 px-3 py-1 rounded hover:bg-blue-200 font-bold">接受</button><button onClick={() => { setIsReplying(true); if(isReplying && replyText) handleAction('PROCESSED'); }} className="text-xs bg-green-100 text-green-600 px-3 py-1 rounded hover:bg-green-200 font-bold">{isReplying ? '提交回复并完成' : '回复并处理'}</button></>)}{fb.status === 'ACCEPTED' && (<button onClick={() => { setIsReplying(true); if(isReplying && replyText) handleAction('PROCESSED'); }} className="text-xs bg-green-100 text-green-600 px-3 py-1 rounded hover:bg-green-200 font-bold">{isReplying ? '提交回复并完成' : '处理'}</button>)}</div>)}
         </div>
     );
 };
@@ -113,369 +45,141 @@ export const WishesAndFeedback: React.FC = () => {
     const [loading, setLoading] = useState(true);
     const [wishes, setWishes] = useState<Wish[]>([]);
     const [feedbackList, setFeedbackList] = useState<Feedback[]>([]);
-    
-    // Config / Data
     const [teachers, setTeachers] = useState<User[]>([]);
     const [studentInfo, setStudentInfo] = useState<Student | null>(null);
     const [myPendingWish, setMyPendingWish] = useState<Wish | null>(null);
-
-    // Filter States
-    const [filterStatus, setFilterStatus] = useState<string>('PENDING,ACCEPTED,PROCESSED'); // Default hide ignored
-
-    // Forms
+    const [filterStatus, setFilterStatus] = useState<string>('PENDING,ACCEPTED,PROCESSED');
     const [wishContent, setWishContent] = useState('');
     const [feedbackContent, setFeedbackContent] = useState('');
     const [selectedTeacherId, setSelectedTeacherId] = useState('');
+    const [confirmModal, setConfirmModal] = useState<{isOpen: boolean, title: string, message: string, onConfirm: () => void}>({ isOpen: false, title: '', message: '', onConfirm: () => {} });
 
     const currentUser = api.auth.getCurrentUser();
     const isStudent = currentUser?.role === 'STUDENT';
     const isTeacher = currentUser?.role === 'TEACHER';
-    const isPrincipal = currentUser?.role === 'PRINCIPAL';
     const isAdmin = currentUser?.role === 'ADMIN';
 
-    useEffect(() => {
-        loadData();
-    }, [activeTab, filterStatus]);
+    useEffect(() => { loadData(); }, [activeTab, filterStatus]);
 
     const loadData = async () => {
         setLoading(true);
         try {
-            // Common: Load Teachers for selection
             if (teachers.length === 0 && !isAdmin) {
-                // If student, get class teachers. If teacher, get colleagues or just use list for principal
                 if (isStudent) {
                     const stus = await api.students.getAll();
                     const me = stus.find((s: Student) => s.name === (currentUser?.trueName || currentUser?.username));
-                    if (me) {
-                        setStudentInfo(me);
-                        const tList = await api.users.getTeachersForClass(me.className);
-                        setTeachers(tList);
-                        // Default teacher is homeroom if possible, or first in list
-                        // Logic for finding homeroom teacher ID is complex on frontend without extra calls, 
-                        // so we might just default to first one.
-                        if (tList.length > 0) setSelectedTeacherId(tList[0]._id!);
-                    }
-                } else {
-                    const allTeachers = await api.users.getAll({ role: 'TEACHER' });
-                    setTeachers(allTeachers);
-                }
+                    if (me) { setStudentInfo(me); const tList = await api.users.getTeachersForClass(me.className); setTeachers(tList); if (tList.length > 0) setSelectedTeacherId(tList[0]._id!); }
+                } else { const allTeachers = await api.users.getAll({ role: 'TEACHER' }); setTeachers(allTeachers); }
             }
-
             if (activeTab === 'wishes') {
-                if (isStudent && studentInfo) {
-                    // Load MY wishes
-                    const myWishes = await api.wishes.getAll({ studentId: studentInfo._id || String(studentInfo.id) });
-                    setWishes(myWishes);
-                    setMyPendingWish(myWishes.find((w: Wish) => w.status === 'PENDING') || null);
-                } else if (isTeacher) {
-                    // Load wishes FOR ME
-                    const myWishes = await api.wishes.getAll({ teacherId: currentUser?._id });
-                    setWishes(myWishes);
-                }
+                if (isStudent && studentInfo) { const myWishes = await api.wishes.getAll({ studentId: studentInfo._id || String(studentInfo.id) }); setWishes(myWishes); setMyPendingWish(myWishes.find((w: Wish) => w.status === 'PENDING') || null); } else if (isTeacher) { const myWishes = await api.wishes.getAll({ teacherId: currentUser?._id }); setWishes(myWishes); }
             } else if (activeTab === 'feedback') {
-                if (isStudent && studentInfo) {
-                    const myFb = await api.feedback.getAll({ creatorId: studentInfo._id || String(studentInfo.id), type: 'ACADEMIC' });
-                    setFeedbackList(myFb);
-                } else if (isTeacher) {
-                    const fbForMe = await api.feedback.getAll({ targetId: currentUser?._id, type: 'ACADEMIC', status: filterStatus });
-                    setFeedbackList(fbForMe);
-                }
+                if (isStudent && studentInfo) { const myFb = await api.feedback.getAll({ creatorId: studentInfo._id || String(studentInfo.id), type: 'ACADEMIC' }); setFeedbackList(myFb); } else if (isTeacher) { const fbForMe = await api.feedback.getAll({ targetId: currentUser?._id, type: 'ACADEMIC', status: filterStatus }); setFeedbackList(fbForMe); }
             } else if (activeTab === 'system') {
-                if (isAdmin) {
-                    const sysFb = await api.feedback.getAll({ type: 'SYSTEM' });
-                    setFeedbackList(sysFb);
-                } else {
-                    // Teacher/Principal view their own system feedback
-                    const mySysFb = await api.feedback.getAll({ creatorId: currentUser?._id, type: 'SYSTEM' });
-                    setFeedbackList(mySysFb);
-                }
+                if (isAdmin) { const sysFb = await api.feedback.getAll({ type: 'SYSTEM' }); setFeedbackList(sysFb); } else { const mySysFb = await api.feedback.getAll({ creatorId: currentUser?._id, type: 'SYSTEM' }); setFeedbackList(mySysFb); }
             }
-
-        } catch (e) { console.error(e); } 
-        finally { setLoading(false); }
+        } catch (e) { console.error(e); } finally { setLoading(false); }
     };
 
-    // --- Actions ---
-
     const submitWish = async () => {
         if (!wishContent.trim()) return alert('请输入愿望内容');
         if (!selectedTeacherId) return alert('请选择许愿对象');
-        
         try {
             const targetTeacher = teachers.find(t => t._id === selectedTeacherId);
-            await api.wishes.create({
-                studentId: studentInfo?._id || String(studentInfo?.id),
-                studentName: studentInfo?.name,
-                className: studentInfo?.className,
-                teacherId: selectedTeacherId,
-                teacherName: targetTeacher?.trueName || targetTeacher?.username,
-                content: wishContent,
-                status: 'PENDING'
-            });
-            alert('许愿成功！愿望已挂上许愿树。');
-            setWishContent('');
-            loadData();
-        } catch (e: any) {
-            alert(e.message || '许愿失败');
-        }
+            await api.wishes.create({ studentId: studentInfo?._id || String(studentInfo?.id), studentName: studentInfo?.name, className: studentInfo?.className, teacherId: selectedTeacherId, teacherName: targetTeacher?.trueName || targetTeacher?.username, content: wishContent, status: 'PENDING' });
+            alert('许愿成功！愿望已挂上许愿树。'); setWishContent(''); loadData();
+        } catch (e: any) { alert(e.message || '许愿失败'); }
     };
 
     const fulfillWish = async (id: string) => {
-        if (!confirm('确定要实现这个愿望吗？')) return;
-        await api.wishes.fulfill(id);
-        loadData();
+        setConfirmModal({
+            isOpen: true,
+            title: '实现愿望',
+            message: '确定要实现这个愿望吗？',
+            onConfirm: async () => {
+                await api.wishes.fulfill(id);
+                loadData();
+            }
+        });
     };
 
     const randomFulfill = async () => {
-        if (!confirm('系统将随机选择一个待实现的愿望，确定吗？')) return;
-        try {
-            const res = await api.wishes.randomFulfill(currentUser?._id!);
-            alert(`🎉 命运之选：${res.wish.studentName} 的愿望 "${res.wish.content}" 已被选中实现！`);
-            loadData();
-        } catch (e: any) { alert(e.message); }
+        setConfirmModal({
+            isOpen: true,
+            title: '随机抽取',
+            message: '系统将随机选择一个待实现的愿望，确定吗？',
+            onConfirm: async () => {
+                try {
+                    const res = await api.wishes.randomFulfill(currentUser?._id!);
+                    alert(`🎉 命运之选：${res.wish.studentName} 的愿望 "${res.wish.content}" 已被选中实现！`);
+                    loadData();
+                } catch (e: any) { alert(e.message); }
+            }
+        });
     };
 
     const submitFeedback = async (type: 'ACADEMIC' | 'SYSTEM') => {
-        const content = type === 'ACADEMIC' ? feedbackContent : wishContent; // Reuse state for simplicity or separate
+        const content = type === 'ACADEMIC' ? feedbackContent : wishContent; 
         if (!content.trim()) return alert('请输入内容');
-        
         try {
-            const payload: Partial<Feedback> = {
-                creatorId: type === 'ACADEMIC' ? (studentInfo?._id || String(studentInfo?.id)) : currentUser?._id,
-                creatorName: type === 'ACADEMIC' ? studentInfo?.name : (currentUser?.trueName || currentUser?.username),
-                creatorRole: currentUser?.role,
-                content: content,
-                type: type,
-                status: 'PENDING'
-            };
-
-            if (type === 'ACADEMIC') {
-                if (!selectedTeacherId) return alert('请选择反馈对象');
-                const targetTeacher = teachers.find(t => t._id === selectedTeacherId);
-                payload.targetId = selectedTeacherId;
-                payload.targetName = targetTeacher?.trueName || targetTeacher?.username;
-            } else {
-                payload.targetId = 'ADMIN';
-                payload.targetName = '系统管理员';
-            }
-
-            await api.feedback.create(payload);
-            alert('提交成功');
-            if (type === 'ACADEMIC') setFeedbackContent(''); else setWishContent('');
-            loadData();
+            const payload: Partial<Feedback> = { creatorId: type === 'ACADEMIC' ? (studentInfo?._id || String(studentInfo?.id)) : currentUser?._id, creatorName: type === 'ACADEMIC' ? studentInfo?.name : (currentUser?.trueName || currentUser?.username), creatorRole: currentUser?.role, content: content, type: type, status: 'PENDING' };
+            if (type === 'ACADEMIC') { if (!selectedTeacherId) return alert('请选择反馈对象'); const targetTeacher = teachers.find(t => t._id === selectedTeacherId); payload.targetId = selectedTeacherId; payload.targetName = targetTeacher?.trueName || targetTeacher?.username; } else { payload.targetId = 'ADMIN'; payload.targetName = '系统管理员'; }
+            await api.feedback.create(payload); alert('提交成功'); if (type === 'ACADEMIC') setFeedbackContent(''); else setWishContent(''); loadData();
         } catch(e) { alert('提交失败'); }
     };
 
-    const handleFeedbackStatus = async (id: string, status: string, reply?: string) => {
-        await api.feedback.update(id, { status, reply });
-        loadData();
-    };
-
+    const handleFeedbackStatus = async (id: string, status: string, reply?: string) => { await api.feedback.update(id, { status, reply }); loadData(); };
     const handleIgnoreAll = async () => {
-        if (!confirm('确定要忽略所有待处理的反馈吗？')) return;
-        await api.feedback.ignoreAll(currentUser?._id!);
-        loadData();
+        setConfirmModal({
+            isOpen: true,
+            title: '全部忽略',
+            message: '确定要忽略所有待处理的反馈吗？',
+            onConfirm: async () => {
+                await api.feedback.ignoreAll(currentUser?._id!);
+                loadData();
+            }
+        });
     };
 
-    // --- RENDER ---
-
     return (
         <div className="h-full flex flex-col bg-slate-50 overflow-hidden">
-            {/* Header Tabs */}
+            <ConfirmModal isOpen={confirmModal.isOpen} title={confirmModal.title} message={confirmModal.message} onClose={()=>setConfirmModal({...confirmModal, isOpen: false})} onConfirm={confirmModal.onConfirm}/>
             <div className="bg-white border-b border-gray-200 px-6 pt-4 flex gap-6 shrink-0 shadow-sm z-10">
-                <button onClick={() => setActiveTab('wishes')} className={`pb-3 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 ${activeTab === 'wishes' ? 'border-pink-500 text-pink-600' : 'border-transparent text-gray-500 hover:text-gray-700'}`}>
-                    <Heart size={18} className={activeTab === 'wishes' ? 'fill-pink-500' : ''}/> 许愿树
-                </button>
-                {/* Feedback Tab logic: Students see "My Feedback", Teachers see "Inbox" */}
-                <button onClick={() => setActiveTab('feedback')} className={`pb-3 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 ${activeTab === 'feedback' ? 'border-blue-500 text-blue-600' : 'border-transparent text-gray-500 hover:text-gray-700'}`}>
-                    <MessageSquare size={18} className={activeTab === 'feedback' ? 'fill-blue-500' : ''}/> {isStudent ? '我的意见箱' : '学生反馈'}
-                </button>
-                {/* System Feedback: Admin sees inbox, others see submission form */}
-                {!isStudent && (
-                    <button onClick={() => setActiveTab('system')} className={`pb-3 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 ${activeTab === 'system' ? 'border-purple-500 text-purple-600' : 'border-transparent text-gray-500 hover:text-gray-700'}`}>
-                        <Mail size={18} className={activeTab === 'system' ? 'fill-purple-500' : ''}/> 系统建议
-                    </button>
-                )}
+                <button onClick={() => setActiveTab('wishes')} className={`pb-3 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 ${activeTab === 'wishes' ? 'border-pink-500 text-pink-600' : 'border-transparent text-gray-500 hover:text-gray-700'}`}><Heart size={18} className={activeTab === 'wishes' ? 'fill-pink-500' : ''}/> 许愿树</button>
+                <button onClick={() => setActiveTab('feedback')} className={`pb-3 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 ${activeTab === 'feedback' ? 'border-blue-500 text-blue-600' : 'border-transparent text-gray-500 hover:text-gray-700'}`}><MessageSquare size={18} className={activeTab === 'feedback' ? 'fill-blue-500' : ''}/> {isStudent ? '我的意见箱' : '学生反馈'}</button>
+                {!isStudent && <button onClick={() => setActiveTab('system')} className={`pb-3 text-sm font-bold border-b-2 transition-colors flex items-center gap-2 ${activeTab === 'system' ? 'border-purple-500 text-purple-600' : 'border-transparent text-gray-500 hover:text-gray-700'}`}><Mail size={18} className={activeTab === 'system' ? 'fill-purple-500' : ''}/> 系统建议</button>}
             </div>
-
             <div className="flex-1 overflow-hidden relative">
                 {loading && <div className="absolute inset-0 bg-white/50 z-50 flex items-center justify-center"><Loader2 className="animate-spin text-blue-600"/></div>}
-
-                {/* --- TAB: WISHES --- */}
                 {activeTab === 'wishes' && (
                     <div className="h-full flex flex-col">
-                        {/* Tree Background Area */}
                         <div className="flex-1 bg-green-50 overflow-y-auto p-6 relative custom-scrollbar">
-                            <div className="absolute inset-0 opacity-10 pointer-events-none flex justify-center items-center">
-                                {/* Simple CSS Tree representation or SVG */}
-                                <svg viewBox="0 0 200 200" className="w-full h-full text-green-800" fill="currentColor">
-                                    <path d="M100 20 L140 100 H120 L150 160 H50 L80 100 H60 Z" />
-                                    <rect x="90" y="160" width="20" height="40" />
-                                </svg>
-                            </div>
-                            
+                            <div className="absolute inset-0 opacity-10 pointer-events-none flex justify-center items-center"><svg viewBox="0 0 200 200" className="w-full h-full text-green-800" fill="currentColor"><path d="M100 20 L140 100 H120 L150 160 H50 L80 100 H60 Z" /><rect x="90" y="160" width="20" height="40" /></svg></div>
                             <div className="relative z-10 flex flex-wrap gap-6 justify-center content-start min-h-[300px]">
-                                {wishes.length === 0 ? (
-                                    <div className="text-gray-400 mt-20 font-bold bg-white/80 p-4 rounded-xl shadow-sm">
-                                        🌲 许愿树上还空荡荡的，快来挂上第一个愿望吧！
-                                    </div>
-                                ) : (
-                                    wishes.map(w => (
-                                        <WishNote key={w._id} wish={w} onFulfill={isTeacher ? fulfillWish : undefined} />
-                                    ))
-                                )}
+                                {wishes.length === 0 ? <div className="text-gray-400 mt-20 font-bold bg-white/80 p-4 rounded-xl shadow-sm">🌲 许愿树上还空荡荡的，快来挂上第一个愿望吧！</div> : wishes.map(w => (<WishNote key={w._id} wish={w} onFulfill={isTeacher ? fulfillWish : undefined} />))}
                             </div>
                         </div>
-
-                        {/* Bottom Control Panel */}
                         <div className="bg-white border-t border-gray-200 p-4 shrink-0 shadow-[0_-4px_10px_-1px_rgba(0,0,0,0.05)]">
-                            {isStudent ? (
-                                myPendingWish ? (
-                                    <div className="text-center p-4 bg-yellow-50 border border-yellow-200 rounded-xl">
-                                        <p className="text-yellow-800 font-bold mb-1">您许下的愿望正在等待实现中...</p>
-                                        <p className="text-sm text-yellow-600">"{myPendingWish.content}"</p>
-                                        <p className="text-xs text-gray-400 mt-2">当老师实现此愿望后，您才可以许下新的愿望。</p>
-                                    </div>
-                                ) : (
-                                    <div className="flex flex-col md:flex-row gap-4 items-end max-w-4xl mx-auto">
-                                        <div className="flex-1 w-full">
-                                            <label className="text-xs font-bold text-gray-500 mb-1 block uppercase">许愿内容</label>
-                                            <input 
-                                                className="w-full border border-gray-300 rounded-lg p-3 focus:ring-2 focus:ring-pink-500 outline-none" 
-                                                placeholder="我希望..." 
-                                                value={wishContent}
-                                                onChange={e => setWishContent(e.target.value)}
-                                            />
-                                        </div>
-                                        <div className="w-full md:w-48">
-                                            <label className="text-xs font-bold text-gray-500 mb-1 block uppercase">许愿对象</label>
-                                            <select 
-                                                className="w-full border border-gray-300 rounded-lg p-3 bg-white outline-none"
-                                                value={selectedTeacherId}
-                                                onChange={e => setSelectedTeacherId(e.target.value)}
-                                            >
-                                                {teachers.map(t => <option key={t._id} value={t._id}>{t.teachingSubject ? `${t.teachingSubject}-${t.trueName||t.username}` : t.trueName||t.username}</option>)}
-                                            </select>
-                                        </div>
-                                        <button onClick={submitWish} className="w-full md:w-auto bg-pink-500 text-white px-6 py-3 rounded-lg font-bold hover:bg-pink-600 flex items-center justify-center gap-2 shadow-md">
-                                            <Send size={18}/> 挂上愿望
-                                        </button>
-                                    </div>
-                                )
-                            ) : isTeacher ? (
-                                <div className="flex justify-between items-center max-w-4xl mx-auto">
-                                    <div className="text-sm text-gray-500">
-                                        <span className="font-bold text-gray-800">{wishes.filter(w=>w.status==='PENDING').length}</span> 个待实现愿望
-                                    </div>
-                                    <button onClick={randomFulfill} className="bg-gradient-to-r from-purple-500 to-indigo-500 text-white px-6 py-3 rounded-lg font-bold hover:shadow-lg transition-all flex items-center gap-2">
-                                        <Shuffle size={18}/> 随机实现一个愿望
-                                    </button>
-                                </div>
-                            ) : <div className="text-center text-gray-400">只读模式</div>}
+                            {isStudent ? (myPendingWish ? (<div className="text-center p-4 bg-yellow-50 border border-yellow-200 rounded-xl"><p className="text-yellow-800 font-bold mb-1">您许下的愿望正在等待实现中...</p><p className="text-sm text-yellow-600">"{myPendingWish.content}"</p><p className="text-xs text-gray-400 mt-2">当老师实现此愿望后，您才可以许下新的愿望。</p></div>) : (<div className="flex flex-col md:flex-row gap-4 items-end max-w-4xl mx-auto"><div className="flex-1 w-full"><label className="text-xs font-bold text-gray-500 mb-1 block uppercase">许愿内容</label><input className="w-full border border-gray-300 rounded-lg p-3 focus:ring-2 focus:ring-pink-500 outline-none" placeholder="我希望..." value={wishContent} onChange={e => setWishContent(e.target.value)}/></div><div className="w-full md:w-48"><label className="text-xs font-bold text-gray-500 mb-1 block uppercase">许愿对象</label><select className="w-full border border-gray-300 rounded-lg p-3 bg-white outline-none" value={selectedTeacherId} onChange={e => setSelectedTeacherId(e.target.value)}>{teachers.map(t => <option key={t._id} value={t._id}>{t.teachingSubject ? `${t.teachingSubject}-${t.trueName||t.username}` : t.trueName||t.username}</option>)}</select></div><button onClick={submitWish} className="w-full md:w-auto bg-pink-500 text-white px-6 py-3 rounded-lg font-bold hover:bg-pink-600 flex items-center justify-center gap-2 shadow-md"><Send size={18}/> 挂上愿望</button></div>)) : isTeacher ? (<div className="flex justify-between items-center max-w-4xl mx-auto"><div className="text-sm text-gray-500"><span className="font-bold text-gray-800">{wishes.filter(w=>w.status==='PENDING').length}</span> 个待实现愿望</div><button onClick={randomFulfill} className="bg-gradient-to-r from-purple-500 to-indigo-500 text-white px-6 py-3 rounded-lg font-bold hover:shadow-lg transition-all flex items-center gap-2"><Shuffle size={18}/> 随机实现一个愿望</button></div>) : <div className="text-center text-gray-400">只读模式</div>}
                         </div>
                     </div>
                 )}
-
-                {/* --- TAB: FEEDBACK --- */}
                 {activeTab === 'feedback' && (
                     <div className="h-full flex flex-col md:flex-row">
-                        {/* List Area */}
                         <div className="flex-1 overflow-y-auto p-6 bg-gray-50">
-                            {isTeacher && (
-                                <div className="mb-4 flex justify-between items-center bg-white p-3 rounded-xl border border-gray-100 shadow-sm">
-                                    <div className="flex items-center gap-2 text-sm text-gray-600">
-                                        <Filter size={16}/>
-                                        <label className="flex items-center gap-1 cursor-pointer">
-                                            <input type="checkbox" checked={filterStatus.includes('IGNORED')} onChange={e => {
-                                                if(e.target.checked) setFilterStatus('PENDING,ACCEPTED,PROCESSED,IGNORED');
-                                                else setFilterStatus('PENDING,ACCEPTED,PROCESSED');
-                                            }} />
-                                            显示已忽略
-                                        </label>
-                                    </div>
-                                    <button onClick={handleIgnoreAll} className="text-xs text-red-500 hover:text-red-600 hover:bg-red-50 px-3 py-1.5 rounded flex items-center transition-colors">
-                                        <Trash2 size={14} className="mr-1"/> 一键忽略所有待处理
-                                    </button>
-                                </div>
-                            )}
-
-                            <div className="space-y-4 max-w-3xl mx-auto">
-                                {feedbackList.length === 0 ? (
-                                    <div className="text-center text-gray-400 py-10">暂无反馈记录</div>
-                                ) : (
-                                    feedbackList.map(fb => (
-                                        <FeedbackItem key={fb._id} fb={fb} onStatusChange={isTeacher ? handleFeedbackStatus : undefined} />
-                                    ))
-                                )}
-                            </div>
+                            {isTeacher && (<div className="mb-4 flex justify-between items-center bg-white p-3 rounded-xl border border-gray-100 shadow-sm"><div className="flex items-center gap-2 text-sm text-gray-600"><Filter size={16}/><label className="flex items-center gap-1 cursor-pointer"><input type="checkbox" checked={filterStatus.includes('IGNORED')} onChange={e => { if(e.target.checked) setFilterStatus('PENDING,ACCEPTED,PROCESSED,IGNORED'); else setFilterStatus('PENDING,ACCEPTED,PROCESSED'); }} /> 显示已忽略</label></div><button onClick={handleIgnoreAll} className="text-xs text-red-500 hover:text-red-600 hover:bg-red-50 px-3 py-1.5 rounded flex items-center transition-colors"><Trash2 size={14} className="mr-1"/> 一键忽略所有待处理</button></div>)}
+                            <div className="space-y-4 max-w-3xl mx-auto">{feedbackList.length === 0 ? <div className="text-center text-gray-400 py-10">暂无反馈记录</div> : feedbackList.map(fb => (<FeedbackItem key={fb._id} fb={fb} onStatusChange={isTeacher ? handleFeedbackStatus : undefined} />))}</div>
                         </div>
-
-                        {/* Input Area (Student Only) */}
-                        {isStudent && (
-                            <div className="w-full md:w-80 bg-white border-l border-gray-200 p-6 flex flex-col shadow-xl z-20">
-                                <h3 className="font-bold text-gray-800 mb-4 flex items-center"><MessageSquare size={18} className="mr-2 text-blue-500"/> 提交反馈</h3>
-                                <div className="space-y-4 flex-1">
-                                    <div>
-                                        <label className="text-xs font-bold text-gray-500 mb-1 block uppercase">反馈对象</label>
-                                        <select 
-                                            className="w-full border border-gray-300 rounded-lg p-2 text-sm bg-white"
-                                            value={selectedTeacherId}
-                                            onChange={e => setSelectedTeacherId(e.target.value)}
-                                        >
-                                            {teachers.map(t => <option key={t._id} value={t._id}>{t.teachingSubject ? `${t.teachingSubject}-${t.trueName||t.username}` : t.trueName||t.username}</option>)}
-                                        </select>
-                                    </div>
-                                    <div className="flex-1 flex flex-col">
-                                        <label className="text-xs font-bold text-gray-500 mb-1 block uppercase">内容</label>
-                                        <textarea 
-                                            className="w-full border border-gray-300 rounded-lg p-3 text-sm flex-1 resize-none focus:ring-2 focus:ring-blue-500 outline-none"
-                                            placeholder="老师，我对课程有建议..."
-                                            value={feedbackContent}
-                                            onChange={e => setFeedbackContent(e.target.value)}
-                                        />
-                                    </div>
-                                    <button onClick={() => submitFeedback('ACADEMIC')} className="w-full bg-blue-600 text-white py-3 rounded-lg font-bold hover:bg-blue-700 shadow-md">
-                                        提交反馈
-                                    </button>
-                                </div>
-                            </div>
-                        )}
+                        {isStudent && (<div className="w-full md:w-80 bg-white border-l border-gray-200 p-6 flex flex-col shadow-xl z-20"><h3 className="font-bold text-gray-800 mb-4 flex items-center"><MessageSquare size={18} className="mr-2 text-blue-500"/> 提交反馈</h3><div className="space-y-4 flex-1"><div><label className="text-xs font-bold text-gray-500 mb-1 block uppercase">反馈对象</label><select className="w-full border border-gray-300 rounded-lg p-2 text-sm bg-white" value={selectedTeacherId} onChange={e => setSelectedTeacherId(e.target.value)}>{teachers.map(t => <option key={t._id} value={t._id}>{t.teachingSubject ? `${t.teachingSubject}-${t.trueName||t.username}` : t.trueName||t.username}</option>)}</select></div><div className="flex-1 flex flex-col"><label className="text-xs font-bold text-gray-500 mb-1 block uppercase">内容</label><textarea className="w-full border border-gray-300 rounded-lg p-3 text-sm flex-1 resize-none focus:ring-2 focus:ring-blue-500 outline-none" placeholder="老师，我对课程有建议..." value={feedbackContent} onChange={e => setFeedbackContent(e.target.value)}/></div><button onClick={() => submitFeedback('ACADEMIC')} className="w-full bg-blue-600 text-white py-3 rounded-lg font-bold hover:bg-blue-700 shadow-md">提交反馈</button></div></div>)}
                     </div>
                 )}
-
-                {/* --- TAB: SYSTEM FEEDBACK --- */}
                 {activeTab === 'system' && (
                     <div className="h-full flex flex-col md:flex-row">
-                        <div className="flex-1 overflow-y-auto p-6 bg-gray-50">
-                            <div className="max-w-3xl mx-auto space-y-4">
-                                {feedbackList.length === 0 ? (
-                                    <div className="text-center text-gray-400 py-10">暂无系统反馈</div>
-                                ) : (
-                                    feedbackList.map(fb => (
-                                        <FeedbackItem key={fb._id} fb={fb} onStatusChange={isAdmin ? handleFeedbackStatus : undefined} />
-                                    ))
-                                )}
-                            </div>
-                        </div>
-                        
-                        {!isAdmin && (
-                            <div className="w-full md:w-80 bg-white border-l border-gray-200 p-6 flex flex-col shadow-xl z-20">
-                                <h3 className="font-bold text-gray-800 mb-4 flex items-center"><Mail size={18} className="mr-2 text-purple-500"/> 联系管理员</h3>
-                                <p className="text-xs text-gray-500 mb-4">如果您在使用系统中遇到问题或有优化建议，请在此反馈。</p>
-                                <textarea 
-                                    className="w-full border border-gray-300 rounded-lg p-3 text-sm h-40 resize-none focus:ring-2 focus:ring-purple-500 outline-none mb-4"
-                                    placeholder="描述您的问题或建议..."
-                                    value={wishContent} // Reusing state var for simplicity
-                                    onChange={e => setWishContent(e.target.value)}
-                                />
-                                <button onClick={() => submitFeedback('SYSTEM')} className="w-full bg-purple-600 text-white py-3 rounded-lg font-bold hover:bg-purple-700 shadow-md">
-                                    发送反馈
-                                </button>
-                            </div>
-                        )}
+                        <div className="flex-1 overflow-y-auto p-6 bg-gray-50"><div className="max-w-3xl mx-auto space-y-4">{feedbackList.length === 0 ? <div className="text-center text-gray-400 py-10">暂无系统反馈</div> : feedbackList.map(fb => (<FeedbackItem key={fb._id} fb={fb} onStatusChange={isAdmin ? handleFeedbackStatus : undefined} />))}</div></div>
+                        {!isAdmin && (<div className="w-full md:w-80 bg-white border-l border-gray-200 p-6 flex flex-col shadow-xl z-20"><h3 className="font-bold text-gray-800 mb-4 flex items-center"><Mail size={18} className="mr-2 text-purple-500"/> 联系管理员</h3><p className="text-xs text-gray-500 mb-4">如果您在使用系统中遇到问题或有优化建议，请在此反馈。</p><textarea className="w-full border border-gray-300 rounded-lg p-3 text-sm h-40 resize-none focus:ring-2 focus:ring-purple-500 outline-none mb-4" placeholder="描述您的问题或建议..." value={wishContent} onChange={e => setWishContent(e.target.value)}/><button onClick={() => submitFeedback('SYSTEM')} className="w-full bg-purple-600 text-white py-3 rounded-lg font-bold hover:bg-purple-700 shadow-md">发送反馈</button></div>)}
                     </div>
                 )}
             </div>
         </div>
     );
-};
+};

server.js

@@ -3,7 +3,7 @@ const {
     School, User, Student, Course, Score, ClassModel, SubjectModel, ExamModel, ScheduleModel,
     ConfigModel, NotificationModel, GameSessionModel, StudentRewardModel, LuckyDrawConfigModel, GameMonsterConfigModel, GameZenConfigModel,
     AchievementConfigModel, TeacherExchangeConfigModel, StudentAchievementModel, AttendanceModel, LeaveRequestModel, SchoolCalendarModel,
-    WishModel, FeedbackModel
+    WishModel, FeedbackModel, TodoModel
 } = require('./models');
 
 // Import AI Routes
@@ -16,25 +16,22 @@ const bodyParser = require('body-parser');
 const path = require('path');
 const compression = require('compression'); 
 
-// ... constants
 const PORT = 7860;
 const MONGO_URI = 'mongodb+srv://dv890a:db8822723@chatpro.gw3v0v7.mongodb.net/chatpro?retryWrites=true&w=majority&appName=chatpro&authSource=admin';
 
 const app = express();
 
-// FIX: Disable compression for AI Chat SSE endpoint to allow real-time streaming
-// Using req.originalUrl to match the full path regardless of mounting point
 app.use(compression({
   filter: (req, res) => {
     if (req.originalUrl && req.originalUrl.includes('/api/ai/chat')) {
-        return false; // Don't compress SSE streams
+        return false; 
     }
     return compression.filter(req, res);
   }
 }));
 
 app.use(cors());
-app.use(bodyParser.json({ limit: '50mb' })); // Increased limit for audio
+app.use(bodyParser.json({ limit: '50mb' })); 
 app.use(express.static(path.join(__dirname, 'dist'), {
   setHeaders: (res, filePath) => {
     if (filePath.endsWith('.html')) {
@@ -45,7 +42,6 @@ app.use(express.static(path.join(__dirname, 'dist'), {
   }
 }));
 
-// ... (DB Connection and helpers remain the same) ...
 const InMemoryDB = { schools: [], users: [], isFallback: false };
 const connectDB = async () => {
   try {
@@ -76,7 +72,6 @@ const getQueryFilter = (req) => {
 };
 const injectSchoolId = (req, b) => ({ ...b, schoolId: req.headers['x-school-id'] });
 
-// ... (existing helper functions) ...
 const getGameOwnerFilter = async (req) => {
     const role = req.headers['x-user-role'];
     const username = req.headers['x-user-username'];
@@ -110,8 +105,63 @@ const generateStudentNo = async () => {
 app.use('/api/ai', aiRoutes);
 
 // ... (Rest of Existing Routes) ...
+
+// --- TODO LIST ENDPOINTS ---
+app.get('/api/todos', async (req, res) => {
+    const username = req.headers['x-user-username'];
+    if (!username) return res.status(401).json({ error: 'Unauthorized' });
+    const user = await User.findOne({ username });
+    if (!user) return res.status(404).json({ error: 'User not found' });
+    res.json(await TodoModel.find({ userId: user._id.toString() }).sort({ isCompleted: 1, createTime: -1 }));
+});
+
+app.post('/api/todos', async (req, res) => {
+    const username = req.headers['x-user-username'];
+    const user = await User.findOne({ username });
+    if (!user) return res.status(404).json({ error: 'User not found' });
+    await TodoModel.create({ ...req.body, userId: user._id.toString() });
+    res.json({ success: true });
+});
+
+app.put('/api/todos/:id', async (req, res) => {
+    await TodoModel.findByIdAndUpdate(req.params.id, req.body);
+    res.json({ success: true });
+});
+
+app.delete('/api/todos/:id', async (req, res) => {
+    await TodoModel.findByIdAndDelete(req.params.id);
+    res.json({ success: true });
+});
+
+// --- UPDATED SCHEDULE ENDPOINTS ---
+app.get('/api/schedules', async (req, res) => { 
+    const query = { ...getQueryFilter(req), ...req.query }; 
+    if (query.grade) { query.className = { $regex: '^' + query.grade }; delete query.grade; } 
+    res.json(await ScheduleModel.find(query)); 
+});
+
+app.post('/api/schedules', async (req, res) => { 
+    const filter = { className:req.body.className, dayOfWeek:req.body.dayOfWeek, period:req.body.period, weekType: req.body.weekType || 'ALL' }; 
+    const sId = req.headers['x-school-id']; 
+    if(sId) filter.schoolId = sId; 
+    await ScheduleModel.findOneAndUpdate(filter, injectSchoolId(req, req.body), {upsert:true}); 
+    res.json({}); 
+});
+
+app.delete('/api/schedules', async (req, res) => { 
+    await ScheduleModel.deleteOne({...getQueryFilter(req), ...req.query}); 
+    res.json({}); 
+});
+
+// --- USER MENU ORDER ---
+app.put('/api/users/:id/menu-order', async (req, res) => {
+    const { menuOrder } = req.body;
+    await User.findByIdAndUpdate(req.params.id, { menuOrder });
+    res.json({ success: true });
+});
+
+// --- Existing Routes (Minimally Modified) ---
 app.get('/api/classes/:className/teachers', async (req, res) => {
-// ... existing code ...
     const { className } = req.params;
     const schoolId = req.headers['x-school-id'];
     const normalize = (s) => (s || '').replace(/\s+/g, '');
@@ -148,78 +198,44 @@ app.get('/api/classes/:className/teachers', async (req, res) => {
     } catch (e) { res.json([]); }
 });
 
-// --- WISH TREE ENDPOINTS ---
 app.get('/api/wishes', async (req, res) => {
     const { teacherId, studentId, status } = req.query;
     const filter = getQueryFilter(req);
     if (teacherId) filter.teacherId = teacherId;
     if (studentId) filter.studentId = studentId;
     if (status) filter.status = status;
-    
-    // Sort pending first, then by createTime
     res.json(await WishModel.find(filter).sort({ status: -1, createTime: -1 }));
 });
 
 app.post('/api/wishes', async (req, res) => {
     const data = injectSchoolId(req, req.body);
-    // Validation: Check if student already has a pending wish
-    const existing = await WishModel.findOne({ 
-        studentId: data.studentId, 
-        status: 'PENDING'
-    });
-    
-    if (existing) {
-        return res.status(400).json({ error: 'LIMIT_REACHED', message: '您还有一个未实现的愿望，请等待实现后再许愿！' });
-    }
-    
+    const existing = await WishModel.findOne({ studentId: data.studentId, status: 'PENDING' });
+    if (existing) { return res.status(400).json({ error: 'LIMIT_REACHED', message: '您还有一个未实现的愿望，请等待实现后再许愿！' }); }
     await WishModel.create(data);
     res.json({ success: true });
 });
 
 app.post('/api/wishes/:id/fulfill', async (req, res) => {
-    const { id } = req.params;
-    await WishModel.findByIdAndUpdate(id, { 
-        status: 'FULFILLED', 
-        fulfillTime: new Date() 
-    });
+    await WishModel.findByIdAndUpdate(req.params.id, { status: 'FULFILLED', fulfillTime: new Date() });
     res.json({ success: true });
 });
 
 app.post('/api/wishes/random-fulfill', async (req, res) => {
     const { teacherId } = req.body;
     const pendingWishes = await WishModel.find({ teacherId, status: 'PENDING' });
-    
-    if (pendingWishes.length === 0) {
-        return res.status(404).json({ error: 'NO_WISHES', message: '暂无待实现的愿望' });
-    }
-    
+    if (pendingWishes.length === 0) { return res.status(404).json({ error: 'NO_WISHES', message: '暂无待实现的愿望' }); }
     const randomWish = pendingWishes[Math.floor(Math.random() * pendingWishes.length)];
-    await WishModel.findByIdAndUpdate(randomWish._id, { 
-        status: 'FULFILLED', 
-        fulfillTime: new Date() 
-    });
-    
+    await WishModel.findByIdAndUpdate(randomWish._id, { status: 'FULFILLED', fulfillTime: new Date() });
     res.json({ success: true, wish: randomWish });
 });
 
-// --- FEEDBACK WALL ENDPOINTS ---
 app.get('/api/feedback', async (req, res) => {
     const { targetId, creatorId, type, status } = req.query;
     const filter = getQueryFilter(req);
     if (targetId) filter.targetId = targetId;
     if (creatorId) filter.creatorId = creatorId;
     if (type) filter.type = type;
-    
-    // Filter logic for status (comma separated allowed)
-    if (status) {
-        const statuses = status.split(',');
-        if (statuses.length > 1) {
-            filter.status = { $in: statuses };
-        } else {
-            filter.status = status;
-        }
-    }
-    
+    if (status) { const statuses = status.split(','); if (statuses.length > 1) { filter.status = { $in: statuses }; } else { filter.status = status; } }
     res.json(await FeedbackModel.find(filter).sort({ createTime: -1 }));
 });
 
@@ -230,27 +246,20 @@ app.post('/api/feedback', async (req, res) => {
 });
 
 app.put('/api/feedback/:id', async (req, res) => {
-    const { id } = req.params;
-    const { status, reply } = req.body;
+    const { id } = req.params; const { status, reply } = req.body;
     const updateData = { updateTime: new Date() };
     if (status) updateData.status = status;
     if (reply !== undefined) updateData.reply = reply;
-    
     await FeedbackModel.findByIdAndUpdate(id, updateData);
     res.json({ success: true });
 });
 
 app.post('/api/feedback/ignore-all', async (req, res) => {
     const { targetId } = req.body;
-    await FeedbackModel.updateMany(
-        { targetId, status: 'PENDING' },
-        { status: 'IGNORED', updateTime: new Date() }
-    );
+    await FeedbackModel.updateMany( { targetId, status: 'PENDING' }, { status: 'IGNORED', updateTime: new Date() } );
     res.json({ success: true });
 });
 
-// ... (Rest of existing routes from server.js) ...
-// ...
 app.get('/api/games/lucky-config', async (req, res) => {
    const filter = getQueryFilter(req);
    if (req.query.ownerId) { filter.ownerId = req.query.ownerId; } else { const ownerFilter = await getGameOwnerFilter(req); Object.assign(filter, ownerFilter); }
@@ -428,7 +437,7 @@ app.post('/api/auth/login', async (req, res) => { const { username, password } =
 app.get('/api/schools', async (req, res) => { res.json(await School.find()); });
 app.post('/api/schools', async (req, res) => { res.json(await School.create(req.body)); });
 app.put('/api/schools/:id', async (req, res) => { await School.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
-app.delete('/api/schools/:id', async (req, res) => { const schoolId = req.params.id; try { await School.findByIdAndDelete(schoolId); await User.deleteMany({ schoolId }); await Student.deleteMany({ schoolId }); await ClassModel.deleteMany({ schoolId }); await SubjectModel.deleteMany({ schoolId }); await Course.deleteMany({ schoolId }); await Score.deleteMany({ schoolId }); await ExamModel.deleteMany({ schoolId }); await ScheduleModel.deleteMany({ schoolId }); await NotificationModel.deleteMany({ schoolId }); await AttendanceModel.deleteMany({ schoolId }); await LeaveRequestModel.deleteMany({ schoolId }); await GameSessionModel.deleteMany({ schoolId }); await StudentRewardModel.deleteMany({ schoolId }); await LuckyDrawConfigModel.deleteMany({ schoolId }); await GameMonsterConfigModel.deleteMany({ schoolId }); await GameZenConfigModel.deleteMany({ schoolId }); await AchievementConfigModel.deleteMany({ schoolId }); await StudentAchievementModel.deleteMany({ schoolId }); await SchoolCalendarModel.deleteMany({ schoolId }); await WishModel.deleteMany({ schoolId }); await FeedbackModel.deleteMany({ schoolId }); res.json({ success: true }); } catch (e) { res.status(500).json({ error: e.message }); } });
+app.delete('/api/schools/:id', async (req, res) => { const schoolId = req.params.id; try { await School.findByIdAndDelete(schoolId); await User.deleteMany({ schoolId }); await Student.deleteMany({ schoolId }); await ClassModel.deleteMany({ schoolId }); await SubjectModel.deleteMany({ schoolId }); await Course.deleteMany({ schoolId }); await Score.deleteMany({ schoolId }); await ExamModel.deleteMany({ schoolId }); await ScheduleModel.deleteMany({ schoolId }); await NotificationModel.deleteMany({ schoolId }); await AttendanceModel.deleteMany({ schoolId }); await LeaveRequestModel.deleteMany({ schoolId }); await GameSessionModel.deleteMany({ schoolId }); await StudentRewardModel.deleteMany({ schoolId }); await LuckyDrawConfigModel.deleteMany({ schoolId }); await GameMonsterConfigModel.deleteMany({ schoolId }); await GameZenConfigModel.deleteMany({ schoolId }); await AchievementConfigModel.deleteMany({ schoolId }); await StudentAchievementModel.deleteMany({ schoolId }); await SchoolCalendarModel.deleteMany({ schoolId }); await WishModel.deleteMany({ schoolId }); await FeedbackModel.deleteMany({ schoolId }); await TodoModel.deleteMany({}); res.json({ success: true }); } catch (e) { res.status(500).json({ error: e.message }); } });
 app.delete('/api/users/:id', async (req, res) => { const requesterRole = req.headers['x-user-role']; if (requesterRole === 'PRINCIPAL') { const user = await User.findById(req.params.id); if (!user || user.schoolId !== req.headers['x-school-id']) return res.status(403).json({error: 'Permission denied'}); if (user.role === 'ADMIN') return res.status(403).json({error: 'Cannot delete admin'}); } await User.findByIdAndDelete(req.params.id); res.json({}); });
 app.get('/api/students', async (req, res) => { res.json(await Student.find(getQueryFilter(req))); });
 app.post('/api/students', async (req, res) => { const data = injectSchoolId(req, req.body); if (data.studentNo === '') delete data.studentNo; try { const existing = await Student.findOne({ schoolId: data.schoolId, name: data.name, className: data.className }); if (existing) { Object.assign(existing, data); if (!existing.studentNo) { existing.studentNo = await generateStudentNo(); } await existing.save(); } else { if (!data.studentNo) { data.studentNo = await generateStudentNo(); } await Student.create(data); } res.json({ success: true }); } catch (e) { if (e.code === 11000) return res.status(409).json({ error: 'DUPLICATE', message: '保存失败：存在重复的系统ID' }); res.status(500).json({ error: e.message }); } });
@@ -448,9 +457,6 @@ app.put('/api/scores/:id', async (req, res) => { await Score.findByIdAndUpdate(r
 app.delete('/api/scores/:id', async (req, res) => { await Score.findByIdAndDelete(req.params.id); res.json({}); });
 app.get('/api/exams', async (req, res) => { res.json(await ExamModel.find(getQueryFilter(req))); });
 app.post('/api/exams', async (req, res) => { await ExamModel.findOneAndUpdate({name:req.body.name}, injectSchoolId(req, req.body), {upsert:true}); res.json({}); });
-app.get('/api/schedules', async (req, res) => { const query = { ...getQueryFilter(req), ...req.query }; if (query.grade) { query.className = { $regex: '^' + query.grade }; delete query.grade; } res.json(await ScheduleModel.find(query)); });
-app.post('/api/schedules', async (req, res) => { const filter = { className:req.body.className, dayOfWeek:req.body.dayOfWeek, period:req.body.period }; const sId = req.headers['x-school-id']; if(sId) filter.schoolId = sId; await ScheduleModel.findOneAndUpdate(filter, injectSchoolId(req, req.body), {upsert:true}); res.json({}); });
-app.delete('/api/schedules', async (req, res) => { await ScheduleModel.deleteOne({...getQueryFilter(req), ...req.query}); res.json({}); });
 app.get('/api/stats', async (req, res) => { const filter = getQueryFilter(req); const studentCount = await Student.countDocuments(filter); const courseCount = await Course.countDocuments(filter); const scores = await Score.find({...filter, status: 'Normal'}); let avgScore = 0; let excellentRate = '0%'; if (scores.length > 0) { const total = scores.reduce((sum, s) => sum + s.score, 0); avgScore = parseFloat((total / scores.length).toFixed(1)); const excellent = scores.filter(s => s.score >= 90).length; excellentRate = Math.round((excellent / scores.length) * 100) + '%'; } res.json({ studentCount, courseCount, avgScore, excellentRate }); });
 app.get('/api/config', async (req, res) => { const currentSem = getAutoSemester(); let config = await ConfigModel.findOne({key:'main'}); if (config) { let semesters = config.semesters || []; if (!semesters.includes(currentSem)) { semesters.unshift(currentSem); config.semesters = semesters; config.semester = currentSem; await ConfigModel.updateOne({ key: 'main' }, { semesters, semester: currentSem }); } } else { config = { key: 'main', allowRegister: true, semester: currentSem, semesters: [currentSem] }; } res.json(config); });
 app.post('/api/config', async (req, res) => { await ConfigModel.findOneAndUpdate({key:'main'}, req.body, {upsert:true}); res.json({}); });

services/api.ts

@@ -1,6 +1,8 @@
+
 // ... existing imports
-import { User, ClassInfo, SystemConfig, Subject, School, Schedule, GameSession, StudentReward, LuckyDrawConfig, Attendance, LeaveRequest, AchievementConfig, SchoolCalendarEntry, TeacherExchangeConfig, Wish, Feedback, AIChatMessage } from '../types';
+import { User, ClassInfo, SystemConfig, Subject, School, Schedule, GameSession, StudentReward, LuckyDrawConfig, Attendance, LeaveRequest, AchievementConfig, SchoolCalendarEntry, TeacherExchangeConfig, Wish, Feedback, AIChatMessage, Todo } from '../types';
 
+// ... existing getBaseUrl ...
 const getBaseUrl = () => {
   let isProd = false;
   try {
@@ -31,7 +33,6 @@ async function request(endpoint: string, options: RequestInit = {}) {
       headers['x-school-id'] = currentUser.schoolId;
     }
     
-    // Inject User Role for backend logic (e.g., bypassing draw limits)
     if (currentUser?.role) {
       headers['x-user-role'] = currentUser.role;
       headers['x-user-username'] = currentUser.username;
@@ -104,7 +105,7 @@ export const api = {
     getAll: () => request('/schools'),
     add: (data: School) => request('/schools', { method: 'POST', body: JSON.stringify(data) }),
     update: (id: string, data: Partial<School>) => request(`/schools/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
-    delete: (id: string) => request(`/schools/${id}`, { method: 'DELETE' }) // NEW
+    delete: (id: string) => request(`/schools/${id}`, { method: 'DELETE' })
   },
 
   users: {
@@ -119,6 +120,7 @@ export const api = {
     applyClass: (data: { userId: string, type: 'CLAIM'|'RESIGN', targetClass?: string, action: 'APPLY'|'APPROVE'|'REJECT' }) => 
         request('/users/class-application', { method: 'POST', body: JSON.stringify(data) }),
     getTeachersForClass: (className: string) => request(`/classes/${encodeURIComponent(className)}/teachers`),
+    saveMenuOrder: (userId: string, order: string[]) => request(`/users/${userId}/menu-order`, { method: 'PUT', body: JSON.stringify({ menuOrder: order }) }), // NEW
   },
 
   students: {
@@ -126,7 +128,6 @@ export const api = {
     add: (data: any) => request('/students', { method: 'POST', body: JSON.stringify(data) }),
     update: (id: string, data: any) => request(`/students/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
     delete: (id: string | number) => request(`/students/${id}`, { method: 'DELETE' }),
-    // NEW: Promote and Transfer
     promote: (data: { teacherFollows: boolean }) => request('/students/promote', { method: 'POST', body: JSON.stringify(data) }),
     transfer: (data: { studentId: string, targetClass: string }) => request('/students/transfer', { method: 'POST', body: JSON.stringify(data) })
   },
@@ -225,7 +226,6 @@ export const api = {
       getStudentAchievements: (studentId: string, semester?: string) => request(`/achievements/student?studentId=${studentId}${semester ? `&semester=${semester}` : ''}`),
       grant: (data: { studentId: string, achievementId: string, semester: string }) => request('/achievements/grant', { method: 'POST', body: JSON.stringify(data) }),
       exchange: (data: { studentId: string, ruleId: string, teacherId?: string }) => request('/achievements/exchange', { method: 'POST', body: JSON.stringify(data) }),
-      // Teacher Exchange Rules
       getMyRules: () => request('/achievements/teacher-rules'),
       saveMyRules: (data: TeacherExchangeConfig) => request('/achievements/teacher-rules', { method: 'POST', body: JSON.stringify(data) }),
       getRulesByTeachers: (teacherIds: string[]) => request(`/achievements/teacher-rules?teacherIds=${teacherIds.join(',')}`),
@@ -248,7 +248,6 @@ export const api = {
     return request('/batch-delete', { method: 'POST', body: JSON.stringify({ type, ids }) });
   },
 
-  // NEW: Wish and Feedback API
   wishes: {
       getAll: (params: { teacherId?: string, studentId?: string, status?: string }) => {
           const qs = new URLSearchParams(params as any).toString();
@@ -269,9 +268,15 @@ export const api = {
       ignoreAll: (targetId: string) => request('/feedback/ignore-all', { method: 'POST', body: JSON.stringify({ targetId }) }),
   },
 
-  // NEW: AI Endpoints
   ai: {
       chat: (data: { text?: string, audio?: string, history?: { role: string, text?: string }[] }) => request('/ai/chat', { method: 'POST', body: JSON.stringify(data) }),
       evaluate: (data: { question: string, audio?: string, image?: string }) => request('/ai/evaluate', { method: 'POST', body: JSON.stringify(data) }),
+  },
+
+  todos: { // NEW
+      getAll: () => request('/todos'),
+      add: (content: string) => request('/todos', { method: 'POST', body: JSON.stringify({ content }) }),
+      update: (id: string, data: Partial<Todo>) => request(`/todos/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
+      delete: (id: string) => request(`/todos/${id}`, { method: 'DELETE' }),
   }
-};
+};

types.ts

@@ -1,70 +1,7 @@
 
-// ... existing imports
-
-// ... existing types
-
-// AI Assistant Types
-
-export interface AIChatMessage {
-  id: string;
-  role: 'user' | 'model';
-  text?: string;
-  audio?: string; // Base64 encoded audio for playback
-  isAudioMessage?: boolean; // Was the input/output audio based?
-  timestamp: number;
-}
-
-export interface OralAssessment {
-  id: string;
-  topic: string;
-  difficulty: string;
-  studentAudio?: string;
-  score?: number;
-  feedback?: string;
-  transcription?: string; // What the AI heard
-  status: 'IDLE' | 'RECORDING' | 'ANALYZING' | 'COMPLETED';
-}
-
-// ... rest of the file
-export type WishStatus = 'PENDING' | 'FULFILLED';
-
-export interface Wish {
-  _id?: string;
-  schoolId: string;
-  studentId: string;
-  studentName: string;
-  className: string;
-  teacherId: string; // Target Teacher
-  teacherName: string;
-  content: string;
-  status: WishStatus;
-  createTime: string;
-  fulfillTime?: string;
-}
-
-export type FeedbackStatus = 'PENDING' | 'ACCEPTED' | 'PROCESSED' | 'IGNORED';
-export type FeedbackType = 'ACADEMIC' | 'SYSTEM'; // ACADEMIC: Student->Teacher, SYSTEM: Staff->Admin
-
-export interface Feedback {
-  _id?: string;
-  schoolId: string;
-  creatorId: string;
-  creatorName: string;
-  creatorRole: string;
-  targetId: string; // Teacher ID or 'ADMIN'
-  targetName: string;
-  content: string;
-  type: FeedbackType;
-  status: FeedbackStatus;
-  reply?: string; // Teacher/Admin reply
-  createTime: string;
-  updateTime?: string;
-}
-
-// ... rest of the file (UserRole, etc.)
 export enum UserRole {
   ADMIN = 'ADMIN',
-  PRINCIPAL = 'PRINCIPAL', // 新增校长角色
+  PRINCIPAL = 'PRINCIPAL',
   TEACHER = 'TEACHER',
   STUDENT = 'STUDENT',
   USER = 'USER'
@@ -76,119 +13,82 @@ export enum UserStatus {
   BANNED = 'banned'
 }
 
-export interface School {
-  id?: number;
-  _id?: string;
-  name: string;
-  code: string; 
-}
-
 export interface User {
   id?: number;
   _id?: string;
   username: string;
+  password?: string;
   trueName?: string;
   phone?: string;
   email?: string;
   schoolId?: string;
-  role: UserRole;
-  status: UserStatus;
+  role: UserRole | string;
+  status: UserStatus | string;
   avatar?: string;
   createTime?: string;
   teachingSubject?: string; 
   homeroomClass?: string; 
-  // NEW: Feature Flag
   aiAccess?: boolean;
-  // Class Application
+  menuOrder?: string[];
   classApplication?: {
     type: 'CLAIM' | 'RESIGN';
     targetClass?: string;
     status: 'PENDING' | 'REJECTED';
   };
-  // Student Registration Temp Fields
   studentNo?: string;
   parentName?: string;
   parentPhone?: string;
   address?: string;
   gender?: 'Male' | 'Female';
   seatNo?: string; 
-  idCard?: string; // NEW
-}
-
-export interface ClassInfo {
-// ... (rest remains same)
-  id?: number;
-  _id?: string;
-  schoolId?: string;
-  grade: string;
-  className: string;
-  teacherName?: string; // Display string (e.g., "张三, 李四")
-  homeroomTeacherIds?: string[]; // Actual IDs for logic
-  studentCount?: number;
-}
-
-export interface Subject {
-  id?: number;
-  _id?: string;
-  schoolId?: string;
-  name: string;
-  code: string;
-  color: string;
-  excellenceThreshold?: number;
-  thresholds?: Record<string, number>; // Grade specific overrides e.g. {'一年级': 95}
-}
-
-export interface SystemConfig {
-  systemName: string;
-  semester: string;
-  semesters?: string[];
-  allowRegister: boolean;
-  allowAdminRegister: boolean;
-  allowPrincipalRegister?: boolean; // 新增：是否允许校长注册
-  allowStudentRegister?: boolean;
-  maintenanceMode: boolean;
-  emailNotify: boolean;
-  // NEW AI CONFIG
-  enableAI?: boolean;
-  aiTotalCalls?: number;
+  idCard?: string; 
 }
 
 export interface Student {
   id?: number;
   _id?: string;
   schoolId?: string;
-  studentNo: string; // System ID (Login ID)
-  seatNo?: string;   // Class Seat Number (Optional, for sorting/display)
+  studentNo: string;
+  seatNo?: string;
   name: string;
-  gender: 'Male' | 'Female' | 'Other';
-  birthday: string;
-  idCard: string;
-  phone: string;
+  gender: 'Male' | 'Female';
+  birthday?: string;
+  idCard?: string;
+  phone?: string;
   className: string;
   status: 'Enrolled' | 'Graduated' | 'Suspended';
   parentName?: string;
   parentPhone?: string;
   address?: string;
-  // Game related
-  teamId?: string; 
-  drawAttempts?: number; 
-  dailyDrawLog?: { date: string; count: number }; 
-  // Achievement related
-  flowerBalance?: number; 
+  teamId?: string;
+  drawAttempts?: number;
+  dailyDrawLog?: { date: string, count: number };
+  flowerBalance?: number;
+}
+
+export interface ClassInfo {
+  id?: number;
+  _id?: string;
+  schoolId?: string;
+  grade: string;
+  className: string;
+  teacherName?: string;
+  homeroomTeacherIds?: string[];
+  studentCount?: number;
 }
 
 export interface Course {
   id?: number;
   _id?: string;
   schoolId?: string;
-  courseCode: string;
-  courseName: string; // Subject Name
-  className: string; // Target Class (e.g. "一年级(1)班")
+  courseCode?: string;
+  courseName: string;
   teacherName: string;
-  teacherId?: string; // Optional linkage
-  credits: number;
-  capacity: number;
-  enrolled: number;
+  teacherId?: string;
+  className: string;
+  credits?: number;
+  capacity?: number;
+  enrolled?: number;
 }
 
 export type ExamStatus = 'Normal' | 'Absent' | 'Leave' | 'Cheat';
@@ -201,20 +101,30 @@ export interface Score {
   studentNo: string;
   courseName: string;
   score: number;
-  semester: string;
-  type: 'Midterm' | 'Final' | 'Quiz';
+  semester?: string;
+  type: string;
   examName?: string;
   status?: ExamStatus;
 }
 
-export interface Exam {
+export interface Subject {
   id?: number;
+  _id?: string;
+  schoolId?: string;
+  name: string;
+  code?: string;
+  color?: string;
+  excellenceThreshold?: number;
+  thresholds?: Record<string, number>;
+}
+
+export interface Exam {
   _id?: string;
   schoolId?: string;
   name: string;
   date: string;
+  type: string; // 'Midterm', 'Final', 'Quiz'
   semester?: string;
-  type?: 'Midterm' | 'Final' | 'Quiz' | string;
 }
 
 export interface Schedule {
@@ -226,75 +136,106 @@ export interface Schedule {
   subject: string;
   dayOfWeek: number;
   period: number;
+  weekType?: 'ALL' | 'ODD' | 'EVEN';
 }
 
-export interface Notification {
+export interface School {
   id?: number;
+  _id?: string;
+  name: string;
+  code: string;
+}
+
+export interface Notification {
   _id?: string;
   schoolId?: string;
-  targetRole?: UserRole;
+  targetRole?: string;
   targetUserId?: string;
   title: string;
   content: string;
   type: 'info' | 'success' | 'warning' | 'error';
-  isRead?: boolean;
   createTime: string;
 }
 
-export interface ApiResponse<T> {
-  code: number;
-  message: string;
-  data: T;
-  timestamp: number;
+export interface PeriodConfig {
+  period: number; 
+  name: string;   
+  startTime?: string;
+  endTime?: string;
 }
 
-// --- Game Types ---
+export interface SystemConfig {
+  systemName: string;
+  semester: string;
+  semesters?: string[];
+  allowRegister: boolean;
+  allowAdminRegister: boolean;
+  allowPrincipalRegister?: boolean; 
+  allowStudentRegister?: boolean;
+  maintenanceMode: boolean;
+  emailNotify: boolean;
+  enableAI?: boolean;
+  aiTotalCalls?: number;
+  periodConfig?: PeriodConfig[];
+}
+
+export interface SchoolCalendarEntry {
+  _id?: string;
+  schoolId: string;
+  className?: string; 
+  type: 'HOLIDAY' | 'BREAK' | 'OFF' | 'WORKDAY'; 
+  startDate: string; 
+  endDate: string; 
+  name: string;
+}
 
+export interface Todo {
+  _id?: string;
+  userId: string;
+  content: string;
+  isCompleted: boolean;
+  createTime: string;
+}
+
+// Game & Rewards
 export interface GameTeam {
   id: string;
   name: string;
   score: number;
-  avatar: string; // Emoji or URL
+  avatar: string;
   color: string;
-  members: string[]; // Student IDs
+  members: string[];
 }
 
 export interface GameRewardConfig {
-  scoreThreshold: number; 
-  rewardType: 'ITEM' | 'DRAW_COUNT' | 'ACHIEVEMENT'; 
-  rewardName: string; 
-  rewardValue: number; 
-  achievementId?: string; 
+  scoreThreshold: number;
+  rewardType: 'DRAW_COUNT' | 'ITEM' | 'ACHIEVEMENT';
+  rewardName: string;
+  rewardValue: number;
+  achievementId?: string;
 }
 
 export interface GameSession {
   _id?: string;
   schoolId: string;
-  className: string; 
-  subject: string; 
+  className: string;
+  subject: string;
   isEnabled: boolean;
+  maxSteps: number;
   teams: GameTeam[];
   rewardsConfig: GameRewardConfig[];
-  maxSteps: number; 
-}
-
-export enum RewardType {
-  ITEM = 'ITEM',
-  DRAW_COUNT = 'DRAW_COUNT',
-  CONSOLATION = 'CONSOLATION',
-  ACHIEVEMENT = 'ACHIEVEMENT' 
 }
 
 export interface StudentReward {
   _id?: string;
-  schoolId?: string;
-  studentId: string; 
+  schoolId: string;
+  studentId: string;
   studentName: string;
-  rewardType: RewardType | string; 
+  rewardType: 'DRAW_COUNT' | 'ITEM' | 'CONSOLATION' | 'ACHIEVEMENT';
   name: string;
-  count?: number; 
+  count: number;
   status: 'PENDING' | 'REDEEMED';
-  source: string; 
+  source: string;
   createTime: string;
   ownerId?: string;
 }
@@ -302,70 +243,49 @@ export interface StudentReward {
 export interface LuckyPrize {
   id: string;
   name: string;
-  probability: number; // Treated as Weight
-  count: number; // Inventory
+  probability: number;
+  count: number;
   icon?: string;
 }
 
 export interface LuckyDrawConfig {
-  _id?: string;
-  schoolId: string;
-  className?: string; 
-  ownerId?: string; // Isolated by teacher
-  prizes: LuckyPrize[]; 
-  dailyLimit: number;
-  cardCount?: number; 
-  defaultPrize: string; // "再接再厉"
-  consolationWeight?: number; // Weight for NOT winning a main prize
-}
-
-export interface GameMonsterConfig {
   _id?: string;
   schoolId: string;
   className: string;
-  ownerId?: string; // Isolated by teacher
-  duration: number;
-  sensitivity: number;
-  difficulty: number;
-  useKeyboardMode: boolean;
-  rewardConfig: {
-      enabled: boolean;
-      type: 'DRAW_COUNT' | 'ITEM' | 'ACHIEVEMENT';
-      val: string;
-      count: number;
-  };
+  ownerId?: string;
+  prizes: LuckyPrize[];
+  dailyLimit: number;
+  cardCount: number;
+  defaultPrize: string;
+  consolationWeight: number;
 }
 
-// --- Achievement System Types ---
 export interface AchievementItem {
   id: string;
   name: string;
-  icon: string; 
-  points: number; 
+  icon: string;
+  points: number;
   description?: string;
-  addedBy?: string; // Teacher ID
-  addedByName?: string; // Teacher Name
+  addedBy?: string;
+  addedByName?: string;
 }
 
 export interface ExchangeRule {
   id: string;
-  cost: number; 
-  rewardType: 'ITEM' | 'DRAW_COUNT';
+  cost: number;
+  rewardType: 'DRAW_COUNT' | 'ITEM';
   rewardName: string;
-  rewardValue: number; 
+  rewardValue: number;
 }
 
-// Class-based Config (Shared Achievement Library)
 export interface AchievementConfig {
   _id?: string;
   schoolId: string;
   className: string;
   achievements: AchievementItem[];
-  // exchangeRules is deprecated here, moving to TeacherExchangeConfig
-  exchangeRules?: ExchangeRule[]; 
+  exchangeRules: ExchangeRule[];
 }
 
-// New: Teacher-based Config (Global Rules for a teacher)
 export interface TeacherExchangeConfig {
   _id?: string;
   schoolId: string;
@@ -379,24 +299,21 @@ export interface StudentAchievement {
   schoolId: string;
   studentId: string;
   studentName: string;
-  achievementId: string; 
-  achievementName: string; 
+  achievementId: string;
+  achievementName: string;
   achievementIcon: string;
   semester: string;
   createTime: string;
 }
 
-// --- Attendance Types ---
-export type AttendanceStatus = 'Present' | 'Absent' | 'Leave';
-
 export interface Attendance {
   _id?: string;
   schoolId: string;
   studentId: string;
   studentName: string;
   className: string;
-  date: string; // YYYY-MM-DD
-  status: AttendanceStatus;
+  date: string;
+  status: 'Present' | 'Absent' | 'Leave';
   checkInTime?: string;
 }
 
@@ -413,12 +330,41 @@ export interface LeaveRequest {
   createTime: string;
 }
 
-export interface SchoolCalendarEntry {
+export interface Wish {
   _id?: string;
   schoolId: string;
-  className?: string; // Optional, if set applies to specific class only
-  type: 'HOLIDAY' | 'BREAK' | 'OFF';
-  startDate: string; // YYYY-MM-DD
-  endDate: string; // YYYY-MM-DD
-  name: string;
+  studentId: string;
+  studentName: string;
+  className?: string;
+  teacherId: string;
+  teacherName: string;
+  content: string;
+  status: 'PENDING' | 'FULFILLED';
+  createTime: string;
+  fulfillTime?: string;
+}
+
+export interface Feedback {
+  _id?: string;
+  schoolId: string;
+  creatorId: string;
+  creatorName: string;
+  creatorRole: string;
+  targetId?: string;
+  targetName?: string;
+  content: string;
+  type: 'ACADEMIC' | 'SYSTEM';
+  status: 'PENDING' | 'ACCEPTED' | 'PROCESSED' | 'IGNORED';
+  reply?: string;
+  createTime: string;
+  updateTime?: string;
+}
+
+export interface AIChatMessage {
+  id: string;
+  role: 'user' | 'model';
+  text?: string;
+  audio?: string;
+  isAudioMessage?: boolean;
+  timestamp: number;
 }