From 4380b4b8afde89a012fc079ce856b8568c5a269e Mon Sep 17 00:00:00 2001
From: nopy <646880214@qq.com>
Date: Thu, 11 Jul 2024 15:51:35 +0800
Subject: [PATCH] 1
---
.../Questionmanage/questionmanage.css | 8 +++--
.../TeacherPages/TestManage/ManageTest.css | 12 ++++---
.../src/TeacherPages/TestManage/SendTest.css | 13 ++++----
.../src/TeacherPages/TestManage/SendTest.jsx | 4 +--
.../TeacherPages/Trainmanage/SendTrain.css | 13 ++++----
.../TeacherPages/Trainmanage/SendTrain.jsx | 3 +-
.../TeacherPages/Trainmanage/Trainmanage.css | 4 ++-
.../TeacherPages/classlistpages/classid.css | 8 ++---
.../pages/ListPages/Analyse/AnalysePages.css | 2 +-
app-dm/src/pages/ListPages/Subject/Exam.css | 32 ++++++++++++++-----
app-dm/src/pages/ListPages/Subject/Exam.jsx | 2 +-
.../pages/ListPages/Subject/SubjectPage.css | 5 ++-
.../pages/ListPages/Subject/SubjectPage.jsx | 2 +-
.../pages/ListPages/Training/Operation1.css | 8 ++---
.../pages/ListPages/Training/Operation1.jsx | 5 ---
.../pages/ListPages/Training/TrainingPage.css | 2 +-
16 files changed, 71 insertions(+), 52 deletions(-)
diff --git a/app-dm/src/TeacherPages/Questionmanage/questionmanage.css b/app-dm/src/TeacherPages/Questionmanage/questionmanage.css
index 1efe539..1a3d16c 100644
--- a/app-dm/src/TeacherPages/Questionmanage/questionmanage.css
+++ b/app-dm/src/TeacherPages/Questionmanage/questionmanage.css
@@ -8,7 +8,6 @@
border-radius: 10px;
float: right;
background-color: #f7f8fa;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
}
.question-allbox{
display: flex;
@@ -49,6 +48,7 @@
inset 0 0 0 2px #aee1e3, /* 外边框颜色 */
inset 0 0 0 6px #aee1e3;
margin-top: 80px;
+ padding: 3px;
}
.title-link1{
height: 60px;
@@ -57,7 +57,7 @@
background-color: #aee1e3;
}
.title-link1 th{
- padding: 0 13px;
+ padding: 0 11px;
min-width: 92.5px;
}
.question-box{
@@ -65,6 +65,7 @@
line-height: 50px;
}
.question-box td{
+ padding: 0 3px;
border-bottom: 1px solid #8a9991;
}
@@ -96,10 +97,12 @@
inset 0 0 0 2px #aee1e3, /* 外边框颜色 */
inset 0 0 0 6px #aee1e3;
margin-top: 80px;
+ padding: 3px;
}
.appendbtn{
width:80px;
height: 40px;
+ font-size: 16px;
background-color: #aee1e3;
border: none;
margin-left: 1110px;
@@ -108,6 +111,7 @@
.appenddel{
width:80px;
height: 40px;
+ font-size: 16px;
background-color: #aee1e3;
border: none;
margin-left: 25px;
diff --git a/app-dm/src/TeacherPages/TestManage/ManageTest.css b/app-dm/src/TeacherPages/TestManage/ManageTest.css
index fd9fc3c..1fc37b1 100644
--- a/app-dm/src/TeacherPages/TestManage/ManageTest.css
+++ b/app-dm/src/TeacherPages/TestManage/ManageTest.css
@@ -86,9 +86,10 @@
margin-top: 180px;
width: 600px;
height: 400px;
- border: 1px solid black;
+ border: 10px solid #f8efce;
position: absolute;
- background-color: #fef9dd;
+ /* background-color: #fef9dd; */
+ background-image: linear-gradient(#fffcea,#f8efce);
z-index: 2;
}
#splitter{
@@ -99,11 +100,14 @@
padding-bottom: 10px;
}
#return{
+ height: 20px;
+ width: 30px;
position: absolute;
- margin-left: 230px;
+ margin-left: 235px;
font-size: 20px;
- margin-top: -10px;
+ margin-top: -20px;
cursor: pointer;
+ background-color: #f8efce;
color: rgb(154, 131, 66);
}
#detailed span{
diff --git a/app-dm/src/TeacherPages/TestManage/SendTest.css b/app-dm/src/TeacherPages/TestManage/SendTest.css
index 0b6a6a2..17c66f1 100644
--- a/app-dm/src/TeacherPages/TestManage/SendTest.css
+++ b/app-dm/src/TeacherPages/TestManage/SendTest.css
@@ -111,16 +111,15 @@
/* 按钮 */
#SendTestBtn{
- height: 40px;
- width: 130px;
+ height: 50px;
+ width: 220px;
font-size: 25px;
- margin-top: 40px;
- margin-bottom: 40px;
- margin-left: 900px;
- background-color: #9acec2;
+ margin-top: 50px;
+ margin-left: 60px;
+ background-color: #bfddd6;
border: none;
border-radius: 20px;
- color: #fff;
+ color: #ffffff;
}
diff --git a/app-dm/src/TeacherPages/TestManage/SendTest.jsx b/app-dm/src/TeacherPages/TestManage/SendTest.jsx
index a871035..85c545b 100644
--- a/app-dm/src/TeacherPages/TestManage/SendTest.jsx
+++ b/app-dm/src/TeacherPages/TestManage/SendTest.jsx
@@ -124,7 +124,7 @@ function SendTest(){
-
+
题目选择
{question&&
选择题
@@ -216,7 +216,6 @@ function SendTest(){
))}
}
-
{/* 右边的内容 */}
@@ -251,6 +250,7 @@ function SendTest(){
请填写截至时间
天后
+
diff --git a/app-dm/src/TeacherPages/Trainmanage/SendTrain.css b/app-dm/src/TeacherPages/Trainmanage/SendTrain.css
index e480a6c..890c329 100644
--- a/app-dm/src/TeacherPages/Trainmanage/SendTrain.css
+++ b/app-dm/src/TeacherPages/Trainmanage/SendTrain.css
@@ -255,16 +255,15 @@
/* 按钮 */
#SendTrainBtn{
- height: 40px;
- width: 130px;
+ height: 50px;
+ width: 220px;
font-size: 25px;
- margin-top: 100px;
- margin-bottom: 40px;
- margin-left: 900px;
- background-color: #9acec2;
+ margin-top: 50px;
+ margin-left: 60px;
+ background-color: #bfddd6;
border: none;
border-radius: 20px;
- color: #fff;
+ color: #ffffff;
}
diff --git a/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx b/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx
index 7b1b91e..f5ae75a 100644
--- a/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx
+++ b/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx
@@ -301,7 +301,7 @@ function SendTrain(){
}
-
+ {/* */}
{/* 最右边的内容 */}
@@ -369,6 +369,7 @@ function SendTrain(){
))}
分钟
+
diff --git a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css
index d977f36..0ac3472 100644
--- a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css
+++ b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css
@@ -119,7 +119,9 @@
margin-top: 180px;
z-index: 2;
border: 10px solid #ceedf5;
- background-color: #d4f6f6;
+ /* background-color: #d4f6f6; */
+ background-color: #e7f5f8;
+ background-image: linear-gradient(#e7f5f8,#ceedf5);
}
.TrainBox table{
margin-top: 60px;
diff --git a/app-dm/src/TeacherPages/classlistpages/classid.css b/app-dm/src/TeacherPages/classlistpages/classid.css
index 27f0191..b10e753 100644
--- a/app-dm/src/TeacherPages/classlistpages/classid.css
+++ b/app-dm/src/TeacherPages/classlistpages/classid.css
@@ -1,6 +1,6 @@
.body-right-classId{
/* width: 1420px; */
- width: 86.3%;
+ width: 85.6%;
height: 830px;
position: absolute;
top: 72px;
@@ -151,7 +151,7 @@
left: 0px;
}
.studentName{
- font-size: 18px;
- padding-top: 20px;
- padding-left: 10px;
+ font-size: 20px;
+ padding-top: 25px;
+ padding-left: 42px;
}
\ No newline at end of file
diff --git a/app-dm/src/pages/ListPages/Analyse/AnalysePages.css b/app-dm/src/pages/ListPages/Analyse/AnalysePages.css
index 6a76053..fb49b81 100644
--- a/app-dm/src/pages/ListPages/Analyse/AnalysePages.css
+++ b/app-dm/src/pages/ListPages/Analyse/AnalysePages.css
@@ -101,7 +101,7 @@
height: 420px;
position: absolute;
top: 160px;
- left: 150px;
+ left: 180px;
background-color: #d1ece2ea;
z-index: 1;
}
diff --git a/app-dm/src/pages/ListPages/Subject/Exam.css b/app-dm/src/pages/ListPages/Subject/Exam.css
index de0ac31..804103a 100644
--- a/app-dm/src/pages/ListPages/Subject/Exam.css
+++ b/app-dm/src/pages/ListPages/Subject/Exam.css
@@ -21,7 +21,7 @@
/* 第二页(实训题)的左边导航 */
.nav-left-exam{
width: 215px;
- height: 900px;
+ height: 840px;
position: absolute;
box-shadow: 2px 2px 6px #d4d4d4;
}
@@ -59,8 +59,8 @@
z-index: 1000;
}
.dropdown-menu1-exam li{
- background-color: rgb(236, 232, 232);
- border-bottom: 2px solid rgb(213, 208, 208);
+ background-color: rgb(254, 252, 252);
+ border-bottom: 2px solid rgb(231, 231, 231);
}
/* 显示下拉菜单 */
.subject-dropdown.open1-exam + .dropdown-menu1-exam {
@@ -120,23 +120,39 @@
margin-top: 5px;
cursor: pointer;
}
+/* 题目 */
.body-right1-exam{
width: 1414px;
- height: 1540px;
position: absolute;
top: 64px;
left: 230px;
border-radius: 10px;
background-color: #f7f8fa;
}
+.body-right1-exam p{
+ width: 80px;
+ height: 30px;
+ margin: 0px;
+ padding-left: 10px;
+ margin-left: -10px;
+ font-size: 20px;
+ color: #273128;
+ background-image: linear-gradient(#c7e0ca,#a7daa3);
+ border-radius: 0 10px 10px 0;
+}
+.body-right1-exam table{
+ width: 100%;
+ border-spacing: 10px;
+}
.subject-btn{
- width: 100px;
- height: 40px;
+ width: 120px;
+ height: 45px;
border: none;
- margin-top: 150px;
+ margin-top: 120px;
+ margin-bottom: 30px;
margin-left: 1200px;
border-radius: 20px;
font-size: 18px;
- background-image: linear-gradient(rgb(195, 255, 227),rgb(168, 224, 200));
+ background-image: linear-gradient(rgb(211, 249, 231),rgb(191, 231, 213));
}
\ No newline at end of file
diff --git a/app-dm/src/pages/ListPages/Subject/Exam.jsx b/app-dm/src/pages/ListPages/Subject/Exam.jsx
index 38affd5..3802355 100644
--- a/app-dm/src/pages/ListPages/Subject/Exam.jsx
+++ b/app-dm/src/pages/ListPages/Subject/Exam.jsx
@@ -264,7 +264,7 @@ function Exam() {
-
+
{TestData&&
选择题
diff --git a/app-dm/src/pages/ListPages/Subject/SubjectPage.css b/app-dm/src/pages/ListPages/Subject/SubjectPage.css
index b7db5e8..071f7ef 100644
--- a/app-dm/src/pages/ListPages/Subject/SubjectPage.css
+++ b/app-dm/src/pages/ListPages/Subject/SubjectPage.css
@@ -74,10 +74,9 @@
#score{
position: absolute;
- margin-left: 290px;
+ margin-left: 260px;
margin-top: -135px;
- font-size: 45px;
- /* color: #ff6666; */
+ font-size: 30px;
color: rgb(252, 102, 102);
}
diff --git a/app-dm/src/pages/ListPages/Subject/SubjectPage.jsx b/app-dm/src/pages/ListPages/Subject/SubjectPage.jsx
index b322116..630dd82 100644
--- a/app-dm/src/pages/ListPages/Subject/SubjectPage.jsx
+++ b/app-dm/src/pages/ListPages/Subject/SubjectPage.jsx
@@ -59,7 +59,7 @@ function SubjectPage(){
发布者:{'小陈老师'}
发布时间:{testdata[key][1][0][5]}
截至时间:{testdata[key][1][0][6]}
- {testdata[key][0][5]}
+ 分数:{testdata[key][0][5]}
))}
diff --git a/app-dm/src/pages/ListPages/Training/Operation1.css b/app-dm/src/pages/ListPages/Training/Operation1.css
index 9877da3..1bb1b38 100644
--- a/app-dm/src/pages/ListPages/Training/Operation1.css
+++ b/app-dm/src/pages/ListPages/Training/Operation1.css
@@ -59,8 +59,8 @@
z-index: 1000;
}
.dropdown-menu1 li{
- background-color: rgb(236, 232, 232);
- border-bottom: 2px solid rgb(213, 208, 208);
+ background-color: rgb(254, 252, 252);
+ border-bottom: 2px solid rgb(231, 231, 231);
}
/* 显示下拉菜单 */
.subject-dropdown.open1 + .dropdown-menu1 {
@@ -124,7 +124,6 @@
/* 第一页(主观题)的右边页面 */
.body-right1{
width: 1414px;
- height: 2150px;
position: absolute;
top: 64px;
left: 230px;
@@ -198,10 +197,11 @@
}
.operation-btn1{
- width: 100px;
+ width: 110px;
height: 40px;
border: none;
margin-top: 50px;
+ margin-bottom: 20px;
margin-left: 20px;
border-radius: 20px;
font-size: 18px;
diff --git a/app-dm/src/pages/ListPages/Training/Operation1.jsx b/app-dm/src/pages/ListPages/Training/Operation1.jsx
index 9109436..65b3782 100644
--- a/app-dm/src/pages/ListPages/Training/Operation1.jsx
+++ b/app-dm/src/pages/ListPages/Training/Operation1.jsx
@@ -343,7 +343,6 @@ function Operation1() {
{Object.keys(TrainData['operateID'][1]).map((key,index)=>(
{index+1}.{TrainData['operateID'][1][key][0][1]}
- {/*
*/}
请填入你的答案:
@@ -373,10 +372,6 @@ function Operation1() {
-
diff --git a/app-dm/src/pages/ListPages/Training/TrainingPage.css b/app-dm/src/pages/ListPages/Training/TrainingPage.css
index d16c020..67fe038 100644
--- a/app-dm/src/pages/ListPages/Training/TrainingPage.css
+++ b/app-dm/src/pages/ListPages/Training/TrainingPage.css
@@ -53,7 +53,7 @@
font-size: 17px;
border: none;
display: inline-block;
- padding: 3px 26px;
+ padding: 3px 23px;
background-color: rgba(175, 235, 230, 0.929);
color: #000;
text-decoration: none;