Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm

app-dm/src/TeacherPages/SendTest/SendTest.css

@@ -2,6 +2,8 @@
     flex: 20%;
 }
 
+
+
 #body_right{
     border-left: 1px solid black;
     height: 100%;
@@ -26,6 +28,9 @@
     border-bottom: 1px solid black;
 }
 
+
+
+
 #body_top{
     border-bottom: 1px solid black;
     width: 100%;

app-dm/src/TeacherPages/SendTest/SendTest.jsx

@@ -47,7 +47,7 @@ function SendTest(){
             background.style.display='block'
             body.style.display='none'
             send_box.display='none'
-            SetClassData(select_class_src.data['Class']);
+            SetClassData(select_class_src.data);
         } catch (error) {
             console.log(error);
         }
@@ -262,6 +262,7 @@ function SendTest(){
                                     </td>
                                 </tr>
                                 ))}
+                                
                             </thead>
                         </table>}
                     </div>

app-dm/src/TeacherPages/teachermanagetest/ManageTest.css

@@ -1,10 +1,10 @@
 /* 页面右边 */
 .body-right-manage{
-    width: 87%;
-    height: 830px;
-    position: relative;
-    margin-top: 5px;
-    margin-left: 10px;
+    width: 1420px;
+    height: 820px;
+    position: absolute;
+    top: 72px;
+    left: 220px;
     border-radius: 10px;
     float: right;
     background-color: #f7f8fa;

app-dm/src/TeacherPages/teachermanagetest/ManageTest.jsx

@@ -165,7 +165,7 @@ function TeacherPage() {
                                 settestID(key)
                                 setIsDetailedBoxVisible(true)
                             }}>
-                            <td style={{ flex: 1 }}>{key}</td>  
+                            <td style={{ flex: 1 }}>{key}</td>
                             <td style={{ flex: 1 }}>{defaultclass[key][0][0].slice(0, 10)}</td>
                             <td style={{ flex: 1 }}>{defaultclass[key][0][1].slice(0, 10)}</td>
                             <td style={{ flex: 1 }}>{defaultclass[key][2]}人</td>

app-dm/src/nav/nav.jsx

@@ -3,10 +3,10 @@ import './style.css';
 import React,{ useState } from 'react';
 import HomeIcon from '../pages/Home/img/主页.jpg';
 import Subject from "../pages/Home/img/题目.jpg";
-import Mark from "../pages/Home/img/问题.jpg";
+import Analyse from "../pages/Home/img/学习分析.jpg";
 import Set from '../pages/Home/img/设置.jpg';
 import Logo from '../pages/Home/img/logo.jpg';
-import Computer from '../pages/Home/img/电脑.jpg';
+import Computer from '../pages/Home/img/实训.jpg';
 
 // 导航
 function HeaderNav() {
@@ -55,11 +55,11 @@ function HeaderNav() {
             </div>
             <div className='left-nav-li'>
                 <ul>
-                    {[{name:'首页',path:'/',ImgSrc:HomeIcon},{name:'练习',path:'subject',ImgSrc:Subject},{name:'实训',path:'train',ImgSrc:Computer},{name:'学习分析',path:'analyse',ImgSrc:Mark},{name:'设置',path:'#',ImgSrc:Set,onClick:handleSettingsClick}].map((item)=> 
+                    {[{name:'首页',path:'/',ImgSrc:HomeIcon},{name:'练习',path:'subject',ImgSrc:Subject},{name:'实训',path:'train',ImgSrc:Computer},{name:'学习分析',path:'analyse',ImgSrc:Analyse},{name:'设置',path:'#',ImgSrc:Set,onClick:handleSettingsClick}].map((item)=> 
                         <li onClick={item.onClick}>
                             <div className='nav-li-box'>
                                 <Link to={item.path} className="custom-link-home" style={{color:'black'}}>
-                                <img src={ item.ImgSrc } alt="" width='32px' height='32px'/>
+                                <img src={ item.ImgSrc } alt="" width='30px' height='30px'/>
                                 <p>{item.name}</p>
                                 </Link>
                             </div>

app-dm/src/nav/style.css

@@ -78,8 +78,8 @@
     background-image: linear-gradient(190deg,rgba(179, 255, 249, 0.8),rgba(190, 218, 249, 0.6));
 }
 .left-nav-li img{
-    margin-top: 13px;
-    margin-right: 10px;
+    margin-top: 14px;
+    margin-right: 12px;
 }
 .left-nav-li p{
     float: right;

app-dm/src/nav/teacherIndex.jsx

@@ -56,7 +56,7 @@ function HeaderNavTeacher() {
             </div>
             <div className='left-nav-li'>
                 <ul>
-                {[{name:'班级管理',path:'/teacher',ImgSrc:ClassManage},{name:'实训管理',path:'/teacher/Trainmanage',ImgSrc:Send},{name:'批改',path:'/teacher/mark',ImgSrc:Mark},{name:'考试管理',path:'/teacher/managetest',ImgSrc:SubjectManage},{name:'设置',ImgSrc:Set,onClick:handleSettingsClick}].map((item)=> 
+                {[{name:'班级管理',path:'/teacher',ImgSrc:ClassManage},{name:'发布实训',path:'/teacher/sendtest',ImgSrc:Send},{name:'批改',path:'/teacher/mark',ImgSrc:Mark},{name:'考试管理',path:'/teacher/managetest',ImgSrc:SubjectManage},{name:'设置',ImgSrc:Set,onClick:handleSettingsClick}].map((item)=> 
                         <li onClick={item.onClick}>
                             <div className='nav-li-box'>
                                 <Link to={item.path} className="custom-link-home" style={{color:'black'}}>

app-dm/src/pages/Home/Home.jsx

@@ -63,9 +63,9 @@ function Home(){
                 }
         }
     }
-    useEffect(()=>{
-        student_succeed_func()
-    },[])
+    // useEffect(()=>{
+    //     student_succeed_func()
+    // },[])
 
     useEffect(()=>{
         if(lesson.length>0){

app-dm/src/router/index.jsx

@@ -21,8 +21,6 @@ import ClassID from '../TeacherPages/classlistpages/classId';
 import ManageTest from '../TeacherPages/teachermanagetest/ManageTest';
 import SendTest from '../TeacherPages/SendTest/SendTest';
 import Marking from '../TeacherPages/MarkingPages/Marking';
-import SendTrain from '../TeacherPages/SendTrain/SendTrain';
-import Trainmanage from '../TeacherPages/Trainmanage/Trainmanage'
 
 // 定义一个组件来包裹除了特定页面(exam)外的所有页面使其有导航
 const MainLayout = ({ headerNav:HeaderNav }) => {
@@ -58,7 +56,6 @@ function App() {
             <Route path='managetest/:ClassID' element={<ManageTest />}/>
             <Route path="classID/:key" element={<ClassID />} />
             <Route path='mark' element={<Marking/>}/>
-            <Route path='Trainmanage' element={<Trainmanage/>}/>
             {/* 其他需要HeaderNavTeacher的页面 */}
           </Route>
 
@@ -71,7 +68,6 @@ function App() {
           <Route path='/teacher/sendtest' element={<SendTest />}/>
           <Route path='operation1/:operateID' element={<Operation1/>}/>
           <Route path='operation2/:operateID' element={<Operation2/>}/>
-          <Route path='/teacher/SendTrain' element={<SendTrain/>}/>
           
 
           {/* 独立的顶级路由，如登录页面，也不包含HeaderNav */}