From d4634017bf8c1d255cf79601a9c38e4be4b862e5 Mon Sep 17 00:00:00 2001
From: 30404 <3040471803@qq.com>
Date: Sun, 7 Jul 2024 17:05:54 +0800
Subject: [PATCH 1/2] 123

---
 app-dm/src/TeacherPages/TestManage/ManageTest.css   | 2 +-
 app-dm/src/TeacherPages/TestManage/ManageTest.jsx   | 2 +-
 app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-dm/src/TeacherPages/TestManage/ManageTest.css b/app-dm/src/TeacherPages/TestManage/ManageTest.css
index 531627f..7d535cb 100644
--- a/app-dm/src/TeacherPages/TestManage/ManageTest.css
+++ b/app-dm/src/TeacherPages/TestManage/ManageTest.css
@@ -20,7 +20,7 @@
     padding-top: 10px;
 }
 #view_history_nav{
-    border-bottom: 1px solid black;
+    /* border-bottom: 1px solid black; */
     width: 935px;
     font-size: 18px;
     text-align: center;
diff --git a/app-dm/src/TeacherPages/TestManage/ManageTest.jsx b/app-dm/src/TeacherPages/TestManage/ManageTest.jsx
index 9670ddc..46b48a3 100644
--- a/app-dm/src/TeacherPages/TestManage/ManageTest.jsx
+++ b/app-dm/src/TeacherPages/TestManage/ManageTest.jsx
@@ -109,7 +109,7 @@ function TeacherPage() {
             {isDetailedBoxVisible && <div id='detailed'>
                 <p id='splitter'>试卷ID{testID}<span id='return' onClick={return_detailed}>X</span></p>
                 <p style={{display:'flex'}}>
-                    <span style={{ flex: 1}}>详情</span>
+                    <span style={{ flex: 1}}>姓名</span>
                     <span style={{ flex: 1}}>分数</span>
                     <span style={{ flex: 1}}>与上次相比</span>
                     <span style={{ flex: 1}}>总评</span>
diff --git a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx
index a9777b9..f3a4328 100644
--- a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx
+++ b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx
@@ -33,6 +33,14 @@ function TrainManage(){
                         <span>111</span>
                         <p>关闭时间：2024-11-5</p>
                     </li>
+                    <li>
+                        <span>333</span>
+                        <p>关闭时间：2024-11-5</p>
+                    </li>   
+                    <li>
+                        <span>333</span>
+                        <p>关闭时间：2024-11-5</p>
+                    </li>
                     <li>
                         <span>333</span>
                         <p>关闭时间：2024-11-5</p>

From 95f3590150d34b847d5df3767ab66220373e8ccb Mon Sep 17 00:00:00 2001
From: 30404 <3040471803@qq.com>
Date: Sun, 7 Jul 2024 21:02:06 +0800
Subject: [PATCH 2/2] 123

---
 .../src/TeacherPages/MarkingPages/StudentLink.css |  8 ++++----
 app-dm/src/TeacherPages/TestManage/SendTest.jsx   |  6 +-----
 app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx |  4 ----
 .../src/TeacherPages/Trainmanage/Trainmanage.css  | 14 ++++++++++++--
 .../src/TeacherPages/Trainmanage/Trainmanage.jsx  | 15 ++++++++-------
 python/del.py                                     |  2 +-
 python/teacher_func.py                            |  3 ++-
 7 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/app-dm/src/TeacherPages/MarkingPages/StudentLink.css b/app-dm/src/TeacherPages/MarkingPages/StudentLink.css
index fceada2..a6a24e9 100644
--- a/app-dm/src/TeacherPages/MarkingPages/StudentLink.css
+++ b/app-dm/src/TeacherPages/MarkingPages/StudentLink.css
@@ -35,13 +35,13 @@
 }
 
 .submit{
-    width: 140px;
+    width: 100px;
     height: 45px;
     font-size: 20px;
+    border-radius: 20px;
     /* background-color: rgb(187, 235, 219); */
     background-image: linear-gradient(#bbf5e2,#a4d1d3);
-    border-radius: 20px;
     border: none;
-    margin-left: 1180px;
-    margin-top: 700px;
+    margin-left: 1280px;
+    margin-top: 20px;
 }
\ No newline at end of file
diff --git a/app-dm/src/TeacherPages/TestManage/SendTest.jsx b/app-dm/src/TeacherPages/TestManage/SendTest.jsx
index ae59e2c..a871035 100644
--- a/app-dm/src/TeacherPages/TestManage/SendTest.jsx
+++ b/app-dm/src/TeacherPages/TestManage/SendTest.jsx
@@ -119,12 +119,8 @@ function SendTest(){
             <div className='SendTrain_body_left'>
                 <h3>题目集</h3>
                 <ul className='SendTrain_body_left_ul'>
-                    <li>
+                    <li>    
                         <button>基础题</button>
-                        <ul style={{all:'unset'}} className='left-list-ul'>
-                            <li>第一章</li>
-                            <li>第二章</li>
-                        </ul>
                     </li>
                 </ul>
             </div>
diff --git a/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx b/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx
index 2893024..9f19b59 100644
--- a/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx
+++ b/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx
@@ -157,10 +157,6 @@ function SendTrain(){
                 <ul className='SendTrain_body_left_ul'>
                     <li>
                         <button onClick={clickQuestion}>基础题</button>
-                        <ul style={{all:'unset'}} className='left-list-ul'>
-                            <li>第一章</li>
-                            <li>第二章</li>
-                        </ul>
                     </li>
                     <li>
                         <button onClick={clickTrain}>实训题</button>
diff --git a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css
index 2170ed1..40fc094 100644
--- a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css
+++ b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css
@@ -11,7 +11,7 @@
 .body-trainmanage p{
     font-size: 20px;
     position: absolute;
-    left: 50px;
+
 }
 .line{
     width: 250px;
@@ -78,7 +78,6 @@
 
 
 
-
 .sendtestpage{
     padding: 10px 30px;
     font-size: 20px;
@@ -100,4 +99,15 @@
     right: 220px;
     bottom: 100px;
     background-color: rgb(186, 237, 237);
+}
+
+.title{
+    margin-left: 55px;
+}
+.TrainTitle{
+    all: unset;
+    position: absolute;
+    margin-top: 40px;
+    font-size: 14px;
+    margin-left: 52px;
 }
\ 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 7ffeb44..f1026e1 100644
--- a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx
+++ b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx
@@ -25,16 +25,17 @@ function TrainManage(){
     },[])
     return(
         <div className='body-trainmanage'>
-            <p>已批改的试卷</p>
+            <p className='title'>已结束的实训</p>
             <div className='line'></div>
             {Data&&<div className='train-list-trainmanage'>
                 <ul className="ul-trainmanage">
-                    {['111', '222', '333', '444'].map(num => (
-                        <li key={num}>
-                            <span>{num}</span>
-                            <p>关闭时间：{`2024-11-${num === '111' ? '11' : 'XX'}`}</p>
-                        </li>
-                    ))}
+                   {Object.keys(Data).map((key)=>(
+                    <li key={key}>
+                    <span>实训ID:{Data[key][10]}</span>
+                    <h6 className='TrainTitle'>实训名称:{eval(Data[key][11])}</h6>
+                    <p>关闭时间：{Data[key][6]}</p>
+                </li>
+                   ))}
                 </ul>
                 <Link to='/teacher/trainmanage/TrainPods' className='ManagePods' >管理实训</Link>
                 <Link to='/teacher/SendTrain' className='sendtestpage'>发布实训</Link>
diff --git a/python/del.py b/python/del.py
index f3a0b05..f5f535c 100644
--- a/python/del.py
+++ b/python/del.py
@@ -1,5 +1,5 @@
 import k8s_func
-studentList=['s20240101-67','s20240102-67']
+studentList=['s20240101-71','s20240102-71']
 
 for i in studentList:
     k8s_func.delete_pod(i)
diff --git a/python/teacher_func.py b/python/teacher_func.py
index 563def7..51a99e0 100644
--- a/python/teacher_func.py
+++ b/python/teacher_func.py
@@ -384,7 +384,8 @@ def submitScoreFunc(score,testID,suggestion):
 
 def getTrainFunc(teacherID):
     cursor = db.cursor()
-    cursor.execute(f'SELECT * FROM TRAINTEST WHERE TEACHER_ID=?',(teacherID))
+    current_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+    cursor.execute(f'SELECT * FROM TRAINTEST WHERE TEACHER_ID=? AND STOPTIME<?',(teacherID,current_time))
     data = cursor.fetchall()
     return data