From 08172ba0e48c9b43fd337477beec6954fd05b106 Mon Sep 17 00:00:00 2001
From: nopy <646880214@qq.com>
Date: Mon, 8 Jul 2024 20:40:07 +0800
Subject: [PATCH] 1

---
 .../Questionmanage/questionmanage.css         |  1 +
 .../TeacherPages/Trainmanage/SendTrain.css    |  2 +-
 app-dm/src/nav/nav.jsx                        |  7 ---
 app-dm/src/nav/style.css                      | 22 +--------
 app-dm/src/nav/teacherIndex.jsx               | 24 ----------
 app-dm/src/pages/Home/Home.css                | 48 +++++++++----------
 app-dm/src/pages/Home/Home.jsx                | 15 +++---
 .../pages/ListPages/Analyse/AnalysePages.css  |  4 +-
 .../pages/ListPages/Analyse/AnalysePages.jsx  |  1 -
 app-dm/src/pages/ListPages/Subject/Exam.jsx   |  2 +-
 .../pages/ListPages/Training/Operation1.css   |  1 +
 .../pages/ListPages/Training/TrainingPage.jsx |  2 +-
 12 files changed, 40 insertions(+), 89 deletions(-)

diff --git a/app-dm/src/TeacherPages/Questionmanage/questionmanage.css b/app-dm/src/TeacherPages/Questionmanage/questionmanage.css
index 926cfb1..1efe539 100644
--- a/app-dm/src/TeacherPages/Questionmanage/questionmanage.css
+++ b/app-dm/src/TeacherPages/Questionmanage/questionmanage.css
@@ -95,6 +95,7 @@
     box-shadow: 
     inset 0 0 0 2px #aee1e3, /* 外边框颜色 */
     inset 0 0 0 6px #aee1e3;
