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

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

@@ -78,14 +78,23 @@ function SendTrain(){
                 teacher_ID
             })
             alert('发布成功')
+            window.location.href='http://localhost:3000/teacher/trainmanage'
         }catch{
             alert('SendTrainTest出错')
+            
         }
     }
 
+    
     const SendTrainBtn=()=>{
         if(selectedItems.length>0 && (HourValue || MinValue)&&StopTime){
-            SendTrainTest()
+            if(Train.length>0){
+                SendTrainTest()
+            }else{
+                alert('未选择实训内容')
+                SetTrainquestion(null)
+                setisTrain(true)
+            }
         }else{
             alert('发布信息未完全')
         }
@@ -294,6 +303,10 @@ function SendTrain(){
                             <option value={num} key={num}>{num}</option>
                         ))}
                     </select>小时
+                    <button onClick={()=>{
+                        console.log(selectedItems);
+                        console.log(Train);
+                    }}>asd</button>
                     <select name="" id="" alue={MinValue} onChange={getminvalue}>
                     {min_list.map((num)=>(
                         <option value={num} key={num}>{num}</option>

app-dm/src/pages/ListPages/Subject/SubjectPage.jsx

@@ -84,7 +84,6 @@ function SubjectPage(){
                     })}
                 </div>}
             </div>
-            
         </div>
 )};