From a7a03839b8193485bdc069c8132d31cc4052aff0 Mon Sep 17 00:00:00 2001
From: 30404 <3040471803@qq.com>
Date: Wed, 10 Jul 2024 21:47:55 +0800
Subject: [PATCH] 123
---
.../pages/ListPages/Analyse/AnalysePages.jsx | 16 ++++++++--------
.../pages/ListPages/Training/Operation2.jsx | 19 ++++++++++---------
python/student_func.py | 4 ++--
python/test.py | 12 ++++--------
4 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx b/app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx
index 67f8821..4f1dc36 100644
--- a/app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx
+++ b/app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx
@@ -21,12 +21,14 @@ function SubjectPage(){
const [PieOptions,setPieOptions]=useState({})
//题目总分
const [score,setscore]=useState()
+ const [testID,settestID]=useState()
const handleSubjectClick = (key) => {
+ settestID(key)
setSubjectModal(!SubjectModal)
//计算总分
- setscore((JSON.parse(HistoryTrain[key][1][0]).length+JSON.parse(HistoryTrain[key][1][1]).length+JSON.parse(HistoryTrain[key][1][2]).length)*5+40)
+ setscore((JSON.parse(HistoryTrain[key][1][0][0]).length+JSON.parse(HistoryTrain[key][1][0][1]).length+JSON.parse(HistoryTrain[key][1][0][2]).length)*5+40)
setPieData({labels: ['实训题','基础题'],
datasets: [
@@ -81,17 +83,15 @@ function SubjectPage(){
handleSubjectClick(key)} key={key}>
-
实训ID:{HistoryTrain[key][1][10]}{eval(HistoryTrain[key][1][11])}
- {HistoryTrain[key][1][5]}
+ 实训ID:{HistoryTrain[key][0][2]}{eval(HistoryTrain[key][1][0][11])}
+ {HistoryTrain[key][1][0][5]}
))}
}
-
-
{SubjectModal && (
-
+
{/* 饼图组件 */}
@@ -102,8 +102,8 @@ function SubjectPage(){
{/* 图表或者文字分析 */}
- 总得分:{parseInt(PieData['datasets'][0]['data'][0])+parseInt(PieData['datasets'][0]['data'][1])}/{score}
- - 分析:{parseInt(PieData['datasets'][0]['data'][0])>parseInt(PieData['datasets'][0]['data'][1]) ? '基础知识掌握薄弱,需优化学习方法':'提高实训得分需优化学习方法与题目理解。'}
- - 老师建议:{parseInt(PieData['datasets'][0]['data'][0])>parseInt(PieData['datasets'][0]['data'][1]) ? '巩固基础,稳步提升':'加强HTML语法'}
+ - 分析:{HistoryTrain[testID][0][10]}
+ - 老师建议:{HistoryTrain[testID][0][9]}
}
diff --git a/app-dm/src/pages/ListPages/Training/Operation2.jsx b/app-dm/src/pages/ListPages/Training/Operation2.jsx
index 6277032..58663af 100644
--- a/app-dm/src/pages/ListPages/Training/Operation2.jsx
+++ b/app-dm/src/pages/ListPages/Training/Operation2.jsx
@@ -15,11 +15,11 @@ function Operation2() {
const score=localStorage.getItem('score')
const { operateID } = useParams();
const [isTrue,setisTrue]=useState(false)
- const [TrainScore,serTrainScore]=(null)
+ const [TrainScore,setTrainScore]=useState()
const succeed=localStorage.getItem('succeed')
const TrainData=JSON.parse(localStorage.getItem('TrainData'))
- //获取链接
+ // 获取链接
const [Src,setSrc]=useState()
const Train1=async()=>{
try{
@@ -58,8 +58,8 @@ function Operation2() {
}
},[])
- //倒计时
- // const { OperationId } = useParams();
+ // 倒计时
+ const { OperationId } = useParams();
const [countdown, setCountdown] = useState(0);
// 倒计时初始化
@@ -81,7 +81,7 @@ function Operation2() {
return () => clearInterval(interval);
}, [countdown]);
- // 转换秒数为时分秒格式
+ // 转换秒数为时分秒格式
const formatTime = (seconds) => {
const hours = Math.floor(seconds / 3600);
const minutes = Math.floor((seconds % 3600) / 60);
@@ -123,7 +123,7 @@ function Operation2() {
localStorage.removeItem('TrainData')
}
- //检测按钮
+ // 检测按钮
const detection=async()=>{
try{
const detectionSrc=await axios.post('/api/student/check_pod',{
@@ -133,10 +133,10 @@ function Operation2() {
const result=detectionSrc.data['result']
if(result==='NO'){
alert('连接失败')
- TrainScore(0)
+ setTrainScore(0)
}else{
alert('连接成功')
- TrainScore(50)
+ setTrainScore(50)
}
}catch{
alert('detection出错')
@@ -191,7 +191,7 @@ function Operation2() {
{ isTrue&&TrainData&&
{TrainData['operateID'][3][0]}
- {Src&&
}
+ {/* {Src&&} */}
}
{/* 达梦数据库连接⬆ */}
@@ -207,6 +207,7 @@ function Operation2() {
+
)
}
diff --git a/python/student_func.py b/python/student_func.py
index 6426e2f..dc60def 100644
--- a/python/student_func.py
+++ b/python/student_func.py
@@ -325,8 +325,8 @@ def HistoryTrainFunc(ID):
for i in historytrain:
cursor.execute("SELECT * FROM TRAINTEST WHERE ID=?", (i[2]))
- dic[i[2]]=i,cursor.fetchall()[0]
-
+ result=cursor.fetchall()
+ dic[i[2]]=i,result
return dic
diff --git a/python/test.py b/python/test.py
index 7e589c5..4932c14 100644
--- a/python/test.py
+++ b/python/test.py
@@ -1,11 +1,7 @@
-a=[]
-succeed={0:'计算机基础', 1:'计算机概念', 2:'通信技术', 3:'计算机网络'}
-for i in succeed:
- a.append(succeed[i])
-
-result_string = ','.join(set(a))
-
-print(result_string+'需要加强')
+list1=[1,2,3,4,5]
+name='asd'
+dic={name:list1}
+print(dic)