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

app-dm/src/TeacherPages/Questionmanage/questionmanage.css

@@ -8,6 +8,12 @@
     border-radius: 10px;
     float: right;
     background-color: #f7f8fa;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}
+.question-allbox{
+    display: flex;
+  justify-content: center; /* 水平居中 */
+  align-items: center; /* 垂直居中 */
 }
 .appendBox{
     width: 1400px;
@@ -25,8 +31,11 @@
 }
 .select-box2{
     font-size: 18px;
-    margin-left: 50px;
+    /* margin-left: 50px;
-    margin-top: 20px;
+    margin-top: 20px; */
+    position: absolute;
+    left: 50px;
+    top: 20px;
     padding-bottom: 20px;
 }
 .select-box2 select{
@@ -34,13 +43,22 @@
     height: 28px;
     margin: 0 10px;
 }
+.link-box-question{
+    height: 500px;
+    box-shadow: 
+    inset 0 0 0 2px #aee1e3, /* 外边框颜色 */
+    inset 0 0 0 6px #aee1e3;
+    margin-top: 80px;
+}
 .title-link1{
+    height: 60px;
     font-size: 18px;
     line-height: 60px;
     background-color: #aee1e3;
 }
 .title-link1 th{
-    padding: 0 65px;
+    padding: 0 29px;
+    min-width: 92.5px;
 }
 .question-box{
     text-align: center;
@@ -72,8 +90,8 @@
 }
 
 .smaller-box{
-    margin: 0 300px;
+    margin: 0 200px;
-    height: 400px;
+    height: 500px;
     box-shadow: 
     inset 0 0 0 2px #aee1e3, /* 外边框颜色 */
     inset 0 0 0 6px #aee1e3;
@@ -94,3 +112,19 @@
     margin-left: 25px;
     margin-top: 150px;
 }
+.appendbtn{
+    width:80px;
+    height: 40px;
+    background-color: #aee1e3;
+    border: none;
+    margin-left: 1110px;
+    margin-top: 150px;
+}
+.appenddel{
+    width:80px;
+    height: 40px;
+    background-color: #aee1e3;
+    border: none;
+    margin-left: 25px;
+    margin-top: 150px;
+}

app-dm/src/TeacherPages/Questionmanage/questionmanage.jsx

@@ -169,6 +169,7 @@ function Questionmange(){
 
     return (
         <div className="body-right-question">
+            <div className='question-allbox'>
             {!append&&<div>
                 <div className='select-box2'>
                     <span>题目类型</span>
@@ -186,9 +187,16 @@ function Questionmange(){
                     </span>
                 </div>
                 {type==='选择题'&&data&&<table>
-                    <div className='link-box'>
+                    <div className='link-box-question'>
                         <tr className='title-link1'>
-                            <th>题目ID</th><th>题目</th><th>选项A</th><th>选项B</th><th>选项C</th><th>选项D</th><th>正确答案</th>{isTrue&&<th style={{color:'red'}}>选择要删除的题目</th>}
+                            <th>题目ID</th>
+                            <th>题目</th>
+                            <th>选项A</th>
+                            <th>选项B</th>
+                            <th>选项C</th>
+                            <th>选项D</th>
+                            <th>正确选项</th>
+                            {isTrue&&<th style={{color:'red'}}>选择要删除的题目</th>}
                         </tr>
                         {Object.keys(data).map((key)=>(
                             <tr key={key} className='question-box'>
@@ -235,9 +243,10 @@ function Questionmange(){
                 </table>}
                 {!isTrue&&<button onClick={appendClick} className='question-btn1'>添加题目</button>}
                 {!isTrue&&<button onClick={del1} className='question-btn2'>删除</button>}
-                {isTrue&&<button onClick={del2}>确定</button>}
+                {isTrue&&<button onClick={del2} className='question-btn1'>确定</button>}
-                {isTrue&&<button onClick={cancellation1}>取消</button>}
+                {isTrue&&<button onClick={cancellation1} className='question-btn2'>取消</button>}
             </div>}
+            </div>
             {append&&<div className='appendBox'>
                 <p><span style={{marginLeft:'40px',marginTop:'10px',fontSize:'17px'}}>请选择题目类型</span>
                 <select onChange={appendClick1} style={{fontSize:'17px'}}>    

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

@@ -204,8 +204,8 @@
 }
 .Train_1_right{
     flex: 40%;
-    /* background-color: rgb(143, 230, 250); */
+    background-color: rgb(143, 230, 250);
-    background-color: #befdee;
+    /* background-color: #befdee; */
     display: flex;
     align-items: center;
 }
@@ -239,8 +239,8 @@
 }
 .Train_2_right{
     flex: 40%;
-    /* background-color: rgb(254, 175, 243); */
+    background-color: rgb(254, 175, 243);
-    background-color: #fcefcf;
+    /* background-color: #fcefcf; */
 }
 .Train_1_right span{
     font-size: 20px;

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

@@ -50,17 +50,19 @@
 
 
 .train-list-trainmanage span {
+    margin-top: -20px;
     font-size: 20px;
 }
+.train-list-trainmanage h6{
+    margin-top: 30px;
+}
 .train-list-trainmanage p{
     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;
+    padding-left: 400px;
     text-align: right; /* 右对齐文本 */
     overflow-wrap: break-word; /* 允许长单词换行 */
     word-break: break-all; /* 允许在任意字符处断行 */