Compare commits

..

No commits in common. "0d108ffea0f6b7f16fd6b66892b4a7c920605b32" and "18bb2aa33afdc569861f6bd3e663ad5dbd8f9f19" have entirely different histories.

16 changed files with 21 additions and 23 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -3,10 +3,10 @@ import './style.css';
import React,{ useState } from 'react'; import React,{ useState } from 'react';
import HomeIcon from '../pages/Home/img/主页.jpg'; import HomeIcon from '../pages/Home/img/主页.jpg';
import Subject from "../pages/Home/img/题目.jpg"; import Subject from "../pages/Home/img/题目.jpg";
import Analyse from "../pages/Home/img/学习分析.jpg"; import Mark from "../pages/Home/img/问题.jpg";
import Set from '../pages/Home/img/设置.jpg'; import Set from '../pages/Home/img/设置.jpg';
import Logo from '../pages/Home/img/logo.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() { function HeaderNav() {
@ -55,11 +55,11 @@ function HeaderNav() {
</div> </div>
<div className='left-nav-li'> <div className='left-nav-li'>
<ul> <ul>
{[{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)=> {[{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)=>
<li onClick={item.onClick}> <li onClick={item.onClick}>
<div className='nav-li-box'> <div className='nav-li-box'>
<Link to={item.path} className="custom-link-home" style={{color:'black'}}> <Link to={item.path} className="custom-link-home" style={{color:'black'}}>
<img src={ item.ImgSrc } alt="" width='30px' height='30px'/> <img src={ item.ImgSrc } alt="" width='32px' height='32px'/>
<p>{item.name}</p> <p>{item.name}</p>
</Link> </Link>
</div> </div>

View File

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

View File

@ -56,7 +56,7 @@ function HeaderNavTeacher() {
</div> </div>
<div className='left-nav-li'> <div className='left-nav-li'>
<ul> <ul>
{[{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)=> {[{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)=>
<li onClick={item.onClick}> <li onClick={item.onClick}>
<div className='nav-li-box'> <div className='nav-li-box'>
<Link to={item.path} className="custom-link-home" style={{color:'black'}}> <Link to={item.path} className="custom-link-home" style={{color:'black'}}>

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

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