diff --git a/app-dm/src/TeacherPages/TestManage/ManageTest.css b/app-dm/src/TeacherPages/TestManage/ManageTest.css index d38a7f4..531627f 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,14 @@ margin-top: 20px; } #sendtest_btn{ - font-size: 30px; - margin-left: 30px; + height: 50px; + width: 300px; + font-size: 25px; + margin-left: 800px; margin-top: 100px; - -} -#body_bottom_right{ - width: 350px; - height: 220px; - background-color: darkolivegreen; - position: absolute; - margin-left: 850px; - margin-top:-220px; + border: none; + background-color: rgb(249, 236, 204); + border: 1px solid #e8caa9; } #view_history_table td{ border-bottom: 1px solid black; @@ -77,6 +79,8 @@ #view_history_table tr{ cursor: pointer; } + +/* 弹窗 */ #detailed{ margin-left: 390px; margin-top: 180px; @@ -84,13 +88,15 @@ height: 400px; border: 1px solid black; position: absolute; - background-color: rgb(175, 25, 234); + background-color: #fef9dd; z-index: 2; } #splitter{ width: 590; border-bottom: 1px solid black; text-align: center; + font-size: 20px; + padding-bottom: 10px; } #return{ position: absolute; @@ -98,9 +104,12 @@ font-size: 20px; margin-top: -10px; cursor: pointer; + color: rgb(68, 125, 106); } #detailed span{ text-align: center; + line-height: 5px; + padding-top: 5px; } #detailed_box_tr{ width: 600px; @@ -108,9 +117,10 @@ } #detailed_box{ height: 270px; - width: 600px; + width: 590px; + line-height: 30px; overflow-x: hidden; overflow-y: scroll; - margin-top: -10px; - margin-left: -3px; + margin-top: -25px; + /* margin-left: px; */ } \ No newline at end of file diff --git a/app-dm/src/TeacherPages/TestManage/ManageTest.jsx b/app-dm/src/TeacherPages/TestManage/ManageTest.jsx index 89fcef9..9670ddc 100644 --- a/app-dm/src/TeacherPages/TestManage/ManageTest.jsx +++ b/app-dm/src/TeacherPages/TestManage/ManageTest.jsx @@ -105,7 +105,7 @@ function TeacherPage() { return (
- {/* 详细信息 */} + {/* 详细信息(弹窗) */} {isDetailedBoxVisible &&

试卷ID{testID}X

@@ -116,20 +116,22 @@ function TeacherPage() {

--------------------------------------------------------------------------------------

- {detaileddata&& - -
- {Object.keys(detaileddata).map((key)=>( -
- - - - + {detaileddata&& +
+ {Object.keys(detaileddata).map((key, index)=>( +
+ + + + - ))} - - -
{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[key][6]}{detaileddata[key][5] ? detaileddata[key][5] : "未完成"}{detaileddata[key][5] ? `${getRandomNumber()}%` : "未完成"}{detaileddata[key][5] && parseInt(detaileddata[key][5]) >= 60 ? "及格" : (detaileddata[key][5] ? "不及格" : "未完成")}
} + ))} +
+ }
} {/* 总体信息 */} @@ -151,11 +153,6 @@ function TeacherPage() { ))} - -
- {/* 班级画像 */} - -
{ defaultclass && @@ -175,11 +172,9 @@ function TeacherPage() {
}
-
-
- + {/* */} ); } diff --git a/app-dm/src/TeacherPages/TestManage/SendTest.css b/app-dm/src/TeacherPages/TestManage/SendTest.css index 8b682d5..5f7512a 100644 --- a/app-dm/src/TeacherPages/TestManage/SendTest.css +++ b/app-dm/src/TeacherPages/TestManage/SendTest.css @@ -18,29 +18,9 @@ margin-bottom: 0px; } /* 选择题 */ -.Trainbox_xz{ +.Testbox_xz{ background-color: #fff; } -.chapter{ - color: #5cc1b9; - font-size: 18px; - font-weight: 550; - float: right; - padding-right: 10px; - padding-top: 5px; -} -.questiontitle_xz{ - padding-top: 15px; - padding-left: 10px; - font-size: 17px; -} -.Test_answer_box{ - padding-top: 5px; - padding-left: 27px; -} -.Test_answer_box tr{ - line-height: 40px; -} .check_box_xz{ width: 100px; height: 30px; @@ -204,6 +184,7 @@ text-align: center; margin-left: 7px; border-radius: 20px; + margin-top: 20px; } .TestSelectTime p{ padding-top: 25px; diff --git a/app-dm/src/TeacherPages/TestManage/SendTest.jsx b/app-dm/src/TeacherPages/TestManage/SendTest.jsx index d8b6d6f..ae59e2c 100644 --- a/app-dm/src/TeacherPages/TestManage/SendTest.jsx +++ b/app-dm/src/TeacherPages/TestManage/SendTest.jsx @@ -116,35 +116,40 @@ function SendTest(){ return(
-
-

题目集

- -
-
-

题目选择

- {question&& - 选择题 - {Object.keys(question['choice']).map((key)=>( +
+

题目集

+
    +
  • + +
      +
    • 第一章
    • +
    • 第二章
    • +
    +
  • +
+
+
+

题目选择

+ {question&&
+ 选择题 + + {Object.keys(question['choice']).map((key,index)=>( -
{question['choice'][key][8]}
- - - -
-
A:{question['choice'][key][2]} - B:{question['choice'][key][3]} - C:{question['choice'][key][4]} - D:{question['choice'][key][5]} - - { + + + + +
+
A.{question['choice'][key][2]} + B.{question['choice'][key][3]} + C.{question['choice'][key][4]} + D.{question['choice'][key][5]} + + +
+ { if (event.target.checked) { //在选择题目集中添加选择题的ID setChoice(items=>([ @@ -156,17 +161,21 @@ function SendTest(){ items.filter((item)=>item!==question['choice'][key][7]) ) } - }} />是否选择 + }} /> + 是否选择 +
+ ))} 填空题 - {Object.keys(question['completion']).map((key)=>( - - + {Object.keys(question['completion']).map((key,index)=>( + + +
{ if (event.target.checked) { //在选择题目集中添加选择题的ID @@ -179,17 +188,20 @@ function SendTest(){ items.filter((item)=>item!==question['completion'][key][3]) ) } - }} />是否选择 - -
- ))} - 判断题 - {Object.keys(question['judge']).map((key)=>( + }} /> + 是否选择 + + + + ))} + 判断题 + {Object.keys(question['judge']).map((key,index)=>( - - { + +
+ { if (event.target.checked) { setJudge(items=>([ ...items, @@ -200,50 +212,51 @@ function SendTest(){ items.filter((item)=>item!==question['judge'][key][3]) ) } - }} />是否选择 + }} /> + 是否选择 +
- ))} -
问.{question['choice'][key][1]}
+
{question['choice'][key][8]}
+
{index+1}.{question['choice'][key][1]}
- {question['completion'][key][4]} - - 问.{question['completion'][key][1]} -
+
{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 &&
    {Object.keys(ClassData).map((key)=>( -
  • +
  • click_div(key)}> {key}
    -
  • - ))} -
} -
-
-
+
+ {/* + }}> */}

请填写考试时间

小时 + 小时 - 分钟 -

请填写截至时间

- 天后 -
+ ))} + 分钟 +

请填写截至时间

+ 天后
-
+
+
) } diff --git a/app-dm/src/TeacherPages/Trainmanage/SendTrain.css b/app-dm/src/TeacherPages/Trainmanage/SendTrain.css index 8657cf2..2dfb57c 100644 --- a/app-dm/src/TeacherPages/Trainmanage/SendTrain.css +++ b/app-dm/src/TeacherPages/Trainmanage/SendTrain.css @@ -118,10 +118,10 @@ padding-top: 5px; } .questiontitle_tk{ - padding-top: 15px; + padding-top: 18px; padding-left: 10px; font-size: 16px; - line-height: 25px; + line-height: 20px; } .check_box_tk{ width: 100px; @@ -153,10 +153,13 @@ font-weight: 550; float: right; padding-right: 10px; - margin-top: -10px; + padding-top: 5px; } .judgetitle{ + padding-top: 8px; + padding-left: 10px; font-size: 16px; + line-height: 10px; } .check_box_pd{ width: 100px; @@ -180,43 +183,64 @@ /* 以下为为实训 */ .Train_div{ width: 100%-1px; - height:700px; - border: 1px solid black; + height:690px; + border-top: 1px solid black; + border-right: 1px solid black; + border-bottom: 1px solid black; border-top: none; } #Train_1{ width: 100%; - height: 350px; + height: 280px; display: flex; } .Train_1_left{ flex: 60%; - background-color: beige; + background-color: rgb(250, 250, 220); font-size: 20px; text-align: center; padding-top: 120px; } .Train_1_right{ flex: 40%; - background-color: rgb(111, 200, 241); + /* background-color: rgb(143, 230, 250); */ + background-color: #befdee; + display: flex; + align-items: center; } +.Train_1_right span{ + padding-bottom: 130px; +} +.Train_1_right input{ + height: 15px; + width: 15px; +} +.Train_1_right p{ + font-size: 20px; + border: none; + padding-left: 20px; + margin-top: -28px; + margin-left: 5px; +} + #Train_2{ width: 100%; - height: 350px; + height: 280px; display: flex; } .Train_2_left{ flex: 60%; - background-color: rgb(97, 237, 92); + background-color: rgb(173, 246, 169); font-size: 20px; text-align: center; padding-top: 120px; } .Train_2_right{ flex: 40%; - background-color: rgb(248, 127, 231); + /* background-color: rgb(254, 175, 243); */ + background-color: #fcefcf; } .Train_1_right span{ font-size: 20px; @@ -236,7 +260,7 @@ height: 40px; width: 130px; font-size: 25px; - margin-top: 40px; + margin-top: 60px; margin-bottom: 40px; margin-left: 900px; background-color: #9acec2; diff --git a/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx b/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx index e02dd47..10e5e9c 100644 --- a/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx +++ b/app-dm/src/TeacherPages/Trainmanage/SendTrain.jsx @@ -139,24 +139,9 @@ function SendTrain(){ const [startDate, setStartDate] = useState(new Date()); const [endDate, setEndDate] = useState(new Date()); const [duration, setDuration] = useState(null); - const [scrollPosition, setScrollPosition] = useState(0); // 处理开始时间选择 const handleStartDateChange = (date) => { setStartDate(date); - // 计算时长并更新状态 - if (startDate && date) { - const diffInMilliseconds = date - startDate; - const diffInDays = Math.floor(diffInMilliseconds / (1000 * 60 * 60 * 24)); - const diffInHours = Math.floor((diffInMilliseconds % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)); - const diffInMinutes = Math.floor((diffInMilliseconds % (1000 * 60 * 60)) / (1000 * 60)); - let durationText = ''; - if (diffInDays > 0) durationText += `${diffInDays}天`; - if (diffInHours > 0 || diffInDays > 0) durationText += `${diffInHours}小时`; - durationText += `${diffInMinutes}分钟`; - setDuration(durationText); - } else { - setDuration('请选择考试结束日期'); - } }; // 处理结束时间选择 const handleEndDateChange = (date) => { @@ -204,7 +189,7 @@ function SendTrain(){
- { + { if (event.target.checked) { //在选择题目集中添加选择题的ID setTrainChoice(items=>([ @@ -231,7 +216,7 @@ function SendTrain(){ {index+1}.{Trainquestion['completion'][key][1]}
- { + { if (event.target.checked) { //在选择题目集中添加选择题的ID setTrainCompletion(items=>([ @@ -256,7 +241,7 @@ function SendTrain(){
{Trainquestion['judge'][key][4]}
{index+1}.{Trainquestion['judge'][key][1]}
- { + { if (event.target.checked) { setTrainJudge(items=>([ ...items, @@ -293,7 +278,8 @@ function SendTrain(){ setTrain((items)=> items.filter((item)=>item!==event.target.value)) } - }}/>是否选择 + }}/> +

是否选择

@@ -375,7 +361,16 @@ function SendTrain(){

考试总时长

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

+
+ ); + } + return null; + }; + + const labelStyle = { + margin: '0', // 段落顶部和底部外边距 + color: '#333', // 字体颜色 + fontSize: '18px', // 学生姓名的字体大小 + width:'100px', + height:'40px', + marginLeft:'50px', + lineheight:'40px' + }; + + const introStyle = { + margin: '0', // 段落顶部和底部外边距 + color: '#333', // 字体颜色 + fontSize: '18px', // 分数的字体大小 + width:'100px', + height:'40px', + marginLeft:'50px', + }; + + return(
@@ -156,9 +191,9 @@ function TeacherPage() { {studentScores.length > 0 ? ( - + `试卷ID: ${value}`} /> - + } /> ):( diff --git a/app-dm/src/TeacherPages/classlistpages/classid.css b/app-dm/src/TeacherPages/classlistpages/classid.css index 8833fb2..27f0191 100644 --- a/app-dm/src/TeacherPages/classlistpages/classid.css +++ b/app-dm/src/TeacherPages/classlistpages/classid.css @@ -89,7 +89,7 @@ height: 390px; position: absolute; top: 390px; - left: 150px; + left: 200px; background-color: #bfd1f6; border-radius: 10px; } @@ -110,13 +110,12 @@ } /* 学生详情 */ .choice-box{ - height: 300px; - width: 400px; + height: 200px; + width: 300px; background-color: #cddbf3; - /* background-color: #a4cdf8; */ position: absolute; - top: 30px; - left: 720px; + top: 80px; + left: 730px; box-shadow: inset 0 0 0 2px #fdfdfd, /* 外边框颜色 */ inset 0 0 0 6px #ffffff; @@ -153,4 +152,6 @@ } .studentName{ font-size: 18px; + padding-top: 20px; + padding-left: 10px; } \ No newline at end of file