+    margin-top: 80px;
 }
 .appendbtn{
     width:80px;
diff --git a/app-dm/src/TeacherPages/Trainmanage/SendTrain.css b/app-dm/src/TeacherPages/Trainmanage/SendTrain.css
index 0c6638c..ba3e8d0 100644
--- a/app-dm/src/TeacherPages/Trainmanage/SendTrain.css
+++ b/app-dm/src/TeacherPages/Trainmanage/SendTrain.css
@@ -262,7 +262,7 @@
     height: 40px;
     width: 130px;
     font-size: 25px;
-    margin-top: 160px;
+    margin-top: 100px;
     margin-bottom: 40px;
     margin-left: 900px;
     background-color: #9acec2;
diff --git a/app-dm/src/nav/nav.jsx b/app-dm/src/nav/nav.jsx
index edba60d..e2bf2e3 100644
--- a/app-dm/src/nav/nav.jsx
+++ b/app-dm/src/nav/nav.jsx
@@ -57,13 +57,6 @@ function HeaderNav() {
                     <div className='Form-nav'>
                         <div className="set-list-nav">
                             <button className='close-btn-nav' onClick={handleSettingsClick}>X</button>
-                            <ul>
-                                <li>账号管理</li>
-                                <li>个人信息</li>
-                                <li>登录设备</li>
-                                <li>我的通知</li>
-                                <li>个性化</li>
-                            </ul>
                         </div>
                         <button className='exit-btn-nav' onClick={outlog}>退出登录</button>
                     </div>
diff --git a/app-dm/src/nav/style.css b/app-dm/src/nav/style.css
index 4dbbce9..8956aed 100644
--- a/app-dm/src/nav/style.css
+++ b/app-dm/src/nav/style.css
@@ -46,7 +46,7 @@
 /* 左侧导航 */
 .left-nav-li{
     width: 200px;
-    height: 800px;
+    height: 840px;
     position: absolute;
     top: 70px;
     left: 8px;
@@ -127,20 +127,6 @@
 .set-list-nav {
     margin-top: 80px;
 }
-.set-list-nav ul {
-    background-color: transparent;
-    padding: 0;
-}
-.set-list-nav li {
-    height: 80px;
-    width: 100%;
-    font-size: 20px;
-    text-align: center;
-    line-height: 80px;
-    border-bottom: 1px solid #4f946a;
-    background-color: #e7f8fbf3;
-    overflow: hidden;
-}
 .close-btn-nav {
     width: 30px;
     height: 25px;
@@ -160,17 +146,13 @@
     background-color: #c6f1e3;
 }
 
-.set-list-nav li:hover{
-    cursor: pointer;
-    color: rgb(13, 121, 105);
-}
 .exit-btn-nav{
     height: 40px;
     width: 170px;
     border: none;
     border-radius: 10px;
     font-size: 18px;
-    margin-top: 290px;
+    margin-top: 340%;
     margin-left: 25px;
     background-color: rgb(176, 245, 218);
 }
diff --git a/app-dm/src/nav/teacherIndex.jsx b/app-dm/src/nav/teacherIndex.jsx
index 1d2de73..771ed50 100644
--- a/app-dm/src/nav/teacherIndex.jsx
+++ b/app-dm/src/nav/teacherIndex.jsx
@@ -40,23 +40,6 @@ function HeaderNavTeacher() {
                 {/* <div>
                     头像
                 </div> */}
-                <ul className="narbar-nav mr-auto">
-                    <li className='nav-item'>
-                        <Link className='nav-link' to='/refresh'>刷新页面</Link>
-                    </li>
-                    <li className='nav-item'>
-                        <Link className='nav-link' to='/'>学生</Link>
-                    </li>
-                    <li className='nav-item'>
-                        <Link className='nav-link' to='/teacher'>教师</Link>
-                    </li>
-                    <li className='nav-item'>
-                        <Link className='nav-link' to='/signup'>注册</Link>
-                    </li>
-                    <li className='nav-item'>
-                        <Link className='nav-link' to='/signin'>登录</Link>
-                    </li>
-                </ul>
             </div>
             <div className='left-nav-li'>
                 <ul>
@@ -76,13 +59,6 @@ function HeaderNavTeacher() {
                     <div className='Form-nav'>
                         <div className="set-list-nav">
                             <button className='close-btn-nav' onClick={handleSettingsClick}>X</button>
-                            <ul>
-                                <li>账号管理</li>
-                                <li>个人信息</li>
-                                <li>登录设备</li>
-                                <li>我的通知</li>
-                                <li>个性化</li>
-                            </ul>
                         </div>
                         <button className='exit-btn-nav' onClick={outlog}>退出登录</button>
                     </div>
diff --git a/app-dm/src/pages/Home/Home.css b/app-dm/src/pages/Home/Home.css
index 7a82c35..331b33f 100644
--- a/app-dm/src/pages/Home/Home.css
+++ b/app-dm/src/pages/Home/Home.css
@@ -1,7 +1,8 @@
 /* 右侧首页内容 */
 .body-right-home{
     width: 1420px;
-    height: 1330px;
+    /* height: 1330px; */
+    height: 830px;
     position: absolute;
     top: 72px;
     left: 220px;
@@ -33,7 +34,7 @@
 }
 
 /* 灰盒子 */
-.block{
+/* .block{
     width: 1300px;
     height: 150px;
     position: absolute;
@@ -48,21 +49,19 @@
     background-color: #f7f8f9;
     border: 1px solid #d3d3d3;
     margin: 11px;
-}
+} */
 
 /* 题目+课表 */
-.box-two{
+/* .box-two{
     width: 1420px;
     height: 390px;
     display: flex;
     align-content: center;
-}
+} */
 /* 题目 */
-.list{
+/* .list{
     width: 560px;
     height: 310px;
-    /* background-color: #e9eef8; */
-    /* background-color: #bdd2ee; */
     background-image: linear-gradient(120deg,rgb(192, 215, 245),rgb(217, 237, 250),rgb(178, 207, 245));
     position: absolute;
     top: 390px;
@@ -76,7 +75,6 @@
     margin-left: -5px;
     font-weight: 600;
     font-size: 18px;
-    /* background-color: #d5e3ff; */
     background-color: #cce6f6;
     color: #506f98;
     border-radius: 0 0 10px 10px;
@@ -116,17 +114,17 @@
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-}
+} */
 
 /* 课表 */
 .timetable{
-    width: 580px;
-    height: 330px;
+    width: 620px;
+    height: 400px;
     /* background-color: #eee8f9; */
     background-image: linear-gradient(rgb(234, 212, 251),rgb(219, 195, 238),rgb(218, 184, 244));
     position: absolute;
-    top: 390px;
-    left: 730px;
+    top: 280px;
+    left: 780px;
 }
 .schedule{
     width: 560px;
@@ -148,9 +146,9 @@
     box-shadow: 2px 0 5px #beb0dc;
 }
 .schedule table{
-    width: 500px;
-    height: 280px;
-    margin-top: -50px;
+    width: 530px;
+    height: 340px;
+    margin-top: -45px;
     margin-left: 40px;
     background-color: #ffffff;
     border: 1px solid rgb(187, 186, 186);
@@ -166,11 +164,12 @@
 
 /* 图表 */
 .chart{
-    width: 1200px;
-    height: 500px;
+    width: 730px;
+    height: 400px;
     position: absolute;
     left: 110px;
-    top: 750px;
+    top: 280px;
+    left: 20px;
     /* background-color: #d8f2f7d7; */
     background-image: linear-gradient(#d8f2f7d7,rgb(165, 232, 232),rgba(192, 244, 243, 0.916));
 }
@@ -189,11 +188,11 @@
 }
 
 .line-graph{
-    width: 860px;
-    height: 420px;
+    width: 620px;
+    height: 320px;
     padding: 10px;
     margin-top: -90px;
-    margin-left: 160px;
+    margin-left: 50px;
     background-color: #fff;
     border-radius: 15px;
 }
@@ -227,5 +226,6 @@
     height: 60px;
     position: absolute;
     bottom: 0;
-    background-color: rgba(49, 67, 113, 0.4);
+    /* background-color: rgba(49, 67, 113, 0.4); */
+    background-color: #d8dcec;
 }
\ No newline at end of file
diff --git a/app-dm/src/pages/Home/Home.jsx b/app-dm/src/pages/Home/Home.jsx
index 87413f5..2055899 100644
--- a/app-dm/src/pages/Home/Home.jsx
+++ b/app-dm/src/pages/Home/Home.jsx
@@ -145,13 +145,13 @@ function Home(){
                 <span>吾日三省吾身,吃饭了吗,睡觉了吗,上达梦做题了吗？</span>
                 <img src={Ad} alt="" height='190px' width='100%'/>
             </div>
-            <div className='block'>
+            {/* <div className='block'>
                 <div className='block-box'>
-                    {/* 内容暂定 */}
+                    内容暂定
                 </div>
-            </div>
-            <div className='box-two'>
-                <div className='list'>
+            </div> */}
+            {/* <div className='box-two'> */}
+                {/* <div className='list'>
                     <h3>练习和考试</h3>
                     <ul>
                         <li onClick={handelTestClick}>
@@ -171,7 +171,7 @@ function Home(){
                             <span>暂定时间3</span>
                         </li>
                     </ul>
-                </div>
+                </div> */}
                 <div className='timetable'>
                     {/* 课表 */}
                     <div className='schedule'>
@@ -217,10 +217,9 @@ function Home(){
                         </table>
                     </div>
                 </div>
-            </div>
+            {/* </div> */}
             <div className='chart'>
                 <h3>分析图表</h3>
-                {/* 图表 (未完成)*/}
                 <div className='line-graph' >
                     <Line data={chartData} options={options}/>
                 </div>
diff --git a/app-dm/src/pages/ListPages/Analyse/AnalysePages.css b/app-dm/src/pages/ListPages/Analyse/AnalysePages.css
index a2bdbfa..d0f542c 100644
--- a/app-dm/src/pages/ListPages/Analyse/AnalysePages.css
+++ b/app-dm/src/pages/ListPages/Analyse/AnalysePages.css
@@ -133,7 +133,6 @@
 .analyse-box ul{
     width: 250px;
     height: 200px;
-    /* background-color: #eefdf6; */
     background-image: linear-gradient(#ecfff7,#dafbfd);
     position: absolute;
     top: 50px;
@@ -146,5 +145,6 @@
     height: 50px;
     font-size: 20px;
     list-style-type: none;
-    padding: 10px;
+    padding: 5px;
+    line-height: 30px;
 }
\ No newline at end of file
diff --git a/app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx b/app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx
index b1aed90..564eaaf 100644
--- a/app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx
+++ b/app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx
@@ -104,7 +104,6 @@ function SubjectPage(){
                             <ul>
                                 <li>总得分：{parseInt(PieData['datasets'][0]['data'][0])+parseInt(PieData['datasets'][0]['data'][1])}/{score}</li>
                                 <li>分析：{parseInt(PieData['datasets'][0]['data'][0])>parseInt(PieData['datasets'][0]['data'][1]) ? '基础题得分略低':'提高实训得分需优化学习方法与题目理解。'}</li>
-                                <br />
                                 <li>老师建议：{parseInt(PieData['datasets'][0]['data'][0])>parseInt(PieData['datasets'][0]['data'][1]) ? '巩固基础，稳步提升':'加强HTML语法'}</li>
                             </ul>
                         </div>}
diff --git a/app-dm/src/pages/ListPages/Subject/Exam.jsx b/app-dm/src/pages/ListPages/Subject/Exam.jsx
index bf93ff3..8db023f 100644
--- a/app-dm/src/pages/ListPages/Subject/Exam.jsx
+++ b/app-dm/src/pages/ListPages/Subject/Exam.jsx
@@ -235,7 +235,7 @@ function Exam() {
                         )}
                     </li>
                     <Link to={`/operation2/1`} style={{color:'#000',textDecoration:'none'}}>
-                        <li style={{ marginTop: isSubjectDropdownOpen ? '186px' : '0' }}>实训题</li>
+                        {/* <li style={{ marginTop: isSubjectDropdownOpen ? '186px' : '0' }}>实训题</li> */}
                     </Link>
                 </ul>
                 {/* 题目预览框 */}
diff --git a/app-dm/src/pages/ListPages/Training/Operation1.css b/app-dm/src/pages/ListPages/Training/Operation1.css
index 41b40eb..331400a 100644
--- a/app-dm/src/pages/ListPages/Training/Operation1.css
+++ b/app-dm/src/pages/ListPages/Training/Operation1.css
@@ -188,6 +188,7 @@
 }
 .panduan-box label{
     padding-right: 30px;
+    margin-left: 10px;
 }
 
 /* 前进按钮 */
diff --git a/app-dm/src/pages/ListPages/Training/TrainingPage.jsx b/app-dm/src/pages/ListPages/Training/TrainingPage.jsx
index a235d2f..df69b1e 100644
--- a/app-dm/src/pages/ListPages/Training/TrainingPage.jsx
+++ b/app-dm/src/pages/ListPages/Training/TrainingPage.jsx
@@ -85,7 +85,7 @@ function SubjectPage(){
             {/* 警告框 */}
             {isWarningOpen && <WarningModal isOpen={isWarningOpen} onClose={closeWarning} />}
             {title&&<div className='test-training'>
-                <h3>未完成实训项目</h3>
+                <h3>未完成实训考试</h3>
                 <div className='train-box-list'>
                     {Object.keys(title).map((key)=>(
                         <div className='test-box-training' key={key}>