From 409fa080fc43fe28977da2d54e9bcd516f09265d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Fri, 21 Apr 2023 10:27:54 +0800
Subject: [PATCH 01/27] =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=90=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                        |  1 +
 src/compenents/keep-alive/index.tsx | 29 ++++++++++++++++++++++++++++
 src/compenents/left-menu/index.tsx  |  2 +-
 src/pages/dashboard/index.tsx       |  2 +-
 src/pages/department/index.tsx      |  2 +-
 src/routes/index.tsx                | 30 ++++++++++++++++-------------
 6 files changed, 50 insertions(+), 16 deletions(-)
 create mode 100644 src/compenents/keep-alive/index.tsx

diff --git a/package.json b/package.json
index c89999d..83edae1 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@reduxjs/toolkit": "^1.9.3",
+    "ahooks": "^3.7.6",
     "antd": "^5.3.2",
     "axios": "^1.3.4",
     "echarts": "^5.4.2",
diff --git a/src/compenents/keep-alive/index.tsx b/src/compenents/keep-alive/index.tsx
new file mode 100644
index 0000000..94a10f4
--- /dev/null
+++ b/src/compenents/keep-alive/index.tsx
@@ -0,0 +1,29 @@
+import { useUpdate } from "ahooks";
+import { useEffect, useRef } from "react";
+import { useLocation, useOutlet } from "react-router-dom";
+
+function KeepAlive() {
+  const componentList = useRef(new Map());
+  const outLet = useOutlet();
+  const { pathname } = useLocation();
+  const forceUpdate = useUpdate();
+
+  useEffect(() => {
+    if (!componentList.current.has(pathname)) {
+      componentList.current.set(pathname, outLet);
+    }
+    forceUpdate();
+  }, [pathname]);
+
+  return (
+    <div>
+      {Array.from(componentList.current).map(([key, component]) => (
+        <div key={key} style={{ display: pathname === key ? "block" : "none" }}>
+          {component}
+        </div>
+      ))}
+    </div>
+  );
+}
+
+export default KeepAlive;
diff --git a/src/compenents/left-menu/index.tsx b/src/compenents/left-menu/index.tsx
index c3ce869..07d4b24 100644
--- a/src/compenents/left-menu/index.tsx
+++ b/src/compenents/left-menu/index.tsx
@@ -50,7 +50,7 @@ const items = [
     "user",
     <i className="iconfont icon-icon-user" />,
     [
-      getItem("学员", "/member", null, null, null),
+      getItem("学员", "/member/index", null, null, null),
       getItem("部门", "/department", null, null, null),
     ],
     null
diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx
index 1fa89ef..efa7120 100644
--- a/src/pages/dashboard/index.tsx
+++ b/src/pages/dashboard/index.tsx
@@ -199,7 +199,7 @@ const DashboardPage = () => {
               <div
                 className={styles["link-mode"]}
                 onClick={() => {
-                  navigate("/member");
+                  navigate("/member/index");
                 }}
               >
                 <i
diff --git a/src/pages/department/index.tsx b/src/pages/department/index.tsx
index e3d669b..3c885e5 100644
--- a/src/pages/department/index.tsx
+++ b/src/pages/department/index.tsx
@@ -194,7 +194,7 @@ const DepartmentPage = () => {
                     type="link"
                     style={{ paddingLeft: 4, paddingRight: 4 }}
                     danger
-                    onClick={() => navigate("/member")}
+                    onClick={() => navigate("/member/index")}
                   >
                     （{res.data.users.length}个学员），
                   </Button>
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
index 2f1ee5d..1e0c7af 100644
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -4,6 +4,7 @@ import { login, system } from "../api";
 
 import InitPage from "../pages/init";
 import { getToken } from "../utils";
+import KeepAlive from "../compenents/keep-alive";
 
 import LoginPage from "../pages/login";
 import HomePage from "../pages/home";
@@ -94,19 +95,22 @@ const routes: RouteObject[] = [
           },
           {
             path: "/member",
-            element: <MemberPage />,
-          },
-          {
-            path: "/member/import",
-            element: <MemberImportPage />,
-          },
-          {
-            path: "/member/learn",
-            element: <MemberLearnPage />,
-          },
-          {
-            path: "/member/departmentUser",
-            element: <MemberDepartmentProgressPage />,
+            element: <KeepAlive />,
+            children: [
+              { path: "/member/index", element: <MemberPage /> },
+              {
+                path: "/member/import",
+                element: <MemberImportPage />,
+              },
+              {
+                path: "/member/learn",
+                element: <MemberLearnPage />,
+              },
+              {
+                path: "/member/departmentUser",
+                element: <MemberDepartmentProgressPage />,
+              },
+            ],
           },
           {
             path: "/system/config/index",

From 1aa209640d6408cdd7c93d3c55ba231aeaee5d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Sun, 23 Apr 2023 09:17:45 +0800
Subject: [PATCH 02/27] =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=90=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BC=93=E5=AD=98=E6=83=85=E5=86=B5=E4=B8=8B=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/member/departmentUser.tsx | 5 +++++
 src/pages/member/learn.tsx          | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pages/member/departmentUser.tsx b/src/pages/member/departmentUser.tsx
index de96f52..96f916c 100644
--- a/src/pages/member/departmentUser.tsx
+++ b/src/pages/member/departmentUser.tsx
@@ -43,6 +43,11 @@ const MemberDepartmentProgressPage = () => {
   const [did, setDid] = useState(Number(result.get("id")));
   const [title, setTitle] = useState(String(result.get("title")));
 
+  useEffect(() => {
+    setDid(Number(result.get("id")));
+    resetData();
+  }, [Number(result.get("id"))]);
+
   useEffect(() => {
     getData();
   }, [refresh, page, size]);
diff --git a/src/pages/member/learn.tsx b/src/pages/member/learn.tsx
index ec3d42a..bf6c870 100644
--- a/src/pages/member/learn.tsx
+++ b/src/pages/member/learn.tsx
@@ -38,6 +38,10 @@ const MemberLearnPage = () => {
   const [refresh2, setRefresh2] = useState(false);
   const [uid, setUid] = useState(Number(result.get("id")));
 
+  useEffect(() => {
+    setUid(Number(result.get("id")));
+  }, [Number(result.get("id"))]);
+
   useEffect(() => {
     getZxtData();
     return () => {
@@ -47,11 +51,11 @@ const MemberLearnPage = () => {
 
   useEffect(() => {
     getLearnHours();
-  }, [refresh, page, size]);
+  }, [refresh, page, size, uid]);
 
   useEffect(() => {
     getLearnCourses();
-  }, [refresh2, page2, size2]);
+  }, [refresh2, page2, size2, uid]);
 
   const getZxtData = () => {
     member.learnStats(uid).then((res: any) => {

From c7fa24021bf9dcc68b262affa9c7ea4dde859c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Sun, 23 Apr 2023 14:54:23 +0800
Subject: [PATCH 03/27] =?UTF-8?q?=E5=AD=A6=E5=91=98=E7=BA=BF=E4=B8=8A?=
 =?UTF-8?q?=E8=AF=BE=E5=AD=A6=E4=B9=A0=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.ts                               |  22 ++
 .../member/compenents/progress.module.scss    |   0
 src/pages/member/compenents/progress.tsx      | 252 ++++++++++++++++++
 src/pages/member/learn.tsx                    | 115 +++-----
 4 files changed, 307 insertions(+), 82 deletions(-)
 create mode 100644 src/pages/member/compenents/progress.module.scss
 create mode 100644 src/pages/member/compenents/progress.tsx

diff --git a/src/api/user.ts b/src/api/user.ts
index c1165e1..5c29e45 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -121,3 +121,25 @@ export function departmentProgress(
     ...params,
   });
 }
+
+export function learnCoursesProgress(
+  id: number,
+  courseId: number,
+  params: any
+) {
+  return client.get(`/backend/v1/user/${id}/learn-course/${courseId} `, params);
+}
+
+export function destroyAllUserLearned(id: number, courseId: number) {
+  return client.destroy(`/backend/v1/user/${id}/learn-course/${courseId}`);
+}
+
+export function destroyUserLearned(
+  id: number,
+  courseId: number,
+  hourId: number
+) {
+  return client.destroy(
+    `/backend/v1/user/${id}/learn-course/${courseId}/hour/${hourId}`
+  );
+}
diff --git a/src/pages/member/compenents/progress.module.scss b/src/pages/member/compenents/progress.module.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/member/compenents/progress.tsx b/src/pages/member/compenents/progress.tsx
new file mode 100644
index 0000000..6e4ffc2
--- /dev/null
+++ b/src/pages/member/compenents/progress.tsx
@@ -0,0 +1,252 @@
+import { useState, useEffect } from "react";
+import styles from "./progrss.module.less";
+import { Table, Modal, message } from "antd";
+import { PerButton, DurationText } from "../../../compenents";
+import { user as member } from "../../../api/index";
+import type { ColumnsType } from "antd/es/table";
+import { dateFormat } from "../../../utils/index";
+import { ExclamationCircleFilled } from "@ant-design/icons";
+const { confirm } = Modal;
+
+interface DataType {
+  id: React.Key;
+  title: string;
+  type: string;
+  created_at: string;
+  duration: number;
+  finished_duration: number;
+  is_finished: boolean;
+  finished_at: boolean;
+}
+
+interface PropInterface {
+  open: boolean;
+  uid: number;
+  id: number;
+  onCancel: () => void;
+}
+
+export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
+  open,
+  uid,
+  id,
+  onCancel,
+}) => {
+  const [loading, setLoading] = useState<boolean>(false);
+  const [list, setList] = useState<any>([]);
+  const [records, setRecords] = useState<any>({});
+  const [refresh, setRefresh] = useState(false);
+
+  useEffect(() => {
+    if (open) {
+      getData();
+    }
+  }, [uid, id, open, refresh]);
+
+  const getData = () => {
+    if (loading) {
+      return;
+    }
+    setLoading(true);
+    member.learnCoursesProgress(uid, id, {}).then((res: any) => {
+      setList(res.data.hours);
+      setRecords(res.data.learn_records);
+      setLoading(false);
+    });
+  };
+
+  const column: ColumnsType<DataType> = [
+    {
+      title: "课时标题",
+      dataIndex: "title",
+
+      render: (title: string) => (
+        <>
+          <span>{title}</span>
+        </>
+      ),
+    },
+    {
+      title: "总时长",
+      width: 120,
+      dataIndex: "duration",
+      render: (duration: number) => (
+        <>
+          <DurationText duration={duration}></DurationText>
+        </>
+      ),
+    },
+    {
+      title: "已学习时长",
+      width: 120,
+      dataIndex: "finished_duration",
+      render: (_, record: any) => (
+        <>
+          {records && records[record.id] ? (
+            <span>
+              <DurationText
+                duration={records[record.id].finished_duration || 0}
+              ></DurationText>
+            </span>
+          ) : (
+            <span>-</span>
+          )}
+        </>
+      ),
+    },
+    {
+      title: "是否学完",
+      width: 100,
+      dataIndex: "is_finished",
+      render: (_, record: any) => (
+        <>
+          {records &&
+          records[record.id] &&
+          records[record.id].is_finished === 1 ? (
+            <span className="c-green">已学完</span>
+          ) : (
+            <span className="c-red">未学完</span>
+          )}
+        </>
+      ),
+    },
+    {
+      title: "开始时间",
+      width: 150,
+      dataIndex: "created_at",
+      render: (_, record: any) => (
+        <>
+          {records && records[record.id] ? (
+            <span>{dateFormat(records[record.id].created_at)}</span>
+          ) : (
+            <span>-</span>
+          )}
+        </>
+      ),
+    },
+    {
+      title: "学完时间",
+      width: 150,
+      dataIndex: "finished_at",
+      render: (_, record: any) => (
+        <>
+          {records && records[record.id] ? (
+            <span>{dateFormat(records[record.id].finished_at)}</span>
+          ) : (
+            <span>-</span>
+          )}
+        </>
+      ),
+    },
+    {
+      title: "操作",
+      key: "action",
+      fixed: "right",
+      width: 70,
+      render: (_, record: any) => (
+        <>
+          {records && records[record.id] ? (
+            <PerButton
+              type="link"
+              text="删除"
+              class="b-link c-red"
+              icon={null}
+              p="user-learn-destroy"
+              onClick={() => {
+                clearSingleProgress(records[record.id].hour_id);
+              }}
+              disabled={null}
+            />
+          ) : (
+            <span>-</span>
+          )}
+        </>
+      ),
+    },
+  ];
+
+  const clearProgress = () => {
+    confirm({
+      title: "操作确认",
+      icon: <ExclamationCircleFilled />,
+      content: "确认删除此课程下所有课时的学习记录？",
+      centered: true,
+      okText: "确认",
+      cancelText: "取消",
+      onOk() {
+        member.destroyAllUserLearned(uid, id).then((res: any) => {
+          message.success("操作成功");
+          setRefresh(!refresh);
+        });
+      },
+      onCancel() {
+        console.log("Cancel");
+      },
+    });
+  };
+
+  const clearSingleProgress = (hour_id: number) => {
+    if (hour_id === 0) {
+      return;
+    }
+    confirm({
+      title: "操作确认",
+      icon: <ExclamationCircleFilled />,
+      content: "确认删除此课时的学习记录？",
+      centered: true,
+      okText: "确认",
+      cancelText: "取消",
+      onOk() {
+        member.destroyUserLearned(uid, id, hour_id).then((res: any) => {
+          message.success("操作成功");
+          setRefresh(!refresh);
+        });
+      },
+      onCancel() {
+        console.log("Cancel");
+      },
+    });
+  };
+
+  return (
+    <>
+      <Modal
+        title="课时学习进度"
+        centered
+        forceRender
+        open={open}
+        width={1000}
+        onOk={() => onCancel()}
+        onCancel={() => onCancel()}
+        maskClosable={false}
+        footer={null}
+      >
+        <div className="d-flex mt-24">
+          <PerButton
+            type="primary"
+            text="清空"
+            class="c-white"
+            icon={null}
+            p="user-learn-destroy"
+            onClick={() => {
+              clearProgress();
+            }}
+            disabled={null}
+          />
+        </div>
+        <div
+          className="d-flex mt-24"
+          style={{ maxHeight: 800, overflowY: "auto" }}
+        >
+          <Table
+            columns={column}
+            dataSource={list}
+            loading={loading}
+            rowKey={(record) => record.id}
+            pagination={false}
+          />
+        </div>
+      </Modal>
+    </>
+  );
+};
diff --git a/src/pages/member/learn.tsx b/src/pages/member/learn.tsx
index bf6c870..1587407 100644
--- a/src/pages/member/learn.tsx
+++ b/src/pages/member/learn.tsx
@@ -1,13 +1,13 @@
 import { useState, useEffect, useRef } from "react";
 import styles from "./learn.module.less";
-import { Row, Image, Table } from "antd";
-import { useLocation } from "react-router-dom";
+import { Row, Image, Table, Button } from "antd";
+import { useLocation, useNavigate } from "react-router-dom";
 import { BackBartment, DurationText } from "../../compenents";
 import { dateFormat } from "../../utils/index";
 import { user as member } from "../../api/index";
 import * as echarts from "echarts";
 import type { ColumnsType } from "antd/es/table";
-import { duration } from "moment";
+import { MemberLearnProgressDialog } from "./compenents/progress";
 
 interface DataType {
   id: React.Key;
@@ -21,6 +21,7 @@ interface DataType {
 
 const MemberLearnPage = () => {
   let chartRef = useRef(null);
+  const navigate = useNavigate();
   const result = new URLSearchParams(useLocation().search);
   const [loading, setLoading] = useState<boolean>(false);
   const [page, setPage] = useState(1);
@@ -37,6 +38,8 @@ const MemberLearnPage = () => {
   const [total2, setTotal2] = useState(0);
   const [refresh2, setRefresh2] = useState(false);
   const [uid, setUid] = useState(Number(result.get("id")));
+  const [visiable, setVisiable] = useState(false);
+  const [courseId, setcourseId] = useState<number>(0);
 
   useEffect(() => {
     setUid(Number(result.get("id")));
@@ -169,20 +172,6 @@ const MemberLearnPage = () => {
       });
   };
 
-  const paginationProps = {
-    current: page, //当前页码
-    pageSize: size,
-    total: total, // 总条数
-    onChange: (page: number, pageSize: number) =>
-      handlePageChange(page, pageSize), //改变页码的函数
-    showSizeChanger: true,
-  };
-
-  const handlePageChange = (page: number, pageSize: number) => {
-    setPage(page);
-    setSize(pageSize);
-  };
-
   const paginationProps2 = {
     current: page2, //当前页码
     pageSize: size2,
@@ -197,59 +186,6 @@ const MemberLearnPage = () => {
     setSize2(pageSize);
   };
 
-  const columns: ColumnsType<DataType> = [
-    {
-      title: "课时标题",
-      dataIndex: "title",
-      render: (_, record: any) => (
-        <>
-          <span>{hours[record.hour_id].title}</span>
-        </>
-      ),
-    },
-    {
-      title: "课时类型",
-      dataIndex: "type",
-      render: (_, record: any) => (
-        <>
-          <span>{hours[record.hour_id].type}</span>
-        </>
-      ),
-    },
-    {
-      title: "总时长",
-      dataIndex: "total_duration",
-      render: (_, record: any) => (
-        <>
-          <DurationText duration={record.total_duration}></DurationText>
-        </>
-      ),
-    },
-    {
-      title: "已学习时长",
-      dataIndex: "finished_duration",
-      render: (_, record: any) => (
-        <>
-          <DurationText duration={record.finished_duration || 0}></DurationText>
-        </>
-      ),
-    },
-    {
-      title: "状态",
-      dataIndex: "is_finished",
-      render: (_, record: any) => (
-        <>
-          {record.is_finished === 1 ? <span>已学完</span> : <span>未学完</span>}
-        </>
-      ),
-    },
-    {
-      title: "时间",
-      dataIndex: "created_at",
-      render: (text: string) => <span>{dateFormat(text)}</span>,
-    },
-  ];
-
   const column2: ColumnsType<DataType> = [
     {
       title: "课程名称",
@@ -306,11 +242,38 @@ const MemberLearnPage = () => {
         </>
       ),
     },
+    {
+      title: "操作",
+      key: "action",
+      fixed: "right",
+      width: 100,
+      render: (_, record: any) => (
+        <Button
+          type="link"
+          className="b-link c-red"
+          onClick={() => {
+            setcourseId(record.course_id);
+            setVisiable(true);
+          }}
+        >
+          详细
+        </Button>
+      ),
+    },
   ];
 
   return (
     <>
       <Row className="playedu-main-top mb-24">
+        <MemberLearnProgressDialog
+          open={visiable}
+          uid={uid}
+          id={courseId}
+          onCancel={() => {
+            setVisiable(false);
+            setRefresh2(!refresh2);
+          }}
+        ></MemberLearnProgressDialog>
         <div className="float-left mb-24">
           <BackBartment title="学员学习" />
         </div>
@@ -334,18 +297,6 @@ const MemberLearnPage = () => {
           />
         </div>
       </Row>
-      {/* <div className="playedu-main-top mb-24">
-        <div className={styles["large-title"]}>课时学习记录</div>
-        <div className="float-left mt-24">
-          <Table
-            columns={columns}
-            dataSource={list}
-            loading={loading}
-            pagination={paginationProps}
-            rowKey={(record) => record.id}
-          />
-        </div>
-      </div> */}
     </>
   );
 };

From 27ec0e6c4adedf4a49c0fe74f5823e11574dc579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Sun, 23 Apr 2023 15:43:21 +0800
Subject: [PATCH 04/27] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=BF=9B=E5=BA=A6=E5=88=97=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/member/departmentUser.tsx | 100 ++++++++++++++++++++++++----
 1 file changed, 88 insertions(+), 12 deletions(-)

diff --git a/src/pages/member/departmentUser.tsx b/src/pages/member/departmentUser.tsx
index 96f916c..2db7ba7 100644
--- a/src/pages/member/departmentUser.tsx
+++ b/src/pages/member/departmentUser.tsx
@@ -9,12 +9,14 @@ import {
   Space,
   message,
   Table,
+  Select,
 } from "antd";
 import { useNavigate, useLocation } from "react-router-dom";
 import { BackBartment, DurationText } from "../../compenents";
 import { dateFormat } from "../../utils/index";
 import { user as member } from "../../api/index";
 const { Column, ColumnGroup } = Table;
+import * as XLSX from "xlsx";
 
 interface DataType {
   id: React.Key;
@@ -40,8 +42,14 @@ const MemberDepartmentProgressPage = () => {
   const [name, setName] = useState<string>("");
   const [email, setEmail] = useState<string>("");
   const [id_card, setIdCard] = useState<string>("");
+  const [showMode, setShowMode] = useState<string>("all");
   const [did, setDid] = useState(Number(result.get("id")));
   const [title, setTitle] = useState(String(result.get("title")));
+  const [exportLoading, setExportLoading] = useState(false);
+  const modes = [
+    { label: "全部", value: "all" },
+    { label: "不显示公开课", value: "only_dep" },
+  ];
 
   useEffect(() => {
     setDid(Number(result.get("id")));
@@ -64,6 +72,7 @@ const MemberDepartmentProgressPage = () => {
         name: name,
         email: email,
         id_card: id_card,
+        show_mode: showMode,
       })
       .then((res: any) => {
         setList(res.data.data);
@@ -86,6 +95,7 @@ const MemberDepartmentProgressPage = () => {
     setName("");
     setEmail("");
     setIdCard("");
+    setShowMode("all");
     setPage(1);
     setSize(10);
     setList([]);
@@ -130,14 +140,80 @@ const MemberDepartmentProgressPage = () => {
     }
   };
 
+  const exportExcel = () => {
+    if (exportLoading) {
+      return;
+    }
+    setExportLoading(true);
+    let filter = {
+      sort_field: "",
+      sort_algo: "",
+      name: name,
+      email: email,
+      id_card: id_card,
+      show_mode: showMode,
+    };
+    member.departmentProgress(did, page, total, filter).then((res: any) => {
+      if (res.data.total === 0) {
+        message.error("数据为空");
+        setExportLoading(false);
+        return;
+      }
+      let filename = title + "学习进度.xlsx";
+      let sheetName = "sheet1";
+      let data = [];
+      let arr = ["学员"];
+      courses.map((item: any) => {
+        arr.push(item.title);
+      });
+      arr.push("总计课时");
+      data.push(arr);
+
+      res.data.data.forEach((item: any) => {
+        let arr = [item.name];
+        courses.map((it: any) => {
+          if (records && records[item.id] && records[item.id][it.id]) {
+            if (records && records[item.id][it.id].is_finished === 1) {
+              arr.push("已完成");
+            } else {
+              arr.push(
+                records &&
+                  records[item.id][it.id].finished_count + " / " + it.class_hour
+              );
+            }
+          } else {
+            arr.push(0 + " / " + it.class_hour);
+          }
+        });
+        arr.push(getFinishedHours(records[item.id]) + " / " + totalHour);
+        data.push(arr);
+      });
+
+      const jsonWorkSheet = XLSX.utils.json_to_sheet(data);
+      const workBook: XLSX.WorkBook = {
+        SheetNames: [sheetName],
+        Sheets: {
+          [sheetName]: jsonWorkSheet,
+        },
+      };
+      XLSX.writeFile(workBook, filename);
+      setExportLoading(false);
+    });
+  };
+
   return (
     <div className="playedu-main-body">
       <div className="float-left mb-24">
         <BackBartment title={title + "学习进度"} />
       </div>
       <div className="float-left j-b-flex mb-24">
-        <div className="d-flex helper-text ">
-          （以下表格内数字对应的是表头课程的“已学完课时数/总课时数”）
+        <div className="d-flex">
+          <Button type="default" onClick={() => exportExcel()}>
+            批量导出表格
+          </Button>
+          <div className="helper-text ml-24">
+            （以下表格内数字对应的是表头课程的“已学完课时数/总课时数”）
+          </div>
         </div>
         <div className="d-flex">
           <div className="d-flex mr-24 ">
@@ -162,17 +238,17 @@ const MemberDepartmentProgressPage = () => {
               placeholder="请输入邮箱"
             />
           </div>
-          {/* <div className="d-flex mr-24">
-            <Typography.Text>身份证号：</Typography.Text>
-            <Input
-              value={id_card}
-              onChange={(e) => {
-                setIdCard(e.target.value);
-              }}
+          <div className="d-flex mr-24">
+            <Typography.Text>模式：</Typography.Text>
+            <Select
               style={{ width: 160 }}
-              placeholder="请输入身份证号"
+              allowClear
+              placeholder="请选择"
+              value={showMode}
+              onChange={(value: string) => setShowMode(value)}
+              options={modes}
             />
-          </div> */}
+          </div>
           <div className="d-flex">
             <Button className="mr-16" onClick={resetData}>
               重 置
@@ -248,7 +324,7 @@ const MemberDepartmentProgressPage = () => {
           ))}
           <Column
             fixed="right"
-            title="所有课程总课时"
+            title="总计课时"
             dataIndex="id"
             key="id"
             width={100}

From b34cd955c4c2042c04715cdc3dba24e623660b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 24 Apr 2023 09:19:58 +0800
Subject: [PATCH 05/27] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=AF=BE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=87=E6=8D=A2tab=E9=87=8D=E7=BD=AE=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E3=80=81=E9=83=A8=E9=97=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/compenents/tree-category/index.tsx       | 6 ++++++
 src/compenents/tree-department/index.tsx     | 1 +
 src/compenents/upload-image-button/index.tsx | 1 +
 src/compenents/upload-video-sub/index.tsx    | 1 +
 src/pages/course/index.tsx                   | 9 +++++++++
 src/pages/resource/images/index.tsx          | 1 +
 src/pages/resource/videos/index.tsx          | 1 +
 7 files changed, 20 insertions(+)

diff --git a/src/compenents/tree-category/index.tsx b/src/compenents/tree-category/index.tsx
index 7e4cb67..4789496 100644
--- a/src/compenents/tree-category/index.tsx
+++ b/src/compenents/tree-category/index.tsx
@@ -5,12 +5,14 @@ import { resourceCategory } from "../../api/index";
 interface Option {
   key: string | number;
   title: any;
+
   children?: Option[];
 }
 
 interface PropInterface {
   type: string;
   text: string;
+  refresh: boolean;
   onUpdate: (keys: any, title: any) => void;
 }
 
@@ -36,6 +38,10 @@ export const TreeCategory = (props: PropInterface) => {
     });
   }, []);
 
+  useEffect(() => {
+    setSelectKey([]);
+  }, [props.refresh]);
+
   const checkArr = (categories: any[], id: number) => {
     const arr = [];
     for (let i = 0; i < categories[id].length; i++) {
diff --git a/src/compenents/tree-department/index.tsx b/src/compenents/tree-department/index.tsx
index 3da48c5..6b38bca 100644
--- a/src/compenents/tree-department/index.tsx
+++ b/src/compenents/tree-department/index.tsx
@@ -24,6 +24,7 @@ export const TreeDepartment = (props: PropInterface) => {
 
   useEffect(() => {
     setLoading(true);
+    setSelectKey([])
     department.departmentList().then((res: any) => {
       const departments = res.data.departments;
       const departCount = res.data.dep_user_count;
diff --git a/src/compenents/upload-image-button/index.tsx b/src/compenents/upload-image-button/index.tsx
index 8c6cdb8..a6a8521 100644
--- a/src/compenents/upload-image-button/index.tsx
+++ b/src/compenents/upload-image-button/index.tsx
@@ -101,6 +101,7 @@ export const UploadImageButton = (props: PropsInterface) => {
           <Row style={{ width: 752, minHeight: 520, marginTop: 24 }}>
             <Col span={7}>
               <TreeCategory
+                refresh={false}
                 type="no-cate"
                 text={"图片"}
                 onUpdate={(keys: any) => setCategoryIds(keys)}
diff --git a/src/compenents/upload-video-sub/index.tsx b/src/compenents/upload-video-sub/index.tsx
index d7819fb..525564d 100644
--- a/src/compenents/upload-video-sub/index.tsx
+++ b/src/compenents/upload-video-sub/index.tsx
@@ -173,6 +173,7 @@ export const UploadVideoSub = (props: PropsInterface) => {
       <Row style={{ width: 752, minHeight: 520 }}>
         <Col span={7}>
           <TreeCategory
+            refresh={false}
             type="no-cate"
             text={props.label}
             onUpdate={(keys: any) => setCategoryIds(keys)}
diff --git a/src/pages/course/index.tsx b/src/pages/course/index.tsx
index ad94cbb..527e80b 100644
--- a/src/pages/course/index.tsx
+++ b/src/pages/course/index.tsx
@@ -69,6 +69,7 @@ const CoursePage = () => {
       children: (
         <div className="float-left">
           <TreeCategory
+            refresh={refresh}
             type=""
             text={"分类"}
             onUpdate={(keys: any, title: any) => {
@@ -331,6 +332,14 @@ const CoursePage = () => {
   };
 
   const onChange = (key: string) => {
+    setCategoryIds([]);
+    setDepIds([]);
+    if (Number(key) === 1) {
+      setLabel("全部分类");
+    } else {
+      setLabel("全部部门");
+    }
+    setRefresh(!refresh);
     setTabKey(Number(key));
   };
 
diff --git a/src/pages/resource/images/index.tsx b/src/pages/resource/images/index.tsx
index 4ca1430..f2f4f5f 100644
--- a/src/pages/resource/images/index.tsx
+++ b/src/pages/resource/images/index.tsx
@@ -150,6 +150,7 @@ const ResourceImagesPage = () => {
       <div className="tree-main-body">
         <div className="left-box">
           <TreeCategory
+           refresh={false}
             type="no-cate"
             text={"图片"}
             onUpdate={(keys: any, title: any) => {
diff --git a/src/pages/resource/videos/index.tsx b/src/pages/resource/videos/index.tsx
index 6d5a363..e1fe13b 100644
--- a/src/pages/resource/videos/index.tsx
+++ b/src/pages/resource/videos/index.tsx
@@ -170,6 +170,7 @@ const ResourceVideosPage = () => {
       <div className="tree-main-body">
         <div className="left-box">
           <TreeCategory
+            refresh={false}
             type="no-cate"
             text={"视频"}
             onUpdate={(keys: any, title: any) => {

From 1b7f11489bc86968061303d70f46c7b89638704a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 24 Apr 2023 09:54:26 +0800
Subject: [PATCH 06/27] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=80=89=E4=B8=AD=E5=90=8E=E5=86=8D=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../upload-image-button/index.module.less     | 17 ++++++++++
 src/compenents/upload-image-button/index.tsx  | 33 ++++++++++++++++---
 src/index.less                                |  2 ++
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/src/compenents/upload-image-button/index.module.less b/src/compenents/upload-image-button/index.module.less
index 8874736..4084585 100644
--- a/src/compenents/upload-image-button/index.module.less
+++ b/src/compenents/upload-image-button/index.module.less
@@ -18,3 +18,20 @@
   line-height: 30px;
   display: flex;
 }
+
+.checked {
+  width: 16px;
+  height: 16px;
+  background: #ff4d4f;
+  border-radius: 3px;
+  border: 2px solid #ff4d4f;
+  position: absolute;
+  left: 5px;
+  top: 5px;
+  z-index: 100;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #ffffff;
+  cursor: pointer;
+}
diff --git a/src/compenents/upload-image-button/index.tsx b/src/compenents/upload-image-button/index.tsx
index a6a8521..3fb13c9 100644
--- a/src/compenents/upload-image-button/index.tsx
+++ b/src/compenents/upload-image-button/index.tsx
@@ -12,7 +12,7 @@ import {
 import { resource, resourceCategory } from "../../api";
 import styles from "./index.module.less";
 import { CreateResourceCategory } from "../create-rs-category";
-import { CloseOutlined } from "@ant-design/icons";
+import { CloseOutlined, CheckOutlined } from "@ant-design/icons";
 import { UploadImageSub } from "./upload-image-sub";
 import { TreeCategory } from "../../compenents";
 
@@ -49,6 +49,7 @@ export const UploadImageButton = (props: PropsInterface) => {
   const [page, setPage] = useState(1);
   const [size, setSize] = useState(15);
   const [total, setTotal] = useState(0);
+  const [selected, setSelected] = useState<string>("");
 
   // 获取图片列表
   const getImageList = () => {
@@ -97,6 +98,14 @@ export const UploadImageButton = (props: PropsInterface) => {
           open={true}
           width={820}
           maskClosable={false}
+          onOk={() => {
+            if (!selected) {
+              message.error("请选择图片后确定");
+              return;
+            }
+            props.onSelected(selected);
+            setShowModal(false);
+          }}
         >
           <Row style={{ width: 752, minHeight: 520, marginTop: 24 }}>
             <Col span={7}>
@@ -104,7 +113,10 @@ export const UploadImageButton = (props: PropsInterface) => {
                 refresh={false}
                 type="no-cate"
                 text={"图片"}
-                onUpdate={(keys: any) => setCategoryIds(keys)}
+                onUpdate={(keys: any) => {
+                  setSelected("");
+                  setCategoryIds(keys);
+                }}
               />
             </Col>
             <Col span={17}>
@@ -130,10 +142,21 @@ export const UploadImageButton = (props: PropsInterface) => {
                     className="image-item"
                     style={{ backgroundImage: `url(${item.url})` }}
                     onClick={() => {
-                      props.onSelected(item.url);
-                      setShowModal(false);
+                      setSelected(item.url);
                     }}
-                  ></div>
+                  >
+                    {selected.indexOf(item.url) !== -1 && (
+                      <i
+                        className={styles.checked}
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          setSelected("");
+                        }}
+                      >
+                        <CheckOutlined />
+                      </i>
+                    )}
+                  </div>
                 ))}
               </div>
               {imageList.length > 0 && (
diff --git a/src/index.less b/src/index.less
index 019888e..5b5c90e 100644
--- a/src/index.less
+++ b/src/index.less
@@ -614,6 +614,8 @@ textarea.ant-input {
     background-size: contain;
     background-position: center center;
     background-color: #f6f6f6;
+    position: relative;
+    cursor: pointer;
   }
 }
 

From 516c718c78557cb215a20edba3e15996baa39bad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 24 Apr 2023 10:45:09 +0800
Subject: [PATCH 07/27] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=80=89=E4=B8=AD=E5=90=8E=E5=86=8D=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.ts            |   4 +
 src/pages/member/index.tsx |   2 +-
 src/pages/member/learn.tsx | 182 +++++++++++++++++++++----------------
 3 files changed, 108 insertions(+), 80 deletions(-)

diff --git a/src/api/user.ts b/src/api/user.ts
index 5c29e45..66d4fcd 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -109,6 +109,10 @@ export function learnCourses(
   });
 }
 
+export function learnAllCourses(id: number) {
+  return client.get(`/backend/v1/user/${id}/all-courses`, {});
+}
+
 export function departmentProgress(
   id: number,
   page: number,
diff --git a/src/pages/member/index.tsx b/src/pages/member/index.tsx
index e08267c..331cf28 100644
--- a/src/pages/member/index.tsx
+++ b/src/pages/member/index.tsx
@@ -142,7 +142,7 @@ const MemberPage = () => {
           <Space size="small">
             <Link
               style={{ textDecoration: "none" }}
-              to={`/member/learn?id=${record.id}`}
+              to={`/member/learn?id=${record.id}&name=${record.name}`}
             >
               <PerButton
                 type="link"
diff --git a/src/pages/member/learn.tsx b/src/pages/member/learn.tsx
index 1587407..7b4b8dd 100644
--- a/src/pages/member/learn.tsx
+++ b/src/pages/member/learn.tsx
@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef } from "react";
 import styles from "./learn.module.less";
-import { Row, Image, Table, Button } from "antd";
+import { Row, Image, Table, Button, Select } from "antd";
 import { useLocation, useNavigate } from "react-router-dom";
 import { BackBartment, DurationText } from "../../compenents";
 import { dateFormat } from "../../utils/index";
@@ -23,27 +23,27 @@ const MemberLearnPage = () => {
   let chartRef = useRef(null);
   const navigate = useNavigate();
   const result = new URLSearchParams(useLocation().search);
-  const [loading, setLoading] = useState<boolean>(false);
-  const [page, setPage] = useState(1);
-  const [size, setSize] = useState(10);
-  const [list, setList] = useState<any>([]);
-  const [hours, setHours] = useState<any>({});
-  const [total, setTotal] = useState(0);
-  const [refresh, setRefresh] = useState(false);
   const [loading2, setLoading2] = useState<boolean>(false);
-  const [page2, setPage2] = useState(1);
-  const [size2, setSize2] = useState(10);
   const [list2, setList2] = useState<any>([]);
   const [courses, setCourses] = useState<any>({});
+  const [deps, setDeps] = useState<any>([]);
+  const [depValue, setDepValue] = useState<number>(0);
+  const [currentCourses, setCurrentCourses] = useState<any>([]);
+  const [openCourses, setOpenCourses] = useState<any>([]);
+  const [records, setRecords] = useState<any>({});
   const [total2, setTotal2] = useState(0);
   const [refresh2, setRefresh2] = useState(false);
   const [uid, setUid] = useState(Number(result.get("id")));
+  const [userName, setUserName] = useState<string>(String(result.get("name")));
   const [visiable, setVisiable] = useState(false);
   const [courseId, setcourseId] = useState<number>(0);
 
   useEffect(() => {
     setUid(Number(result.get("id")));
-  }, [Number(result.get("id"))]);
+    setUserName(String(result.get("name")));
+    setLoading2(false);
+    setRefresh2(!refresh2);
+  }, [result.get("id"), result.get("name")]);
 
   useEffect(() => {
     getZxtData();
@@ -53,12 +53,22 @@ const MemberLearnPage = () => {
   }, [uid]);
 
   useEffect(() => {
-    getLearnHours();
-  }, [refresh, page, size, uid]);
+    getLearnCourses();
+  }, [refresh2, uid]);
 
   useEffect(() => {
-    getLearnCourses();
-  }, [refresh2, page2, size2, uid]);
+    if (depValue === 0) {
+      return;
+    }
+    let arr = courses[depValue];
+    let arr2 = openCourses;
+    if (arr.length > 0) {
+      var data = arr.concat(arr2);
+      setCurrentCourses(data);
+    } else {
+      setCurrentCourses(arr);
+    }
+  }, [depValue]);
 
   const getZxtData = () => {
     member.learnStats(uid).then((res: any) => {
@@ -134,56 +144,27 @@ const MemberLearnPage = () => {
     };
   };
 
-  const getLearnHours = () => {
-    if (loading) {
-      return;
-    }
-    setLoading(true);
-    member
-      .learnHours(uid, page, size, {
-        sort_field: "",
-        sort_algo: "",
-        is_finished: "",
-      })
-      .then((res: any) => {
-        setList(res.data.data);
-        setHours(res.data.hours);
-        setTotal(res.data.total);
-        setLoading(false);
-      });
-  };
-
   const getLearnCourses = () => {
     if (loading2) {
       return;
     }
     setLoading2(true);
-    member
-      .learnCourses(uid, page2, size2, {
-        sort_field: "",
-        sort_algo: "",
-        is_finished: "",
-      })
-      .then((res: any) => {
-        setList2(res.data.data);
-        setCourses(res.data.courses);
-        setTotal2(res.data.total);
-        setLoading2(false);
+    member.learnAllCourses(uid).then((res: any) => {
+      setList2(res.data.departments);
+      setCourses(res.data.dep_courses);
+      setOpenCourses(res.data.open_courses);
+      setRecords(res.data.user_course_records);
+      let box: any = [];
+      res.data.departments.map((item: any) => {
+        box.push({
+          label: item.name,
+          value: String(item.id),
+        });
       });
-  };
-
-  const paginationProps2 = {
-    current: page2, //当前页码
-    pageSize: size2,
-    total: total2, // 总条数
-    onChange: (page: number, pageSize: number) =>
-      handlePageChange2(page, pageSize), //改变页码的函数
-    showSizeChanger: true,
-  };
-
-  const handlePageChange2 = (page: number, pageSize: number) => {
-    setPage2(page);
-    setSize2(pageSize);
+      setDepValue(Number(box[0].value));
+      setDeps(box);
+      setLoading2(false);
+    });
   };
 
   const column2: ColumnsType<DataType> = [
@@ -193,13 +174,13 @@ const MemberLearnPage = () => {
       render: (_, record: any) => (
         <div className="d-flex">
           <Image
-            src={courses[record.course_id].thumb}
+            src={record.thumb}
             preview={false}
             width={80}
             height={60}
             style={{ borderRadius: 6 }}
           />
-          <span className="ml-8">{courses[record.course_id].title}</span>
+          <span className="ml-8">{record.title}</span>
         </div>
       ),
     },
@@ -209,7 +190,9 @@ const MemberLearnPage = () => {
       render: (_, record: any) => (
         <>
           <span>
-            已完成课时：{record.finished_count} / {record.hour_count}
+            已完成课时：
+            {(records[record.id] && records[record.id].finished_count) ||
+              0} / {record.class_hour}
           </span>
         </>
       ),
@@ -217,28 +200,56 @@ const MemberLearnPage = () => {
     {
       title: "第一次学习时间",
       dataIndex: "created_at",
-      render: (text: string) => <span>{dateFormat(text)}</span>,
+      render: (_, record: any) => (
+        <>
+          {records[record.id] ? (
+            <span>{dateFormat(records[record.id].created_at)}</span>
+          ) : (
+            <span>-</span>
+          )}
+        </>
+      ),
     },
     {
       title: "学习完成时间",
       dataIndex: "finished_at",
-      render: (text: string) => <span>{dateFormat(text)}</span>,
+      render: (_, record: any) => (
+        <>
+          {records[record.id] ? (
+            <span>{dateFormat(records[record.id].finished_at)}</span>
+          ) : (
+            <span>-</span>
+          )}
+        </>
+      ),
     },
     {
       title: "学习进度",
       dataIndex: "is_finished",
       render: (_, record: any) => (
         <>
-          <span
-            className={
-              Math.floor((record.finished_count / record.hour_count) * 100) >=
-              100
-                ? "c-green"
-                : "c-red"
-            }
-          >
-            {Math.floor((record.finished_count / record.hour_count) * 100)}%
-          </span>
+          {records[record.id] ? (
+            <span
+              className={
+                Math.floor(
+                  (records[record.id].finished_count /
+                    records[record.id].hour_count) *
+                    100
+                ) >= 100
+                  ? "c-green"
+                  : "c-red"
+              }
+            >
+              {Math.floor(
+                (records[record.id].finished_count /
+                  records[record.id].hour_count) *
+                  100
+              )}
+              %
+            </span>
+          ) : (
+            <span className="c-red">0%</span>
+          )}
         </>
       ),
     },
@@ -252,11 +263,11 @@ const MemberLearnPage = () => {
           type="link"
           className="b-link c-red"
           onClick={() => {
-            setcourseId(record.course_id);
+            setcourseId(record.id);
             setVisiable(true);
           }}
         >
-          详细
+          明细
         </Button>
       ),
     },
@@ -275,7 +286,7 @@ const MemberLearnPage = () => {
           }}
         ></MemberLearnProgressDialog>
         <div className="float-left mb-24">
-          <BackBartment title="学员学习" />
+          <BackBartment title={userName + "的学习明细"} />
         </div>
         <div className={styles["charts"]}>
           <div
@@ -288,11 +299,24 @@ const MemberLearnPage = () => {
           ></div>
         </div>
         <div className="float-left mt-24">
+          {list2.length > 1 && (
+            <div className="d-flex mb-24">
+              <span>切换部门：</span>
+              <Select
+                style={{ width: 160 }}
+                allowClear
+                placeholder="请选择部门"
+                value={String(depValue)}
+                onChange={(value: string) => setDepValue(Number(value))}
+                options={deps}
+              />
+            </div>
+          )}
           <Table
             columns={column2}
-            dataSource={list2}
+            dataSource={currentCourses}
             loading={loading2}
-            pagination={paginationProps2}
+            pagination={false}
             rowKey={(record) => record.id}
           />
         </div>

From ea934eae072cefbd2750e84fb9de76c46cd25cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 24 Apr 2023 10:45:37 +0800
Subject: [PATCH 08/27] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=AD=A6=E9=99=A2?=
 =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/member/learn.tsx | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/pages/member/learn.tsx b/src/pages/member/learn.tsx
index 7b4b8dd..ce75818 100644
--- a/src/pages/member/learn.tsx
+++ b/src/pages/member/learn.tsx
@@ -60,9 +60,9 @@ const MemberLearnPage = () => {
     if (depValue === 0) {
       return;
     }
-    let arr = courses[depValue];
-    let arr2 = openCourses;
-    if (arr.length > 0) {
+    let arr = [...courses[depValue]];
+    let arr2 = [...openCourses];
+    if (arr2.length > 0) {
       var data = arr.concat(arr2);
       setCurrentCourses(data);
     } else {
@@ -154,15 +154,20 @@ const MemberLearnPage = () => {
       setCourses(res.data.dep_courses);
       setOpenCourses(res.data.open_courses);
       setRecords(res.data.user_course_records);
-      let box: any = [];
-      res.data.departments.map((item: any) => {
-        box.push({
-          label: item.name,
-          value: String(item.id),
+      if (res.data.departments.length > 0) {
+        let box: any = [];
+        res.data.departments.map((item: any) => {
+          box.push({
+            label: item.name,
+            value: String(item.id),
+          });
         });
-      });
-      setDepValue(Number(box[0].value));
-      setDeps(box);
+        setDepValue(Number(box[0].value));
+        setDeps(box);
+      } else {
+        setDepValue(0);
+        setDeps([]);
+      }
       setLoading2(false);
     });
   };

From 0dfbaaf5a650abdcacb55208ce085c8606c08f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 24 Apr 2023 10:49:25 +0800
Subject: [PATCH 09/27] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2tab=E5=88=B7=E6=96=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/system/config/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/system/config/index.tsx b/src/pages/system/config/index.tsx
index 715fc05..a5f0112 100644
--- a/src/pages/system/config/index.tsx
+++ b/src/pages/system/config/index.tsx
@@ -31,7 +31,7 @@ const SystemConfigPage = () => {
 
   useEffect(() => {
     getDetail();
-  }, []);
+  }, [tabKey]);
 
   const getDetail = () => {
     appConfig.appConfig().then((res: any) => {

From b897dfffacee52e6410ed35d54304f6aca01db2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 24 Apr 2023 10:51:45 +0800
Subject: [PATCH 10/27] =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/template/学员批量导入模板.xlsx | Bin 9791 -> 9700 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/template/学员批量导入模板.xlsx b/public/template/学员批量导入模板.xlsx
index 99483adb197ba00ab2f68de0f93fbae5b47b103b..c64a6a5284f65d02fd578e435d790e21bc7392ff 100644
GIT binary patch
literal 9700
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
a_piDJ1!>5i&Wik8F9iK8*GK%K_x}L*hq|c%

literal 9791
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
I_4C*N0j#hfdH?_b


From 18f6056dc93f1d864630abdc1c55c78cf0198d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 24 Apr 2023 11:11:18 +0800
Subject: [PATCH 11/27] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=AF=BEtab=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/compenents/tree-category/index.tsx       |  5 ----
 src/compenents/tree-department/index.tsx     |  1 -
 src/compenents/upload-image-button/index.tsx |  1 -
 src/compenents/upload-video-sub/index.tsx    |  1 -
 src/pages/course/index.tsx                   | 27 +++++++++-----------
 src/pages/resource/images/index.tsx          |  1 -
 src/pages/resource/videos/index.tsx          |  1 -
 7 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/compenents/tree-category/index.tsx b/src/compenents/tree-category/index.tsx
index 4789496..aedc7ea 100644
--- a/src/compenents/tree-category/index.tsx
+++ b/src/compenents/tree-category/index.tsx
@@ -12,7 +12,6 @@ interface Option {
 interface PropInterface {
   type: string;
   text: string;
-  refresh: boolean;
   onUpdate: (keys: any, title: any) => void;
 }
 
@@ -38,10 +37,6 @@ export const TreeCategory = (props: PropInterface) => {
     });
   }, []);
 
-  useEffect(() => {
-    setSelectKey([]);
-  }, [props.refresh]);
-
   const checkArr = (categories: any[], id: number) => {
     const arr = [];
     for (let i = 0; i < categories[id].length; i++) {
diff --git a/src/compenents/tree-department/index.tsx b/src/compenents/tree-department/index.tsx
index 6b38bca..3da48c5 100644
--- a/src/compenents/tree-department/index.tsx
+++ b/src/compenents/tree-department/index.tsx
@@ -24,7 +24,6 @@ export const TreeDepartment = (props: PropInterface) => {
 
   useEffect(() => {
     setLoading(true);
-    setSelectKey([])
     department.departmentList().then((res: any) => {
       const departments = res.data.departments;
       const departCount = res.data.dep_user_count;
diff --git a/src/compenents/upload-image-button/index.tsx b/src/compenents/upload-image-button/index.tsx
index 3fb13c9..89fc6bb 100644
--- a/src/compenents/upload-image-button/index.tsx
+++ b/src/compenents/upload-image-button/index.tsx
@@ -110,7 +110,6 @@ export const UploadImageButton = (props: PropsInterface) => {
           <Row style={{ width: 752, minHeight: 520, marginTop: 24 }}>
             <Col span={7}>
               <TreeCategory
-                refresh={false}
                 type="no-cate"
                 text={"图片"}
                 onUpdate={(keys: any) => {
diff --git a/src/compenents/upload-video-sub/index.tsx b/src/compenents/upload-video-sub/index.tsx
index 525564d..d7819fb 100644
--- a/src/compenents/upload-video-sub/index.tsx
+++ b/src/compenents/upload-video-sub/index.tsx
@@ -173,7 +173,6 @@ export const UploadVideoSub = (props: PropsInterface) => {
       <Row style={{ width: 752, minHeight: 520 }}>
         <Col span={7}>
           <TreeCategory
-            refresh={false}
             type="no-cate"
             text={props.label}
             onUpdate={(keys: any) => setCategoryIds(keys)}
diff --git a/src/pages/course/index.tsx b/src/pages/course/index.tsx
index 527e80b..14cb94b 100644
--- a/src/pages/course/index.tsx
+++ b/src/pages/course/index.tsx
@@ -51,6 +51,7 @@ const CoursePage = () => {
   const [title, setTitle] = useState<string>("");
   const [dep_ids, setDepIds] = useState<any>([]);
   const [selLabel, setLabel] = useState<string>("全部分类");
+  const [selDepLabel, setDepLabel] = useState<string>("全部部门");
   const [course_category_ids, setCourseCategoryIds] = useState<any>({});
   const [course_dep_ids, setCourseDepIds] = useState<any>({});
   const [categories, setCategories] = useState<any>({});
@@ -69,7 +70,6 @@ const CoursePage = () => {
       children: (
         <div className="float-left">
           <TreeCategory
-            refresh={refresh}
             type=""
             text={"分类"}
             onUpdate={(keys: any, title: any) => {
@@ -96,7 +96,7 @@ const CoursePage = () => {
             text={"部门"}
             onUpdate={(keys: any, title: any) => {
               setDepIds(keys);
-              setLabel(title);
+              setDepLabel(title);
             }}
           />
         </div>
@@ -283,11 +283,16 @@ const CoursePage = () => {
     });
   };
 
-  // 获取视频列表
+  // 获取列表
   const getList = () => {
     setLoading(true);
-    let categoryIds = category_ids.join(",");
-    let depIds = dep_ids.join(",");
+    let categoryIds = "";
+    let depIds = "";
+    if (tabKey === 1) {
+      categoryIds = category_ids.join(",");
+    } else {
+      depIds = dep_ids.join(",");
+    }
     course
       .courseList(page, size, "", "", title, depIds, categoryIds)
       .then((res: any) => {
@@ -315,7 +320,7 @@ const CoursePage = () => {
   // 加载列表
   useEffect(() => {
     getList();
-  }, [category_ids, dep_ids, refresh, page, size]);
+  }, [category_ids, dep_ids, refresh, page, size, tabKey]);
 
   const paginationProps = {
     current: page, //当前页码
@@ -332,14 +337,6 @@ const CoursePage = () => {
   };
 
   const onChange = (key: string) => {
-    setCategoryIds([]);
-    setDepIds([]);
-    if (Number(key) === 1) {
-      setLabel("全部分类");
-    } else {
-      setLabel("全部部门");
-    }
-    setRefresh(!refresh);
     setTabKey(Number(key));
   };
 
@@ -357,7 +354,7 @@ const CoursePage = () => {
         </div>
         <div className="right-box">
           <div className="playedu-main-title float-left mb-24">
-            线上课 | {selLabel}
+            线上课 | {tabKey === 1 ? selLabel : selDepLabel}
           </div>
           <div className="float-left j-b-flex mb-24">
             <div className="d-flex">
diff --git a/src/pages/resource/images/index.tsx b/src/pages/resource/images/index.tsx
index f2f4f5f..4ca1430 100644
--- a/src/pages/resource/images/index.tsx
+++ b/src/pages/resource/images/index.tsx
@@ -150,7 +150,6 @@ const ResourceImagesPage = () => {
       <div className="tree-main-body">
         <div className="left-box">
           <TreeCategory
-           refresh={false}
             type="no-cate"
             text={"图片"}
             onUpdate={(keys: any, title: any) => {
diff --git a/src/pages/resource/videos/index.tsx b/src/pages/resource/videos/index.tsx
index e1fe13b..6d5a363 100644
--- a/src/pages/resource/videos/index.tsx
+++ b/src/pages/resource/videos/index.tsx
@@ -170,7 +170,6 @@ const ResourceVideosPage = () => {
       <div className="tree-main-body">
         <div className="left-box">
           <TreeCategory
-            refresh={false}
             type="no-cate"
             text={"视频"}
             onUpdate={(keys: any, title: any) => {

From 391af1a4886de8750c88294831be7d23f95a6bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 24 Apr 2023 11:15:45 +0800
Subject: [PATCH 12/27] =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=90=8E=E5=88=B7=E6=96=B0=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/member/import.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/member/import.tsx b/src/pages/member/import.tsx
index 2c1ed21..caa4d37 100644
--- a/src/pages/member/import.tsx
+++ b/src/pages/member/import.tsx
@@ -58,6 +58,7 @@ const MemberImportPage = () => {
     user
       .storeBatch(2, data)
       .then(() => {
+        setErrorData([]);
         message.success("导入成功！");
         navigate(-1);
       })
@@ -92,9 +93,9 @@ const MemberImportPage = () => {
             {errorData &&
               errorData.map((item: any, index: number) => {
                 return (
-                  <span key={index} className="c-red mb-10">
+                  <div key={index} className="c-red mb-10">
                     {item}
-                  </span>
+                  </div>
                 );
               })}
           </div>

From 86a16c97222c320c77aef2dd195472376fbfe6f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 10:15:07 +0800
Subject: [PATCH 13/27] =?UTF-8?q?input=20=E9=83=BD=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/compenents/create-rs-category/index.tsx   |  1 +
 src/pages/change-password/index.tsx           |  4 ++--
 src/pages/course/compenents/create.tsx        |  2 ++
 src/pages/course/compenents/hour-update.tsx   |  1 +
 src/pages/course/compenents/update.tsx        |  1 +
 src/pages/course/index.tsx                    |  1 +
 src/pages/course/user.tsx                     |  2 ++
 src/pages/department/compenents/create.tsx    |  6 +++++-
 src/pages/login/index.tsx                     |  3 +++
 src/pages/member/compenents/create.tsx        | 13 +++++++++++--
 src/pages/member/compenents/update.tsx        | 19 ++++++++++++++++---
 src/pages/member/departmentUser.tsx           |  2 ++
 src/pages/member/index.tsx                    |  2 ++
 .../resource-category/compenents/create.tsx   |  6 +++++-
 .../resource-category/compenents/update.tsx   |  6 +++++-
 .../administrator/compenents/create.tsx       | 13 +++++++++++--
 .../administrator/compenents/update.tsx       | 13 +++++++++++--
 src/pages/system/administrator/index.tsx      |  1 +
 .../system/adminroles/compenents/create.tsx   |  1 +
 .../system/adminroles/compenents/update.tsx   |  6 +++++-
 src/pages/system/config/index.tsx             | 14 +++++++++++---
 21 files changed, 99 insertions(+), 18 deletions(-)

diff --git a/src/compenents/create-rs-category/index.tsx b/src/compenents/create-rs-category/index.tsx
index 4899a15..e1c8449 100644
--- a/src/compenents/create-rs-category/index.tsx
+++ b/src/compenents/create-rs-category/index.tsx
@@ -54,6 +54,7 @@ export const CreateResourceCategory = (props: PropInterface) => {
           onChange={(e) => {
             setName(e.target.value);
           }}
+          allowClear
         />
       </Modal>
     </>
diff --git a/src/pages/change-password/index.tsx b/src/pages/change-password/index.tsx
index 11aced1..b23e718 100644
--- a/src/pages/change-password/index.tsx
+++ b/src/pages/change-password/index.tsx
@@ -45,14 +45,14 @@ const ChangePasswordPage = () => {
                 name="old_password"
                 rules={[{ required: true, message: "请输入原密码!" }]}
               >
-                <Input.Password placeholder="请输入原密码" />
+                <Input.Password placeholder="请输入原密码" allowClear />
               </Form.Item>
               <Form.Item
                 label="新密码"
                 name="new_password"
                 rules={[{ required: true, message: "请输入新密码!" }]}
               >
-                <Input.Password placeholder="请输入新密码" />
+                <Input.Password placeholder="请输入新密码" allowClear />
               </Form.Item>
               <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
                 <Button type="primary" htmlType="submit">
diff --git a/src/pages/course/compenents/create.tsx b/src/pages/course/compenents/create.tsx
index ed61adb..41f8e87 100644
--- a/src/pages/course/compenents/create.tsx
+++ b/src/pages/course/compenents/create.tsx
@@ -470,6 +470,7 @@ export const CourseCreate: React.FC<PropInterface> = ({
               <Input
                 style={{ width: 424 }}
                 placeholder="请在此处输入课程名称"
+                allowClear
               />
             </Form.Item>
             <Form.Item
@@ -683,6 +684,7 @@ export const CourseCreate: React.FC<PropInterface> = ({
                             onChange={(e) => {
                               setChapterName(index, e.target.value);
                             }}
+                            allowClear
                             placeholder="请在此处输入章节名称"
                           />
                           <Button
diff --git a/src/pages/course/compenents/hour-update.tsx b/src/pages/course/compenents/hour-update.tsx
index 8a622ba..5d25b7d 100644
--- a/src/pages/course/compenents/hour-update.tsx
+++ b/src/pages/course/compenents/hour-update.tsx
@@ -451,6 +451,7 @@ export const CourseHourUpdate: React.FC<PropInterface> = ({
                               saveChapterName(index, e.target.value);
                             }}
                             placeholder="请在此处输入章节名称"
+                            allowClear
                           />
                           <Button
                             className="mr-16"
diff --git a/src/pages/course/compenents/update.tsx b/src/pages/course/compenents/update.tsx
index 8ad8853..8fd3e4c 100644
--- a/src/pages/course/compenents/update.tsx
+++ b/src/pages/course/compenents/update.tsx
@@ -224,6 +224,7 @@ export const CourseUpdate: React.FC<PropInterface> = ({
               rules={[{ required: true, message: "请在此处输入课程名称!" }]}
             >
               <Input
+                allowClear
                 style={{ width: 424 }}
                 placeholder="请在此处输入课程名称"
               />
diff --git a/src/pages/course/index.tsx b/src/pages/course/index.tsx
index 14cb94b..e09c0e4 100644
--- a/src/pages/course/index.tsx
+++ b/src/pages/course/index.tsx
@@ -376,6 +376,7 @@ const CoursePage = () => {
                   onChange={(e) => {
                     setTitle(e.target.value);
                   }}
+                  allowClear
                   style={{ width: 160 }}
                   placeholder="请输入名称关键字"
                 />
diff --git a/src/pages/course/user.tsx b/src/pages/course/user.tsx
index fb74011..5aad9d4 100644
--- a/src/pages/course/user.tsx
+++ b/src/pages/course/user.tsx
@@ -206,6 +206,7 @@ const CourseUserPage = () => {
                   onChange={(e) => {
                     setName(e.target.value);
                   }}
+                  allowClear
                   style={{ width: 160 }}
                   placeholder="请输入姓名关键字"
                 />
@@ -217,6 +218,7 @@ const CourseUserPage = () => {
                   onChange={(e) => {
                     setEmail(e.target.value);
                   }}
+                  allowClear
                   style={{ width: 160 }}
                   placeholder="请输入学员邮箱"
                 />
diff --git a/src/pages/department/compenents/create.tsx b/src/pages/department/compenents/create.tsx
index 5090ec8..cf11d83 100644
--- a/src/pages/department/compenents/create.tsx
+++ b/src/pages/department/compenents/create.tsx
@@ -147,7 +147,11 @@ export const DepartmentCreate: React.FC<PropInterface> = ({
               name="name"
               rules={[{ required: true, message: "请输入部门名称!" }]}
             >
-              <Input style={{ width: 200 }} placeholder="请输入部门名称" />
+              <Input
+                style={{ width: 200 }}
+                allowClear
+                placeholder="请输入部门名称"
+              />
             </Form.Item>
           </Form>
         </div>
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index a614298..4767cf8 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -129,6 +129,7 @@ const LoginPage = () => {
               style={{ width: 400, height: 54 }}
               placeholder="请输入管理员邮箱账号"
               onKeyUp={(e) => keyUp(e)}
+              allowClear
             />
           </div>
           <div className="login-box d-flex mt-50">
@@ -137,6 +138,7 @@ const LoginPage = () => {
               onChange={(e) => {
                 setPassword(e.target.value);
               }}
+              allowClear
               style={{ width: 400, height: 54 }}
               placeholder="请输入密码"
             />
@@ -149,6 +151,7 @@ const LoginPage = () => {
               onChange={(e) => {
                 setCaptchaVal(e.target.value);
               }}
+              allowClear
               onKeyUp={(e) => keyUp(e)}
             />
             <div className={styles["captcha-box"]}>
diff --git a/src/pages/member/compenents/create.tsx b/src/pages/member/compenents/create.tsx
index 2dc214d..09b9619 100644
--- a/src/pages/member/compenents/create.tsx
+++ b/src/pages/member/compenents/create.tsx
@@ -154,7 +154,11 @@ export const MemberCreate: React.FC<PropInterface> = ({ open, onCancel }) => {
               name="email"
               rules={[{ required: true, message: "请输入登录邮箱!" }]}
             >
-              <Input style={{ width: 274 }} placeholder="请输入学员登录邮箱" />
+              <Input
+                allowClear
+                style={{ width: 274 }}
+                placeholder="请输入学员登录邮箱"
+              />
             </Form.Item>
             <Form.Item
               label="登录密码"
@@ -162,6 +166,7 @@ export const MemberCreate: React.FC<PropInterface> = ({ open, onCancel }) => {
               rules={[{ required: true, message: "请输入登录密码!" }]}
             >
               <Input.Password
+                allowClear
                 style={{ width: 274 }}
                 placeholder="请输入登录密码"
               />
@@ -182,7 +187,11 @@ export const MemberCreate: React.FC<PropInterface> = ({ open, onCancel }) => {
               />
             </Form.Item>
             <Form.Item label="身份证号" name="idCard">
-              <Input style={{ width: 274 }} placeholder="请填写学员身份证号" />
+              <Input
+                style={{ width: 274 }}
+                allowClear
+                placeholder="请填写学员身份证号"
+              />
             </Form.Item>
           </Form>
         </div>
diff --git a/src/pages/member/compenents/update.tsx b/src/pages/member/compenents/update.tsx
index 477f77f..4ee2bf2 100644
--- a/src/pages/member/compenents/update.tsx
+++ b/src/pages/member/compenents/update.tsx
@@ -181,18 +181,27 @@ export const MemberUpdate: React.FC<PropInterface> = ({
               name="name"
               rules={[{ required: true, message: "请输入学员姓名!" }]}
             >
-              <Input style={{ width: 274 }} placeholder="请填写学员姓名" />
+              <Input
+                allowClear
+                style={{ width: 274 }}
+                placeholder="请填写学员姓名"
+              />
             </Form.Item>
             <Form.Item
               label="登录邮箱"
               name="email"
               rules={[{ required: true, message: "请输入登录邮箱!" }]}
             >
-              <Input style={{ width: 274 }} placeholder="请输入学员登录邮箱" />
+              <Input
+                style={{ width: 274 }}
+                allowClear
+                placeholder="请输入学员登录邮箱"
+              />
             </Form.Item>
             <Form.Item label="登录密码" name="password">
               <Input.Password
                 style={{ width: 274 }}
+                allowClear
                 placeholder="请输入登录密码"
               />
             </Form.Item>
@@ -212,7 +221,11 @@ export const MemberUpdate: React.FC<PropInterface> = ({
               />
             </Form.Item>
             <Form.Item label="身份证号" name="idCard">
-              <Input style={{ width: 274 }} placeholder="请填写学员身份证号" />
+              <Input
+                allowClear
+                style={{ width: 274 }}
+                placeholder="请填写学员身份证号"
+              />
             </Form.Item>
           </Form>
         </div>
diff --git a/src/pages/member/departmentUser.tsx b/src/pages/member/departmentUser.tsx
index 2db7ba7..39982c4 100644
--- a/src/pages/member/departmentUser.tsx
+++ b/src/pages/member/departmentUser.tsx
@@ -223,6 +223,7 @@ const MemberDepartmentProgressPage = () => {
               onChange={(e) => {
                 setName(e.target.value);
               }}
+              allowClear
               style={{ width: 160 }}
               placeholder="请输入姓名关键字"
             />
@@ -234,6 +235,7 @@ const MemberDepartmentProgressPage = () => {
               onChange={(e) => {
                 setEmail(e.target.value);
               }}
+              allowClear
               style={{ width: 160 }}
               placeholder="请输入邮箱"
             />
diff --git a/src/pages/member/index.tsx b/src/pages/member/index.tsx
index 331cf28..bd12c2f 100644
--- a/src/pages/member/index.tsx
+++ b/src/pages/member/index.tsx
@@ -320,6 +320,7 @@ const MemberPage = () => {
                   }}
                   style={{ width: 160 }}
                   placeholder="请输入姓名关键字"
+                  allowClear
                 />
               </div>
               <div className="d-flex mr-24">
@@ -331,6 +332,7 @@ const MemberPage = () => {
                   }}
                   style={{ width: 160 }}
                   placeholder="请输入邮箱账号"
+                  allowClear
                 />
               </div>
               <div className="d-flex">
diff --git a/src/pages/resource/resource-category/compenents/create.tsx b/src/pages/resource/resource-category/compenents/create.tsx
index d58d80f..09d4979 100644
--- a/src/pages/resource/resource-category/compenents/create.tsx
+++ b/src/pages/resource/resource-category/compenents/create.tsx
@@ -147,7 +147,11 @@ export const ResourceCategoryCreate: React.FC<PropInterface> = ({
               name="name"
               rules={[{ required: true, message: "请输入分类名称!" }]}
             >
-              <Input style={{ width: 200 }} placeholder="请输入分类名称" />
+              <Input
+                style={{ width: 200 }}
+                allowClear
+                placeholder="请输入分类名称"
+              />
             </Form.Item>
           </Form>
         </div>
diff --git a/src/pages/resource/resource-category/compenents/update.tsx b/src/pages/resource/resource-category/compenents/update.tsx
index 28bac87..aa5d7e7 100644
--- a/src/pages/resource/resource-category/compenents/update.tsx
+++ b/src/pages/resource/resource-category/compenents/update.tsx
@@ -169,7 +169,11 @@ export const ResourceCategoryUpdate: React.FC<PropInterface> = ({
               name="name"
               rules={[{ required: true, message: "请输入分类名称!" }]}
             >
-              <Input style={{ width: 200 }} placeholder="请输入分类名称" />
+              <Input
+                style={{ width: 200 }}
+                allowClear
+                placeholder="请输入分类名称"
+              />
             </Form.Item>
           </Form>
         </div>
diff --git a/src/pages/system/administrator/compenents/create.tsx b/src/pages/system/administrator/compenents/create.tsx
index e447677..641cfa6 100644
--- a/src/pages/system/administrator/compenents/create.tsx
+++ b/src/pages/system/administrator/compenents/create.tsx
@@ -125,14 +125,22 @@ export const SystemAdministratorCreate: React.FC<PropInterface> = ({
               name="name"
               rules={[{ required: true, message: "请输入管理员姓名!" }]}
             >
-              <Input style={{ width: 200 }} placeholder="请输入管理员姓名" />
+              <Input
+                allowClear
+                style={{ width: 200 }}
+                placeholder="请输入管理员姓名"
+              />
             </Form.Item>
             <Form.Item
               label="邮箱"
               name="email"
               rules={[{ required: true, message: "请输入学员邮箱!" }]}
             >
-              <Input style={{ width: 200 }} placeholder="请输入学员邮箱" />
+              <Input
+                allowClear
+                style={{ width: 200 }}
+                placeholder="请输入学员邮箱"
+              />
             </Form.Item>
             <Form.Item
               label="密码"
@@ -140,6 +148,7 @@ export const SystemAdministratorCreate: React.FC<PropInterface> = ({
               rules={[{ required: true, message: "请输入登录密码!" }]}
             >
               <Input.Password
+                allowClear
                 style={{ width: 200 }}
                 placeholder="请输入登录密码"
               />
diff --git a/src/pages/system/administrator/compenents/update.tsx b/src/pages/system/administrator/compenents/update.tsx
index c87be6c..f069316 100644
--- a/src/pages/system/administrator/compenents/update.tsx
+++ b/src/pages/system/administrator/compenents/update.tsx
@@ -133,18 +133,27 @@ export const SystemAdministratorUpdate: React.FC<PropInterface> = ({
               name="name"
               rules={[{ required: true, message: "请输入管理员姓名!" }]}
             >
-              <Input style={{ width: 200 }} placeholder="请输入管理员姓名" />
+              <Input
+                allowClear
+                style={{ width: 200 }}
+                placeholder="请输入管理员姓名"
+              />
             </Form.Item>
             <Form.Item
               label="邮箱"
               name="email"
               rules={[{ required: true, message: "请输入学员邮箱!" }]}
             >
-              <Input style={{ width: 200 }} placeholder="请输入学员邮箱" />
+              <Input
+                allowClear
+                style={{ width: 200 }}
+                placeholder="请输入学员邮箱"
+              />
             </Form.Item>
             <Form.Item label="密码" name="password">
               <Input.Password
                 style={{ width: 200 }}
+                allowClear
                 placeholder="请输入登录密码"
               />
             </Form.Item>
diff --git a/src/pages/system/administrator/index.tsx b/src/pages/system/administrator/index.tsx
index ab0c9c9..6161916 100644
--- a/src/pages/system/administrator/index.tsx
+++ b/src/pages/system/administrator/index.tsx
@@ -283,6 +283,7 @@ const SystemAdministratorPage = () => {
                   onChange={(e) => {
                     setName(e.target.value);
                   }}
+                  allowClear
                   style={{ width: 160 }}
                   placeholder="请输入管理员姓名"
                 />
diff --git a/src/pages/system/adminroles/compenents/create.tsx b/src/pages/system/adminroles/compenents/create.tsx
index 8525b2a..8bb1d60 100644
--- a/src/pages/system/adminroles/compenents/create.tsx
+++ b/src/pages/system/adminroles/compenents/create.tsx
@@ -180,6 +180,7 @@ export const SystemAdminrolesCreate: React.FC<PropInterface> = ({
               <Input
                 style={{ width: 424 }}
                 placeholder="请在此处输入角色名称"
+                allowClear
               />
             </Form.Item>
             <Form.Item label="操作权限" name="action_ids">
diff --git a/src/pages/system/adminroles/compenents/update.tsx b/src/pages/system/adminroles/compenents/update.tsx
index 555cae1..7b2d750 100644
--- a/src/pages/system/adminroles/compenents/update.tsx
+++ b/src/pages/system/adminroles/compenents/update.tsx
@@ -191,7 +191,11 @@ export const SystemAdminrolesUpdate: React.FC<PropInterface> = ({
               name="name"
               rules={[{ required: true, message: "请输入角色名!" }]}
             >
-              <Input style={{ width: 424 }} placeholder="请输入角色名" />
+              <Input
+                style={{ width: 424 }}
+                allowClear
+                placeholder="请输入角色名"
+              />
             </Form.Item>
             <Form.Item label="操作权限" name="action_ids">
               <TreeSelect
diff --git a/src/pages/system/config/index.tsx b/src/pages/system/config/index.tsx
index a5f0112..8644d9e 100644
--- a/src/pages/system/config/index.tsx
+++ b/src/pages/system/config/index.tsx
@@ -251,7 +251,11 @@ const SystemConfigPage = () => {
             label="网站页脚"
             name="system.pc_index_footer_msg"
           >
-            <Input style={{ width: 274 }} placeholder="请填写网站页脚" />
+            <Input
+              style={{ width: 274 }}
+              allowClear
+              placeholder="请填写网站页脚"
+            />
           </Form.Item>
           {/* <Form.Item
             style={{ marginBottom: 30 }}
@@ -315,7 +319,11 @@ const SystemConfigPage = () => {
           <Form.Item style={{ marginBottom: 30 }} label="跑马灯内容">
             <Space align="baseline" style={{ height: 32 }}>
               <Form.Item name="player.bullet_secret_text">
-                <Input style={{ width: 274 }} placeholder="自定义跑马灯内容" />
+                <Input
+                  style={{ width: 274 }}
+                  allowClear
+                  placeholder="自定义跑马灯内容"
+                />
               </Form.Item>
               <Checkbox
                 checked={nameChecked}
@@ -345,7 +353,7 @@ const SystemConfigPage = () => {
             label="跑马灯文字颜色"
             name="player.bullet_secret_color"
           >
-            <Input type="color" style={{ width: 32, padding: 0 }} />
+            <Input type="color" allowClear style={{ width: 32, padding: 0 }} />
           </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}

From 33e302503c9228cc01fefb4829697fdd82e218a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 10:16:59 +0800
Subject: [PATCH 14/27] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=AF=BE=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E6=B8=85=E6=A5=9A=E5=AD=A6=E4=B9=A0=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=96=87=E6=A1=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/user.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/course/user.tsx b/src/pages/course/user.tsx
index 5aad9d4..93a83fd 100644
--- a/src/pages/course/user.tsx
+++ b/src/pages/course/user.tsx
@@ -190,7 +190,7 @@ const CourseUserPage = () => {
             <div className="d-flex">
               <PerButton
                 type="primary"
-                text="清除学习记录"
+                text="重置学习记录"
                 class="mr-16"
                 icon={null}
                 p="course"

From 09cbffe3aea0c1699673915cc67c32140079d73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 10:17:54 +0800
Subject: [PATCH 15/27] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=AF=BE=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E6=B8=85=E6=A5=9A=E5=AD=A6=E4=B9=A0=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9B=B8=E5=85=B3=E6=96=87=E6=A1=88=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/user.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/course/user.tsx b/src/pages/course/user.tsx
index 93a83fd..2b9fb42 100644
--- a/src/pages/course/user.tsx
+++ b/src/pages/course/user.tsx
@@ -149,13 +149,13 @@ const CourseUserPage = () => {
   // 删除学员
   const delItem = () => {
     if (selectedRowKeys.length === 0) {
-      message.error("请选择学员后再清除");
+      message.error("请选择学员后再重置");
       return;
     }
     confirm({
       title: "操作确认",
       icon: <ExclamationCircleFilled />,
-      content: "确认清除选中学员学习记录？",
+      content: "确认重置选中学员学习记录？",
       centered: true,
       okText: "确认",
       cancelText: "取消",

From 86ab6b7751118913052a53502f9f4dc57c42434c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 10:20:10 +0800
Subject: [PATCH 16/27] =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=98=8E=E7=BB=86=E4=B8=AD=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/member/compenents/progress.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/member/compenents/progress.tsx b/src/pages/member/compenents/progress.tsx
index 6e4ffc2..82fb20a 100644
--- a/src/pages/member/compenents/progress.tsx
+++ b/src/pages/member/compenents/progress.tsx
@@ -148,7 +148,7 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
           {records && records[record.id] ? (
             <PerButton
               type="link"
-              text="删除"
+              text="重置"
               class="b-link c-red"
               icon={null}
               p="user-learn-destroy"
@@ -169,7 +169,7 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
     confirm({
       title: "操作确认",
       icon: <ExclamationCircleFilled />,
-      content: "确认删除此课程下所有课时的学习记录？",
+      content: "确认重置此课程下所有课时的学习记录？",
       centered: true,
       okText: "确认",
       cancelText: "取消",
@@ -192,7 +192,7 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
     confirm({
       title: "操作确认",
       icon: <ExclamationCircleFilled />,
-      content: "确认删除此课时的学习记录？",
+      content: "确认重置此课时的学习记录？",
       centered: true,
       okText: "确认",
       cancelText: "取消",
@@ -224,7 +224,7 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
         <div className="d-flex mt-24">
           <PerButton
             type="primary"
-            text="清空"
+            text="重置学习记录"
             class="c-white"
             icon={null}
             p="user-learn-destroy"

From 0eae2f767391a183c4bbd04d280f5a8d5d39e63c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 10:28:22 +0800
Subject: [PATCH 17/27] =?UTF-8?q?footer=E7=BB=84=E4=BB=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/compenents/footer/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compenents/footer/index.tsx b/src/compenents/footer/index.tsx
index 4dbc669..aa52911 100644
--- a/src/compenents/footer/index.tsx
+++ b/src/compenents/footer/index.tsx
@@ -8,7 +8,7 @@ export const Footer: React.FC = () => {
       style={{
         width: "100%",
         backgroundColor: "#F6F6F6",
-        height: 232,
+        height: 166,
         paddingTop: 80,
         textAlign: "center",
       }}

From e0e1192fb777e4b14bac2b4b6ca458a05e35ecf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 10:32:42 +0800
Subject: [PATCH 18/27] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A6=82=E8=A7=88?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BA=A7=E5=93=81=E6=96=87=E6=A1=A3=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=93=BE=E6=8E=A5=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/dashboard/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx
index efa7120..d07a251 100644
--- a/src/pages/dashboard/index.tsx
+++ b/src/pages/dashboard/index.tsx
@@ -516,7 +516,7 @@ const DashboardPage = () => {
             <div className={styles["usage-guide"]}>
               <img className={styles["banner"]} src={banner} alt="" />
               <Link
-                to="https://www.playedu.xyz/docs/docs/intro/"
+                to="https://www.playedu.xyz/docs/docs/guide/"
                 target="blank"
                 className={styles["link"]}
               >

From 6bbe2cbeecfd7a035686d67abf908efb99460696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 10:37:00 +0800
Subject: [PATCH 19/27] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=AF=BE=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E8=AF=BE=E7=A8=8B=E6=97=B6=E9=83=A8=E9=97=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=8B=AC=E7=AB=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/course/index.tsx b/src/pages/course/index.tsx
index e09c0e4..6f15feb 100644
--- a/src/pages/course/index.tsx
+++ b/src/pages/course/index.tsx
@@ -406,8 +406,8 @@ const CoursePage = () => {
               rowKey={(record) => record.id}
             />
             <CourseCreate
-              cateIds={category_ids}
-              depIds={dep_ids}
+              cateIds={tabKey === 1 ? category_ids : []}
+              depIds={tabKey === 2 ? dep_ids : []}
               open={createVisible}
               onCancel={() => {
                 setCreateVisible(false);

From e133c724f32591d925db85a60a52549a1a0d8059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 10:45:16 +0800
Subject: [PATCH 20/27] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E6=90=BA=E5=B8=A6=E9=83=A8=E9=97=A8id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/member/compenents/create.tsx | 11 ++++++++---
 src/pages/member/index.tsx             |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pages/member/compenents/create.tsx b/src/pages/member/compenents/create.tsx
index 09b9619..6eff2bf 100644
--- a/src/pages/member/compenents/create.tsx
+++ b/src/pages/member/compenents/create.tsx
@@ -8,6 +8,7 @@ import { ValidataCredentials } from "../../../utils/index";
 
 interface PropInterface {
   open: boolean;
+  depIds: any;
   onCancel: () => void;
 }
 
@@ -17,7 +18,11 @@ interface Option {
   children?: Option[];
 }
 
-export const MemberCreate: React.FC<PropInterface> = ({ open, onCancel }) => {
+export const MemberCreate: React.FC<PropInterface> = ({
+  open,
+  depIds,
+  onCancel,
+}) => {
   const [form] = Form.useForm();
   const [loading, setLoading] = useState<boolean>(true);
   const [departments, setDepartments] = useState<any>([]);
@@ -39,10 +44,10 @@ export const MemberCreate: React.FC<PropInterface> = ({ open, onCancel }) => {
       password: "",
       avatar: memberDefaultAvatar,
       idCard: "",
-      dep_ids: [],
+      dep_ids: depIds,
     });
     setAvatar(memberDefaultAvatar);
-  }, [form, open]);
+  }, [form, open, depIds]);
 
   const getParams = () => {
     department.departmentList().then((res: any) => {
diff --git a/src/pages/member/index.tsx b/src/pages/member/index.tsx
index bd12c2f..cc2ced2 100644
--- a/src/pages/member/index.tsx
+++ b/src/pages/member/index.tsx
@@ -361,6 +361,7 @@ const MemberPage = () => {
             />
             <MemberCreate
               open={createVisible}
+              depIds={dep_ids}
               onCancel={() => {
                 setCreateVisible(false);
                 setRefresh(!refresh);

From 1900e55d0399e32da66324c22f493283e2e2007d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 10:58:43 +0800
Subject: [PATCH 21/27] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E9=83=A8=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E8=BF=9B=E5=BA=A6=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/member/departmentUser.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/member/departmentUser.tsx b/src/pages/member/departmentUser.tsx
index 39982c4..41e1131 100644
--- a/src/pages/member/departmentUser.tsx
+++ b/src/pages/member/departmentUser.tsx
@@ -281,7 +281,7 @@ const MemberDepartmentProgressPage = () => {
             title="学员"
             dataIndex="name"
             key="name"
-            width={100}
+            width={150}
             render={(_, record: any) => (
               <>
                 <Image
@@ -301,7 +301,7 @@ const MemberDepartmentProgressPage = () => {
               ellipsis={true}
               dataIndex="id"
               key={item.id}
-              width={100}
+              width={168}
               render={(_, record: any) => (
                 <>
                   {records[record.id] && records[record.id][item.id] ? (
@@ -329,7 +329,7 @@ const MemberDepartmentProgressPage = () => {
             title="总计课时"
             dataIndex="id"
             key="id"
-            width={100}
+            width={150}
             render={(_, record: any) => (
               <>
                 <span>{getFinishedHours(records[record.id])}</span> /{" "}

From 5f26441b8cb0324b5d68c3d295a3740579b4198f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 11:17:41 +0800
Subject: [PATCH 22/27] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=94=99=E8=AF=AFtoast?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index 4767cf8..f3fe4d7 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -73,7 +73,6 @@ const LoginPage = () => {
 
       navigate("/", { replace: true });
     } catch (e) {
-      message.error("登录出现错误");
       console.error("错误信息", e);
       setLoading(false);
       fetchImageCaptcha(); //刷新图形验证码

From d85ba55b9c073fb612cd0c12ec05d2c37a819bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 11:26:46 +0800
Subject: [PATCH 23/27] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E9=83=A8=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E8=BF=9B=E5=BA=A6=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/member/departmentUser.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/member/departmentUser.tsx b/src/pages/member/departmentUser.tsx
index 41e1131..f6e7eb0 100644
--- a/src/pages/member/departmentUser.tsx
+++ b/src/pages/member/departmentUser.tsx
@@ -174,7 +174,7 @@ const MemberDepartmentProgressPage = () => {
         courses.map((it: any) => {
           if (records && records[item.id] && records[item.id][it.id]) {
             if (records && records[item.id][it.id].is_finished === 1) {
-              arr.push("已完成");
+              arr.push("已学完");
             } else {
               arr.push(
                 records &&
@@ -306,7 +306,7 @@ const MemberDepartmentProgressPage = () => {
                 <>
                   {records[record.id] && records[record.id][item.id] ? (
                     records[record.id][item.id].is_finished === 1 ? (
-                      <span>已完成</span>
+                      <span>已学完</span>
                     ) : (
                       <>
                         <span>

From a656f21cbc4685aeb3a62cefab7acdb53b01623f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 11:28:01 +0800
Subject: [PATCH 24/27] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E9=83=A8=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E8=BF=9B=E5=BA=A6=E7=AD=9B=E9=80=89=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/member/departmentUser.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/member/departmentUser.tsx b/src/pages/member/departmentUser.tsx
index f6e7eb0..e39044f 100644
--- a/src/pages/member/departmentUser.tsx
+++ b/src/pages/member/departmentUser.tsx
@@ -228,7 +228,7 @@ const MemberDepartmentProgressPage = () => {
               placeholder="请输入姓名关键字"
             />
           </div>
-          <div className="d-flex mr-24">
+          {/* <div className="d-flex mr-24">
             <Typography.Text>邮箱：</Typography.Text>
             <Input
               value={email}
@@ -250,7 +250,7 @@ const MemberDepartmentProgressPage = () => {
               onChange={(value: string) => setShowMode(value)}
               options={modes}
             />
-          </div>
+          </div> */}
           <div className="d-flex">
             <Button className="mr-16" onClick={resetData}>
               重 置

From 096466633fc85242d8953ccf0bbada7c92203503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 11:30:29 +0800
Subject: [PATCH 25/27] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E9=83=A8=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E8=BF=9B=E5=BA=A6=E9=83=A8=E9=97=A8title=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/member/departmentUser.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/member/departmentUser.tsx b/src/pages/member/departmentUser.tsx
index e39044f..577b574 100644
--- a/src/pages/member/departmentUser.tsx
+++ b/src/pages/member/departmentUser.tsx
@@ -53,8 +53,9 @@ const MemberDepartmentProgressPage = () => {
 
   useEffect(() => {
     setDid(Number(result.get("id")));
+    setTitle(String(result.get("title")));
     resetData();
-  }, [Number(result.get("id"))]);
+  }, [result.get("id"), result.get("title")]);
 
   useEffect(() => {
     getData();

From e44b129f82608b4dfd9c2ec9c59c05b58ffd2fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 11:42:48 +0800
Subject: [PATCH 26/27] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/system/config/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/system/config/index.tsx b/src/pages/system/config/index.tsx
index 8644d9e..8ff69b9 100644
--- a/src/pages/system/config/index.tsx
+++ b/src/pages/system/config/index.tsx
@@ -244,7 +244,7 @@ const SystemConfigPage = () => {
             label="网站标题"
             name="system.name"
           >
-            <Input style={{ width: 274 }} placeholder="请填写网站标题" />
+            <Input style={{ width: 274 }} allowClear placeholder="请填写网站标题" />
           </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}

From 6c3b29e91904abedaf4624e92f90acc5e348e612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Tue, 25 Apr 2023 17:29:01 +0800
Subject: [PATCH 27/27] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B7=91=E9=A9=AC=E7=81=AF=E9=A2=9C=E8=89=B2=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/system/config/index.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/system/config/index.tsx b/src/pages/system/config/index.tsx
index 8ff69b9..625934b 100644
--- a/src/pages/system/config/index.tsx
+++ b/src/pages/system/config/index.tsx
@@ -244,7 +244,11 @@ const SystemConfigPage = () => {
             label="网站标题"
             name="system.name"
           >
-            <Input style={{ width: 274 }} allowClear placeholder="请填写网站标题" />
+            <Input
+              style={{ width: 274 }}
+              allowClear
+              placeholder="请填写网站标题"
+            />
           </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}
@@ -353,7 +357,7 @@ const SystemConfigPage = () => {
             label="跑马灯文字颜色"
             name="player.bullet_secret_color"
           >
-            <Input type="color" allowClear style={{ width: 32, padding: 0 }} />
+            <Input type="color" style={{ width: 32, padding: 0 }} />
           </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}