Upload 37 files

components/Header.tsx

@@ -1,3 +1,4 @@
+
 import React, { useState, useEffect } from 'react';
 import { Bell, Search, Menu, Building, Info, Check, AlertTriangle } from 'lucide-react';
 import { User, School, Notification } from '../types';
@@ -19,36 +20,46 @@ export const Header: React.FC<HeaderProps> = ({ user, title, onMenuClick }) => {
   const [showNotif, setShowNotif] = useState(false);
   const [hasUnread, setHasUnread] = useState(false);
 
-  useEffect(() => {
+  const fetchSchools = async () => {
     if (user.role === 'ADMIN') {
-      api.schools.getAll().then(data => {
-        setSchools(data);
-        if (data.length > 0) {
-           if (!selectedSchool || !data.find((s: School) => s._id === selectedSchool)) {
-              const defaultId = data[0]._id!;
-              setSelectedSchool(defaultId);
-              localStorage.setItem('admin_view_school_id', defaultId);
-              if (!localStorage.getItem('admin_view_school_id_init')) {
-                 localStorage.setItem('admin_view_school_id_init', 'true');
-                 window.location.reload();
-              }
-           }
-        }
-      }).catch(console.error);
+        try {
+            const data = await api.schools.getAll();
+            setSchools(data);
+            if (data.length > 0) {
+               if (!selectedSchool || !data.find((s: School) => s._id === selectedSchool)) {
+                  const defaultId = data[0]._id!;
+                  setSelectedSchool(defaultId);
+                  localStorage.setItem('admin_view_school_id', defaultId);
+                  if (!localStorage.getItem('admin_view_school_id_init')) {
+                     localStorage.setItem('admin_view_school_id_init', 'true');
+                     window.location.reload();
+                  }
+               }
+            }
+        } catch (e) { console.error(e); }
     } else {
-       api.schools.getPublic().then(data => {
-          const mySchool = data.find((s: School) => s._id === user.schoolId);
-          if (mySchool) setCurrentSchoolName(mySchool.name);
-       });
+         try {
+             const data = await api.schools.getPublic();
+             const mySchool = data.find((s: School) => s._id === user.schoolId);
+             if (mySchool) setCurrentSchoolName(mySchool.name);
+         } catch(e) { console.error(e); }
     }
+  };
+
+  useEffect(() => {
+    fetchSchools();
+    
+    // Listen for custom event to refresh schools
+    const handleSchoolUpdate = () => {
+        fetchSchools();
+    };
+    window.addEventListener('school-updated', handleSchoolUpdate);
     
     // Fetch notifications
     const fetchNotifs = async () => {
        try {
           const list = await api.notifications.getAll(user._id || '', user.role);
           setNotifications(list);
-          // Simple logic: if recent notifications exist, show red dot. 
-          // In real app, track 'read' IDs in local storage or DB.
           const lastReadTime = localStorage.getItem('last_read_notif_time');
           if (list.length > 0) {
              if (!lastReadTime || new Date(list[0].createTime) > new Date(lastReadTime)) {
@@ -58,6 +69,10 @@ export const Header: React.FC<HeaderProps> = ({ user, title, onMenuClick }) => {
        } catch (e) { console.error(e); }
     };
     fetchNotifs();
+
+    return () => {
+        window.removeEventListener('school-updated', handleSchoolUpdate);
+    };
   }, [user]);
 
   const handleSchoolChange = (e: React.ChangeEvent<HTMLSelectElement>) => {

pages/ClassList.tsx

@@ -31,10 +31,10 @@ export const ClassList: React.FC = () => {
     try {
       const [clsData, userData] = await Promise.all([
           api.classes.getAll(),
-          api.users.getAll({ role: 'TEACHER', global: true }) // Get all users to check apps
+          api.users.getAll({ role: 'TEACHER', global: true }) // Get filtered users
       ]);
       setClasses(clsData);
-      setTeachers(userData);
+      setTeachers(userData); // Now only contains teachers
       
       // Filter users with pending class applications
       const apps = userData.filter((u: User) => u.classApplication && u.classApplication.status === 'PENDING');
@@ -264,4 +264,4 @@ export const ClassList: React.FC = () => {
       )}
     </div>
   );
-};
+};

pages/Login.tsx

@@ -1,6 +1,6 @@
 
 import React, { useState, useEffect } from 'react';
-import { GraduationCap, Lock, User as UserIcon, AlertCircle, ArrowRight, Loader2, ArrowLeft, School as SchoolIcon, Mail, Phone, Smile, BookOpen, Users } from 'lucide-react';
+import { GraduationCap, Lock, User as UserIcon, AlertCircle, ArrowRight, Loader2, ArrowLeft, School as SchoolIcon, Mail, Phone, Smile, BookOpen, Users, Clipboard } from 'lucide-react';
 import { User, UserRole, School, ClassInfo, Subject } from '../types';
 import { api } from '../services/api';
 
@@ -28,7 +28,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
     schoolId: '', trueName: '', phone: '', email: '', avatar: '',
     teachingSubject: '', homeroomClass: '',
     // Student specific
-    studentNo: '', parentName: '', parentPhone: '', address: '', gender: 'Male'
+    seatNo: '', parentName: '', parentPhone: '', address: '', gender: 'Male'
   });
 
   const [schools, setSchools] = useState<School[]>([]);
@@ -40,6 +40,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
   const [error, setError] = useState('');
   const [loading, setLoading] = useState(false);
   const [successMsg, setSuccessMsg] = useState('');
+  const [generatedId, setGeneratedId] = useState('');
 
   useEffect(() => {
     if (view === 'register') {
@@ -80,20 +81,23 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
     setLoading(true);
     try {
       // Default avatar if none selected
-      const finalAvatar = regForm.avatar || `https://api.dicebear.com/7.x/avataaars/svg?seed=${regForm.username}`;
-      // Map username to studentNo if student (simplification)
+      const finalAvatar = regForm.avatar || `https://api.dicebear.com/7.x/avataaars/svg?seed=${regForm.username || regForm.trueName}`;
+      
       const payload = { ...regForm, avatar: finalAvatar };
-      if (payload.role === UserRole.STUDENT) {
-         payload.username = payload.studentNo; // Use Student No as username
-         payload.trueName = payload.trueName;
-      }
       
-      await api.auth.register(payload);
-      setSuccessMsg('注册成功！请等待审核。');
-      setView('login');
-      setStep(1);
+      const res = await api.auth.register(payload);
+      
+      if (regForm.role === UserRole.STUDENT && res.username) {
+          setGeneratedId(res.username);
+          setSuccessMsg('注册成功！');
+          // Don't switch view immediately, let them see the ID
+      } else {
+          setSuccessMsg('注册成功！请等待审核。');
+          setView('login');
+          setStep(1);
+      }
     } catch (err: any) {
-      setError(err.message || '注册失败: 用户名可能已存在');
+      setError(err.message || '注册失败: 可能用户名冲突');
     } finally { setLoading(false); }
   };
 
@@ -145,38 +149,26 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
       {/* Dynamic Fields based on Role */}
       {regForm.role === UserRole.STUDENT ? (
          <>
+            <div className="bg-yellow-50 p-2 rounded text-xs text-yellow-800 border border-yellow-200 mb-2">
+                注意：注册成功后系统将自动生成您的 <b>登录账号(系统学号)</b>，请务必牢记。
+            </div>
             <div className="grid grid-cols-2 gap-2">
                <input 
                  className="w-full p-2 border rounded-lg" 
-                 placeholder="学号 (作为登录账号)" 
-                 value={regForm.studentNo} onChange={e => setRegForm({...regForm, studentNo: e.target.value})}
-               />
-               <input 
-                 className="w-full p-2 border rounded-lg" 
-                 placeholder="真实姓名" 
+                 placeholder="真实姓名 (必填)" 
                  value={regForm.trueName} onChange={e => setRegForm({...regForm, trueName: e.target.value})}
                />
-            </div>
-            <div className="grid grid-cols-2 gap-2">
                <input 
                  className="w-full p-2 border rounded-lg" 
-                 type="password" placeholder="密码" 
+                 type="password" placeholder="设置密码 (必填)" 
                  value={regForm.password} onChange={e => setRegForm({...regForm, password: e.target.value})}
                />
-               <select 
-                  className="w-full p-2 border rounded-lg bg-white"
-                  value={regForm.gender}
-                  onChange={e => setRegForm({...regForm, gender: e.target.value})}
-               >
-                  <option value="Male">男</option>
-                  <option value="Female">女</option>
-               </select>
             </div>
             
             <div className="bg-blue-50 p-3 rounded-lg space-y-2 border border-blue-100">
-               <p className="text-xs font-bold text-blue-600 uppercase">班级与家庭 (必填)</p>
+               <p className="text-xs font-bold text-blue-600 uppercase">班级信息 (必填)</p>
                <select 
-                  className="w-full p-1.5 border rounded text-sm"
+                  className="w-full p-1.5 border rounded text-sm bg-white"
                   value={regForm.homeroomClass} // Reusing field for class selection
                   onChange={e => setRegForm({...regForm, homeroomClass: e.target.value})}
                >
@@ -184,10 +176,24 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
                   {schoolClasses.map(c => <option key={c._id} value={c.grade+c.className}>{c.grade}{c.className}</option>)}
                </select>
                <div className="grid grid-cols-2 gap-2">
+                   <select 
+                      className="w-full p-1.5 border rounded text-sm bg-white"
+                      value={regForm.gender}
+                      onChange={e => setRegForm({...regForm, gender: e.target.value})}
+                   >
+                      <option value="Male">男</option>
+                      <option value="Female">女</option>
+                   </select>
+                   <input className="border p-1.5 rounded text-sm w-full" placeholder="座号 (选填, 如: 05)" value={regForm.seatNo} onChange={e => setRegForm({...regForm, seatNo: e.target.value})}/>
+               </div>
+            </div>
+
+            <div className="border-t pt-2">
+               <p className="text-xs font-bold text-gray-400 uppercase mb-1">家庭信息 (选填)</p>
+               <div className="grid grid-cols-2 gap-2 mb-2">
                   <input className="border p-1.5 rounded text-sm w-full" placeholder="家长姓名" value={regForm.parentName} onChange={e => setRegForm({...regForm, parentName: e.target.value})}/>
                   <input className="border p-1.5 rounded text-sm w-full" placeholder="家长电话" value={regForm.parentPhone} onChange={e => setRegForm({...regForm, parentPhone: e.target.value})}/>
                </div>
-               <input className="border p-1.5 rounded text-sm w-full" placeholder="家庭住址" value={regForm.address} onChange={e => setRegForm({...regForm, address: e.target.value})}/>
             </div>
          </>
       ) : (
@@ -251,7 +257,7 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
         <button onClick={() => setStep(1)} className="flex-1 border py-2 rounded-lg">上一步</button>
         <button 
           onClick={() => setStep(3)} 
-          disabled={regForm.role === UserRole.STUDENT ? (!regForm.studentNo || !regForm.trueName) : (!regForm.username || !regForm.password)}
+          disabled={regForm.role === UserRole.STUDENT ? (!regForm.trueName || !regForm.homeroomClass) : (!regForm.username || !regForm.password)}
           className="flex-1 bg-blue-600 text-white py-2 rounded-lg disabled:opacity-50"
         >
           下一步
@@ -287,6 +293,25 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
     </div>
   );
 
+  const renderSuccess = () => (
+      <div className="text-center animate-in zoom-in space-y-4">
+          <div className="w-16 h-16 bg-green-100 text-green-600 rounded-full flex items-center justify-center mx-auto mb-4">
+              <Smile size={32}/>
+          </div>
+          <h3 className="text-2xl font-bold text-gray-800">注册成功!</h3>
+          <div className="bg-blue-50 border border-blue-200 rounded-xl p-6">
+              <p className="text-sm text-gray-600 mb-2">您的登录账号 (系统学号)</p>
+              <div className="text-3xl font-black text-blue-700 tracking-wider font-mono select-all">
+                  {generatedId}
+              </div>
+              <p className="text-xs text-red-500 mt-2 font-bold">请务必截图或记下此号码，用于以后登录！</p>
+          </div>
+          <button onClick={() => window.location.reload()} className="w-full bg-blue-600 text-white py-3 rounded-lg font-bold hover:bg-blue-700">
+              去登录
+          </button>
+      </div>
+  );
+
   return (
     <div className="min-h-screen bg-gray-100 flex items-center justify-center p-4">
       <div className="max-w-md w-full bg-white rounded-2xl shadow-xl overflow-hidden transition-all duration-300">
@@ -302,45 +327,49 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
         </div>
 
         <div className="p-8">
-          <div className="mb-6 flex justify-center">
-             <div className="bg-gray-100 p-1 rounded-lg flex text-sm font-medium">
-                <button onClick={() => { setView('login'); setError(''); }} className={`px-6 py-2 rounded-md transition-all ${view==='login' ? 'bg-white text-blue-600 shadow-sm' : 'text-gray-500'}`}>登录</button>
-                <button onClick={() => { setView('register'); setError(''); }} className={`px-6 py-2 rounded-md transition-all ${view==='register' ? 'bg-white text-blue-600 shadow-sm' : 'text-gray-500'}`}>注册账号</button>
-             </div>
-          </div>
+          {generatedId ? renderSuccess() : (
+            <>
+                <div className="mb-6 flex justify-center">
+                    <div className="bg-gray-100 p-1 rounded-lg flex text-sm font-medium">
+                        <button onClick={() => { setView('login'); setError(''); }} className={`px-6 py-2 rounded-md transition-all ${view==='login' ? 'bg-white text-blue-600 shadow-sm' : 'text-gray-500'}`}>登录</button>
+                        <button onClick={() => { setView('register'); setError(''); }} className={`px-6 py-2 rounded-md transition-all ${view==='register' ? 'bg-white text-blue-600 shadow-sm' : 'text-gray-500'}`}>注册账号</button>
+                    </div>
+                </div>
 
-          {error && <div className="bg-red-50 text-red-600 p-3 rounded-lg text-sm mb-4 flex items-center"><AlertCircle size={16} className="mr-2"/>{error}</div>}
-          {successMsg && <div className="bg-green-50 text-green-600 p-3 rounded-lg text-sm mb-4">{successMsg}</div>}
+                {error && <div className="bg-red-50 text-red-600 p-3 rounded-lg text-sm mb-4 flex items-center"><AlertCircle size={16} className="mr-2"/>{error}</div>}
+                {successMsg && !generatedId && <div className="bg-green-50 text-green-600 p-3 rounded-lg text-sm mb-4">{successMsg}</div>}
 
-          {view === 'login' ? (
-            <form onSubmit={handleLogin} className="space-y-5">
-              <div className="space-y-2">
-                <label className="text-sm font-medium text-gray-700">用户名 / 学号</label>
-                <div className="relative">
-                  <UserIcon className="absolute left-3 top-2.5 h-5 w-5 text-gray-400" />
-                  <input type="text" required value={loginForm.username} onChange={e => setLoginForm({...loginForm, username:e.target.value})} className="block w-full pl-10 pr-3 py-2.5 border border-gray-300 rounded-lg focus:ring-blue-500" placeholder="请输入用户名" />
-                </div>
-              </div>
-              <div className="space-y-2">
-                <label className="text-sm font-medium text-gray-700">密码</label>
-                <div className="relative">
-                  <Lock className="absolute left-3 top-2.5 h-5 w-5 text-gray-400" />
-                  <input type="password" required value={loginForm.password} onChange={e => setLoginForm({...loginForm, password:e.target.value})} className="block w-full pl-10 pr-3 py-2.5 border border-gray-300 rounded-lg focus:ring-blue-500" placeholder="请输入密码" />
-                </div>
-              </div>
-              <button type="submit" disabled={loading} className="w-full py-3 bg-blue-600 text-white rounded-lg font-bold hover:bg-blue-700 transition-colors">
-                {loading ? <Loader2 className="animate-spin inline"/> : '登 录'}
-              </button>
-            </form>
-          ) : (
-            <div className="min-h-[300px]">
-               {step === 1 && renderStep1()}
-               {step === 2 && renderStep2()}
-               {step === 3 && renderStep3()}
-            </div>
+                {view === 'login' ? (
+                    <form onSubmit={handleLogin} className="space-y-5">
+                    <div className="space-y-2">
+                        <label className="text-sm font-medium text-gray-700">用户名 / 学号</label>
+                        <div className="relative">
+                        <UserIcon className="absolute left-3 top-2.5 h-5 w-5 text-gray-400" />
+                        <input type="text" required value={loginForm.username} onChange={e => setLoginForm({...loginForm, username:e.target.value})} className="block w-full pl-10 pr-3 py-2.5 border border-gray-300 rounded-lg focus:ring-blue-500" placeholder="请输入用户名" />
+                        </div>
+                    </div>
+                    <div className="space-y-2">
+                        <label className="text-sm font-medium text-gray-700">密码</label>
+                        <div className="relative">
+                        <Lock className="absolute left-3 top-2.5 h-5 w-5 text-gray-400" />
+                        <input type="password" required value={loginForm.password} onChange={e => setLoginForm({...loginForm, password:e.target.value})} className="block w-full pl-10 pr-3 py-2.5 border border-gray-300 rounded-lg focus:ring-blue-500" placeholder="请输入密码" />
+                        </div>
+                    </div>
+                    <button type="submit" disabled={loading} className="w-full py-3 bg-blue-600 text-white rounded-lg font-bold hover:bg-blue-700 transition-colors">
+                        {loading ? <Loader2 className="animate-spin inline"/> : '登 录'}
+                    </button>
+                    </form>
+                ) : (
+                    <div className="min-h-[300px]">
+                    {step === 1 && renderStep1()}
+                    {step === 2 && renderStep2()}
+                    {step === 3 && renderStep3()}
+                    </div>
+                )}
+            </>
           )}
         </div>
       </div>
     </div>
   );
-};
+};

pages/SchoolList.tsx

@@ -31,6 +31,8 @@ export const SchoolList: React.FC = () => {
       setIsAdding(false);
       setForm({ name: '', code: '' });
       loadSchools();
+      // Notify Header to update
+      window.dispatchEvent(new Event('school-updated'));
     } catch (e) { alert('保存失败，代码可能重复'); }
   };
 
@@ -97,4 +99,4 @@ export const SchoolList: React.FC = () => {
       </div>
     </div>
   );
-};
+};

pages/StudentList.tsx

@@ -32,7 +32,8 @@ export const StudentList: React.FC = () => {
 
   const initialForm = {
     name: '',
-    studentNo: '',
+    studentNo: '', // System ID
+    seatNo: '',    // Seat No
     gender: 'Male',
     className: '',
     phone: '',
@@ -52,8 +53,14 @@ export const StudentList: React.FC = () => {
         api.students.getAll(),
         api.classes.getAll()
       ]);
-      // Sort students by studentNo by default
-      setStudents(studentData.sort((a: Student, b: Student) => a.studentNo.localeCompare(b.studentNo, undefined, {numeric: true})));
+      // Sort students: Primary by SeatNo (if numeric), Secondary by System ID
+      const sorted = studentData.sort((a: Student, b: Student) => {
+          const seatA = parseInt(a.seatNo || '9999');
+          const seatB = parseInt(b.seatNo || '9999');
+          if (seatA !== seatB) return seatA - seatB;
+          return a.studentNo.localeCompare(b.studentNo, undefined, {numeric: true});
+      });
+      setStudents(sorted);
       setClassList(classData);
     } catch (error) {
       console.error(error);
@@ -117,6 +124,7 @@ export const StudentList: React.FC = () => {
       setFormData({
           name: student.name,
           studentNo: student.studentNo,
+          seatNo: student.seatNo || '',
           gender: (student.gender === 'Female' ? 'Female' : 'Male'),
           className: student.className,
           phone: student.phone || '',
@@ -225,8 +233,8 @@ export const StudentList: React.FC = () => {
            };
 
            const name = getVal(['姓名', 'Name'], 1);
-           const studentNo = getVal(['学号', 'No', 'ID'], 0);
-           if (!name || !studentNo) continue;
+           const seatNo = getVal(['学号', '座号', 'No', 'ID'], 0); // Re-mapped: treat import "No" as Seat No
+           if (!name) continue;
 
            const genderVal = getVal(['性别', 'Gender'], 2);
            const gender = (genderVal === '女' || genderVal === 'Female') ? 'Female' : 'Male';
@@ -241,7 +249,8 @@ export const StudentList: React.FC = () => {
            promises.push(
              api.students.add({
                name: String(name).trim(),
-               studentNo: String(studentNo).trim(),
+               seatNo: seatNo ? String(seatNo).trim() : '',
+               studentNo: '', // Auto Generate
                gender,
                className: targetClassName,
                phone: String(getVal(['电话', '联系方式', 'Mobile'], 3)).trim(),
@@ -324,7 +333,7 @@ export const StudentList: React.FC = () => {
                  />
                  )}
               </th>
-              <th className="px-6 py-3">学号</th>
+              <th className="px-6 py-3">座号 / 系统ID</th>
               <th className="px-6 py-3">姓名/性别</th>
               <th className="px-6 py-3">班级</th>
               <th className="px-6 py-3">家长/住址</th>
@@ -339,7 +348,12 @@ export const StudentList: React.FC = () => {
                 <td className="px-6 py-4">
                   {canEdit && <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 text-sm font-mono text-gray-600">{s.studentNo}</td>
+                <td className="px-6 py-4">
+                    <div className="flex flex-col">
+                        <span className="font-bold text-gray-800 text-lg">{s.seatNo || '-'}</span>
+                        <span className="text-xs text-gray-400 font-mono" title="系统登录账号">{s.studentNo}</span>
+                    </div>
+                </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>
@@ -390,9 +404,20 @@ export const StudentList: React.FC = () => {
               <h3 className="font-bold text-lg mb-4">{editStudentId ? '编辑学生档案' : '新增学生档案'}</h3>
               <form onSubmit={handleSubmit} 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>
+                        <label className="text-xs font-bold text-gray-500 block mb-1">姓名 *</label>
+                        <input className="w-full border p-2 rounded" value={formData.name} onChange={e=>setFormData({...formData, name:e.target.value})} required/>
+                    </div>
+                    <div>
+                        <label className="text-xs font-bold text-gray-500 block mb-1">班级座号 (选填)</label>
+                        <input className="w-full border p-2 rounded" value={formData.seatNo} onChange={e=>setFormData({...formData, seatNo:e.target.value})} placeholder="如: 05"/>
+                    </div>
                  </div>
+                 {editStudentId && (
+                     <div className="bg-gray-50 p-2 rounded text-xs text-gray-600 mb-2">
+                         <span className="font-bold">系统ID (登录账号): </span> {formData.studentNo}
+                     </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>
@@ -460,8 +485,8 @@ export const StudentList: React.FC = () => {
                  <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>
+                    <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])}
@@ -477,4 +502,4 @@ export const StudentList: React.FC = () => {
       )}
     </div> 
   ); 
-};
+};

server.js

@@ -80,6 +80,7 @@ const UserSchema = new mongoose.Schema({
     parentPhone: String, 
     address: String, 
     gender: String, 
+    seatNo: String, // Added seatNo
     classApplication: { 
         type: { type: String }, // Explicitly define type to avoid Mongoose casting error
         targetClass: String, 
@@ -88,7 +89,25 @@ const UserSchema = new mongoose.Schema({
 });
 const User = mongoose.model('User', UserSchema);
 
-const StudentSchema = new mongoose.Schema({ schoolId: String, studentNo: String, name: String, gender: String, birthday: String, idCard: String, phone: String, className: String, status: String, parentName: String, parentPhone: String, address: String, teamId: String, drawAttempts: { type: Number, default: 0 }, dailyDrawLog: { date: String, count: { type: Number, default: 0 } }, flowerBalance: { type: Number, default: 0 } });
+const StudentSchema = new mongoose.Schema({ 
+    schoolId: String, 
+    studentNo: String, 
+    seatNo: String, // Added seatNo
+    name: String, 
+    gender: String, 
+    birthday: String, 
+    idCard: String, 
+    phone: String, 
+    className: String, 
+    status: String, 
+    parentName: String, 
+    parentPhone: String, 
+    address: String, 
+    teamId: String, 
+    drawAttempts: { type: Number, default: 0 }, 
+    dailyDrawLog: { date: String, count: { type: Number, default: 0 } }, 
+    flowerBalance: { type: Number, default: 0 } 
+});
 const Student = mongoose.model('Student', StudentSchema);
 const CourseSchema = new mongoose.Schema({ schoolId: String, courseCode: String, courseName: String, teacherName: String, credits: Number, capacity: Number, enrolled: Number });
 const Course = mongoose.model('Course', CourseSchema);
@@ -149,8 +168,119 @@ const getAutoSemester = () => {
     }
 };
 
+const generateStudentNo = async () => {
+    const year = new Date().getFullYear();
+    const random = Math.floor(100000 + Math.random() * 900000); // 6 digits
+    return `${year}${random}`;
+};
+
 // --- ROUTES ---
 
+// --- AUTH / REGISTER ---
+
+app.post('/api/auth/register', async (req, res) => {
+    const { role, username, password, schoolId, trueName, className, seatNo } = req.body;
+    
+    try {
+        if (role === 'STUDENT') {
+            // Student Registration Logic
+            // 1. Check if a Student Profile already exists for this Name + Class + School
+            let student = await Student.findOne({ name: trueName, className, schoolId });
+            let finalUsername = '';
+
+            if (student) {
+                // Profile exists.
+                // 1a. Check if it already has a User account
+                const existingUser = await User.findOne({ 
+                    role: 'STUDENT', 
+                    schoolId, 
+                    $or: [{ username: student.studentNo }, { trueName: trueName, homeroomClass: className }] // Defensive check
+                });
+
+                if (existingUser) {
+                    return res.status(409).json({ error: 'ACCOUNT_EXISTS', message: '该学生账号已存在，请直接登录或联系老师重置密码。' });
+                }
+
+                // 1b. Migration Logic: If current studentNo looks like a seat number (short), move it to seatNo
+                // and generate a new System ID for login.
+                if (student.studentNo && student.studentNo.length < 6) {
+                     if (!student.seatNo) student.seatNo = student.studentNo;
+                     student.studentNo = await generateStudentNo();
+                     await student.save();
+                } else if (!student.studentNo) {
+                     student.studentNo = await generateStudentNo();
+                     await student.save();
+                }
+                
+                // If user provided a seatNo during reg, update it
+                if (seatNo) {
+                    student.seatNo = seatNo;
+                    await student.save();
+                }
+
+                finalUsername = student.studentNo;
+
+            } else {
+                // Profile does NOT exist. Create new.
+                finalUsername = await generateStudentNo();
+                student = await Student.create({
+                    schoolId,
+                    studentNo: finalUsername,
+                    seatNo: seatNo || '',
+                    name: trueName,
+                    className: className,
+                    gender: req.body.gender || 'Male',
+                    parentName: req.body.parentName,
+                    parentPhone: req.body.parentPhone,
+                    address: req.body.address,
+                    status: 'Enrolled',
+                    birthday: '2015-01-01'
+                });
+            }
+
+            // Create User Account
+            await User.create({
+                username: finalUsername,
+                password,
+                role: 'STUDENT',
+                trueName,
+                schoolId,
+                status: 'pending', // Requires approval? Or auto active? User said "Pending approval"
+                homeroomClass: className, // Store class in user for easy access
+                studentNo: finalUsername,
+                seatNo: student.seatNo,
+                parentName: req.body.parentName,
+                parentPhone: req.body.parentPhone,
+                address: req.body.address,
+                gender: req.body.gender
+            });
+
+            return res.json({ username: finalUsername });
+        } 
+        
+        // Teacher/Admin Registration
+        const existing = await User.findOne({ username });
+        if (existing) return res.status(409).json({ error: 'USERNAME_EXISTS', message: '用户名已存在' });
+
+        await User.create({...req.body, status: 'pending'});
+        res.json({ username });
+
+    } catch(e) {
+        console.error(e);
+        res.status(500).json({ error: e.message });
+    }
+});
+
+
+// --- USERS ---
+app.get('/api/users', async (req, res) => {
+    const filter = getQueryFilter(req);
+    // Explicitly handle role filtering
+    if (req.query.role) filter.role = req.query.role;
+    res.json(await User.find(filter)); 
+});
+
+
 // --- TEACHER CLASS APPLICATION ROUTES ---
 app.post('/api/users/class-application', async (req, res) => {
     const { userId, type, targetClass, action } = req.body; 
@@ -472,15 +602,18 @@ app.post('/api/auth/login', async (req, res) => {
   if (user.status !== 'active') return res.status(403).json({ error: 'PENDING_APPROVAL' });
   res.json(user);
 });
-app.post('/api/auth/register', async (req, res) => { try { await User.create({...req.body, status: 'pending'}); res.json({}); } catch(e) { res.status(500).json({}); } });
 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.get('/api/users', async (req, res) => { res.json(await User.find(getQueryFilter(req))); });
 app.put('/api/users/:id', async (req, res) => { await User.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/users/:id', async (req, res) => { 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) => { await Student.findOneAndUpdate({ studentNo: req.body.studentNo }, injectSchoolId(req, req.body), {upsert:true}); res.json({}); });
+app.post('/api/students', async (req, res) => { 
+    const data = injectSchoolId(req, req.body);
+    if (!data.studentNo) data.studentNo = await generateStudentNo();
+    await Student.findOneAndUpdate({ studentNo: data.studentNo }, data, {upsert:true}); 
+    res.json({}); 
+});
 app.put('/api/students/:id', async (req, res) => { await Student.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/students/:id', async (req, res) => { await Student.findByIdAndDelete(req.params.id); res.json({}); });
 app.get('/api/classes', async (req, res) => { 
@@ -698,4 +831,4 @@ app.post('/api/batch-delete', async (req, res) => {
 });
 
 app.get('*', (req, res) => { res.sendFile(path.join(__dirname, 'dist', 'index.html')); });
-app.listen(PORT, () => console.log(`🚀 Server running on port ${PORT}`));
+app.listen(PORT, () => console.log(`🚀 Server running on port ${PORT}`));

types.ts

@@ -45,6 +45,7 @@ export interface User {
   parentPhone?: string;
   address?: string;
   gender?: 'Male' | 'Female';
+  seatNo?: string; // NEW
 }
 
 export interface ClassInfo {
@@ -82,7 +83,8 @@ export interface Student {
   id?: number;
   _id?: string;
   schoolId?: string;
-  studentNo: string;
+  studentNo: string; // System ID (Login ID)
+  seatNo?: string;   // Class Seat Number (Optional, for sorting/display)
   name: string;
   gender: 'Male' | 'Female' | 'Other';
   birthday: string;
@@ -301,4 +303,4 @@ export interface LeaveRequest {
   endDate: string;
   status: 'Pending' | 'Approved' | 'Rejected';
   createTime: string;
-}
+}