diff --git a/app-dm/src/TeacherPages/MarkingPages/Marking.jsx b/app-dm/src/TeacherPages/MarkingPages/Marking.jsx index 1c42827..e38c9df 100644 --- a/app-dm/src/TeacherPages/MarkingPages/Marking.jsx +++ b/app-dm/src/TeacherPages/MarkingPages/Marking.jsx @@ -79,8 +79,8 @@ function Marking(){

  • -

    {eval(MarkData[key][0][11])}

    - {} +

    实训ID:{MarkData[key][0][10]}{eval(MarkData[key][0][11])}

    + {MarkData[key][0][6]}

    • diff --git a/app-dm/src/TeacherPages/MarkingPages/StudentLink.jsx b/app-dm/src/TeacherPages/MarkingPages/StudentLink.jsx index 678c112..6687f35 100644 --- a/app-dm/src/TeacherPages/MarkingPages/StudentLink.jsx +++ b/app-dm/src/TeacherPages/MarkingPages/StudentLink.jsx @@ -1,8 +1,33 @@ import './StudentLink.css' - +import { useParams } from 'react-router-dom'; +import React, { useEffect, useState } from 'react'; +import { Link } from 'react-router-dom'; +import axios from 'axios'; function StudentLink(){ + const testID=useParams()['key'] + + + const submit=()=>{ + console.log(TestLink); + } + + const [TestLink,setTestLink]=useState() + const NotMarkTestFunc=async ()=>{ + try{ + const NotMarkTestSrc=await axios.post('/api/teacher/NotMarkTest',{ + testID + }) + setTestLink(NotMarkTestSrc.data['result']) + }catch{ + alert('出错') + } + } + useEffect(()=>{ + NotMarkTestFunc() + },[]) + return(
    @@ -13,14 +38,17 @@ function StudentLink(){ - - - - - + {TestLink&& + {Object.keys(TestLink).map((key)=>( + + + + - + ))} + }
    分数
    数据1数据2数据3
    {key}{TestLink[key][6]}
    +
    ) } diff --git a/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx b/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx index 651842a..3ffb297 100644 --- a/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx +++ b/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx @@ -78,7 +78,9 @@ function SendTrain(){ StopTime, selectedItems, Train, - teacher_ID + teacher_ID, + startDate, + endDate }) alert('发布成功') window.location.href='http://localhost:3000/teacher/trainmanage' @@ -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{ diff --git a/app-dm/src/router/index.jsx b/app-dm/src/router/index.jsx index 152ea3f..bc10b90 100755 --- a/app-dm/src/router/index.jsx +++ b/app-dm/src/router/index.jsx @@ -62,14 +62,13 @@ function App() { }/> {/* 批改 */} }/> {/* 考试管理 */} } /> {/* 班级管理1 */} - }/> {/* 批改1 */} + }/> {/* 批改1 */} {/* 其他需要HeaderNavTeacher的页面 */} }> } /> - }/> {/* 页面使用单独的布局，不包含HeaderNav和HeaderNavTeacher */} } />{/* 练习-考试页面 */} diff --git a/python/app.py b/python/app.py index 055440e..5b52326 100644 --- a/python/app.py +++ b/python/app.py @@ -256,11 +256,12 @@ def SendTrainTest(): TrainJudge=data['TrainJudge'] Hour=data['HourValue'] Min=data['MinValue'] - StopTime=data['StopTime'] Class=data['selectedItems'] Train=data['Train'] teacher_id=data['teacher_ID'] - SendTrainTestFunc(TrainChoice, TrainCompletion, TrainJudge, Hour, Min, StopTime,Class,Train,teacher_id) + startTime=data['startDate'] + endTime=data['endDate'] + SendTrainTestFunc(TrainChoice, TrainCompletion, TrainJudge, Hour, Min,Class,Train,teacher_id,startTime,endTime) TeacherMark(Class,teacher_id) return '发布成功' @@ -272,6 +273,12 @@ def Find_details(): result=Find_details_Func(ID) return jsonify({'TestScore':result}) +@app.route('/api/teacher/NotMarkTest',methods=["POST"]) +def NotMark(): + testID=request.json['testID'] + result=NotMarkTest(testID) + return jsonify({'result':result}) + @app.route('/') @app.route('/') @@ -330,5 +337,6 @@ def handle_disconnect(): if __name__ == '__main__': - socketio.run(app, host='0.0.0.0', port=5000 ,allow_unsafe_werkzeug=True) + socketio.run(app, host='0.0.0.0', port=5000 ,allow_unsafe_werkzeug=True, debug=True) + diff --git a/python/teacher_func.py b/python/teacher_func.py index 63ae1e9..242b717 100644 --- a/python/teacher_func.py +++ b/python/teacher_func.py @@ -224,7 +224,7 @@ def train_question(): testID=None TrainName="" # train_question() -def SendTrainTestFunc(TrainChoice,TrainCompletion,TrainJudge,Hour,Min,StopTime,Class,Train,teacher_id): +def SendTrainTestFunc(TrainChoice,TrainCompletion,TrainJudge,Hour,Min,Class,Train,teacher_id,startTime,endTime): TrainChoice = json.dumps(TrainChoice) TrainCompletion = json.dumps(TrainCompletion) TrainJudge = json.dumps(TrainJudge) @@ -232,17 +232,14 @@ def SendTrainTestFunc(TrainChoice,TrainCompletion,TrainJudge,Hour,Min,StopTime,C Train=json.dumps(Train) global TrainName TrainName=Train - # 获取当前时间 - now_time = datetime.datetime.now().replace(microsecond=0) - end_time = now_time + datetime.timedelta(days=int(StopTime)) - end_time = end_time.replace(microsecond=0) + cursor = db.cursor() cursor.execute(f'INSERT INTO TRAINTEST (CHOICE,COMPLE,JUDGE,HOUR,MIN,RELEASETIME,STOPTIME,CLASS,SUBJECT,TEACHER_ID,Train) VALUES' - f'(?,?,?,?,?,?,?,?,?,?,?)',(TrainChoice,TrainCompletion,TrainJudge,Hour,Min,now_time,end_time,Class,'Train',teacher_id,Train)) + f'(?,?,?,?,?,?,?,?,?,?,?)',(TrainChoice,TrainCompletion,TrainJudge,Hour,Min,startTime,endTime,Class,'Train',teacher_id,Train)) db.commit() print('添加成功') - cursor.execute(f'SELECT ID FROM TRAINTEST WHERE RELEASETIME=?', (now_time,)) + cursor.execute(f'SELECT ID FROM TRAINTEST WHERE RELEASETIME=?', (startTime,)) test_id = cursor.fetchall()[0][0] # 查找学生 student_list = [] @@ -326,3 +323,16 @@ def MarkTrainFunc(ClassID,teacher_ID): return dic # MarkTrainFunc('202401','111111') + +def NotMarkTest(testID): + cursor = db.cursor() + dic={} + cursor.execute(f'SELECT * FROM TRAINSCORE WHERE TEST_ID=?',(testID)) + for i in cursor.fetchall(): + cursor.execute(f'SELECT NAME FROM STUDENT WHERE ID=?',(i[0])) + dic[cursor.fetchall()[0][0]]=i + + return dic + +NotMarkTest('9') +