2312072104
/
dm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: 2312072104:afbf2e07af9f5f77bb660c0f5fd9bfb16fe6d35e
Branches Tags
2312072104:master
..
compare: 2312072104:6e3c3e82f9360300cb14b5bbce48e1923d03400a
Branches Tags
2312072104:master

No commits in common. "afbf2e07af9f5f77bb660c0f5fd9bfb16fe6d35e" and "6e3c3e82f9360300cb14b5bbce48e1923d03400a" have entirely different histories.
afbf2e07af ... 6e3c3e82f9

12 changed files with 273 additions and 480 deletions
Show Stats Expand all files Collapse all files

11
app-dm/src/TeacherPages/Questionmanage/questionmanage.css
View File

@ -1,11 +0,0 @@
/* 页面右边 */
.body-right-question{
width: 1420px;
height: 830px;
position: absolute;
top: 72px;
left: 220px;
border-radius: 10px;
float: right;
background-color: #f7f8fa;
}

8
app-dm/src/TeacherPages/Questionmanage/questionmanage.jsx
View File

@ -1,8 +0,0 @@
import './questionmanage.css'
function Questionmange(){
return (
<div className="body-right-question"></div>
)
}
export default Questionmange

31
app-dm/src/TeacherPages/TeacherPage.css
View File

