Upload 27 files

pages/Dashboard.tsx

@@ -1,8 +1,7 @@
-
 import React, { useEffect, useState } from 'react';
-import { Users, BookOpen, GraduationCap, TrendingUp, AlertTriangle, ArrowRight, Activity, Calendar, X, CheckCircle } from 'lucide-react';
+import { Users, BookOpen, GraduationCap, TrendingUp, AlertTriangle, ArrowRight, Activity, Calendar, X, CheckCircle, Plus } from 'lucide-react';
 import { api } from '../services/api';
-import { Score, ClassInfo, Subject } from '../types';
+import { Score, ClassInfo, Subject, Schedule, User } from '../types';
 
 interface DashboardProps {
   onNavigate: (view: string) => void;
@@ -13,24 +12,40 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
   const [warnings, setWarnings] = useState<string[]>([]);
   const [loading, setLoading] = useState(true);
   
-  // Modal States
+  // 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[]>([]);
+  
+  // Timetable Filter
+  const [viewClass, setViewClass] = useState('');
+  
+  // Timetable Edit
+  const [editingCell, setEditingCell] = useState<{day: number, period: number} | null>(null);
+  const [editForm, setEditForm] = useState({ subject: '', teacherName: '' });
+
+  const currentUser = api.auth.getCurrentUser();
 
   useEffect(() => {
     const loadData = async () => {
       setLoading(true);
       try {
-        const [summary, scores, classes, subjects] = await Promise.all([
+        const [summary, scores, classes, subs, userList] = await Promise.all([
           api.stats.getSummary(),
           api.scores.getAll(),
           api.classes.getAll(),
-          api.subjects.getAll()
+          api.subjects.getAll(),
+          api.users.getAll({ role: 'TEACHER' })
         ]);
         setStats(summary);
+        setClassList(classes);
+        setSubjects(subs);
+        setTeachers(userList);
 
         const newWarnings: string[] = [];
-        subjects.forEach((sub: Subject) => {
+        subs.forEach((sub: Subject) => {
            const subScores = scores.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;
@@ -47,6 +62,47 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
     loadData();
   }, []);
 
+  useEffect(() => {
+     if (showSchedule) fetchSchedules();
+  }, [showSchedule, viewClass]);
+
+  const fetchSchedules = async () => {
+     try {
+        const params: any = {};
+        if (viewClass) params.className = viewClass;
+        // If teacher, only show own schedule unless filter applied
+        if (currentUser?.role === 'TEACHER' && !viewClass) {
+           params.teacherName = currentUser.trueName || currentUser.username;
+        }
+        const data = await api.schedules.get(params);
+        setSchedules(data);
+     } catch(e) { console.error(e); }
+  };
+
+  const handleSaveSchedule = async () => {
+     if (!editingCell || !viewClass) return alert('请先选择班级');
+     await api.schedules.save({
+        className: viewClass,
+        dayOfWeek: editingCell.day,
+        period: editingCell.period,
+        subject: editForm.subject,
+        teacherName: editForm.teacherName
+     });
+     setEditingCell(null);
+     fetchSchedules();
+  };
+
+  const handleDeleteSchedule = async () => {
+     if (!editingCell || !viewClass) return;
+     await api.schedules.delete({
+        className: viewClass,
+        dayOfWeek: editingCell.day,
+        period: editingCell.period
+     });
+     setEditingCell(null);
+     fetchSchedules();
+  };
+
   const cards = [
     { label: '在校学生', value: stats.studentCount, icon: Users, color: 'bg-blue-500', trend: '+12%' },
     { label: '开设课程', value: stats.courseCount, icon: BookOpen, color: 'bg-emerald-500', trend: '+4' },
@@ -63,7 +119,7 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
         </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>
+              <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>
@@ -130,28 +186,102 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
         </div>
       </div>
 
-      {/* Schedule Modal */}
+      {/* Timetable Modal */}
       {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-md p-6 relative animate-in fade-in zoom-in-95">
-               <button onClick={()=>setShowSchedule(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-4 flex items-center"><Calendar className="mr-2 text-blue-600"/>本周日程</h3>
-               <div className="space-y-3">
-                  <div className="flex gap-4 p-3 bg-blue-50 rounded-lg border-l-4 border-blue-500">
-                     <div className="text-center w-12"><div className="text-xs text-gray-500">周一</div><div className="font-bold">09:00</div></div>
-                     <div><div className="font-bold text-gray-800">全校升旗仪式</div><div className="text-xs text-gray-500">大操场</div></div>
-                  </div>
-                  <div className="flex gap-4 p-3 bg-gray-50 rounded-lg border-l-4 border-gray-300">
-                     <div className="text-center w-12"><div className="text-xs text-gray-500">周三</div><div className="font-bold">14:30</div></div>
-                     <div><div className="font-bold text-gray-800">教职工会议</div><div className="text-xs text-gray-500">第一会议室</div></div>
-                  </div>
-                  <div className="flex gap-4 p-3 bg-emerald-50 rounded-lg border-l-4 border-emerald-500">
-                     <div className="text-center w-12"><div className="text-xs text-gray-500">周五</div><div className="font-bold">16:00</div></div>
-                     <div><div className="font-bold text-gray-800">期末考试考务会</div><div className="text-xs text-gray-500">报告厅</div></div>
+            <div className="bg-white rounded-xl w-full max-w-5xl h-[85vh] p-6 relative animate-in fade-in flex flex-col">
+               <div className="flex justify-between items-center mb-6">
+                  <div className="flex items-center space-x-4">
+                     <h3 className="text-xl font-bold flex items-center"><Calendar className="mr-2 text-blue-600"/> 智能课程表</h3>
+                     {/* Filter for Admin */}
+                     {currentUser?.role === 'ADMIN' && (
+                        <select className="border rounded p-1 text-sm bg-gray-50" value={viewClass} onChange={e=>setViewClass(e.target.value)}>
+                           <option value="">选择班级查看/排课</option>
+                           {classList.map(c=><option key={c._id} value={c.grade+c.className}>{c.grade}{c.className}</option>)}
+                        </select>
+                     )}
+                     {viewClass && <span className="text-sm font-bold text-blue-600 bg-blue-50 px-2 py-1 rounded">当前: {viewClass}</span>}
                   </div>
+                  <button onClick={()=>setShowSchedule(false)} className="text-gray-400 hover:text-gray-600"><X size={24}/></button>
+               </div>
+
+               <div className="flex-1 overflow-auto">
+                  <table className="w-full border-collapse text-center">
+                     <thead>
+                        <tr className="bg-gray-50 text-gray-500 uppercase text-sm">
+                           <th className="p-3 border">节次</th>
+                           <th className="p-3 border w-1/5">周一</th>
+                           <th className="p-3 border w-1/5">周二</th>
+                           <th className="p-3 border w-1/5">周三</th>
+                           <th className="p-3 border w-1/5">周四</th>
+                           <th className="p-3 border w-1/5">周五</th>
+                        </tr>
+                     </thead>
+                     <tbody className="text-sm">
+                        {[1,2,3,4,5,6,7,8].map(period => (
+                           <tr key={period} className="hover:bg-gray-50/50">
+                              <td className="p-4 border font-bold text-gray-400">第{period}节</td>
+                              {[1,2,3,4,5].map(day => {
+                                 const item = schedules.find(s => s.dayOfWeek === day && s.period === period);
+                                 return (
+                                    <td 
+                                       key={day} 
+                                       className={`p-2 border h-20 align-middle transition-colors ${viewClass ? 'cursor-pointer hover:bg-blue-50' : ''}`}
+                                       onClick={() => {
+                                          if (!viewClass) return;
+                                          setEditingCell({ day, period });
+                                          if(item) setEditForm({ subject: item.subject, teacherName: item.teacherName });
+                                          else setEditForm({ subject: '', teacherName: '' });
+                                       }}
+                                    >
+                                       {item ? (
+                                          <div className="flex flex-col">
+                                             <span className="font-bold text-gray-800">{item.subject}</span>
+                                             <span className="text-xs text-gray-500">{item.teacherName}</span>
+                                             {!viewClass && <span className="text-xs text-blue-400">{item.className}</span>}
+                                          </div>
+                                       ) : (
+                                          viewClass && <Plus size={16} className="text-gray-200 mx-auto"/>
+                                       )}
+                                    </td>
+                                 );
+                              })}
+                           </tr>
+                        ))}
+                     </tbody>
+                  </table>
                </div>
-               <button onClick={()=>setShowSchedule(false)} className="w-full mt-6 bg-gray-100 text-gray-600 py-2 rounded-lg hover:bg-gray-200">关闭</button>
             </div>
+            
+            {/* Edit Cell Modal */}
+            {editingCell && (
+               <div className="absolute inset-0 bg-black/20 flex items-center justify-center backdrop-blur-[1px]">
+                  <div className="bg-white p-6 rounded-lg shadow-xl w-80">
+                     <h4 className="font-bold mb-4">排课: 周{['一','二','三','四','五'][editingCell.day-1]} 第{editingCell.period}节</h4>
+                     <div className="space-y-3">
+                        <div>
+                           <label className="text-xs text-gray-500">科目</label>
+                           <select className="w-full border rounded p-2" value={editForm.subject} onChange={e=>setEditForm({...editForm, subject: e.target.value})}>
+                              <option value="">选择科目</option>
+                              {subjects.map(s=><option key={s._id} value={s.name}>{s.name}</option>)}
+                           </select>
+                        </div>
+                        <div>
+                           <label className="text-xs text-gray-500">任课教师</label>
+                           <select className="w-full border rounded p-2" value={editForm.teacherName} onChange={e=>setEditForm({...editForm, teacherName: e.target.value})}>
+                              <option value="">选择教师</option>
+                              {teachers.map(t=><option key={t._id} value={t.trueName || t.username}>{t.username}</option>)}
+                           </select>
+                        </div>
+                        <div className="flex gap-2 pt-2">
+                           <button onClick={handleSaveSchedule} className="flex-1 bg-blue-600 text-white py-2 rounded">保存</button>
+                           <button onClick={handleDeleteSchedule} className="flex-1 bg-red-50 text-red-600 py-2 rounded border border-red-100">清除</button>
+                           <button onClick={()=>setEditingCell(null)} className="flex-1 border py-2 rounded">取消</button>
+                        </div>
+                     </div>
+                  </div>
+               </div>
+            )}
          </div>
       )}
 
@@ -185,4 +315,4 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
       )}
     </div>
   );
-};
+};

pages/ScoreList.tsx

@@ -1,120 +1,108 @@
 import React, { useState, useEffect } from 'react';
+import { Search, Plus, Upload, Edit, Trash2, X, Loader2, User, FileSpreadsheet } from 'lucide-react';
 import { api } from '../services/api';
-import { Score, Student, Subject, ClassInfo, ExamStatus, Exam } from '../types';
-import { Loader2, Plus, Trash2, Award, FileSpreadsheet, X, Upload, Edit, Save, Calendar } from 'lucide-react';
+import { Student, ClassInfo } from '../types';
 
-export const ScoreList: React.FC = () => {
-  const [subjects, setSubjects] = useState<Subject[]>([]);
-  const [activeSubject, setActiveSubject] = useState(''); 
-  const [scores, setScores] = useState<Score[]>([]);
+export const StudentList: React.FC = () => {
+  const [searchTerm, setSearchTerm] = useState('');
   const [students, setStudents] = useState<Student[]>([]);
   const [classList, setClassList] = useState<ClassInfo[]>([]);
-  const [exams, setExams] = useState<Exam[]>([]);
   const [loading, setLoading] = useState(true);
-  
-  const [selectedGrade, setSelectedGrade] = useState('All');
-  const [selectedClass, setSelectedClass] = useState('All');
-  const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
-  
-  const [isAddOpen, setIsAddOpen] = useState(false);
+  const [isModalOpen, setIsModalOpen] = useState(false);
   const [isImportOpen, setIsImportOpen] = useState(false);
-  const [isExamModalOpen, setIsExamModalOpen] = useState(false);
-  
-  const [importFile, setImportFile] = useState<File | null>(null);
   const [submitting, setSubmitting] = useState(false);
-  
-  // Import Config
-  const [importSemester, setImportSemester] = useState('2023-2024学年 第一学期');
-  const [importType, setImportType] = useState('Final');
-  const [importExamName, setImportExamName] = useState(''); 
+  const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
 
-  // Manual Add Form
-  const [formData, setFormData] = useState({ studentId: '', score: '', type: 'Final', examName: '', status: 'Normal' });
+  // Filters
+  const [selectedGrade, setSelectedGrade] = useState('All');
+  const [selectedClass, setSelectedClass] = useState('All');
 
-  // Edit State
-  const [editingId, setEditingId] = useState<string | null>(null);
-  const [editScoreVal, setEditScoreVal] = useState<string>('');
-  const [editStatus, setEditStatus] = useState<ExamStatus>('Normal');
+  // Import Data
+  const [importFile, setImportFile] = useState<File | null>(null);
+  const [importTargetClass, setImportTargetClass] = useState('');
+
+  // Form State (Extended)
+  const [formData, setFormData] = useState({
+    name: '',
+    studentNo: '',
+    gender: 'Male',
+    className: '',
+    phone: '',
+    idCard: '',
+    parentName: '',
+    parentPhone: '',
+    address: ''
+  });
 
   const loadData = async () => {
     setLoading(true);
     try {
-      const [subs, scs, stus, cls, exs] = await Promise.all([
-        api.subjects.getAll(),
-        api.scores.getAll(),
+      const [studentData, classData] = await Promise.all([
         api.students.getAll(),
-        api.classes.getAll(),
-        api.exams.getAll()
+        api.classes.getAll()
       ]);
-      setSubjects(subs);
-      if (subs.length > 0 && !activeSubject) setActiveSubject(subs[0].name);
-      setScores(scs);
-      setStudents(stus);
-      setClassList(cls);
-      setExams(exs);
-    } catch (e) { console.error(e); } 
-    finally { setLoading(false); }
+      setStudents(studentData);
+      setClassList(classData);
+    } catch (error) {
+      console.error(error);
+    } finally {
+      setLoading(false);
+    }
   };
 
   useEffect(() => { loadData(); }, []);
 
-  const filteredScores = scores.filter(s => {
-    if (s.courseName !== activeSubject) return false;
-    const stu = students.find(st => st.studentNo === s.studentNo);
-    if (!stu) return false;
-
-    // Filter by grade and class
-    const matchesGrade = selectedGrade === 'All' || stu.className.includes(selectedGrade);
-    const matchesClass = selectedClass === 'All' || stu.className.includes(selectedClass);
-    return matchesGrade && matchesClass;
-  });
+  const handleDelete = async (id: string) => {
+    if (confirm('确定删除？')) {
+      await api.students.delete(id);
+      loadData();
+    }
+  };
 
   const handleBatchDelete = async () => {
-    if (confirm(`删除 ${selectedIds.size} 条记录？`)) {
-      await api.batchDelete('score', Array.from(selectedIds));
-      setSelectedIds(new Set());
-      loadData();
+    if (selectedIds.size === 0) return;
+    if (confirm(`确定要删除选中的 ${selectedIds.size} 名学生吗？`)) {
+       await api.batchDelete('student', Array.from(selectedIds));
+       setSelectedIds(new Set());
+       loadData();
     }
   };
 
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault();
-    const stu = students.find(s => (s._id || s.id) == formData.studentId);
-    if (!stu) return;
-    await api.scores.add({
-      studentName: stu.name,
-      studentNo: stu.studentNo,
-      courseName: activeSubject,
-      score: formData.status === 'Normal' ? Number(formData.score) : 0,
-      semester: '2023-2024学年 第一学期',
-      type: formData.type,
-      examName: formData.examName,
-      status: formData.status
-    });
-    setIsAddOpen(false);
-    setFormData({ studentId: '', score: '', type: 'Final', examName: '', status: 'Normal' });
-    loadData();
+  const toggleSelect = (id: string) => {
+    const newSet = new Set(selectedIds);
+    if (newSet.has(id)) newSet.delete(id);
+    else newSet.add(id);
+    setSelectedIds(newSet);
   };
 
-  const startEditing = (s: Score) => {
-    setEditingId(s._id || String(s.id));
-    setEditScoreVal(String(s.score));
-    setEditStatus(s.status || 'Normal');
+  const toggleSelectAll = (filtered: Student[]) => {
+    if (selectedIds.size === filtered.length && filtered.length > 0) {
+      setSelectedIds(new Set());
+    } else {
+      setSelectedIds(new Set(filtered.map(s => s._id || String(s.id))));
+    }
   };
 
-  const saveEdit = async (id: string) => {
-    await api.scores.update(id, {
-      score: editStatus === 'Normal' ? Number(editScoreVal) : 0,
-      status: editStatus
-    });
-    setEditingId(null);
-    loadData();
+  const handleAddSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    setSubmitting(true);
+    try {
+      await api.students.add({
+        ...formData,
+        birthday: '2015-01-01',
+        status: 'Enrolled',
+        gender: formData.gender as any
+      });
+      setIsModalOpen(false);
+      loadData();
+    } catch (error) { alert('添加失败'); } 
+    finally { setSubmitting(false); }
   };
 
   const handleExcelImport = async () => {
     if (!importFile) return alert('请选择文件');
     // @ts-ignore
-    if (!window.XLSX) return alert('Excel 组件未加载');
+    if (!window.XLSX) return alert('Excel 解析组件未加载，请刷新页面重试');
 
     setSubmitting(true);
     
@@ -126,72 +114,91 @@ export const ScoreList: React.FC = () => {
         const workbook = window.XLSX.read(data, { type: 'array' });
         const firstSheetName = workbook.SheetNames[0];
         const worksheet = workbook.Sheets[firstSheetName];
+        
+        // Use 'header: 1' to get raw array of arrays
         // @ts-ignore
-        const jsonData = window.XLSX.utils.sheet_to_json(worksheet);
+        const rawRows: any[][] = window.XLSX.utils.sheet_to_json(worksheet, { header: 1 });
         
-        const headers = Object.keys(jsonData[0] || {}).map(h => h.trim());
-        const matchedSubjects = subjects.filter(s => headers.includes(s.name));
+        console.log('Importing raw rows:', rawRows);
+
+        if (rawRows.length < 1) return alert('文件为空');
+
+        // Heuristic: Find header row
+        let headerRowIndex = -1;
+        const headerKeywords = ['姓名', 'name', '学号', 'no', 'id'];
         
-        if (matchedSubjects.length === 0) {
-           alert('未在表头找到匹配的学科名称(如: 语文, 数学)');
-           setSubmitting(false);
-           return;
+        for (let i = 0; i < Math.min(10, rawRows.length); i++) {
+           const rowStr = rawRows[i].join(' ').toLowerCase();
+           if (headerKeywords.some(k => rowStr.includes(k))) {
+              headerRowIndex = i;
+              break;
+           }
         }
 
         let successCount = 0;
-        const promises: Promise<any>[] = [];
+        const promises = [];
+
+        // Determine column indices
+        let colMap: Record<string, number> = {};
+        
+        if (headerRowIndex !== -1) {
+           rawRows[headerRowIndex].forEach((cell: any, idx: number) => {
+              if (typeof cell === 'string') colMap[cell.trim()] = idx;
+           });
+        } else {
+           // Fallback: 0=StudentNo, 1=Name
+           colMap = { '学号': 0, '姓名': 1, '性别': 2, '电话': 3 };
+        }
+
+        const startRow = headerRowIndex === -1 ? 0 : headerRowIndex + 1;
 
-        jsonData.forEach((row: any) => {
-           const cleanRow: any = {};
-           Object.keys(row).forEach(k => cleanRow[k.trim()] = row[k]);
+        for (let i = startRow; i < rawRows.length; i++) {
+           const row = rawRows[i];
+           if (!row || row.length === 0) continue;
 
-           const studentName = cleanRow['姓名'] || cleanRow['Name'];
-           if (!studentName) return;
+           // Helper to get val by possible keys or index
+           const getVal = (keys: string[], defaultIdx: number) => {
+              for (const k of keys) {
+                 if (colMap[k] !== undefined && row[colMap[k]]) return row[colMap[k]];
+              }
+              if (headerRowIndex === -1 && row[defaultIdx]) return row[defaultIdx];
+              return '';
+           };
 
-           const student = students.find(s => s.name === studentName);
+           const name = getVal(['姓名', 'Name'], 1);
+           const studentNo = getVal(['学号', 'No', 'ID'], 0);
            
-           if (student) {
-              matchedSubjects.forEach(sub => {
-                 let rawVal = cleanRow[sub.name];
-                 let scoreVal = 0;
-                 let statusVal: ExamStatus = 'Normal';
-
-                 if (typeof rawVal === 'string') {
-                    if (rawVal.includes('缺考')) statusVal = 'Absent';
-                    else if (rawVal.includes('请假')) statusVal = 'Leave';
-                    else if (rawVal.includes('作弊')) statusVal = 'Cheat';
-                    else scoreVal = Number(rawVal) || 0;
-                 } else {
-                    scoreVal = Number(rawVal) || 0;
-                 }
-
-                 if (rawVal !== undefined && rawVal !== null && rawVal !== '') {
-                    promises.push(
-                       api.scores.add({
-                          studentName: student.name,
-                          studentNo: student.studentNo,
-                          courseName: sub.name,
-                          score: scoreVal,
-                          semester: importSemester,
-                          type: importType,
-                          examName: importExamName || '批量导入',
-                          status: statusVal
-                       }).then(() => successCount++)
-                    );
-                 }
-              });
-           }
-        });
+           if (!name || !studentNo) continue;
+
+           const genderVal = getVal(['性别', 'Gender'], 2);
+           const gender = (genderVal === '女' || genderVal === 'Female') ? 'Female' : 'Male';
+           
+           const targetClassName = importTargetClass || getVal(['班级', 'Class'], 99) || '未分配';
+
+           promises.push(
+             api.students.add({
+               name: String(name).trim(),
+               studentNo: String(studentNo).trim(),
+               gender,
+               className: targetClassName,
+               phone: String(getVal(['电话', '联系方式', 'Mobile'], 3)).trim(),
+               parentName: String(getVal(['家长', '家长姓名', 'Parent'], 4)).trim(),
+               parentPhone: String(getVal(['家长电话', '联系电话'], 5)).trim(),
+               address: String(getVal(['地址', '住址', 'Address'], 6)).trim(),
+               birthday: '2015-01-01',
+               status: 'Enrolled'
+             }).then(() => successCount++).catch(err => console.error('Row Import Error:', err))
+           );
+        }
 
         await Promise.all(promises);
-        alert(`成功导入 ${successCount} 条成绩记录`);
+        alert(`成功导入/更新 ${successCount} 名学生信息`);
         setIsImportOpen(false);
-        setImportFile(null);
-        setImportExamName('');
+        setImportFile(null); 
         loadData();
       } catch (err) {
         console.error(err);
-        alert('导入失败，请检查文件');
+        alert('解析 Excel 文件失败，请检查文件格式');
       } finally {
         setSubmitting(false);
       }
@@ -199,272 +206,197 @@ export const ScoreList: React.FC = () => {
     reader.readAsArrayBuffer(importFile);
   };
 
-  const handleUpdateExamDate = async (name: string, date: string) => {
-     await api.exams.save({ name, date });
-     loadData();
-  };
-
-
-  const toggleSelect = (id: string) => {
-     const newSet = new Set(selectedIds);
-     if (newSet.has(id)) newSet.delete(id); else newSet.add(id);
-     setSelectedIds(newSet);
-  };
+  const filteredStudents = students.filter((s) => {
+    const matchesSearch = s.name.toLowerCase().includes(searchTerm.toLowerCase()) || s.studentNo.includes(searchTerm);
+    const matchesGrade = selectedGrade === 'All' || s.className.includes(selectedGrade);
+    const matchesClass = selectedClass === 'All' || s.className.includes(selectedClass);
+    return matchesSearch && matchesGrade && matchesClass;
+  });
 
   const uniqueGrades = Array.from(new Set(classList.map(c => c.grade))).sort();
   const filteredClasses = classList.filter(c => selectedGrade === 'All' || c.grade === selectedGrade);
   const uniqueClasses = Array.from(new Set(filteredClasses.map(c => c.className))).sort();
 
-  // Unique Exam Names for Modal
-  const uniqueExamNames = Array.from(new Set(scores.map(s => s.examName || s.type)));
-
   return (
-    <div className="space-y-6">
-       <div className="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden min-h-[500px]">
-          {loading && <div className="p-10 text-center"><Loader2 className="animate-spin inline"/></div>}
-          
-          <div className="p-4 md:p-6 border-b border-gray-100">
-             <div className="flex flex-col md:flex-row justify-between items-start md:items-center mb-4 gap-4">
-                <h2 className="text-xl font-bold flex items-center text-gray-800"><Award className="mr-2 text-blue-600"/>成绩管理</h2>
-                <div className="grid grid-cols-2 md:flex gap-2 w-full md:w-auto">
-                   <button onClick={() => setIsExamModalOpen(true)} className="col-span-2 md:col-span-1 px-4 py-2 bg-indigo-50 text-indigo-600 border border-indigo-200 rounded-lg flex items-center justify-center text-sm hover:bg-indigo-100 transition-colors">
-                      <Calendar size={16} className="mr-1"/> 考试排期
-                   </button>
-                   <button onClick={() => { setIsImportOpen(true); setImportFile(null); }} className="px-4 py-2 bg-emerald-50 text-emerald-600 border border-emerald-200 rounded-lg flex items-center justify-center text-sm hover:bg-emerald-100 transition-colors">
-                      <FileSpreadsheet size={16} className="mr-1"/> Excel导入
-                   </button>
-                   <button onClick={() => setIsAddOpen(true)} className="px-4 py-2 bg-blue-600 text-white rounded-lg flex items-center justify-center text-sm hover:bg-blue-700 transition-colors">
-                      <Plus size={16} className="mr-1"/> 手动录入
-                   </button>
-                </div>
-             </div>
-             
-             {/* Responsive Filters */}
-             <div className="flex flex-col md:flex-row gap-2 md:gap-4 items-stretch md:items-center bg-gray-50 p-3 rounded-lg">
-                <select className="border border-gray-300 p-2 rounded text-sm text-gray-900 focus:ring-2 focus:ring-blue-500" value={selectedGrade} onChange={e => { setSelectedGrade(e.target.value); setSelectedClass('All'); }}>
-                   <option value="All">所有年级</option>
-                   {uniqueGrades.map(g=><option key={g} value={g}>{g}</option>)}
-                </select>
-                <select className="border border-gray-300 p-2 rounded text-sm text-gray-900 focus:ring-2 focus:ring-blue-500" value={selectedClass} onChange={e=>setSelectedClass(e.target.value)}>
-                   <option value="All">所有班级</option>
-                   {uniqueClasses.map(c=><option key={c} value={c}>{c}</option>)}
-                </select>
-             </div>
-          </div>
-
-          <div className="flex border-b border-gray-100 px-4 overflow-x-auto no-scrollbar">
-             <div className="flex">
-               {subjects.map(sub => (
-                  <button 
-                    key={sub._id || sub.id} 
-                    onClick={() => setActiveSubject(sub.name)}
-                    className={`whitespace-nowrap px-6 py-4 text-sm font-medium border-b-2 transition-colors ${activeSubject === sub.name ? 'border-blue-600 text-blue-600' : 'border-transparent text-gray-500 hover:text-gray-700'}`}
-                  >
-                     {sub.name}
-                  </button>
-               ))}
-             </div>
-          </div>
-
-          {/* Responsive Table Wrapper */}
-          <div className="overflow-x-auto">
-            <table className="w-full text-left min-w-[800px]">
-               <thead className="bg-gray-50 text-xs text-gray-500 uppercase">
-                  <tr>
-                     <th className="px-6 py-3 w-10">
-                        <input type="checkbox" onChange={e => {
-                           if(e.target.checked) setSelectedIds(new Set(filteredScores.map(s=>s._id||String(s.id))));
-                           else setSelectedIds(new Set());
-                        }} checked={filteredScores.length > 0 && selectedIds.size === filteredScores.length}/>
-                     </th>
-                     <th className="px-6 py-3">姓名</th>
-                     <th className="px-6 py-3">考试名称</th>
-                     <th className="px-6 py-3">状态/分数</th>
-                     <th className="px-6 py-3 text-right">操作</th>
-                  </tr>
-               </thead>
-               <tbody>
-                  {filteredScores.length > 0 ? filteredScores.map(s => {
-                     const isEditing = editingId === (s._id || String(s.id));
-                     const displayScore = s.status === 'Normal' ? s.score : (s.status === 'Absent' ? '缺考' : s.status === 'Leave' ? '请假' : '作弊');
-                     const scoreColor = s.status !== 'Normal' ? 'text-gray-400' : (s.score < 60 ? 'text-red-500' : 'text-blue-600');
-                     
-                     return (
-                       <tr key={s._id || s.id} className="hover:bg-gray-50 border-b border-gray-50 last:border-0">
-                          <td className="px-6 py-3"><input type="checkbox" checked={selectedIds.has(s._id||String(s.id))} onChange={()=>toggleSelect(s._id||String(s.id))}/></td>
-                          <td className="px-6 py-3 font-medium text-gray-800">{s.studentName}</td>
-                          <td className="px-6 py-3 text-sm text-gray-500">{s.examName || s.type}</td>
-                          <td className="px-6 py-3 font-bold">
-                             {isEditing ? (
-                                <div className="flex items-center space-x-2">
-                                   <select value={editStatus} onChange={e=>setEditStatus(e.target.value as any)} className="border rounded px-1 py-1 text-xs">
-                                      <option value="Normal">正常</option>
-                                      <option value="Absent">缺考</option>
-                                      <option value="Leave">请假</option>
-                                      <option value="Cheat">作弊</option>
-                                   </select>
-                                   {editStatus === 'Normal' && (
-                                     <input type="number" value={editScoreVal} onChange={e=>setEditScoreVal(e.target.value)} className="w-16 border rounded px-1 py-1 text-sm"/>
-                                   )}
-                                </div>
-                             ) : (
-                                <span className={scoreColor}>{displayScore}</span>
-                             )}
-                          </td>
-                          <td className="px-6 py-3 text-right flex justify-end gap-2">
-                             {isEditing ? (
-                                <>
-                                  <button onClick={()=>saveEdit(s._id||String(s.id))} className="text-green-500 hover:text-green-700"><Save size={16}/></button>
-                                  <button onClick={()=>setEditingId(null)} className="text-gray-400 hover:text-gray-600"><X size={16}/></button>
-                                </>
-                             ) : (
-                                <>
-                                  <button onClick={()=>startEditing(s)} className="text-blue-400 hover:text-blue-600"><Edit size={16}/></button>
-                                  <button onClick={async()=>{await api.scores.delete(s._id||String(s.id));loadData();}} className="text-red-400 hover:text-red-600"><Trash2 size={16}/></button>
-                                </>
-                             )}
-                          </td>
-                       </tr>
-                     );
-                  }) : (
-                     <tr><td colSpan={5} className="text-center py-10 text-gray-400">该班级暂无 {activeSubject} 成绩</td></tr>
-                  )}
-               </tbody>
-            </table>
-          </div>
-       </div>
-
-       {selectedIds.size > 0 && (
-          <div className="fixed bottom-6 right-6 bg-white shadow-lg p-4 rounded-xl border flex items-center gap-4 animate-in slide-in-from-bottom-5 z-20">
-             <span>已选 {selectedIds.size} 项</span>
-             <button onClick={handleBatchDelete} className="bg-red-600 text-white px-4 py-2 rounded-lg text-sm">批量删除</button>
-          </div>
-       )}
-
-       {/* Manual Add Modal */}
-       {isAddOpen && (
-          <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
-             <div className="bg-white rounded-xl p-6 w-full max-w-sm">
-                <h3 className="font-bold mb-4">录入 {activeSubject} 成绩</h3>
-                <form onSubmit={handleSubmit} className="space-y-4">
-                   <select className="w-full border p-2 rounded" value={formData.studentId} onChange={e=>setFormData({...formData, studentId:e.target.value})} required>
-                      <option value="">选择学生</option>
-                      {students.filter(s => {
-                         if (selectedGrade !== 'All' && !s.className.includes(selectedGrade)) return false;
-                         if (selectedClass !== 'All' && !s.className.includes(selectedClass)) return false;
-                         return true;
-                      }).map(s=><option key={s._id||s.id} value={s._id||s.id}>{s.name} - {s.className}</option>)}
-                   </select>
-                   <input className="w-full border p-2 rounded" placeholder="考试名称 (如: 期中测验)" value={formData.examName} onChange={e=>setFormData({...formData, examName:e.target.value})} required/>
-                   <div className="flex gap-2">
-                     <select className="w-1/3 border p-2 rounded" value={formData.status} onChange={e=>setFormData({...formData, status: e.target.value})}>
-                       <option value="Normal">正常</option>
-                       <option value="Absent">缺考</option>
-                       <option value="Leave">请假</option>
-                     </select>
-                     {formData.status === 'Normal' && (
-                       <input type="number" className="flex-1 border p-2 rounded" placeholder="分数" value={formData.score} onChange={e=>setFormData({...formData, score:e.target.value})} required/>
-                     )}
-                   </div>
-                   <div className="flex gap-2">
-                      <button type="submit" className="flex-1 bg-blue-600 text-white py-2 rounded">保存</button>
-                      <button type="button" onClick={()=>setIsAddOpen(false)} className="flex-1 border py-2 rounded">取消</button>
-                   </div>
-                </form>
-             </div>
-          </div>
-       )}
-
-       {/* Exam Schedule Modal */}
-       {isExamModalOpen && (
-          <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
-             <div className="bg-white rounded-xl p-6 w-full max-w-lg max-h-[80vh] overflow-y-auto">
-                <div className="flex justify-between items-center mb-4">
-                   <h3 className="font-bold text-lg">考试排期管理</h3>
-                   <button onClick={()=>setIsExamModalOpen(false)}><X size={20}/></button>
-                </div>
-                <p className="text-sm text-gray-500 mb-4">设置考试的具体日期，以便生成准确的时间轴趋势图。</p>
-                
-                <div className="space-y-3">
-                   {uniqueExamNames.map((name, idx) => {
-                      const examInfo = exams.find(e => e.name === name);
-                      return (
-                         <div key={idx} className="flex items-center justify-between bg-gray-50 p-3 rounded">
-                            <span className="font-medium text-gray-800">{name}</span>
-                            <input 
-                               type="date" 
-                               className="border rounded px-2 py-1 text-sm"
-                               value={examInfo?.date || ''}
-                               onChange={(e) => handleUpdateExamDate(name!, e.target.value)}
-                            />
-                         </div>
-                      );
-                   })}
-                   {uniqueExamNames.length === 0 && <p className="text-center text-gray-400 py-4">暂无考试记录</p>}
-                </div>
-                
-                <div className="mt-6 flex justify-end">
-                   <button onClick={()=>setIsExamModalOpen(false)} className="px-4 py-2 bg-blue-600 text-white rounded">完成</button>
-                </div>
-             </div>
-          </div>
-       )}
-
-       {/* Excel Import Modal */}
-       {isImportOpen && (
-          <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
-             <div className="bg-white rounded-xl p-6 w-full max-w-md relative">
-                <div className="flex justify-between items-center mb-4">
-                   <h3 className="font-bold text-lg text-gray-900">批量导入成绩</h3>
-                   <button onClick={()=>setIsImportOpen(false)}><X size={20} className="text-gray-400"/></button>
-                </div>
-
-                <div className="space-y-4">
+    <div className="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden relative min-h-[600px] flex flex-col">
+      {loading && <div className="absolute inset-0 bg-white/50 z-10 flex items-center justify-center"><Loader2 className="animate-spin text-blue-600" /></div>}
+
+      <div className="p-4 md:p-6 border-b border-gray-100 space-y-4">
+        <div className="flex flex-col md:flex-row justify-between items-start md:items-center gap-4">
+           <div>
+             <h2 className="text-lg font-bold text-gray-800">学生档案</h2>
+             <p className="text-sm text-gray-500">选中 {selectedIds.size} / {filteredStudents.length} 人</p>
+           </div>
+           <div className="flex gap-2 w-full md:w-auto">
+              <button onClick={() => { setIsImportOpen(true); setImportFile(null); }} className="flex-1 md:flex-none btn-secondary flex items-center justify-center space-x-2 px-3 py-2 border rounded-lg text-sm bg-emerald-50 text-emerald-600 hover:bg-emerald-100 border-emerald-200">
+                <FileSpreadsheet size={16}/><span>Excel导入</span>
+              </button>
+              <button onClick={() => setIsModalOpen(true)} className="flex-1 md:flex-none btn-primary flex items-center justify-center space-x-2 px-3 py-2 bg-blue-600 text-white rounded-lg text-sm hover:bg-blue-700">
+                <Plus size={16}/><span>新增</span>
+              </button>
+           </div>
+        </div>
+
+        <div className="flex flex-col md:flex-row gap-2 md:gap-4 bg-gray-50 p-3 rounded-lg">
+           <div className="relative flex-1">
+              <input type="text" placeholder="搜索姓名或学号..." value={searchTerm} onChange={e => setSearchTerm(e.target.value)} className="w-full pl-9 pr-3 py-2 border rounded-md text-sm text-gray-900 focus:outline-none focus:ring-2 focus:ring-blue-500" />
+              <Search className="absolute left-3 top-2.5 text-gray-500" size={16} />
+           </div>
+           <div className="flex gap-2">
+             <select className="flex-1 md:w-32 border rounded-md text-sm text-gray-900 p-2" value={selectedGrade} onChange={e => { setSelectedGrade(e.target.value); setSelectedClass('All'); }}><option value="All">所有年级</option>{uniqueGrades.map(g=><option key={g} value={g}>{g}</option>)}</select>
+             <select className="flex-1 md:w-32 border rounded-md text-sm text-gray-900 p-2" value={selectedClass} onChange={e => setSelectedClass(e.target.value)}><option value="All">所有班级</option>{uniqueClasses.map(c=><option key={c} value={c}>{c}</option>)}</select>
+           </div>
+        </div>
+      </div>
+
+      <div className="flex-1 overflow-x-auto">
+        <table className="w-full text-left min-w-[700px]">
+          <thead className="bg-gray-50 text-xs text-gray-500 uppercase sticky top-0">
+            <tr>
+              <th className="px-6 py-3 w-10">
+                 <input type="checkbox" 
+                   checked={filteredStudents.length > 0 && selectedIds.size === filteredStudents.length}
+                   onChange={() => toggleSelectAll(filteredStudents)}
+                 />
+              </th>
+              <th className="px-6 py-3">基本信息</th>
+              <th className="px-6 py-3">学号</th>
+              <th className="px-6 py-3">班级</th>
+              <th className="px-6 py-3">家庭信息</th>
+              <th className="px-6 py-3 text-right">操作</th>
+            </tr>
+          </thead>
+          <tbody className="divide-y divide-gray-100">
+            {filteredStudents.length > 0 ? filteredStudents.map(s => (
+              <tr key={s._id || s.id} className="hover:bg-blue-50/30 transition-colors">
+                <td className="px-6 py-4">
+                  <input type="checkbox" checked={selectedIds.has(s._id || String(s.id))} onChange={() => toggleSelect(s._id || String(s.id))} />
+                </td>
+                <td className="px-6 py-4 flex items-center space-x-3">
+                   <div className={`w-8 h-8 rounded-full flex items-center justify-center text-xs text-white ${s.gender==='Male'?'bg-blue-400':'bg-pink-400'}`}>{s.name[0]}</div>
                    <div>
-                      <label className="text-sm font-bold text-gray-600">考试信息</label>
-                      <div className="space-y-2 mt-1">
-                         <input className="w-full border border-gray-300 p-2 rounded text-sm text-gray-900" value={importExamName} onChange={e=>setImportExamName(e.target.value)} placeholder="自定义考试名称 (如: 第三次月考)" />
-                         <div className="grid grid-cols-2 gap-2">
-                            <select className="border border-gray-300 p-2 rounded text-sm text-gray-900" value={importType} onChange={e=>setImportType(e.target.value)}>
-                               <option value="Final">期末考试</option>
-                               <option value="Midterm">期中考试</option>
-                               <option value="Quiz">平时测验</option>
-                            </select>
-                            <input className="border border-gray-300 p-2 rounded text-sm text-gray-900" value={importSemester} onChange={e=>setImportSemester(e.target.value)} placeholder="学期" />
-                         </div>
-                      </div>
-                   </div>
-
-                   <div className="relative border-2 border-dashed border-gray-300 rounded-lg p-6 text-center hover:bg-gray-50 transition-colors">
-                      <Upload className="mx-auto h-10 w-10 text-gray-400" />
-                      <p className="mt-2 text-sm text-gray-600">点击上传 .xlsx 文件</p>
-                      <p className="text-xs text-gray-400 mt-1">系统将自动识别 "缺考", "请假" 等文本</p>
-                      <input 
-                        type="file" 
-                        accept=".xlsx, .xls"
-                        className="opacity-0 absolute inset-0 cursor-pointer h-full w-full z-10"
-                        // @ts-ignore
-                        onChange={e => setImportFile(e.target.files?.[0])}
-                      />
+                      <span className="font-bold text-gray-800">{s.name}</span>
+                      <div className="text-xs text-gray-400">{s.idCard || '身份证未录入'}</div>
                    </div>
-                   
-                   {importFile && (
-                      <div className="text-sm text-blue-600 font-medium bg-blue-50 p-2 rounded border border-blue-100">
-                         已选择: {importFile.name}
+                </td>
+                <td className="px-6 py-4 text-sm font-mono text-gray-600">{s.studentNo}</td>
+                <td className="px-6 py-4 text-sm">
+                  <span className="bg-gray-100 px-2 py-1 rounded text-gray-600 text-xs">{s.className}</span>
+                </td>
+                <td className="px-6 py-4 text-xs text-gray-500 max-w-xs truncate">
+                   {s.parentName ? (
+                      <div className="flex flex-col">
+                         <span>{s.parentName} {s.parentPhone}</span>
+                         <span className="text-gray-400 truncate" title={s.address}>{s.address}</span>
                       </div>
-                   )}
-
-                   <button 
-                     onClick={handleExcelImport} 
-                     disabled={!importFile || submitting}
-                     className="w-full bg-emerald-600 text-white py-2 rounded-lg font-medium hover:bg-emerald-700 disabled:opacity-50 transition-colors relative z-20"
-                   >
-                     {submitting ? '处理中...' : '开始导入'}
-                   </button>
-                </div>
-             </div>
-          </div>
-       )}
+                   ) : '-'}
+                </td>
+                <td className="px-6 py-4 text-right">
+                   <button onClick={() => handleDelete(s._id || String(s.id))} className="text-red-400 hover:text-red-600"><Trash2 size={16}/></button>
+                </td>
+              </tr>
+            )) : (
+              <tr>
+                <td colSpan={6} className="text-center py-10 text-gray-400">没有找到匹配的学生</td>
+              </tr>
+            )}
+          </tbody>
+        </table>
+      </div>
+
+      {selectedIds.size > 0 && (
+         <div className="p-4 border-t border-gray-200 bg-white flex justify-between items-center shadow-[0_-4px_6px_-1px_rgba(0,0,0,0.1)] z-20">
+            <span className="text-sm font-medium text-gray-700">已选择 {selectedIds.size} 项</span>
+            <button onClick={handleBatchDelete} className="px-4 py-2 bg-red-600 text-white text-sm rounded-lg hover:bg-red-700">批量删除</button>
+         </div>
+      )}
+
+      {isModalOpen && (
+        <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
+           <div className="bg-white rounded-xl p-6 w-full max-w-lg max-h-[90vh] overflow-y-auto">
+              <h3 className="font-bold text-lg mb-4">新增学生档案</h3>
+              <form onSubmit={handleAddSubmit} className="space-y-4">
+                 <div className="grid grid-cols-2 gap-4">
+                    <input className="w-full border p-2 rounded" placeholder="姓名 *" value={formData.name} onChange={e=>setFormData({...formData, name:e.target.value})} required/>
+                    <input className="w-full border p-2 rounded" placeholder="学号 *" value={formData.studentNo} onChange={e=>setFormData({...formData, studentNo:e.target.value})} required/>
+                 </div>
+                 <div className="grid grid-cols-2 gap-4">
+                    <select className="w-full border p-2 rounded" value={formData.className} onChange={e=>setFormData({...formData, className:e.target.value})} required>
+                        <option value="">选择班级 *</option>
+                        {classList.map(c=><option key={c._id} value={c.grade+c.className}>{c.grade}{c.className}</option>)}
+                    </select>
+                    <select className="w-full border p-2 rounded" value={formData.gender} onChange={e=>setFormData({...formData, gender:e.target.value})} required>
+                        <option value="Male">男</option>
+                        <option value="Female">女</option>
+                    </select>
+                 </div>
+                 <input className="w-full border p-2 rounded" placeholder="身份证号 (选填)" value={formData.idCard} onChange={e=>setFormData({...formData, idCard:e.target.value})}/>
+                 
+                 <div className="border-t border-gray-100 pt-4 mt-2">
+                    <p className="text-xs font-bold text-gray-500 uppercase mb-2">家庭信息 (选填)</p>
+                    <div className="grid grid-cols-2 gap-4 mb-2">
+                       <input className="w-full border p-2 rounded" placeholder="家长姓名" value={formData.parentName} onChange={e=>setFormData({...formData, parentName:e.target.value})}/>
+                       <input className="w-full border p-2 rounded" placeholder="家长电话" value={formData.parentPhone} onChange={e=>setFormData({...formData, parentPhone:e.target.value})}/>
+                    </div>
+                    <input className="w-full border p-2 rounded" placeholder="家庭住址" value={formData.address} onChange={e=>setFormData({...formData, address:e.target.value})}/>
+                 </div>
+
+                 <button type="submit" disabled={submitting} className="w-full bg-blue-600 text-white py-2 rounded mt-4">{submitting?'提交中':'保存'}</button>
+                 <button type="button" onClick={()=>setIsModalOpen(false)} className="w-full border py-2 rounded mt-2">取消</button>
+              </form>
+           </div>
+        </div>
+      )}
+
+      {isImportOpen && (
+        <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
+           <div className="bg-white rounded-xl p-6 w-full max-w-md relative">
+              <div className="flex justify-between items-center mb-4">
+                 <h3 className="font-bold text-lg text-gray-900">Excel 批量导入</h3>
+                 <button onClick={()=>setIsImportOpen(false)} className="text-gray-400 hover:text-gray-600"><X size={20}/></button>
+              </div>
+              
+              <div className="space-y-4">
+                 <div>
+                    <label className="block text-sm font-medium text-gray-700 mb-1">选择归属班级 (若Excel无班级列)</label>
+                    <select className="w-full border border-gray-300 p-2 rounded text-sm text-gray-900" value={importTargetClass} onChange={e => setImportTargetClass(e.target.value)}>
+                       <option value="">-- 请选择 --</option>
+                       {classList.map(c=><option key={c._id} value={c.grade+c.className}>{c.grade}{c.className}</option>)}
+                    </select>
+                 </div>
+
+                 <div className="relative border-2 border-dashed border-gray-300 rounded-lg p-6 text-center hover:bg-gray-50 transition-colors">
+                    <Upload className="mx-auto h-10 w-10 text-gray-400" />
+                    <p className="mt-2 text-sm text-gray-600">点击上传 .xlsx 文件</p>
+                    <p className="text-xs text-gray-400 mt-1">支持列名：姓名, 学号, 家长姓名, 家长电话, 地址</p>
+                    <p className="text-xs text-gray-400">或：第一列学号，第二列姓名</p>
+                    <input 
+                      type="file" 
+                      accept=".xlsx, .xls"
+                      className="opacity-0 absolute inset-0 cursor-pointer h-full w-full z-10"
+                      // @ts-ignore
+                      onChange={e => setImportFile(e.target.files?.[0])}
+                    />
+                 </div>
+                 
+                 {importFile && (
+                    <div className="text-sm text-blue-600 font-medium bg-blue-50 p-2 rounded border border-blue-100">
+                       已选择: {importFile.name}
+                    </div>
+                 )}
+
+                 <button 
+                   onClick={handleExcelImport} 
+                   disabled={!importFile || submitting}
+                   className="w-full bg-emerald-600 text-white py-2 rounded-lg font-medium hover:bg-emerald-700 disabled:opacity-50 transition-colors relative z-20"
+                   style={{position: 'relative', zIndex: 20}}
+                 >
+                   {submitting ? '导入中...' : '开始导入'}
+                 </button>
+              </div>
+           </div>
+        </div>
+      )}
     </div>
   );
 };

server.js

@@ -1,4 +1,3 @@
-
 const express = require('express');
 const mongoose = require('mongoose');
 const cors = require('cors');
@@ -30,6 +29,7 @@ const InMemoryDB = {
   classes: [],
   subjects: [],
   exams: [],
+  schedules: [],
   config: {},
   isFallback: false
 };
@@ -145,6 +145,18 @@ const ExamSchema = new mongoose.Schema({
 });
 const ExamModel = mongoose.model('Exam', ExamSchema);
 
+const ScheduleSchema = new mongoose.Schema({
+  schoolId: String,
+  className: String,
+  teacherName: String,
+  subject: String,
+  dayOfWeek: Number, // 1-5
+  period: Number // 1-8
+});
+// Ensure unique schedule slot per class
+ScheduleSchema.index({ schoolId: 1, className: 1, dayOfWeek: 1, period: 1 }, { unique: true });
+const ScheduleModel = mongoose.model('Schedule', ScheduleSchema);
+
 const ConfigSchema = new mongoose.Schema({
   // Global config, no schoolId
   key: { type: String, default: 'main', unique: true },
@@ -203,6 +215,12 @@ const initData = async () => {
           allowAdminRegister: false
        });
        console.log('✅ Initialized Global Config');
+    } else if (!configExists.semesters || configExists.semesters.length === 0) {
+        // Migration: add semesters if missing
+        configExists.semesters = ['2023-2024学年 第一学期', '2023-2024学年 第二学期'];
+        if (!configExists.semester) configExists.semester = '2023-2024学年 第一学期';
+        await configExists.save();
+        console.log('✅ Migrated Global Config');
     }
 
   } catch (err) {
@@ -406,6 +424,52 @@ app.post('/api/exams', async (req, res) => {
   res.json({ success: true });
 });
 
+// --- Schedules ---
+app.get('/api/schedules', async (req, res) => {
+  const { className, teacherName } = req.query;
+  const filter = getQueryFilter(req);
+  if (className) filter.className = className;
+  if (teacherName) filter.teacherName = teacherName;
+  
+  if (InMemoryDB.isFallback) return res.json(InMemoryDB.schedules.filter(s => 
+     (!filter.schoolId || s.schoolId === filter.schoolId) &&
+     (!filter.className || s.className === filter.className) &&
+     (!filter.teacherName || s.teacherName === filter.teacherName)
+  ));
+  
+  res.json(await ScheduleModel.find(filter));
+});
+app.post('/api/schedules', async (req, res) => {
+  const data = injectSchoolId(req, req.body);
+  const { schoolId, className, dayOfWeek, period } = data;
+  
+  if (InMemoryDB.isFallback) {
+     const idx = InMemoryDB.schedules.findIndex(s => s.schoolId === schoolId && s.className === className && s.dayOfWeek === dayOfWeek && s.period === period);
+     if (idx >= 0) InMemoryDB.schedules[idx] = { ...data, _id: String(Date.now()) };
+     else InMemoryDB.schedules.push({ ...data, _id: String(Date.now()) });
+     return res.json({ success: true });
+  }
+  
+  await ScheduleModel.findOneAndUpdate(
+     { schoolId, className, dayOfWeek, period },
+     data,
+     { upsert: true }
+  );
+  res.json({ success: true });
+});
+app.delete('/api/schedules', async (req, res) => {
+   const { className, dayOfWeek, period } = req.query;
+   const schoolId = req.headers['x-school-id'];
+   if (InMemoryDB.isFallback) {
+      InMemoryDB.schedules = InMemoryDB.schedules.filter(s => 
+         !(s.schoolId === schoolId && s.className === className && s.dayOfWeek == dayOfWeek && s.period == period)
+      );
+      return res.json({ success: true });
+   }
+   await ScheduleModel.deleteOne({ schoolId, className, dayOfWeek, period });
+   res.json({ success: true });
+});
+
 // --- Students ---
 app.get('/api/students', async (req, res) => {
   const filter = getQueryFilter(req);
@@ -414,8 +478,25 @@ app.get('/api/students', async (req, res) => {
 });
 app.post('/api/students', async (req, res) => {
   const data = injectSchoolId(req, req.body);
-  if (InMemoryDB.isFallback) { InMemoryDB.students.push({ ...data, _id: String(Date.now()) }); return res.json({}); }
-  res.json(await Student.create(data));
+  try {
+    if (InMemoryDB.isFallback) { 
+        // Mock upsert behavior
+        const idx = InMemoryDB.students.findIndex(s => s.studentNo === data.studentNo && s.schoolId === data.schoolId);
+        if (idx >= 0) InMemoryDB.students[idx] = { ...InMemoryDB.students[idx], ...data };
+        else InMemoryDB.students.push({ ...data, _id: String(Date.now()) });
+        return res.json({}); 
+    }
+    
+    // Fix: Use Upsert to prevent duplicate key errors (500)
+    await Student.findOneAndUpdate(
+       { schoolId: data.schoolId, studentNo: data.studentNo },
+       data,
+       { upsert: true, new: true }
+    );
+    res.json({});
+  } catch (e) {
+    res.status(500).json({ error: e.message });
+  }
 });
 app.delete('/api/students/:id', async (req, res) => {
   if (InMemoryDB.isFallback) { InMemoryDB.students = InMemoryDB.students.filter(s => s._id != req.params.id); return res.json({}); }
@@ -528,4 +609,4 @@ app.get('*', (req, res) => {
   res.sendFile(path.join(__dirname, 'dist', 'index.html'));
 });
 
-app.listen(PORT, () => console.log(`🚀 Service running on port ${PORT}`));
+app.listen(PORT, () => console.log(`🚀 Service running on port ${PORT}`));

services/api.ts

@@ -1,6 +1,5 @@
-
 /// <reference types="vite/client" />
-import { User, ClassInfo, SystemConfig, Subject, School } from '../types';
+import { User, ClassInfo, SystemConfig, Subject, School, Schedule } from '../types';
 
 const getBaseUrl = () => {
   let isProd = false;
@@ -142,6 +141,18 @@ export const api = {
     delete: (id: string | number) => request(`/scores/${id}`, { method: 'DELETE' })
   },
   
+  schedules: {
+    get: (params: { className?: string; teacherName?: string }) => {
+       const qs = new URLSearchParams(params as any).toString();
+       return request(`/schedules?${qs}`);
+    },
+    save: (data: Schedule) => request('/schedules', { method: 'POST', body: JSON.stringify(data) }),
+    delete: (params: { className: string; dayOfWeek: number; period: number }) => {
+       const qs = new URLSearchParams(params as any).toString();
+       return request(`/schedules?${qs}`, { method: 'DELETE' });
+    }
+  },
+
   stats: {
     getSummary: () => request('/stats')
   },
@@ -155,4 +166,4 @@ export const api = {
   batchDelete: (type: 'student' | 'score' | 'user', ids: string[]) => {
     return request('/batch-delete', { method: 'POST', body: JSON.stringify({ type, ids }) });
   }
-};
+};

types.ts

@@ -1,4 +1,3 @@
-
 export enum UserRole {
   ADMIN = 'ADMIN',
   TEACHER = 'TEACHER',
@@ -122,9 +121,20 @@ export interface Exam {
   semester?: string;
 }
 
+export interface Schedule {
+  id?: number;
+  _id?: string;
+  schoolId?: string;
+  className: string; // Linked to ClassInfo
+  teacherName: string; // Linked to User
+  subject: string;
+  dayOfWeek: number; // 1 (Mon) - 5 (Fri)
+  period: number; // 1 - 8
+}
+
 export interface ApiResponse<T> {
   code: number;
   message: string;
   data: T;
   timestamp: number;
-}
+}