@@ -204,7 +192,7 @@ function SendTrain(){
{
if (event.target.checked) {
//在选择题目集中添加选择题的ID
- setTrainChoice(items=>([
+ setTrainChoice(items=>([
...items,
Trainquestion['choice'][key][7]
]))
@@ -334,10 +322,10 @@ function SendTrain(){
))}
小时
- {/*
*/}
+
实训:{eval(title[key][0][11])}
+
实训ID:{(title[key][0][10])}
发布者:陈老师
发布时间:{title[key][0][5]}
截至时间:{title[key][0][6]}
diff --git a/app-dm/src/router/index.jsx b/app-dm/src/router/index.jsx
index cce1679..f52c3f4 100644
--- a/app-dm/src/router/index.jsx
+++ b/app-dm/src/router/index.jsx
@@ -27,6 +27,10 @@ import SendTrain from '../TeacherPages/Trainmanage/SendTrain'
import TrainManage from '../TeacherPages/Trainmanage/Trainmanage'
import StudentLink from '../TeacherPages/MarkingPages/StudentLink';
import Test from '../TeacherPages/TestManage/Test.tsx'
+
+
+import SendTrain from '../TeacherPages/Trainmanage/SendTrain';
+import TrainManage from '../TeacherPages/Trainmanage/Trainmanage';
// 定义一个组件来包裹除了特定页面(exam)外的所有页面使其有导航
const MainLayout = ({ headerNav:HeaderNav }) => {
return (
@@ -61,7 +65,7 @@ function App() {
}/> {/* 批改 */}
}/> {/* 考试管理 */}
} /> {/* 班级管理1 */}
- }/> {/* 批改1 */}
+ }/> {/* 批改1 */}
{/* 其他需要HeaderNavTeacher的页面 */}
diff --git a/app-dm/src/setupProxy.js b/app-dm/src/setupProxy.js
index d6d9212..4a40b4f 100644
--- a/app-dm/src/setupProxy.js
+++ b/app-dm/src/setupProxy.js
@@ -4,7 +4,7 @@ module.exports = function(app) {
app.use(
'/api', // 如果请求路径匹配'/api'，则进行代理
createProxyMiddleware({
- target: 'http://36.138.114.105:32087', // 目标后端服务地址
+ target: 'http://127.0.0.1:5000', // 目标后端服务地址
changeOrigin: true,
})
);
diff --git a/python/app.py b/python/app.py
index af58cfc..15c08eb 100644
--- a/python/app.py
+++ b/python/app.py
@@ -197,6 +197,12 @@ def select_class(): # 查找每个老师管理的班级 以及在考试管理
# print(testID)
return jsonify({'Class': class_dic,'default': find_default_class_func(default_class, teacher_id)})
+@app.route('/api/teacher/marktrain',methods=['POST'])
+def mark(): # 批阅试卷
+ ClassID=request.json['ClassID']
+ teacher_ID=request.json['teacher_ID']
+ return jsonify({'MarkClass': MarkTrainFunc(ClassID,teacher_ID)})
+
@app.route('/api/teacher/change_class', methods=['POST'])
def change_class(): # 查找每个老师管理的班级 以及在考试管理查找默认班级
teacher_id = request.json['teacher_ID']
@@ -343,5 +349,6 @@ def handle_disconnect():
if __name__ == '__main__':
- socketio.run(app, host='0.0.0.0', port=5000, debug=True)
+ socketio.run(app, host='0.0.0.0', port=5000 ,allow_unsafe_werkzeug=True, debug=True)
+
diff --git a/python/student_func.py b/python/student_func.py
index 306b76d..af1d9a2 100644
--- a/python/student_func.py
+++ b/python/student_func.py
@@ -252,12 +252,22 @@ def FetchTrainTitleFunc(ID):
titles.append(i[2])
for i in titles:
- cursor.execute('SELECT * FROM TRAINTEST WHERE ID=? ',(i))
- title.append(cursor.fetchall())
+ cursor.execute('SELECT * FROM TRAINTEST WHERE ID=? AND STOPTIME>? ',(i,Time))
+ result=cursor.fetchall()
+ title.append(result)
+ if result:
+ pass
+ else:
+ cursor.execute("UPDATE TRAINSCORE SET TF='true' , RESULT='0' , TRAINRESULT='0' WHERE TEST_ID=? AND STUDENT_ID=?",(i,ID))
+
+ title = [item for item in title if item]
+ print(title)
+ db.commit()
cursor.close()
return title
+# FetchTrainTitleFunc("20240101")
def FetchTrainTestFunc(operateID):
diff --git a/python/teacher_func.py b/python/teacher_func.py
index b2a4399..242b717 100644
--- a/python/teacher_func.py
+++ b/python/teacher_func.py
@@ -7,6 +7,8 @@ import datetime
db = dmPython.connect(user='SYSDBA', password='dameng!!', host="36.138.114.105", port="32522")
+
+
#获取题目
def choice_question_func(ID):
question_cursor = db.cursor()
@@ -218,24 +220,26 @@ def train_question():
# print(Train)
return Train
+
+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)
Class=json.dumps(Class)
Train=json.dumps(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)
+ global TrainName
+ TrainName=Train
+
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 = []
@@ -258,13 +262,27 @@ def SendTrainTestFunc(TrainChoice,TrainCompletion,TrainJudge,Hour,Min,StopTime,C
(i, i[0:6], test_id, end,one))
# 发布实训的时候根据实训不同给予不同链接
-
+ cursor.execute(f"SELECT ID FROM TRAINTEST WHERE RELEASETIME=? ", (now_time))
+ test_id = cursor.fetchall()[0][0]
+ global testID
+ testID=test_id
print('分配成功')
db.commit()
cursor.close()
return '发布成功'
+def TeacherMark(CLASS,ID):
+ global testID
+ global TrainName
+ cursor = db.cursor()
+ strClass=str(CLASS)
+ if TrainName.find(r'["\u524d\u7aef\u4e0e\u6570\u636e\u5e93\u7ed3\u5408"]') != -1:
+ for i in eval(strClass):
+ cursor.execute(f'INSERT INTO TEACHERMARK VALUES(?,?,?,?) ', (ID,testID,'false', i))
+ db.commit()
+ cursor.close()
+
# def Find_dic(dic):
# # 获取字典的键，并按照从大到小的顺序排序
# keys_sorted = sorted(dic.keys(), reverse=True)
@@ -291,3 +309,30 @@ def Find_details_Func(ID):
return dic
# print(Find_details('20240101'))
+
+
+#获取未批改的卷子
+def MarkTrainFunc(ClassID,teacher_ID):
+ dic={}
+ cursor = db.cursor()
+ cursor.execute(f"SELECT * FROM TEACHERMARK WHERE CLASS=? AND TEACHERID=? AND TF='false'", (ClassID,teacher_ID))
+ for i in cursor.fetchall():
+ cursor.execute(f"SELECT * FROM TRAINTEST WHERE ID=? ", (i[1],))
+ dic[i[1]]=cursor.fetchall()
+ # print(dic)
+ 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')
+
diff --git a/python/test.py b/python/test.py
new file mode 100644
index 0000000..cfbe974
--- /dev/null
+++ b/python/test.py
@@ -0,0 +1,5 @@
+TrainName='["\u524d\u7aef\u4e0e\u6570\u636e\u5e93\u7ed3\u5408"]'
+print(TrainName)
+print(type(TrainName))
+if TrainName == '["\u524d\u7aef\u4e0e\u6570\u636e\u5e93\u7ed3\u5408"]':
+ print('yes')
-
+