diff --git a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css index 6ac8b0d..9c690f5 100644 --- a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css +++ b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css @@ -112,4 +112,18 @@ margin-top: 40px; font-size: 14px; margin-left: 52px; +} +.TrainBox{ + width: 1000px; + height: 500px; + background-color: aqua; +} +.TrainBox table{ + margin-top: 200px; + margin-left: 400px; + width: 500px; + text-align: center; + border: 1px solid black; +} +.TrainBox th{ } \ No newline at end of file diff --git a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx index d9afb0c..4e741a1 100644 --- a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx +++ b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx @@ -6,8 +6,9 @@ import React, { useEffect, useState } from 'react'; function TrainManage(){ const teacher_ID=localStorage.getItem('islogin') + const [isTrue,setisTrue]=useState(false) const [Data,setData]=useState([]) - const [showModal, setShowModal] = useState(false); + const [showModal, setShowModal] = useState(true); const [selectedTrain, setSelectedTrain] = useState(null); const [testID,settestID]=useState() const [TrainData,setTrainData]=useState() @@ -39,16 +40,19 @@ function TrainManage(){ } useEffect(()=>{ - getTrainData() + if(isTrue){ + getTrainData() + }else{ + setisTrue(true) + } },[testID]) + const Click=(testID,train)=>{ + settestID(testID) + setSelectedTrain(train) + } - const handleTrainClick = (train) => { - setSelectedTrain(train); - setShowModal(true); - }; - return(

已结束的实训

@@ -56,7 +60,7 @@ function TrainManage(){ {Data&&
} - - - {/* 弹窗组件 */} - {showModal && ( -
-
- setShowModal(false)}>× -

实训信息

- - - - - - - - - - - - - {selectedTrain && selectedTrain.students.map((student, index) => ( - - - - - - - - - ))} - -
实训ID实训名称学号基础成绩实训成绩总成绩
{selectedTrain[10]}{eval(selectedTrain[11])}{student.studentID}{student.baseScore}{student.trainScore}{student.totalScore}
-
-
- )} - +
+ + + + + + + + + + + + {Object.keys(TrainData).map((key)=>( + + + + + + + + ))} + +
姓名ID基础成绩实训成绩总成绩
{key}{TrainData[key][0]}{TrainData[key][4]}{TrainData[key][5]}{parseInt(TrainData[key][4])+parseInt(TrainData[key][5])}
+
+
) } diff --git a/python/app.py b/python/app.py index 26ee5a9..0f93cdc 100644 --- a/python/app.py +++ b/python/app.py @@ -342,11 +342,9 @@ def appendQuestion(): def getTrainData(): testID=request.json['testID'] print(testID) - if testID: - data = getTrainDataFunc(testID) - return jsonify({'data': data}) - else: - pass + data = getTrainDataFunc(testID) + return jsonify({'data': data}) + diff --git a/python/teacher_func.py b/python/teacher_func.py index a23000a..e65db63 100644 --- a/python/teacher_func.py +++ b/python/teacher_func.py @@ -456,10 +456,20 @@ def appendQuestionFunc(subject,chapter,inputValue,A,B,C,D,correct,judgeValue): return 'INSERT' def getTrainDataFunc(testID): + dic={} cursor = db.cursor() cursor.execute(f'SELECT * FROM TRAINSCORE WHERE TEST_ID=? ',(testID,)) data = cursor.fetchall() + for i in data: + cursor.execute(f'SELECT NAME FROM STUDENT WHERE ID=? ', (i[0],)) + name=cursor.fetchall()[0][0] + dic[name]=i + + + print(dic) cursor.close() - return data + return dic + +# getTrainDataFunc('71')