diff --git a/app-dm/src/pages/ListPages/Subject/Exam.jsx b/app-dm/src/pages/ListPages/Subject/Exam.jsx index a622651..67a3c4d 100644 --- a/app-dm/src/pages/ListPages/Subject/Exam.jsx +++ b/app-dm/src/pages/ListPages/Subject/Exam.jsx @@ -111,9 +111,6 @@ function Exam(){ for(let i of item){ if(i[2]===completion_answer[sum]){ setscore(prevscore => prevscore + 2); - - }else{ - } } } diff --git a/app-dm/src/pages/ListPages/Training/Operation1.css b/app-dm/src/pages/ListPages/Training/Operation1.css index 400682d..5d1ebbe 100644 --- a/app-dm/src/pages/ListPages/Training/Operation1.css +++ b/app-dm/src/pages/ListPages/Training/Operation1.css @@ -83,16 +83,7 @@ /* 前进按钮 */ .btn-back1{ - height: 50px; - position: absolute; - bottom: 50px; - right: 80px; - padding: 0 20px; - display: flex; - align-items: center; - /* border: 1px solid #000; */ - box-shadow: 1px 2px 5px gray; - background-color: #efefef; + } .btn-back1 p{ font-size: 20px; @@ -113,4 +104,11 @@ .optionBox label{ margin-left: 10px; } +.body-right1-comple{ + border-collapse: separate; + border-spacing: 10px; /* 设置行和列之间的间距 */ +} +.body-right1-comple tr{ + background-color: rgb(110, 130, 130); +} diff --git a/app-dm/src/pages/ListPages/Training/Operation1.jsx b/app-dm/src/pages/ListPages/Training/Operation1.jsx index 7e708ed..15413c8 100644 --- a/app-dm/src/pages/ListPages/Training/Operation1.jsx +++ b/app-dm/src/pages/ListPages/Training/Operation1.jsx @@ -11,10 +11,13 @@ import axios from 'axios'; function Operation1() { const click=()=>{ - console.log(choice_answer); + console.log(score); } const clear=()=>{ + localStorage.clear('choice_answers'); setchoice_answer({}) + localStorage.clear('completion_answer') + setcompletion_answer({}) } const { operateID } = useParams(); @@ -81,22 +84,77 @@ function Operation1() { const key = parseInt(event.target.name.replace('group', '')); const updatedChoiceAnswer = { ...choice_answer, [key]: selectedValue }; setchoice_answer(updatedChoiceAnswer); - + }; + //填空题 + const handleInputChange = (event) => { + const { name, value } = event.target; + setcompletion_answer({ + ...completion_answer, + [name]: value + }); }; - //保存答案到 localStorage - const saveAnswers = () => { - localStorage.setItem('choice_answers', JSON.stringify(choice_answer)); - }; + //判断题 + const handleJudgeOption=(event)=>{ + const judgeoption=event.target.value; + const key=parseInt(event.target.name.replace('judge','')) + const updatedJudgeAnswer={ ...judge_answer,[key]:judgeoption} + setjudge_answer(updatedJudgeAnswer) + } + + //保存答案到 localStorage + const saveAnswers = () => { + localStorage.setItem('choice_answers', JSON.stringify(choice_answer)); + localStorage.setItem('completion_answer', JSON.stringify(completion_answer)); + localStorage.setItem('judge_answer',JSON.stringify(judge_answer)) + }; - // 在组件加载时从 localStorage 中恢复答案 - useEffect(() => { - const storedAnswers = localStorage.getItem('choice_answers'); - if (storedAnswers) { - const parsedAnswers = JSON.parse(storedAnswers); - setchoice_answer(parsedAnswers); - } - }, []); + // 在组件加载时从 localStorage 中恢复答案 + useEffect(() => { + const storedChoiceAnswers = localStorage.getItem('choice_answers'); + const storedCompleAnswers = localStorage.getItem('completion_answer'); + const storedJudgeAnswers = localStorage.getItem('judge_answer') + if (storedChoiceAnswers) { + const parsedAnswers = JSON.parse(storedChoiceAnswers); + setchoice_answer(parsedAnswers); + } + if (storedCompleAnswers) { + const parsedAnswers = JSON.parse(storedCompleAnswers); + setcompletion_answer(parsedAnswers); + } + if(storedJudgeAnswers){ + const parsedAnswers = JSON.parse(storedJudgeAnswers); + setjudge_answer(parsedAnswers); + } + }, []); + + //不包含实训分数 + const [score,setscore]=useState(0) + //提交按钮,或者下一页 + const submit=()=>{ + let CHO_sum=0; + let COM_sum=0; + let JUD_sum=0; + for(let item of TrainData['operateID'][0]){ + if(item[0][6]===choice_answer[CHO_sum]){ + setscore(prevscore=>prevscore+5) + } + CHO_sum++ + } + for(let item of TrainData['operateID'][1]){ + if (item[0][2]===completion_answer[COM_sum]) { + setscore(prevscore=>prevscore+5) + } + COM_sum++ + } + for(let item of TrainData['operateID'][2]){ + if (item[0][2]===judge_answer[JUD_sum]) { + setscore(prevscore=>prevscore+5) + } + JUD_sum++ + } + + } return (
@@ -128,12 +186,12 @@ function Operation1() {
{TrainData && ( - +

选择题:

{Object.keys(TrainData['operateID'][0]).map((key) => ( - {TrainData['operateID'][0][key][0][1]} + {TrainData['operateID'][0][key][0][1]}

@@ -147,15 +205,40 @@ function Operation1() { ))}
- )} - - - + )} + {TrainData&&( + + +

填空题:

+ {Object.keys(TrainData['operateID'][1]).map((key)=>( + {TrainData['operateID'][1][key][0][1]} +
+ 请填入你的答案: + + + ))} + +
+ )} + {TrainData&&( + + +

判断题:

+ {Object.keys(TrainData['operateID'][2]).map((key)=>( + {TrainData['operateID'][2][key][0][1]} + + + + + + ))} + + +
+ )} + +
- - -

下一页

-
) diff --git a/python/student_func.py b/python/student_func.py index 392d7c1..ffd1cb9 100644 --- a/python/student_func.py +++ b/python/student_func.py @@ -266,8 +266,6 @@ def FetchTrainTestFunc(operateID): return dic - - # FetchTrainTestFunc('3')