@ -12,32 +12,17 @@
/* 班级管理 */
.manage_class{
/* flex-basis: calc(50.00% - 10PX); */
width: 400px;
height: 250px;
background-image: linear-gradient(rgb(193,240,222),rgb(128, 235, 226));
border: 5px double rgb(185, 222, 200);
margin: 60px 50px;
box-shadow:
0 0 0 0 , /* 填充颜色 */
inset 0 0 0 2px #fdfdfd, /* 外边框颜色 */
inset 0 0 0 6px #ffffff;
}
.manage_class h3{
font-size: 20px;
padding-left: 118px;
padding-top: 20px;
color: rgb(33, 110, 87);
background-color: rgb(200, 249, 230);
margin-left: 150px;
margin-top: 50px;
}
.manage_class p{
font-size: 18px;
padding-right: 10px;
text-align: center;
margin-top: -2px;
padding-bottom: 10px;
color: rgb(75, 122, 122);
margin-left: 50px;
}
.Link-teacherpage{
padding: 10px 50px;
margin-left: 112px;
background-color: #e1fff7;
.manage_class button{
margin-left: 300px;
margin-top: 100px;
}

6
app-dm/src/TeacherPages/TeacherPage.jsx
View File

@ -9,7 +9,7 @@ function TeacherPage() {
const teacher_ID = localStorage.getItem('islogin')
if(teacher_ID==null){
alert('登录过期，请重新登录')
window.location.href='http://36.138.114.105:30294/'
window.location.href='/signin'
}
const [classData, setClassData] = useState({});
const log=(key)=>{
@ -37,10 +37,10 @@ function TeacherPage() {
<div id='class_box' style={{ display: 'flex' }}>
{Object.keys(classData).map((key) => (
<div className='manage_class' key={key} style={{ display: '1' }}>
<h3 id='class_name'>班级:{key}</h3>
<p id='class_name'>班级:{key}</p>
<p id='number'>人数:<span>{classData[key][1]}</span></p>
<p id='headteacher'>班主任:<span>{classData[key][0]}</span></p>
<Link to={`/classID/${key}`} onClick={()=>{log(key);}} style={{color:'rgb(44, 103, 83)',textDecoration:'none',fontSize:'17px'}} className='Link-teacherpage'>管理</Link>
<Link to={`/classID/${key}`} onClick={()=>{log(key);}}>管理</Link>
</div>
))}
</div>

135
app-dm/src/TeacherPages/Trainmanage/SendTrain.css
View File

@ -5,8 +5,7 @@
/* 页面区域占比 */
.SendTrain_body_left{
flex: 11%;
border: 1px solid #000;
margin-left: 20px;
/* border: 1px solid #000; */
}
.SendTrain_body_right{
flex: 60%;
@ -19,9 +18,8 @@
line-height: 50px;
font-size: 26px;
font-weight: 440;
margin-top: 40px;
text-align: center;
border-top: 1px solid #000;
margin-top: 43px;
padding-left: 75px;
}
.SendTrain_body_left_ul{
/* all: unset; */
@ -38,144 +36,39 @@
font-size: 22px;
}
.left-list-ul li{
height: 20px;
text-align: center;
font-size: 18px;
padding-top: 12px;
padding-top: 10px;
}
/* 页面中间题目(基础题) */
.SendTrain_body_right p{
font-size: 30px;
border-top: 1px solid black;
border-right: 1px solid black;
border-bottom: 1px solid black;
border: 1px solid black;
text-align: center;
margin-top: 0px;
margin-bottom: 0px;
}
.SendTrain_body_right table{
width: 100%;
border-left: 1px solid black;
border-right: 1px solid black;
background-color: #eaeeec;
}
.title{
font-size: 21px;
font-size: 25px;
margin-bottom: 0px;
}
/* 选择题 */
.Trainbox_xz{
background-color: #fff;
.questiontitle{
font-size: 20px;
}
.chapter{
color: #5cc1b9;
font-size: 18px;
font-weight: 550;
float: right;
padding-right: 10px;
padding-top: 5px;
}
.questiontitle_xz{
padding-top: 15px;
padding-left: 10px;
font-size: 17px;
}
.Train_answer_box{
padding-top: 5px;
padding-left: 27px;
}
.Train_answer_box tr{
line-height: 40px;
}
.check_box_xz{
width: 100px;
height: 30px;
float: right;
margin-right: 20px;
margin-top: -20px;
display: flex;
align-items: center;
}
.check_box_xz input{
height: 15px;
width: 15px;
}
.check_box_xz span{
font-size: 18px;
margin-top: -2px;
}
/* 填空题 */
.Trainbox_tk{
background-color: #fff;
}
.chapter_tk{
color: #5cc1b9;
font-size: 16px;
font-weight: 550;
float: right;
padding-right: 10px;
padding-top: 5px;
}
.questiontitle_tk{
padding-top: 15px;
padding-left: 10px;
font-size: 16px;
line-height: 25px;
}
.check_box_tk{
width: 100px;
height: 40px;
float: right;
margin-right: 10px;
margin-top: -20px;
display: flex;
align-items: center;
}
.check_box_tk input{
width: 15px;
height: 15px;
}
.check_box_tk span{
font-size: 16px;
margin-top: -2px;
}
/* 判断题 */
.Trainbox_pd{
background-color: #fff;
padding-top: 20px;
}
.chapter_pd{
color: #5cc1b9;
font-size: 16px;
font-weight: 550;
float: right;
padding-right: 10px;
margin-top: -10px;
.Trainbox{
background-color: rgb(166, 161, 161);
}
.judgetitle{
font-size: 16px;
font-size: 20px;
background-color: rgb(166, 161, 161);
}
.check_box_pd{
width: 100px;
float: right;
margin-right: 10px;
margin-bottom: 5px;
display: flex;
align-items: center;
}
.check_box_pd input{
width: 15px;
height: 15px;
}
.check_box_pd span{
font-size: 16px;
margin-top: -2px;
}
/* 以下为为实训 */
.Train_div{

54
app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx
View File

@ -78,10 +78,12 @@ function SendTrain(){
StopTime,
selectedItems,
Train,
teacher_ID
teacher_ID,
startDate,
endDate
})
alert('发布成功')
window.location.href='http://localhost:3000/teacher/trainmanage'
window.location.href='/teacher/trainmanage'
}catch{
alert('SendTrainTest出错')
@ -90,7 +92,7 @@ function SendTrain(){
const SendTrainBtn=()=>{
if(selectedItems.length>0 && (HourValue || MinValue)&&StopTime){
if(selectedItems.length>0 && (HourValue || MinValue)){
if(Train.length>0){
SendTrainTest()
}else{
@ -171,24 +173,23 @@ function SendTrain(){
{Trainquestion &&<table>
<span className='title'>选择题</span>
<tbody>
{Object.keys(Trainquestion['choice']).map((key,index)=>(
{Object.keys(Trainquestion['choice']).map((key)=>(
<tr key={key}>
{/* 章节切换⬇ */}
<td className='Trainbox_xz'>
<div className='chapter'>{Trainquestion['choice'][key][8]}</div>
<td className='Trainbox'>
<div>{Trainquestion['choice'][key][8]}</div>
<tr>
<td className='questiontitle_xz'>{index+1}.{Trainquestion['choice'][key][1]}</td>
<td className='questiontitle'>问.{Trainquestion['choice'][key][1]}</td>
</tr>
<tr>
<div className='Train_answer_box'>
<tr>A.{Trainquestion['choice'][key][2]}</tr>
<tr>B.{Trainquestion['choice'][key][3]}</tr>
<tr>C.{Trainquestion['choice'][key][4]}</tr>
<tr>D.{Trainquestion['choice'][key][5]}</tr>
<tr>A:{Trainquestion['choice'][key][2]}</tr>
<tr>B:{Trainquestion['choice'][key][3]}</tr>
<tr>C:{Trainquestion['choice'][key][4]}</tr>
<tr>D:{Trainquestion['choice'][key][5]}</tr>
</div>
</tr>
<div className='check_box_xz'>
<input type="checkbox" onClick={(event)=>{
<input type="checkbox" className='check_box' onClick={(event)=>{
if (event.target.checked) {
//在选择题目集中添加选择题的ID
setTrainChoice(items=>([
@ -202,20 +203,18 @@ function SendTrain(){
}
}} />
<span>是否选择</span>
</div>
</td>
</tr>
))}
<span className='title'>填空题</span>
{Object.keys(Trainquestion['completion']).map((key,index)=>(
{Object.keys(Trainquestion['completion']).map((key)=>(
<tr key={key}>
<td className='Trainbox_tk'>
<div className='chapter_tk'>{Trainquestion['completion'][key][4]}</div>
<td className='questiontitle_tk'>
{index+1}.{Trainquestion['completion'][key][1]}
<td className='Trainbox'>
{Trainquestion['completion'][key][4]}
<td className='questiontitle'>
问.{Trainquestion['completion'][key][1]}
</td>
<div className='check_box_tk'>
<input type="checkbox" onClick={(event)=>{
<input type="checkbox" className='check_box' onClick={(event)=>{
if (event.target.checked) {
//在选择题目集中添加选择题的ID
setTrainCompletion(items=>([
@ -229,18 +228,16 @@ function SendTrain(){
}
}} />
<span>是否选择</span>
</div>
</td>
</tr>
))}
<span className='title'>判断题</span>
{Object.keys(Trainquestion['judge']).map((key,index)=>(
{Object.keys(Trainquestion['judge']).map((key)=>(
<tr key={key}>
<td className='Trainbox_pd'>
<div className='chapter_pd'>{Trainquestion['judge'][key][4]}</div>
<td className='judgetitle'>{index+1}.{Trainquestion['judge'][key][1]}</td>
<div className='check_box_pd'>
<input type="checkbox" onClick={(event)=>{
<td className='Trainbox'>
{Trainquestion['judge'][key][4]}
<td className='judgetitle'>问:{Trainquestion['judge'][key][1]}</td>
<input type="checkbox" className='check_box' onClick={(event)=>{
if (event.target.checked) {
setTrainJudge(items=>([
...items,
@ -253,7 +250,6 @@ function SendTrain(){
}
}} />
<span>是否选择</span>
</div>
</td>
</tr>
))}

42
app-dm/src/TeacherPages/classlistpages/classId.jsx
View File

@ -25,10 +25,11 @@ function TeacherPage() {
const teacher_ID=localStorage.getItem('islogin')
if(teacher_ID==null){
alert('登录过期，请重新登录')
window.location.href='http://36.138.114.105:30294/'
window.location.href='/signin'
}
//学生表格
const class_succeed = async () => {
try{
const class_scr=await axios.post('/api/teacher/find_student',{key})
@ -112,14 +113,13 @@ function TeacherPage() {
setname(classdata[item][0]);
};
return(
<div className='body-right-classId'>
<div id='body-right-bottom'>
<h3>班级信息</h3>
<div id='body-right-bottom-left'>
<div id='body-right-bottom-left-nav'>
<p style={{ display: 'flex', justifyContent: 'space-between',fontSize:'18px',color:'#457e98' }}>
<p style={{ display: 'flex', justifyContent: 'space-between' }}>
<span style={{ flex: 1 }}>班级</span>
<span style={{ flex: 1 }}>姓名</span>
<span style={{ flex: 1 }}>学号</span>
@ -140,7 +140,7 @@ function TeacherPage() {
<td className='box-content'>{classdata[item][3]}</td>
<td className='box-content'>{classdata[item][5]}</td>
<td className='box-content'>{formatDate(classdata[item][4])}</td>
<td className='box-content1'><button onClick={(e)=>handleClick(item)} className='btn-ckxq'>查看详情</button></td>
<td className='box-content'><button onClick={(e)=>handleClick(item)} style={{border:'none'}}>查看详情</button></td>
</tr>
))}
</tbody>
@ -149,29 +149,10 @@ function TeacherPage() {
</div>
</div>
<div className='body-test-score'>
{/* <h3>成绩</h3> */}
<h3>成绩</h3>
<div className='body-test-score-bar'>
{/* <button onClick={click}>测试</button> */}
<div style={{ width: '610px', height: '350px',position:'absolute',top:'20px',left:'20px', backgroundColor: '#fff',display:'flex',alignItems:'center',justifyContent:'center' }}>
{studentScores.length > 0 ? (
<BarChart width={600} height={350} data={studentScores} barSize={80} className='bar' >
<CartesianGrid strokeDasharray="3 3" />
<XAxis dataKey="name" />
<YAxis dataKey="score" />
<Tooltip active='false'/>
<Bar dataKey="score" fill="#fdf0d3" />
</BarChart>
):(
<p>请选择学生和科目</p>
)}
</div>
</div>
<div className='choice-box'>
<div className='studentmassage'>
{name&&<div className='studentName'>学生：{name}</div>}
{/* <p>学生成绩:</p> */}
</div>
{name&&<div className='studentName'>已选中{name}</div>}
<button onClick={click}>测试</button>
<select onChange={handleSubjectChange} id='selectvalue'>
<option value="">请选择科目</option>
<option value="Chinese">语文</option>
@ -179,6 +160,15 @@ function TeacherPage() {
<option value="English">英语</option>
<option value="Train">实训</option>
</select>
<div className='table-bar'>
<BarChart width={600} height={350} data={studentScores} barSize={80} className='bar' >
<CartesianGrid strokeDasharray="3 3" />
<XAxis dataKey="name" />
<YAxis dataKey="score"/>
<Tooltip />
<Bar dataKey="score" fill="#ffeed4" />
</BarChart>
</div>
</div>
</div>
</div>

110
app-dm/src/TeacherPages/classlistpages/classid.css
View File

@ -1,6 +1,5 @@
.body-right-classId{
/* width: 1420px; */
width: 86.3%;
width: 1420px;
height: 830px;
position: absolute;
top: 72px;
@ -19,12 +18,11 @@
#body-right-bottom h3{
position: absolute;
top: -50px;
color: #236b76;
}
#body-right-bottom-left{
width: 1200px;
height: 320px;
background-color: #bef1f4;
height: 360px;
background-color: #b19bc6;
position: absolute;
}
#body-right-bottom-left-nav{
@ -35,15 +33,12 @@
}
#body-right-bottom span{
text-align: center;
font-weight: 550;
}
#body-right-student-box{
width: 1150px;
height: 240px;
border: 1px rgb(70, 188, 199) solid;
background-color: #fff;
/* background-color: #dff9fd; */
height: 280px;
border: 1px black solid;
margin-left: 25px;
position: absolute;
top: 50px;
@ -51,106 +46,61 @@
#body-right-student-box table {
display: flex;
flex-direction: column;
/* background-color: #dff9fd; */
}
#body-right-student-box tr {
display: flex;
align-items: center; /* 垂直居中 */
}
#body-right-student-box td {
padding: 15px;
border-bottom: 1px solid #5aafbc;
padding: 10px;
border-bottom: 1px solid #ccc;
text-align: center;
line-height: 30px;
}
.box-content {
flex: 1; /* 占据剩余空间 */
color: #236b76;
}
.box-content1 {
flex: 1; /* 占据剩余空间 */
}
/* 查看详情按钮 */
.btn-ckxq{
border: none;
height: 30px;
width: 100px;
background-color: #85cad4;
color: #fff;
font-size: 16px;
}
.btn-ckxq:visited{
color: #5aafbc;
}
/* 画像 */
.body-test-score{
width: 650px;
height: 390px;
width: 1200px;
height: 370px;
position: absolute;
top: 390px;
left: 150px;
top: 440px;
left: 110px;
background-color: #bfd1f6;
border-radius: 10px;
}
.body-test-score-bar p{
width: 250px;
height: 60px;
font-size: 25px;
text-align: center;
line-height: 60px;
border-bottom: 2px double #95aee0;
.body-test-score h3{
position: absolute;
top: -50px;
}
/* 柱形图 */
.bar{
position: absolute;
top: 10px;
left: -20px;
}
/* 学生详情 */
.choice-box{
height: 300px;
width: 400px;
background-color: #cddbf3;
/* background-color: #a4cdf8; */
position: absolute;
top: 30px;
left: 720px;
box-shadow:
inset 0 0 0 2px #fdfdfd, /* 外边框颜色 */
inset 0 0 0 6px #ffffff;
border: 5px double #bfd1f6;
}
.choice-box select{
.body-test-score-bar select{
height: 40px;
width: 120px;
font-size: 15px;
margin-top: 20px;
margin-left: 10px;
border: 5px solid #bdcbe3;
outline-color:#8891a4;
color: #4e5f7c;
border: 1px solid #a1c1f4;
outline-color:#a1c1f4;
color: rgb(122, 122, 122);
position: absolute;
top: -5px;
left: 20px;
left: 920px;
}
.studentmassage{
width: 300px;
height: 200px;
/* background-color: #fff; */
.table-bar{
width: 640px;
position: absolute;
top: 70px;
left: 30px;
display: flex;
top: 10px;
left: 250px;
border-radius: 15px;
background-color: #fff;
}
.studentmassage p{
font-size: 18px;
.bar{
position: absolute;
top: 15px;
left: 0px;
top: 10px;
}
.studentName{
margin-top: 20px;
font-size: 18px;
margin-left: 50px;
}

3
app-dm/src/nav/teacherIndex.jsx
View File

@ -7,7 +7,6 @@ import Send from "../pages/Home/img/test.jpg"
import Set from '../pages/Home/img/setting.jpg'
import Mark from '../pages/Home/img/correct.jpg'
import Logo from '../pages/Home/img/logo.jpg'
import Question from '../pages/Home/img/question.jpg'
// 导航
function HeaderNavTeacher() {
@ -60,7 +59,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:'题库管理',path:'questionmange',ImgSrc:Question},{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}>
<div className='nav-li-box'>
<Link to={item.path} className="custom-link-home" style={{color:'black'}}>

BIN
app-dm/src/pages/Home/img/question.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB

1
app-dm/src/pages/SignIn/SignInPage.css
View File

@ -14,6 +14,7 @@
display: flex;
align-content: center;
padding: 75px;
/* border: 10px solid ; */
box-shadow: 0px -20px 20px 0px rgba(131, 244, 254, 0.6), 0 20px 20px 2px rgba(229, 210, 255, 0.6);
}

2
app-dm/src/router/index.jsx
View File

@ -28,7 +28,6 @@ import TrainManage from '../TeacherPages/Trainmanage/Trainmanage'
import StudentLink from '../TeacherPages/MarkingPages/StudentLink';
import Test from '../TeacherPages/TestManage/Test'
import TrainPods from '../TeacherPages/Trainmanage/TrainPods'
import Questionmange from '../TeacherPages/Questionmanage/questionmanage'
// 定义一个组件来包裹除了特定页面(exam)外的所有页面使其有导航
@ -67,7 +66,6 @@ function App() {
<Route path="classID/:key" element={<ClassID />} /> {/* 班级管理1 */}
<Route path='mark/studentlink/Mark/:key' element={<StudentLink/>}/> {/* 批改1 */}
<Route path='trainmanage/TrainPods' element={<TrainPods/> }/>
<Route path='questionmange' element={<Questionmange/>}/>
{/* 其他需要HeaderNavTeacher的页面 */}
</Route>