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

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

@@ -0,0 +1,10 @@
+.body-right-Pods{
+    width: 1420px;
+    height: 830px;
+    position: absolute;
+    top: 72px;
+    left: 220px;
+    border-radius: 10px;
+    float: right;
+    background-color: #f7f8fa;
+}

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

@@ -0,0 +1,11 @@
+import React, { useEffect, useState } from 'react';
+import axios from 'axios';
+import './TrainPods.css'
+
+function TrainPods(){
+    return(
+        <div className='body-right-Pods'>asdas</div>
+    )
+}
+
+export default TrainPods

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

@@ -48,6 +48,7 @@ function TrainManage(){
                         <p>关闭时间：2024-11-5</p>
                     </li>
                 </ul>
+                <Link to='/teacher/trainmanage/TrainPods' >管理实训</Link>
                 <Link to='/teacher/SendTrain' className='sendtestpage'>前往发布实训</Link>
             </div>}
             <button onClick={()=>{

app-dm/src/pages/ListPages/Training/Operation1.jsx

@@ -254,7 +254,7 @@ function Operation1() {
                             </ul>
                         )}
                     </li>
-                    <Link to={`/operation2/1`} style={{color:'#000',textDecoration:'none'}}>
+                    <Link to={`/operation2/${operateID}`} style={{color:'#000',textDecoration:'none'}}>
                         <li style={{ marginTop: isSubjectDropdownOpen ? '186px' : '0' }}>实训题</li>
                     </Link>
                 </ul>

app-dm/src/pages/SignIn/SignInPage.jsx

@@ -21,7 +21,7 @@ function SignInPage(){
                 if (data.result === '登录成功' && data.user==='user'){
                     localStorage.setItem('islogin',ID)
                     alert('用户登录成功')
-                    window.location.href=''//后期改成学生页面
+                    window.location.href='/'//后期改成学生页面
                 }else if(data.result==='登录成功'&&data.user==='teacher'){
                     localStorage.setItem('islogin',ID)
                     alert('教师登录成功')

app-dm/src/router/index.jsx

@@ -27,6 +27,7 @@ import SendTrain from '../TeacherPages/Trainmanage/SendTrain'
 import TrainManage from '../TeacherPages/Trainmanage/Trainmanage'
 import StudentLink from '../TeacherPages/MarkingPages/StudentLink';
 import Test from '../TeacherPages/TestManage/Test'
+import TrainPods from '../TeacherPages/Trainmanage/TrainPods'
 
 
 // 定义一个组件来包裹除了特定页面(exam)外的所有页面使其有导航
@@ -64,6 +65,7 @@ function App() {
             <Route path='managetest' element={<ManageTest />}/> {/* 考试管理 */}
             <Route path="classID/:key" element={<ClassID />} /> {/* 班级管理1 */}
             <Route path='mark/studentlink/Mark/:key' element={<StudentLink/>}/> {/* 批改1 */}
+            <Route path='trainmanage/TrainPods' element={<TrainPods/> }/>
             {/* 其他需要HeaderNavTeacher的页面 */}
           </Route>
 

python/assets/type0-pod.yaml

@@ -17,8 +17,8 @@ spec:
         runAsGroup: 0
       resources:
         limits:
-          cpu: '0.5'
+          cpu: '1'
-          memory: 0.5Gi
+          memory: 1.2Gi
         requests:
-          cpu: '0.3'
+          cpu: '0.2'
-          memory: 0.3Gi
+          memory: 0.2Gi

python/assets/type1-pod.yaml

@@ -15,8 +15,8 @@ spec:
         runAsGroup: 0
       resources:
         limits:
-          cpu: '0.5'
+          cpu: '1.3'
-          memory: 0.5Gi
+          memory: 1.3Gi
         requests:
           cpu: '0.3'
           memory: 0.3Gi

python/del.py

@@ -1,5 +1,5 @@
 import k8s_func
-studentList=['n20240101-55']
+studentList=['n20240101-56','n20240102-56','s20240101-52','s20240102-52']
 
 for i in studentList:
     k8s_func.delete_pod(i)

python/k8s_func.py

@@ -5,6 +5,7 @@ import yaml
 from kubernetes import client, config
 from flask import jsonify
 import dmPython
+
 # Load in-cluster config
 
 config.load_incluster_config()
@@ -12,6 +13,7 @@ v1 = client.CoreV1Api()
 namespace = open("/var/run/secrets/kubernetes.io/serviceaccount/namespace").read()
 IP = "36.138.114.105"
 
+
 def list_pods():
     ret = v1.list_namespaced_pod(namespace, watch=False)
     return ({
@@ -21,6 +23,7 @@ def list_pods():
         } for item in ret.items]
     })
 
+
 def list_services():
     ret = v1.list_namespaced_service(namespace)
     return {
@@ -31,6 +34,7 @@ def list_services():
         } for item in ret.items]
     }
 
+
 def create_pod(type, name):
     # 读取 pod yaml 文件
     with open(f"assets/type{type}-pod.yaml") as f:
@@ -65,6 +69,7 @@ def create_pod(type, name):
     # print("访问地址:" + IP + ":" + str(service.spec.ports[0].node_port))
     return "cjcg"
 
+
 # create_pod(0,'20240101-zt-9-0')
 
 def delete_pod(name):
@@ -73,6 +78,7 @@ def delete_pod(name):
     v1.delete_namespaced_service(name=name + "-service", namespace=namespace)
     return "删除成功"
 
+
 def check_dm(name):
     try:
         service = v1.read_namespaced_service(name=name + "-service", namespace=namespace)
@@ -86,7 +92,3 @@ def check_dm(name):
     except:
         traceback.print_exc()
         return "NO"
-
-
-
-