From c5d33838132d41601d895d31bf6c26460c3bc84f Mon Sep 17 00:00:00 2001 From: nopy <646880214@qq.com> Date: Sat, 6 Jul 2024 18:50:07 +0800 Subject: [PATCH 1/2] 1 --- .../TeacherPages/TestManage/ManageTest.css | 75 ++++---- .../TeacherPages/TestManage/ManageTest.jsx | 11 +- .../src/TeacherPages/TestManage/SendTest.css | 23 +-- .../src/TeacherPages/TestManage/SendTest.jsx | 171 ++++++++++-------- .../TeacherPages/Trainmanage/SendTrain.css | 48 +++-- .../TeacherPages/Trainmanage/SendTrain.jsx | 35 ++-- .../TeacherPages/Trainmanage/Trainmanage.css | 12 +- .../TeacherPages/classlistpages/classId.jsx | 39 +++- .../TeacherPages/classlistpages/classid.css | 13 +- 9 files changed, 234 insertions(+), 193 deletions(-) diff --git a/app-dm/src/TeacherPages/TestManage/ManageTest.css b/app-dm/src/TeacherPages/TestManage/ManageTest.css index d38a7f4..89e888a 100644 --- a/app-dm/src/TeacherPages/TestManage/ManageTest.css +++ b/app-dm/src/TeacherPages/TestManage/ManageTest.css @@ -10,44 +10,50 @@ background-color: #f7f8fa; } #view_history{ - margin-left: 100px; - width: 1200px; - height: 350px; - background-color: aqua; - margin-top: 100px; + width: 1100px; + height: 520px; + background-color: rgb(175, 235, 217); + position: absolute; + top: 60px; + left: 125px; + padding-left: 60px; + padding-top: 10px; } #view_history_nav{ border-bottom: 1px solid black; - width: 850px; + width: 935px; + font-size: 18px; text-align: center; + padding-bottom: 5px; } + +#class_list{ + position: absolute; +} +#class_list select{ + width: 100px; + height:40px; + font-size: 20px; + position: absolute; + left: 970px; + top: -30px; + border: 3px solid #f6fffd; +} + .view_history_content{ - width: 850px; + width: 940px; + font-size: 17px; + padding: 5px 0; + line-height: 35px; text-align: center; } -#class_portrait{ - position: absolute; - width: 330px; - height: 300px; - margin-left: 860px; - margin-top: 10px; - background-color: rgb(112, 80, 227); -} #view_history_box{ overflow-y: scroll; overflow-x: hidden; - height: 550px; - width: 850px; - background-color: antiquewhite; -} -#class_list{ - position: absolute; - margin-left: 975px; - margin-top: -20px; -} -#class_list select{ - font-size: 20px; - border: none; + height: 450px; + width: 940px; + /* background-color: antiquewhite; */ + background-color: #f6fffc; } #body_bottom{ @@ -58,18 +64,11 @@ margin-top: 20px; } #sendtest_btn{ - font-size: 30px; - margin-left: 30px; + height: 50px; + width: 300px; + font-size: 28px; + margin-left: 830px; margin-top: 100px; - -} -#body_bottom_right{ - width: 350px; - height: 220px; - background-color: darkolivegreen; - position: absolute; - margin-left: 850px; - margin-top:-220px; } #view_history_table td{ border-bottom: 1px solid black; diff --git a/app-dm/src/TeacherPages/TestManage/ManageTest.jsx b/app-dm/src/TeacherPages/TestManage/ManageTest.jsx index 89fcef9..c552844 100644 --- a/app-dm/src/TeacherPages/TestManage/ManageTest.jsx +++ b/app-dm/src/TeacherPages/TestManage/ManageTest.jsx @@ -105,7 +105,7 @@ function TeacherPage() { return (
试卷ID{testID}X
@@ -151,11 +151,6 @@ function TeacherPage() { ))} -
题目选择
- {question&&问.{question['choice'][key][1]} | -|||
+ {question['choice'][key][8]}
+ | |||
{index+1}.{question['choice'][key][1]} | +|||
- {question['completion'][key][4]} - | - 问.{question['completion'][key][1]} - | + {Object.keys(question['completion']).map((key,index)=>( +||
+ {question['completion'][key][4]}
+ | + {index+1}.{question['completion'][key][1]} + | +||
- {question['judge'][key][4]} - | 问:{question['judge'][key][1]} | - { +
+ {question['judge'][key][4]}
+ | {index+1}.{question['judge'][key][1]} | +
请选择发布班级
- { ClassData &&请选择发布班级
+ { ClassData &&请填写考试时间
小时 + 小时 - 分钟 -请填写截至时间
- 天后 -请填写截至时间
+ 天后是否选择
考试总时长
- {duration || '请选择考试结束日期'} + 小时 + 分钟 diff --git a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css index ee97ec8..dc97eba 100644 --- a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css +++ b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.css @@ -63,24 +63,24 @@ } .sendtestpage{ - padding: 20px 30px; + padding: 10px 30px; font-size: 20px; text-decoration: none; color: #000; position: absolute; - bottom: 170px; - right: 100px; + bottom: 100px; + right: 50px; background-color: rgb(186, 237, 237); border-radius: 20px; } .ManagePods{ border-radius: 20px; position: absolute; - padding: 20px 30px; + padding: 10px 30px; text-decoration: none; font-size: 20px; color: #000; - right: 300px; - bottom: 170px; + right: 220px; + bottom: 100px; background-color: rgb(186, 237, 237); } \ No newline at end of file diff --git a/app-dm/src/TeacherPages/classlistpages/classId.jsx b/app-dm/src/TeacherPages/classlistpages/classId.jsx index 66134d2..2104dd1 100644 --- a/app-dm/src/TeacherPages/classlistpages/classId.jsx +++ b/app-dm/src/TeacherPages/classlistpages/classId.jsx @@ -113,6 +113,41 @@ function TeacherPage() { }; + + const CustomTooltip = ({ active, payload }) => { + if (active && payload && payload.length) { + // payload[0] 包含了柱子的数据,您需要确保数据格式与此匹配 + const data = payload[0].payload; // 假设您的数据是通过 payload 传递的 + return ( +{`试卷ID: ${data.name}`}
+{`分数: ${payload[0].value}`}
+--------------------------------------------------------------------------------------
- {detaileddata&&{detaileddata[key][6]} | -{detaileddata[key][5] ? detaileddata[key][5] : "未完成"} | -{detaileddata[key][5] ? `${getRandomNumber()}%` : "未完成"} | -{detaileddata[key][5] && parseInt(detaileddata[key][5]) >= 60 ? "及格" : (detaileddata[key][5] ? "不及格" : "未完成")} | + {detaileddata&&
{detaileddata[key][6]} | +{detaileddata[key][5] ? detaileddata[key][5] : "未完成"} | +{detaileddata[key][5] ? `${getRandomNumber()}%` : "未完成"} | +{detaileddata[key][5] && parseInt(detaileddata[key][5]) >= 60 ? "及格" : (detaileddata[key][5] ? "不及格" : "未完成")} |