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

@@ -95,7 +95,6 @@
     box-shadow: 
     inset 0 0 0 2px #aee1e3, /* 外边框颜色 */
     inset 0 0 0 6px #aee1e3;
-    margin-top: 80px;
 }
 .appendbtn{
     width:80px;

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

@@ -262,7 +262,7 @@
     height: 40px;
     width: 130px;
     font-size: 25px;
-    margin-top: 100px;
+    margin-top: 160px;
     margin-bottom: 40px;
     margin-left: 900px;
     background-color: #9acec2;

app-dm/src/nav/nav.jsx

@@ -57,6 +57,13 @@ 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>

app-dm/src/nav/style.css

@@ -46,7 +46,7 @@
 /* 左侧导航 */
 .left-nav-li{
     width: 200px;
-    height: 840px;
+    height: 800px;
     position: absolute;
     top: 70px;
     left: 8px;
@@ -127,6 +127,20 @@
 .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;
@@ -146,13 +160,17 @@
     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: 340%;
+    margin-top: 290px;
     margin-left: 25px;
     background-color: rgb(176, 245, 218);
 }

app-dm/src/nav/teacherIndex.jsx

@@ -60,6 +60,13 @@ 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>

app-dm/src/pages/Home/Home.css

@@ -1,8 +1,7 @@
 /* 右侧首页内容 */
 .body-right-home{
     width: 1420px;
-    /* height: 1330px; */
+    height: 1330px;
-    height: 830px;
     position: absolute;
     top: 72px;
     left: 220px;
@@ -34,7 +33,7 @@
 }
 
 /* 灰盒子 */
-/* .block{
+.block{
     width: 1300px;
     height: 150px;
     position: absolute;
@@ -49,19 +48,21 @@
     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;
@@ -75,6 +76,7 @@
     margin-left: -5px;
     font-weight: 600;
     font-size: 18px;
+    /* background-color: #d5e3ff; */
     background-color: #cce6f6;
     color: #506f98;
     border-radius: 0 0 10px 10px;
@@ -114,17 +116,17 @@
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-} */
+}
 
 /* 课表 */
 .timetable{
-    width: 620px;
+    width: 580px;
-    height: 400px;
+    height: 330px;
     /* background-color: #eee8f9; */
     background-image: linear-gradient(rgb(234, 212, 251),rgb(219, 195, 238),rgb(218, 184, 244));
     position: absolute;
-    top: 280px;
+    top: 390px;
-    left: 780px;
+    left: 730px;
 }
 .schedule{
     width: 560px;
@@ -146,9 +148,9 @@
     box-shadow: 2px 0 5px #beb0dc;
 }
 .schedule table{
-    width: 530px;
+    width: 500px;
-    height: 340px;
+    height: 280px;
-    margin-top: -45px;
+    margin-top: -50px;
     margin-left: 40px;
     background-color: #ffffff;
     border: 1px solid rgb(187, 186, 186);
@@ -164,12 +166,11 @@
 
 /* 图表 */
 .chart{
-    width: 730px;
+    width: 1200px;
-    height: 400px;
+    height: 500px;
     position: absolute;
     left: 110px;
-    top: 280px;
+    top: 750px;
-    left: 20px;
     /* background-color: #d8f2f7d7; */
     background-image: linear-gradient(#d8f2f7d7,rgb(165, 232, 232),rgba(192, 244, 243, 0.916));
 }
@@ -188,11 +189,11 @@
 }
 
 .line-graph{
-    width: 620px;
+    width: 860px;
-    height: 320px;
+    height: 420px;
     padding: 10px;
     margin-top: -90px;
-    margin-left: 50px;
+    margin-left: 160px;
     background-color: #fff;
     border-radius: 15px;
 }
@@ -226,6 +227,5 @@
     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;
 }

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>
-            {/* <div className='box-two'> */}
+            <div className='box-two'>
-                {/* <div className='list'>
+                <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,9 +217,10 @@ function Home(){
                         </table>
                     </div>
                 </div>
-            {/* </div> */}
+            </div>
             <div className='chart'>
                 <h3>分析图表</h3>
+                {/* 图表 (未完成)*/}
                 <div className='line-graph' >
                     <Line data={chartData} options={options}/>
                 </div>

app-dm/src/pages/ListPages/Analyse/AnalysePages.css

@@ -133,6 +133,7 @@
 .analyse-box ul{
     width: 250px;
     height: 200px;
+    /* background-color: #eefdf6; */
     background-image: linear-gradient(#ecfff7,#dafbfd);
     position: absolute;
     top: 50px;
@@ -145,6 +146,5 @@
     height: 50px;
     font-size: 20px;
     list-style-type: none;
-    padding: 5px;
+    padding: 10px;
-    line-height: 30px;
 }

app-dm/src/pages/ListPages/Analyse/AnalysePages.jsx

@@ -104,6 +104,7 @@ 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>}

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>
                 {/* 题目预览框 */}

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

@@ -188,7 +188,6 @@
 }
 .panduan-box label{
     padding-right: 30px;
-    margin-left: 10px;
 }
 
 /* 前进按钮 */

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}>