Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm

app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx

@@ -1,4 +1,4 @@
-import './trainmanage.css'
+import './Trainmanage.css'
 import { Link } from 'react-router-dom';
 // import React, { useEffect, useState } from 'react';
 // import axios from 'axios';

app-dm/src/TeacherPages/classlistpages/classId.jsx

@@ -1,25 +1,35 @@
-import { useParams } from 'react-router-dom';
+    import { useParams } from 'react-router-dom';
-import { Link } from 'react-router-dom';
+    import { Link } from 'react-router-dom';
-import React, { useEffect, useState } from 'react';
+    import React, { useEffect, useState } from 'react';
-import { BarChart, Bar, XAxis, YAxis, CartesianGrid, Tooltip } from 'recharts';
+    import { BarChart, Bar, XAxis, YAxis, CartesianGrid, Tooltip } from 'recharts';
-import axios from 'axios';
+    import axios from 'axios';
-import './classid.css'
+    import './classid.css'
 
 
 
-function TeacherPage() {
+    function TeacherPage() {
+        const [selectedSubject, setSelectedSubject] = useState();
+        const [ID,setID]=useState(null)
+        const[TestScore,setTestScore]=useState([])
+        const { key } = useParams();
+        const [isclick,setisclick]=useState(false)
+        const [classdata,setClassData]=useState([])
+        const [studentScores, setStudentScores] = useState([])
+        const [name,setname]=useState('')
+
         const click=()=>{
-        console.log(TestScore);
+            console.log(selectedSubject);
+            console.log(ID);
+            console.log(studentScores);
         }
         const teacher_ID=localStorage.getItem('islogin')
         if(teacher_ID==null){
             alert('登录过期，请重新登录')
             window.location.href='http://36.138.114.105:30294/'
         }
-    const { key } = useParams();
+        
-    const [isclick,setisclick]=useState(false)
         //学生表格
-    const [classdata,setClassData]=useState([])
+        
         const class_succeed = async () => {
             try{
                 const class_scr=await axios.post('/api/teacher/find_student',{key})
@@ -34,18 +44,32 @@ function TeacherPage() {
             class_succeed();
         },[])
 
-    //柱形图
-    const [studentScores, setStudentScores] = useState([]);
-
         useEffect(() => {
             class_succeed().then(() => {
-            const scores = classdata.map(student => ({
+              const scores = [];
-                name: 11.26, // 学生姓名
+              // 遍历 TestScore 对象的每个值
-                score:10, // 学生分数
+              for (const studentId in TestScore) {
-            }));
+                // 如果当前学生的信息数组没有被跳过，则对其做进一步处理
+                if (TestScore.hasOwnProperty(studentId)) {
+                  const studentInfo = TestScore[studentId];
+                  // 检查当前学生的信息数组是否符合特定的科目要求
+                  if (studentInfo[2] === selectedSubject) {
+                    // 只有当学生信息数组的第3个元素（科目）等于"Chinese"时，才添加到 scores 数组中
+                    scores.push({
+                      name: studentInfo[3], // 假设姓名总是位于数组的第4个位置
+                      score: studentInfo[5], // 假设分数总是位于数组的第6个位置
+                    });
+                    // 如果 scores 数组已经有三个或更多项目，则移除数组的第一个项目
+                    if (scores.length > 3) {
+                      scores.shift();
+                    }
+                  }
+                }
+              }
+          
               setStudentScores(scores);
             });
-    }, [isclick]);
+          }, [selectedSubject]);
 
         function formatDate(dateString) {
             // 将日期字符串转换为 Date 对象
@@ -59,17 +83,35 @@ function TeacherPage() {
             const formattedDate = `${year}-${(monthIndex + 1).toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
             return formattedDate;
         }
-    const[TestScore,setTestScore]=useState()
+
-    const Find_details=async (ID)=>{
+        const Find_details= async ()=>{
+            if(ID!==null){
                 try{
-            const Find_details_Src=await axios.post('api/Find_details',{
+                    const Find_details_Src = await axios.post('/api/teacher/Find_details',{
                         ID
                     })
-            setTestScore(Find_details_Src.data)
+                    setTestScore(Find_details_Src.data['TestScore'])
+                    setStudentScores([])
+                    setSelectedSubject()
                 }catch{
-            alert('Find_details出错')
+                    alert('Find_details')
                 }
             }
+        }
+        useEffect(()=>{
+            Find_details()
+            const sltvalue=document.getElementById('selectvalue')
+            sltvalue.value=''
+        },[ID])
+        
+        function handleSubjectChange(event) {
+            setSelectedSubject(event.target.value);
+        }
+
+        const handleClick = (item) => {
+            setID(classdata[item][1]);
+            setname(classdata[item][0]);
+          };
 
         return(
             <div className='body-right-classId'>
@@ -98,7 +140,7 @@ function TeacherPage() {
                                             <td className='box-content'>{classdata[item][3]}</td>
                                             <td className='box-content'>{classdata[item][5]}</td>
                                             <td className='box-content'>{formatDate(classdata[item][4])}</td>
-                                        <td className='box-content'><button onClick={()=>Find_details(classdata[item][1])} style={{border:'none'}}>查看详情</button></td>
+                                            <td className='box-content'><button onClick={(e)=>handleClick(item)} style={{border:'none'}}>查看详情</button></td>
                                         </tr>
                                     ))}
                                 </tbody>
@@ -109,17 +151,17 @@ function TeacherPage() {
                 <div className='body-test-score'>
                     <h3>成绩</h3>
                     <div className='body-test-score-bar'>
-                    <div className='studentName'>名字</div>
+                        {name&&<div className='studentName'>已选中{name}</div>}
                         <button onClick={click}>测试</button>
-                     <select>
+                        <select onChange={handleSubjectChange} id='selectvalue'>
                             <option value="">请选择科目</option>
-                        <option value="china">语文</option>
+                            <option value="Chinese">语文</option>
-                        <option value="math">数学</option>
+                            <option value="Math">数学</option>
-                        <option value="english">英语</option>
+                            <option value="English">英语</option>
-                        <option value="test">实训</option>
+                            <option value="Train">实训</option>
                         </select>   
                         <div className='table-bar'>
-                        <BarChart width={600} height={350} data={studentScores} barSize={90} className='bar' >
+                            <BarChart width={600} height={350} data={studentScores} barSize={80} className='bar' >
                                 <CartesianGrid strokeDasharray="3 3" />
                                 <XAxis dataKey="name" />
                                 <YAxis dataKey="score"/>
@@ -131,5 +173,5 @@ function TeacherPage() {
                 </div>
             </div>
         )
-}
+    }
-export default TeacherPage; 
+    export default TeacherPage; 

app-dm/src/TeacherPages/classlistpages/classid.css

@@ -102,7 +102,5 @@
 .studentName{
     margin-top: 20px;
     font-size: 18px;
-    width: 72px;
     margin-left: 50px;
-    border: 1px solid black;
 }

app-dm/src/TeacherPages/list_pods/List_pods.jsx

@@ -3,3 +3,4 @@ function List_pods(){
         <div></div>
     )
 }
+export default List_pods

app-dm/src/router/index.jsx

@@ -23,8 +23,8 @@ import ClassID from '../TeacherPages/classlistpages/classId';
 import ManageTest from '../TeacherPages/TestManage/ManageTest';
 import SendTest from '../TeacherPages/TestManage/SendTest';
 import Marking from '../TeacherPages/MarkingPages/Marking';
-import SendTrain from '../TeacherPages/TrainManage/SendTrain';
+import SendTrain from '../TeacherPages/Trainmanage/SendTrain';
-import TrainManage from '../TeacherPages/TrainManage/trainmanage';
+import TrainManage from '../TeacherPages/Trainmanage/Trainmanage';
 import StudentLink from '../TeacherPages/MarkingPages/StudentLink';
 
 // 定义一个组件来包裹除了特定页面(exam)外的所有页面使其有导航
@@ -72,7 +72,7 @@ function App() {
           {/* 页面使用单独的布局，不包含HeaderNav和HeaderNavTeacher */}
           <Route path="exam/:examId" element={<Exam />} />{/* 练习-考试页面 */}
           <Route path='/teacher/sendtest' element={<SendTest />}/> {/* 考试管理-发布试卷 */}
-          <Route path='/teacher/SendTrain' element={<SendTrain/>}/> {/* 实训管理-发布实训 */}
+          <Route path='/teacher/SendTrain' element={<SendTrain/>}/> {/*实训管理-发布实训*/}
           <Route path='operation1/:operateID' element={<Operation1/>}/> {/* 实训页面1 */}
           <Route path='operation2/:operateID' element={<Operation2/>}/> {/* 实训页面2 */}
           <Route path='/refresh' element={<Refresh/>}/>

python/app.py

@@ -231,10 +231,13 @@ def SendTrainTest():
     return '发布成功'
 
 
-@app.route('/api/Find_details',methods=["POST"])
+@app.route('/api/teacher/Find_details',methods=["POST"])
 def Find_details():
-    id=request.json['student_ID']
+    data=request.json
-    return  Find_details(id)
+    ID=data['ID']
+    result=Find_details_Func(ID)
+    print(result)
+    return  jsonify({'TestScore':result})
 
 
 @app.route('/')

python/teacher_func.py

@@ -269,7 +269,7 @@ def SendTrainTestFunc(TrainChoice,TrainCompletion,TrainJudge,Hour,Min,StopTime,C
 #     return dic_last_three  # 返回一个新字典，该字典仅包含排序后的最后三个键及其对应的值
 
 
-def Find_details(ID):
+def Find_details_Func(ID):
     dic = {}
     cursor = db.cursor()
     cursor.execute(f"SELECT * FROM STUDENT_TEST WHERE STUDENT_ID=? AND TF='true' ", (ID))