diff --git a/src/pages/member/departmentUser.tsx b/src/pages/member/departmentUser.tsx index 940ad96..1da58c7 100644 --- a/src/pages/member/departmentUser.tsx +++ b/src/pages/member/departmentUser.tsx @@ -41,6 +41,7 @@ const MemberDepartmentProgressPage = () => { const [email, setEmail] = useState(""); const [id_card, setIdCard] = useState(""); const [did, setDid] = useState(Number(result.get("id"))); + const [title, setTitle] = useState(String(result.get("title"))); useEffect(() => { getData(); @@ -127,10 +128,13 @@ const MemberDepartmentProgressPage = () => { return (
- +
-
-
+
+
+ 以下表格内数字对应的是表头课程的“已学完课时数/总课时数”) +
+
姓名: { placeholder="请输入邮箱" />
-
+ {/*
身份证号: { style={{ width: 160 }} placeholder="请输入身份证号" /> -
+
*/}
record.id} + scroll={{ x: 1600 }} > ( <> { )} /> {courses.map((item: any) => ( - - ( - <> - {records[record.id] && records[record.id][item.id] ? ( - {records[record.id][item.id].finished_count} - ) : ( - 0 - )} - - )} - /> - ( - <> - {item.class_hour} - - )} - /> - - ))} - ( - <>{getFinishedHours(records[record.id])} + <> + {records[record.id] && records[record.id][item.id] ? ( + records[record.id][item.id].is_finished === 1 ? ( + 已完成 + ) : ( + <> + + {records[record.id][item.id].finished_count} + {" "} + / {item.class_hour} + + ) + ) : ( + <> + 0 / {item.class_hour} + + )} + )} /> - {totalHour}} - /> - + ))} + ( + <> + {getFinishedHours(records[record.id])} /{" "} + {totalHour} + + )} + />
diff --git a/src/pages/member/index.tsx b/src/pages/member/index.tsx index 5441664..e08267c 100644 --- a/src/pages/member/index.tsx +++ b/src/pages/member/index.tsx @@ -294,7 +294,9 @@ const MemberPage = () => { {dep_ids.length > 0 && (