diff --git a/app-dm/src/pages/ListPages/Training/Operation2.jsx b/app-dm/src/pages/ListPages/Training/Operation2.jsx index 4e5579f..737bc57 100644 --- a/app-dm/src/pages/ListPages/Training/Operation2.jsx +++ b/app-dm/src/pages/ListPages/Training/Operation2.jsx @@ -147,4 +147,5 @@ function Operation2() { ) } + export default Operation2; \ No newline at end of file diff --git a/app-dm/src/pages/ListPages/Training/TrainingPage.css b/app-dm/src/pages/ListPages/Training/TrainingPage.css index ca6d480..e91207b 100644 --- a/app-dm/src/pages/ListPages/Training/TrainingPage.css +++ b/app-dm/src/pages/ListPages/Training/TrainingPage.css @@ -78,6 +78,17 @@ justify-content: center; align-items: center; z-index: 1000; + animation: slideInFromUp 0.5s ease-out forwards; +} +@keyframes slideInFromUp { + from { + transform: translateY(100%); + opacity: 0; + } + to { + transform: translateY(0); + opacity: 1; + } } .warning-content { width: 1420px; diff --git a/app-dm/src/pages/ListPages/Training/TrainingPage.jsx b/app-dm/src/pages/ListPages/Training/TrainingPage.jsx index 833bc80..7e9ce92 100755 --- a/app-dm/src/pages/ListPages/Training/TrainingPage.jsx +++ b/app-dm/src/pages/ListPages/Training/TrainingPage.jsx @@ -4,17 +4,43 @@ import '../Training/TrainingPage.css' import axios from 'axios'; +// const WarningModal = ({ isOpen, onClose }) => { + +// if (!isOpen) return; // 如果警告框不显示,则不渲染 +// return ( +//
+//
+// × +//

提醒 : 请及时完成实训内容!!!

+//
+//
+// ); +// }; + const WarningModal = ({ isOpen, onClose }) => { - if (!isOpen) return null; // 如果警告框不显示,则不渲染 + // 添加一个状态来控制是否应用动画 + const [isClosing, setIsClosing] = useState(false); - return ( -
+ // 定义关闭警告框的函数 + const handleClose = () => { + setIsClosing(true); // 设置状态以触发动画 + setTimeout(() => { + setIsClosing(false); // 确保动画结束后状态能够重置 + onClose(); // 动画结束后调用传入的onClose函数来关闭Modal + }, 500); // 500ms 应与CSS动画持续时间一致 + }; + + if (!isOpen || !isClosing) { + return ( +
- × + {!isClosing && ×}

提醒 : 请及时完成实训内容!!!

); + } + return null; }; const list4=[ @@ -23,6 +49,7 @@ const list4=[ ] // 首页 学习分析 function SubjectPage(){ + const student_ID=localStorage.getItem('islogin') if(student_ID==null){ alert('登录过期,请重新登录') @@ -48,13 +75,10 @@ function SubjectPage(){ // 控制警告框显示的状态 const [isWarningOpen, setWarningOpen] = useState(false); - // 打开警告框 const openWarning = () => setWarningOpen(true); - // 关闭警告框 const closeWarning = () => setWarningOpen(false); - // 可以在适当的时机调用openWarning函数来显示警告框 useEffect(() => { openWarning(); diff --git a/app-dm/src/pages/SighUp/SignUpForm.jsx b/app-dm/src/pages/SighUp/SignUpForm.jsx index 27d6d93..117566a 100644 --- a/app-dm/src/pages/SighUp/SignUpForm.jsx +++ b/app-dm/src/pages/SighUp/SignUpForm.jsx @@ -3,7 +3,7 @@ import React, { useState } from 'react'; import api from '../../api'; import classnames from 'classnames'; import './SignUpForm.css' -import Sign from './注册页面右.png' +import Sign from './signup.png' import axios from 'axios'; diff --git a/app-dm/src/pages/SighUp/注册页面右.png b/app-dm/src/pages/SighUp/signup.png similarity index 100% rename from app-dm/src/pages/SighUp/注册页面右.png rename to app-dm/src/pages/SighUp/signup.png diff --git a/app-dm/src/pages/SignIn/SignInPage.jsx b/app-dm/src/pages/SignIn/SignInPage.jsx index c956eeb..2ab28c1 100644 --- a/app-dm/src/pages/SignIn/SignInPage.jsx +++ b/app-dm/src/pages/SignIn/SignInPage.jsx @@ -1,6 +1,6 @@ import { Link } from 'react-router-dom' import "./SignInPage.css" -import Login from "./登录页面左.png" +import Login from "./signin.png" import React,{ useState } from 'react' import axios from 'axios' diff --git a/app-dm/src/pages/SignIn/登录页面左.png b/app-dm/src/pages/SignIn/signin.png similarity index 100% rename from app-dm/src/pages/SignIn/登录页面左.png rename to app-dm/src/pages/SignIn/signin.png diff --git a/app-dm/src/router/index.jsx b/app-dm/src/router/index.jsx index 019d193..3f1ffc4 100755 --- a/app-dm/src/router/index.jsx +++ b/app-dm/src/router/index.jsx @@ -3,7 +3,7 @@ import { BrowserRouter, Outlet, Route ,Routes} from 'react-router-dom'; // 登录注册页面 import SignUpPage from '../pages/SighUp/SignUpPage'; import SignInPage from '../pages/SignIn/SignInPage'; -// 导航 +// 导航 import HeaderNav from '../nav/nav'; import HeaderNavTeacher from '../nav/teacherIndex'; //刷新页面 @@ -23,8 +23,8 @@ import ClassID from '../TeacherPages/classlistpages/classId'; import ManageTest from '../TeacherPages/TestManage/ManageTest'; import SendTest from '../TeacherPages/TestManage/SendTest'; import Marking from '../TeacherPages/MarkingPages/Marking'; -import SendTrain from '../TeacherPages/Trainmanage/SendTrain'; -import TrainManage from '../TeacherPages/Trainmanage/Trainmanage'; +import SendTrain from '../TeacherPages/TrainManage/SendTrain'; +import TrainManage from '../TeacherPages/TrainManage/Trainmanage'; import StudentLink from '../TeacherPages/MarkingPages/StudentLink'; import List_pods from '../TeacherPages/list_pods/list_pods'; @@ -75,8 +75,8 @@ function App() { } />{/* 练习-考试页面 */} }/> {/* 考试管理-发布试卷 */} }/> {/*实训管理-发布实训*/} - }/> {/* 实训页面1 */} - }/> {/* 实训页面2 */} + }/> {/* 实训页面1:理论 */} + }/> {/* 实训页面2:数据库 */} }/> }/>