From b553659a9551c5c78df045bc697494440c0b4f3a Mon Sep 17 00:00:00 2001
From: unknown <18119604035@163.com>
Date: Mon, 13 Nov 2023 12:00:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/index.less                           | 4 ++++
 src/pages/member/compenents/progress.tsx | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/index.less b/src/index.less
index 1b43fb7..8f2d6c6 100644
--- a/src/index.less
+++ b/src/index.less
@@ -20,6 +20,10 @@ code {
     monospace;
 }
 
+.w-100 {
+  width: 100%;
+}
+
 .w-174px {
   max-width: 134px;
   overflow: hidden;
diff --git a/src/pages/member/compenents/progress.tsx b/src/pages/member/compenents/progress.tsx
index 1589487..fba71d8 100644
--- a/src/pages/member/compenents/progress.tsx
+++ b/src/pages/member/compenents/progress.tsx
@@ -222,7 +222,7 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
           maskClosable={false}
           footer={null}
         >
-          <div className="d-flex mt-24">
+          <div className="w-100 d-flex mt-24">
             <PerButton
               type="primary"
               text="重置学习记录"
@@ -236,7 +236,7 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
             />
           </div>
           <div
-            className="d-flex mt-24"
+            className="w-100 d-flex mt-24"
             style={{ maxHeight: 800, overflowY: "auto" }}
           >
             <Table

From e12c13e5cd611469c06ff8768ad505079b1ef92b Mon Sep 17 00:00:00 2001
From: unknown <18119604035@163.com>
Date: Mon, 13 Nov 2023 14:05:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AC=AC=E4=B8=80=E6=AC=A1=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/member/learn.tsx | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/pages/member/learn.tsx b/src/pages/member/learn.tsx
index 637db33..c689bfc 100644
--- a/src/pages/member/learn.tsx
+++ b/src/pages/member/learn.tsx
@@ -57,6 +57,22 @@ type DepartmentsListModel = {
   updated_at: string;
 };
 
+type PerCourseRecordsModel = {
+  [key: number]: {
+    course_id: number;
+    created_at: string;
+    finished_at: string;
+    finished_duration: number;
+    hour_id: number;
+    id: number;
+    is_finished: number;
+    real_duration: number;
+    total_duration: number;
+    updated_at: string;
+    user_id: number;
+  };
+};
+
 const MemberLearnPage = () => {
   let chartRef = useRef(null);
   const navigate = useNavigate();
@@ -69,6 +85,7 @@ const MemberLearnPage = () => {
   const [currentCourses, setCurrentCourses] = useState<DataType[]>([]);
   const [openCourses, setOpenCourses] = useState<CourseModel[]>([]);
   const [records, setRecords] = useState<UserCourseRecordsModel>({});
+  const [perRecords, setPerRecords] = useState<PerCourseRecordsModel>({});
   const [hourCount, setHourCount] = useState<HourCountModel>({});
   const [total2, setTotal2] = useState(0);
   const [refresh2, setRefresh2] = useState(false);
@@ -194,6 +211,7 @@ const MemberLearnPage = () => {
       setOpenCourses(res.data.open_courses);
       setHourCount(res.data.user_course_hour_count);
       setRecords(res.data.user_course_records);
+      setPerRecords(res.data.per_course_earliest_records);
       if (res.data.departments.length > 0) {
         let box: OptionModel[] = [];
         res.data.departments.map((item: any) => {
@@ -247,8 +265,8 @@ const MemberLearnPage = () => {
       dataIndex: "created_at",
       render: (_, record: any) => (
         <>
-          {records[record.id] ? (
-            <span>{dateFormat(records[record.id].created_at)}</span>
+          {perRecords[record.id] ? (
+            <span>{dateFormat(perRecords[record.id].created_at)}</span>
           ) : (
             <span>-</span>
           )}