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

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

@@ -20,30 +20,35 @@
     top: 60px;
     background-image: linear-gradient(120deg,#ffffff,rgb(181, 181, 181),#fff);
 }
-.ul1-trainmanage{
-    width: 650px;
+.ul-trainmanage{
+    /* width: 650px; */
     height: 200px;
     position: absolute;
     top: 50px;
     left: 10px;
+    width: 95%; /* 占满其父元素的宽度 */
+    display: flex;
+    flex-wrap: wrap; /* 允许换行 */
+    padding-left: 20px; /* 移除默认的内边距 */
+    list-style-type: none; /* 移除列表项的默认标记 */
 }
-.ul2-trainmanage{
-    width: 650px;
-    height: 200px;
-    position: absolute;
-    top: 50px;
-    left: 700px;
-}
-.train-list-trainmanage li{
-    width: 650px;
+.ul-trainmanage li{
+    width: calc(50% - 20px); /* 每个li占据其父元素宽度的一半，减去外边距 */
     height: 70px;
     list-style-type: none;
-    margin-top: 10px;
     border-radius: 10px;
     background-color: #ffffff;
     box-shadow: 2px 2px 2px #d8d9d9;
     cursor: pointer;
+    margin: 10px; /* 外边距 */
+    box-sizing: border-box; /* 边框计算在宽度内 */
+    display: flex; /* 使用Flexbox布局 */
+    align-items: center; /* 垂直居中 */
+    padding: 0 15px; /* 内边距 */
+    position: relative;
 }
+
+
 .train-list-trainmanage span {
     font-size: 20px;
 }
@@ -51,6 +56,14 @@
     font-size: 15px;
     margin-left: 460px;
     margin-top: -40px;
+    flex-shrink: 0; /* span不缩小 */
+    white-space: nowrap;
+    flex-grow: 1; /* p标签占据剩余空间 */
+    margin: 0; /* 移除默认外边距 */
+    padding-left: 410px;
+    text-align: right; /* 右对齐文本 */
+    overflow-wrap: break-word; /* 允许长单词换行 */
+    word-break: break-all; /* 允许在任意字符处断行 */
 }
 .train-list-trainmanage li::before {
     content: "▶";
@@ -62,6 +75,10 @@
     display: inline-block;
 }
 
+
+
+
+
 .sendtestpage{
     padding: 10px 30px;
     font-size: 20px;

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

@@ -28,25 +28,13 @@ function TrainManage(){
             <p>已批改的试卷</p>
             <div className='line'></div>
             {Data&&<div className='train-list-trainmanage'>
-                <ul className='ul1-trainmanage'>
-                    <li>
-                        <span>111</span>
-                        <p>关闭时间：2024-11-5</p>
-                    </li>
-                    <li>
-                        <span>333</span>
-                        <p>关闭时间：2024-11-5</p>
-                    </li>
-                </ul>
-                <ul className='ul2-trainmanage'>
-                    <li>
-                        <span>222</span>
-                        <p>关闭时间：2024-11-5</p>
-                    </li>
-                    <li> 
-                        <span>444</span>
-                        <p>关闭时间：2024-11-5</p>
-                    </li>
+                <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>
+                    ))}
                 </ul>
                 <Link to='/teacher/trainmanage/TrainPods' className='ManagePods' >管理实训</Link>
                 <Link to='/teacher/SendTrain' className='sendtestpage'>发布实训</Link>