线上课-学员第一次学习时间显示优化

Merge pull request !19 from 白书科技/fix/11131

src/api/department.ts

@@ -54,3 +54,7 @@ export function dropDiffClass(id: number, parent_id: number, ids: number[]) {
 export function checkDestroy(id: number) {
   return client.get(`/backend/v1/department/${id}/destroy`, {});
 }
+
+export function ldapSync() {
+  return client.post(`/backend/v1/department/ldap-sync`, {});
+}

src/compenents/footer/index.tsx

@@ -2,12 +2,16 @@ import React from "react";
 import { Layout } from "antd";
 import { Link } from "react-router-dom";
 
-export const Footer: React.FC = () => {
+interface PropInterface {
+  type?: string;
+}
+
+export const Footer: React.FC<PropInterface> = ({ type }) => {
   return (
     <Layout.Footer
       style={{
         width: "100%",
-        backgroundColor: "#F6F6F6",
+        background: type === "none" ? "none" : "#F6F6F6",
         height: 166,
         paddingTop: 80,
         textAlign: "center",

src/compenents/left-menu/index.tsx

@@ -37,16 +37,16 @@ const items = [
     <i className="iconfont icon-icon-category" />,
     null,
     null,
-    null
+    "resource-category-menu"
   ),
   getItem(
     "资源管理",
     "resource",
     <i className="iconfont icon-icon-file" />,
     [
-      getItem("视频", "/videos", null, null, null, null),
-      getItem("图片", "/images", null, null, null, null),
-      getItem("课件", "/courseware", null, null, null, null),
+      getItem("视频", "/videos", null, null, null, "resource-menu"),
+      getItem("图片", "/images", null, null, null, "resource-menu"),
+      getItem("课件", "/courseware", null, null, null, "resource-menu"),
     ],
     null,
     null
@@ -92,7 +92,6 @@ const items = [
         "admin-user-index"
       ),
       getItem("管理日志", "/system/adminlog", null, null, null, "admin-log"),
-      // getItem("角色配置", "/system/adminroles", null, null, null, null),
     ],
     null,
     null
@@ -120,6 +119,7 @@ export const LeftMenu: React.FC = () => {
     }
     return [];
   };
+
   const openKeyMerge = (pathname: string): string[] => {
     let newOpenKeys = hit(pathname);
     for (let i = 0; i < openKeys.length; i++) {
@@ -166,8 +166,14 @@ export const LeftMenu: React.FC = () => {
 
     for (let i in items) {
       let menuItem = items[i];
-      if (!menuItem.children) {
-        // 一级菜单不做权限控制
+      // 一级菜单=>没有子菜单&配置了权限
+      if (menuItem.children === null) {
+        if (
+          menuItem.permission !== null &&
+          typeof permissions[menuItem.permission] === "undefined"
+        ) {
+          continue;
+        }
         menus.push(menuItem);
         continue;
       }

src/compenents/permission-button/index.tsx

@@ -6,8 +6,8 @@ interface PropInterface {
   text: string;
   p: string;
   class: string;
-  icon: any;
-  onClick: () => void;
+  icon?: any;
+  onClick?: () => void;
   disabled: any;
 }
 
@@ -30,7 +30,7 @@ export const PerButton = (props: PropInterface) => {
           danger
           icon={props.icon}
           onClick={() => {
-            props.onClick();
+            props.onClick && props.onClick();
           }}
           disabled={props.disabled}
         >
@@ -43,7 +43,7 @@ export const PerButton = (props: PropInterface) => {
           type={props.type}
           icon={props.icon}
           onClick={() => {
-            props.onClick();
+            props.onClick && props.onClick();
           }}
           disabled={props.disabled}
         >

src/compenents/tree-category/index.tsx

@@ -1,6 +1,6 @@
 import { Tree } from "antd";
 import { useState, useEffect } from "react";
-import { resourceCategory } from "../../api/index";
+import { useSelector } from "react-redux";
 
 interface Option {
   key: string | number;
@@ -17,8 +17,10 @@ interface PropInterface {
 
 export const TreeCategory = (props: PropInterface) => {
   const [treeData, setTreeData] = useState<any>([]);
-  const [loading, setLoading] = useState<boolean>(true);
   const [selectKey, setSelectKey] = useState<number[]>([]);
+  const resourceCategories = useSelector(
+    (state: any) => state.systemConfig.value.resourceCategories
+  );
 
   useEffect(() => {
     if (props.selected && props.selected.length > 0) {
@@ -27,21 +29,17 @@ export const TreeCategory = (props: PropInterface) => {
   }, [props.selected]);
 
   useEffect(() => {
-    resourceCategory.resourceCategoryList().then((res: any) => {
-      const categories: CategoriesBoxModel = res.data.categories;
-      if (JSON.stringify(categories) !== "{}") {
-        const new_arr: Option[] = checkArr(categories, 0);
-        if (props.type === "no-cate") {
-          new_arr.unshift({
-            key: 0,
-            title: <span className="tree-title-elli">未分类</span>,
-          });
-        }
-
-        setTreeData(new_arr);
+    if (JSON.stringify(resourceCategories) !== "{}") {
+      const new_arr: Option[] = checkArr(resourceCategories, 0);
+      if (props.type === "no-cate") {
+        new_arr.unshift({
+          key: 0,
+          title: <span className="tree-title-elli">未分类</span>,
+        });
       }
-    });
-  }, []);
+      setTreeData(new_arr);
+    }
+  }, [resourceCategories]);
 
   const checkArr = (categories: CategoriesBoxModel, id: number) => {
     const arr = [];

src/compenents/tree-department/index.tsx

@@ -1,6 +1,7 @@
-import { Button, Input, message, Tree } from "antd";
+import { Tree } from "antd";
 import { useState, useEffect } from "react";
 import { department } from "../../api/index";
+import { useSelector } from "react-redux";
 
 interface Option {
   key: string | number;
@@ -9,19 +10,21 @@ interface Option {
 }
 
 interface PropInterface {
-  type: string;
   text: string;
-  refresh: boolean;
   showNum: boolean;
   selected: any;
+  depUserCount?: KeyNumberObject;
+  userCount?: number;
   onUpdate: (keys: any, title: any) => void;
 }
 
 export const TreeDepartment = (props: PropInterface) => {
   const [treeData, setTreeData] = useState<any>([]);
-  const [loading, setLoading] = useState<boolean>(true);
   const [selectKey, setSelectKey] = useState<number[]>([]);
-  const [userTotal, setUserTotal] = useState(0);
+  // 本地缓存
+  const localDepartments = useSelector(
+    (state: any) => state.systemConfig.value.departments
+  );
 
   useEffect(() => {
     if (props.selected && props.selected.length > 0) {
@@ -30,32 +33,25 @@ export const TreeDepartment = (props: PropInterface) => {
   }, [props.selected]);
 
   useEffect(() => {
-    setLoading(true);
-    department.departmentList().then((res: any) => {
-      const departments: DepartmentsBoxModel = res.data.departments;
-      const departCount: DepIdsModel = res.data.dep_user_count;
-      setUserTotal(res.data.user_total);
-      if (JSON.stringify(departments) !== "{}") {
-        if (props.showNum) {
-          const new_arr: any[] = checkNewArr(departments, 0, departCount);
-          setTreeData(new_arr);
-        } else {
-          const new_arr: any[] = checkArr(departments, 0);
-          setTreeData(new_arr);
-        }
+    if (JSON.stringify(localDepartments) !== "{}") {
+      let data: any[] = [];
+      if (props.depUserCount) {
+        data = checkNewArr(localDepartments, 0, props.depUserCount);
       } else {
-        const new_arr: Option[] = [
-          {
-            key: "",
-            title: "全部",
-            children: [],
-          },
-        ];
-        setTreeData(new_arr);
+        data = checkArr(localDepartments, 0);
       }
-      setLoading(false);
-    });
-  }, [props.refresh]);
+      setTreeData(data);
+    } else {
+      const data: Option[] = [
+        {
+          key: "",
+          title: "全部",
+          children: [],
+        },
+      ];
+      setTreeData(data);
+    }
+  }, [localDepartments, props.depUserCount]);
 
   const checkNewArr = (
     departments: DepartmentsBoxModel,
@@ -133,8 +129,10 @@ export const TreeDepartment = (props: PropInterface) => {
     if (info) {
       label = info.node.title.props.children;
     }
-    props.onUpdate(selectedKeys, label);
-    setSelectKey(selectedKeys);
+    if (selectedKeys.length <= 1) {
+      props.onUpdate(selectedKeys, label);
+      setSelectKey(selectedKeys);
+    }
   };
 
   const onExpand = (selectedKeys: any, info: any) => {
@@ -142,8 +140,10 @@ export const TreeDepartment = (props: PropInterface) => {
     if (info) {
       label = info.node.title.props.children;
     }
-    props.onUpdate(selectedKeys, label);
-    setSelectKey(selectedKeys);
+    if (selectedKeys.length <= 1) {
+      props.onUpdate(selectedKeys, label);
+      setSelectKey(selectedKeys);
+    }
   };
 
   return (
@@ -157,7 +157,7 @@ export const TreeDepartment = (props: PropInterface) => {
         onClick={() => onSelect([], "")}
       >
         全部{props.text}
-        {props.showNum && userTotal ? "(" + userTotal + ")" : ""}
+        {props.showNum && props.userCount ? "(" + props.userCount + ")" : ""}
       </div>
       {treeData.length > 0 && (
         <Tree

src/compenents/upload-courseware-sub/index.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { Row, Col, Empty, Table, Spin } from "antd";
+import { Row, Col, Empty, Table, Spin, Typography, Input, Button } from "antd";
 import type { ColumnsType } from "antd/es/table";
 import { resource } from "../../api";
 import styles from "./index.module.less";
@@ -47,6 +47,7 @@ export const UploadCoursewareSub = (props: PropsInterface) => {
   const [size, setSize] = useState(10);
   const [total, setTotal] = useState(0);
   const [selectedRowKeys, setSelectedRowKeys] = useState<any>([]);
+  const [title, setTitle] = useState("");
 
   // 加载列表
   useEffect(() => {
@@ -70,7 +71,7 @@ export const UploadCoursewareSub = (props: PropsInterface) => {
         size,
         "",
         "",
-        "",
+        title,
         "WORD,EXCEL,PPT,PDF,TXT,RAR,ZIP",
         categoryIds
       )
@@ -92,6 +93,7 @@ export const UploadCoursewareSub = (props: PropsInterface) => {
   const resetVideoList = () => {
     setPage(1);
     setVideoList([]);
+    setTitle("");
     setRefresh(!refresh);
   };
 
@@ -178,14 +180,42 @@ export const UploadCoursewareSub = (props: PropsInterface) => {
         </Col>
         <Col span={17}>
           <Row style={{ marginBottom: 24, paddingLeft: 10 }}>
-            <Col span={24}>
+            <div className="float-left  j-b-flex">
               <UploadCoursewareButton
                 categoryIds={category_ids}
                 onUpdate={() => {
                   resetVideoList();
                 }}
               ></UploadCoursewareButton>
-            </Col>
+              <div className="d-flex">
+                <div className="d-flex mr-24">
+                  <Typography.Text>名称：</Typography.Text>
+                  <Input
+                    value={title}
+                    onChange={(e) => {
+                      setTitle(e.target.value);
+                    }}
+                    allowClear
+                    style={{ width: 160 }}
+                    placeholder="请输入名称关键字"
+                  />
+                </div>
+                <div className="d-flex">
+                  <Button className="mr-16" onClick={resetVideoList}>
+                    重 置
+                  </Button>
+                  <Button
+                    type="primary"
+                    onClick={() => {
+                      setPage(1);
+                      setRefresh(!refresh);
+                    }}
+                  >
+                    查 询
+                  </Button>
+                </div>
+              </div>
+            </div>
           </Row>
           {init && (
             <div className="float-left text-center mt-30">

src/compenents/upload-video-sub/index.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { Row, Col, Empty, Table, Spin } from "antd";
+import { Row, Col, Empty, Table, Spin, Typography, Input, Button } from "antd";
 import type { ColumnsType } from "antd/es/table";
 import { resource } from "../../api";
 import styles from "./index.module.less";
@@ -48,6 +48,7 @@ export const UploadVideoSub = (props: PropsInterface) => {
   const [size, setSize] = useState(10);
   const [total, setTotal] = useState(0);
   const [selectedRowKeys, setSelectedRowKeys] = useState<any>([]);
+  const [title, setTitle] = useState("");
 
   // 加载列表
   useEffect(() => {
@@ -66,7 +67,7 @@ export const UploadVideoSub = (props: PropsInterface) => {
     setLoading(true);
     let categoryIds = category_ids.join(",");
     resource
-      .resourceList(page, size, "", "", "", "VIDEO", categoryIds)
+      .resourceList(page, size, "", "", title, "VIDEO", categoryIds)
       .then((res: any) => {
         setTotal(res.data.result.total);
         setVideoExtra(res.data.videos_extra);
@@ -85,6 +86,7 @@ export const UploadVideoSub = (props: PropsInterface) => {
   const resetVideoList = () => {
     setPage(1);
     setVideoList([]);
+    setTitle("");
     setRefresh(!refresh);
   };
 
@@ -159,15 +161,7 @@ export const UploadVideoSub = (props: PropsInterface) => {
     <>
       <Row style={{ width: 752, minHeight: 520 }}>
         <Col span={7}>
-          {init && (
-            <div className="float-left text-center mt-30">
-              <Spin></Spin>
-            </div>
-          )}
-          <div
-            className="float-left"
-            style={{ display: init ? "none" : "block" }}
-          >
+          <div className="float-left">
             <TreeCategory
               selected={[]}
               type="no-cate"
@@ -178,14 +172,42 @@ export const UploadVideoSub = (props: PropsInterface) => {
         </Col>
         <Col span={17}>
           <Row style={{ marginBottom: 24, paddingLeft: 10 }}>
-            <Col span={24}>
+            <div className="float-left  j-b-flex">
               <UploadVideoButton
                 categoryIds={category_ids}
                 onUpdate={() => {
                   resetVideoList();
                 }}
               ></UploadVideoButton>
-            </Col>
+              <div className="d-flex">
+                <div className="d-flex mr-24">
+                  <Typography.Text>名称：</Typography.Text>
+                  <Input
+                    value={title}
+                    onChange={(e) => {
+                      setTitle(e.target.value);
+                    }}
+                    allowClear
+                    style={{ width: 160 }}
+                    placeholder="请输入名称关键字"
+                  />
+                </div>
+                <div className="d-flex">
+                  <Button className="mr-16" onClick={resetVideoList}>
+                    重 置
+                  </Button>
+                  <Button
+                    type="primary"
+                    onClick={() => {
+                      setPage(1);
+                      setRefresh(!refresh);
+                    }}
+                  >
+                    查 询
+                  </Button>
+                </div>
+              </div>
+            </div>
           </Row>
           {init && (
             <div className="float-left text-center mt-30">

src/index.less

@@ -1,5 +1,3 @@
-@import "./assets/iconfont/iconfont.css";
-
 @primaryColor: #ff4d4f;
 
 body {
@@ -22,6 +20,10 @@ code {
     monospace;
 }
 
+.w-100 {
+  width: 100%;
+}
+
 .w-174px {
   max-width: 134px;
   overflow: hidden;

src/main.tsx

@@ -1,4 +1,5 @@
 import ReactDOM from "react-dom/client";
+import "./assets/iconfont/iconfont.css";
 import "./index.less";
 import App from "./App";
 import reportWebVitals from "./reportWebVitals";

src/pages/course/compenents/create.tsx

@@ -330,6 +330,10 @@ export const CourseCreate: React.FC<PropInterface> = ({
       });
     } else {
       setChapterType(e.target.value);
+      setChapters([]);
+      setHours([]);
+      setChapterHours([]);
+      setTreeData([]);
     }
   };
 

src/pages/course/compenents/hour-update.tsx

@@ -234,7 +234,7 @@ export const CourseHourUpdate: React.FC<PropInterface> = ({
     const arr = [...chapters];
     if (arr[index].id) {
       courseChapter
-        .updateCourseChapter(id, Number(arr[index].id), value, arr.length)
+        .updateCourseChapter(id, Number(arr[index].id), value, index + 1)
         .then((res: any) => {
           console.log("ok");
           getDetail();

src/pages/course/compenents/hours.tsx

@@ -65,6 +65,7 @@ export const TreeHours = (props: PropInterface) => {
     }
     props.onRemoveItem(id);
   };
+  
   const onDrop: TreeProps["onDrop"] = (info) => {
     const dropKey = info.node.key;
     const dragKey = info.dragNode.key;
@@ -96,23 +97,35 @@ export const TreeHours = (props: PropInterface) => {
 
     // Find dragObject
     let dragObj: DataNode;
-    loop(data, dragKey, (item, index, arr) => {
-      arr.splice(index, 1);
-      dragObj = item;
-    });
+    let dragLength = (info.dragNode as any).props.pos.split("-").length;
+    let dropLength = (info.node as any).props.pos.split("-").length;
 
     if (!info.dropToGap) {
       // Drop on the content
-      loop(data, dropKey, (item) => {
-        item.children = item.children || [];
-        // where to insert 示例添加到头部，可以是随意位置
-        item.children.unshift(dragObj);
-      });
+      if (
+        (dropPosition == 0 && dropPos.length == 3) ||
+        (dropPosition == 0 && dropPos.length == 2 && dragLength == 2)
+      ) {
+      } else {
+        loop(data, dragKey, (item, index, arr) => {
+          arr.splice(index, 1);
+          dragObj = item;
+        });
+        loop(data, dropKey, (item) => {
+          item.children = item.children || [];
+          // where to insert 示例添加到头部，可以是随意位置
+          item.children.unshift(dragObj);
+        });
+      }
     } else if (
       ((info.node as any).props.children || []).length > 0 && // Has children
       (info.node as any).props.expanded && // Is expanded
       dropPosition === 1 // On the bottom gap
     ) {
+      loop(data, dragKey, (item, index, arr) => {
+        arr.splice(index, 1);
+        dragObj = item;
+      });
       loop(data, dropKey, (item) => {
         item.children = item.children || [];
         // where to insert 示例添加到头部，可以是随意位置
@@ -121,6 +134,16 @@ export const TreeHours = (props: PropInterface) => {
         // item to the tail of the children
       });
     } else {
+      if (
+        (dragLength == 3 && dropLength == 2) ||
+        (dragLength == 2 && dropLength == 3)
+      ) {
+        return;
+      }
+      loop(data, dragKey, (item, index, arr) => {
+        arr.splice(index, 1);
+        dragObj = item;
+      });
       let ar: DataNode[] = [];
       let i: number;
       loop(data, dropKey, (_item, index, arr) => {

src/pages/course/index.tsx

@@ -20,7 +20,7 @@ import {
 import type { MenuProps } from "antd";
 import type { ColumnsType } from "antd/es/table";
 import { dateFormat } from "../../utils/index";
-import { useNavigate, useLocation } from "react-router-dom";
+import { useNavigate, useLocation, useSearchParams } from "react-router-dom";
 import { TreeDepartment, TreeCategory, PerButton } from "../../compenents";
 import type { TabsProps } from "antd";
 import { CourseCreate } from "./compenents/create";
@@ -42,17 +42,30 @@ interface DataType {
   title: string;
 }
 
+interface LocalSearchParamsInterface {
+  page?: number;
+  size?: number;
+  title?: string;
+}
+
 const CoursePage = () => {
   const result = new URLSearchParams(useLocation().search);
+
+  const [searchParams, setSearchParams] = useSearchParams({
+    page: "1",
+    size: "10",
+    title: "",
+  });
+  const page = parseInt(searchParams.get("page") || "1");
+  const size = parseInt(searchParams.get("size") || "10");
+  const title = searchParams.get("title");
+
   const navigate = useNavigate();
   const [list, setList] = useState<DataType[]>([]);
-  const [refresh, setRefresh] = useState(false);
-  const [page, setPage] = useState(1);
-  const [size, setSize] = useState(10);
   const [total, setTotal] = useState(0);
+  const [refresh, setRefresh] = useState(false);
   const [loading, setLoading] = useState(true);
   const [category_ids, setCategoryIds] = useState<number[]>([]);
-  const [title, setTitle] = useState("");
   const [dep_ids, setDepIds] = useState<number[]>([]);
   const [selLabel, setLabel] = useState<string>(
     result.get("label") ? String(result.get("label")) : "全部分类"
@@ -105,7 +118,9 @@ const CoursePage = () => {
             type=""
             text={"分类"}
             onUpdate={(keys: any, title: any) => {
-              setPage(1);
+              resetLocalSearchParams({
+                page: 1,
+              });
               setCategoryIds(keys);
               if (typeof title === "string") {
                 setLabel(title);
@@ -124,12 +139,12 @@ const CoursePage = () => {
         <div className="float-left">
           <TreeDepartment
             selected={dep_ids}
-            refresh={refresh}
             showNum={false}
-            type="no-course"
             text={"部门"}
             onUpdate={(keys: any, title: any) => {
-              setPage(1);
+              resetLocalSearchParams({
+                page: 1,
+              });
               setDepIds(keys);
               setDepLabel(title);
             }}
@@ -346,7 +361,7 @@ const CoursePage = () => {
       depIds = dep_ids.join(",");
     }
     course
-      .courseList(page, size, "", "", title, depIds, categoryIds)
+      .courseList(page, size, "", "", title ? title : "", depIds, categoryIds)
       .then((res: any) => {
         setTotal(res.data.total);
         setList(res.data.data);
@@ -362,10 +377,12 @@ const CoursePage = () => {
   };
   // 重置列表
   const resetList = () => {
-    setPage(1);
-    setSize(10);
+    resetLocalSearchParams({
+      page: 1,
+      size: 10,
+      title: "",
+    });
     setList([]);
-    setTitle("");
     setRefresh(!refresh);
   };
 
@@ -379,8 +396,28 @@ const CoursePage = () => {
   };
 
   const handlePageChange = (page: number, pageSize: number) => {
-    setPage(page);
-    setSize(pageSize);
+    resetLocalSearchParams({
+      page: page,
+      size: pageSize,
+    });
+  };
+
+  const resetLocalSearchParams = (params: LocalSearchParamsInterface) => {
+    setSearchParams(
+      (prev) => {
+        if (typeof params.title !== "undefined") {
+          prev.set("title", params.title);
+        }
+        if (typeof params.page !== "undefined") {
+          prev.set("page", params.page + "");
+        }
+        if (typeof params.size !== "undefined") {
+          prev.set("size", params.size + "");
+        }
+        return prev;
+      },
+      { replace: true }
+    );
   };
 
   const onChange = (key: string) => {
@@ -419,9 +456,11 @@ const CoursePage = () => {
               <div className="d-flex mr-24">
                 <Typography.Text>课程名称：</Typography.Text>
                 <Input
-                  value={title}
+                  value={title || ""}
                   onChange={(e) => {
-                    setTitle(e.target.value);
+                    resetLocalSearchParams({
+                      title: e.target.value,
+                    });
                   }}
                   allowClear
                   style={{ width: 160 }}
@@ -435,7 +474,9 @@ const CoursePage = () => {
                 <Button
                   type="primary"
                   onClick={() => {
-                    setPage(1);
+                    resetLocalSearchParams({
+                      page: 1,
+                    });
                     setRefresh(!refresh);
                   }}
                 >

src/pages/course/user.tsx

@@ -60,6 +60,22 @@ type HourCountModel = {
   [key: number]: string;
 };
 
+type PerCourseRecordsModel = {
+  [key: number]: {
+    course_id: number;
+    created_at: string;
+    finished_at: string;
+    finished_duration: number;
+    hour_id: number;
+    id: number;
+    is_finished: number;
+    real_duration: number;
+    total_duration: number;
+    updated_at: string;
+    user_id: number;
+  };
+};
+
 const CourseUserPage = () => {
   const params = useParams();
   const result = new URLSearchParams(useLocation().search);
@@ -69,6 +85,7 @@ const CourseUserPage = () => {
   const [hourCount, setHourCount] = useState<HourCountModel>({});
   const [userDepIds, setUserDepIds] = useState<DepIdsModel>({});
   const [departments, setDepartments] = useState<DepartmentsModel>({});
+  const [perRecords, setPerRecords] = useState<PerCourseRecordsModel>({});
   const [refresh, setRefresh] = useState(false);
   const [page, setPage] = useState(1);
   const [size, setSize] = useState(10);
@@ -135,8 +152,8 @@ const CourseUserPage = () => {
       dataIndex: "created_at",
       render: (_, record: any) => (
         <>
-          {records[record.id] ? (
-            <span>{dateFormat(records[record.id].created_at)}</span>
+          {perRecords[record.id] ? (
+            <span>{dateFormat(perRecords[record.id].created_at)}</span>
           ) : hourCount[record.id] ? (
             <span>{dateFormat(hourCount[record.id])}</span>
           ) : (
@@ -150,7 +167,7 @@ const CourseUserPage = () => {
       dataIndex: "id",
       render: (_, record: any) => (
         <>
-          {records[record.id] ? (
+          {records[record.id] && records[record.id].finished_at ? (
             <span>{dateFormat(String(records[record.id].finished_at))}</span>
           ) : (
             <span>-</span>
@@ -213,6 +230,7 @@ const CourseUserPage = () => {
         setList(res.data.data);
         setHourCount(res.data.user_course_hour_user_first_at);
         setRecords(res.data.user_course_records);
+        setPerRecords(res.data.per_user_earliest_records);
         setCourse(res.data.course);
         setDepartments(res.data.departments);
         setUserDepIds(res.data.user_dep_ids);

src/pages/dashboard/index.tsx

@@ -558,7 +558,7 @@ const DashboardPage = () => {
             <div className={styles["usage-guide"]}>
               <img className={styles["banner"]} src={banner} alt="" />
               <Link
-                to="https://www.playedu.xyz/docs/docs/guide/"
+                to="https://www.playedu.xyz/book/opensource-handbook/article/wFymJ4SXcX"
                 target="blank"
                 className={styles["link"]}
               >

src/pages/department/index.tsx

@@ -8,7 +8,8 @@ import type { DataNode, TreeProps } from "antd/es/tree";
 import { DepartmentCreate } from "./compenents/create";
 import { DepartmentUpdate } from "./compenents/update";
 import { useNavigate } from "react-router-dom";
-import { useSelector } from "react-redux";
+import { useSelector, useDispatch } from "react-redux";
+import { saveDepartmentsAction } from "../../store/system/systemConfigSlice";
 
 const { confirm } = Modal;
 
@@ -19,6 +20,7 @@ interface Option {
 }
 
 const DepartmentPage = () => {
+  const dispatch = useDispatch();
   const navigate = useNavigate();
   const permissions = useSelector(
     (state: any) => state.loginUser.value.permissions
@@ -32,6 +34,8 @@ const DepartmentPage = () => {
   const [updateVisible, setUpdateVisible] = useState(false);
   const [did, setDid] = useState<number>(0);
   const [modal, contextHolder] = Modal.useModal();
+
+  // 是否启用LDAP
   const ldapEnabled = useSelector(
     (state: any) => state.systemConfig.value["ldap-enabled"]
   );
@@ -55,6 +59,7 @@ const DepartmentPage = () => {
   const getData = () => {
     department.departmentList().then((res: any) => {
       const departments: DepartmentsBoxModel = res.data.departments;
+      dispatch(saveDepartmentsAction(res.data.departments));
       if (JSON.stringify(departments) !== "{}") {
         const new_arr: Option[] = checkArr(departments, 0);
         setTreeData(new_arr);
@@ -389,24 +394,49 @@ const DepartmentPage = () => {
     }
   };
 
+  const ldapSync = () => {
+    if (loading) {
+      message.warning("正在同步，请稍后...");
+      return;
+    }
+    setLoading(true);
+    department.ldapSync().then(() => {
+      message.success("操作成功");
+      setLoading(false);
+      resetData();
+    });
+  };
+
   return (
     <>
-      {!ldapEnabled && (
+      {
         <div className="playedu-main-top mb-24">
           {contextHolder}
           <div className="d-flex">
-            <PerButton
-              type="primary"
-              text="新建部门"
-              class="mr-16"
-              icon={<PlusOutlined />}
-              p="department-cud"
-              onClick={() => setCreateVisible(true)}
-              disabled={null}
-            />
+            {ldapEnabled ? (
+              <PerButton
+                type="primary"
+                text="一键同步LDAP部门架构"
+                class="mr-16"
+                icon={null}
+                p="department-cud"
+                onClick={() => ldapSync()}
+                disabled={null}
+              />
+            ) : (
+              <PerButton
+                type="primary"
+                text="新建部门"
+                class="mr-16"
+                icon={<PlusOutlined />}
+                p="department-cud"
+                onClick={() => setCreateVisible(true)}
+                disabled={null}
+              />
+            )}
           </div>
         </div>
-      )}
+      }
       <div className="playedu-main-body">
         {loading && (
           <div className="float-left text-center mt-30">

src/pages/init/index.tsx

@@ -27,6 +27,8 @@ const InitPage = (props: Props) => {
       systemH5Url: props.configData["system.h5_url"],
       memberDefaultAvatar: props.configData["member.default_avatar"],
       courseDefaultThumbs: props.configData["default.course_thumbs"],
+      departments: props.configData["departments"],
+      resourceCategories: props.configData["resource_categories"],
     };
     dispatch(saveConfigAction(config));
   }

src/pages/login/index.module.less

@@ -13,6 +13,15 @@
       height: 640px;
     }
   }
+  .footer-box {
+    width: 880px;
+    height: auto;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    margin-left: -440px;
+    margin-top: 280px;
+  }
   .login-box {
     width: 880px;
     height: 560px;

src/pages/login/index.tsx

@@ -13,6 +13,7 @@ import {
   SystemConfigStoreInterface,
   saveConfigAction,
 } from "../../store/system/systemConfigSlice";
+import { Footer } from "../../compenents/footer";
 
 const LoginPage = () => {
   const dispatch = useDispatch();
@@ -67,6 +68,8 @@ const LoginPage = () => {
       systemH5Url: res.data["system.h5_url"],
       memberDefaultAvatar: res.data["member.default_avatar"],
       courseDefaultThumbs: res.data["default.course_thumbs"],
+      departments: res.data["departments"],
+      resourceCategories: res.data["resource_categories"],
     };
     dispatch(saveConfigAction(data));
   };
@@ -124,6 +127,9 @@ const LoginPage = () => {
           </div>
         </div>
       </div>
+      <div className={styles["footer-box"]}>
+        <Footer type="none"></Footer>
+      </div>
     </div>
   );
 };

src/pages/member/compenents/progress.tsx

@@ -59,7 +59,6 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
     {
       title: "课时标题",
       dataIndex: "title",
-
       render: (title: string) => (
         <>
           <span>{title}</span>
@@ -68,7 +67,6 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
     },
     {
       title: "总时长",
-      width: 120,
       dataIndex: "duration",
       render: (duration: number) => (
         <>
@@ -78,7 +76,6 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
     },
     {
       title: "已学习时长",
-      width: 120,
       dataIndex: "finished_duration",
       render: (_, record: any) => (
         <>
@@ -96,7 +93,6 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
     },
     {
       title: "是否学完",
-      width: 100,
       dataIndex: "is_finished",
       render: (_, record: any) => (
         <>
@@ -112,7 +108,6 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
     },
     {
       title: "开始时间",
-      width: 150,
       dataIndex: "created_at",
       render: (_, record: any) => (
         <>
@@ -126,7 +121,6 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
     },
     {
       title: "学完时间",
-      width: 150,
       dataIndex: "finished_at",
       render: (_, record: any) => (
         <>
@@ -142,7 +136,6 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
       title: "操作",
       key: "action",
       fixed: "right",
-      width: 70,
       render: (_, record: any) => (
         <>
           {records && records[record.id] ? (
@@ -222,7 +215,7 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
           maskClosable={false}
           footer={null}
         >
-          <div className="d-flex mt-24">
+          <div className="mt-24">
             <PerButton
               type="primary"
               text="重置学习记录"
@@ -235,10 +228,7 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
               disabled={null}
             />
           </div>
-          <div
-            className="d-flex mt-24"
-            style={{ maxHeight: 800, overflowY: "auto" }}
-          >
+          <div className="mt-24" style={{ maxHeight: 800, overflowY: "auto" }}>
             <Table
               columns={column}
               dataSource={list}

src/pages/member/departmentUser.tsx

@@ -117,17 +117,17 @@ const MemberDepartmentProgressPage = () => {
     setSize(pageSize);
   };
 
-  const getTotalHours = (params: any) => {
-    if (params) {
-      let value = 0;
-      for (let key in params) {
-        value += params[key].hour_count;
-      }
-      return value;
-    } else {
-      return 0;
-    }
-  };
+  // const getTotalHours = (params: any) => {
+  //   if (params) {
+  //     let value = 0;
+  //     for (let key in params) {
+  //       value += params[key].hour_count;
+  //     }
+  //     return value;
+  //   } else {
+  //     return 0;
+  //   }
+  // };
 
   const getFinishedHours = (params: any) => {
     if (params) {
@@ -164,7 +164,17 @@ const MemberDepartmentProgressPage = () => {
       let sheetName = "sheet1";
       let data = [];
       let arr = ["学员"];
-      courses.map((item: any) => {
+      let data2 = res.data.courses;
+      let arr2: any = [];
+      let value = 0;
+      for (let key in data2) {
+        arr2.push(data2[key]);
+        value += data2[key].class_hour;
+      }
+      let w_totalHour = value;
+      let w_courses = arr2;
+      let w_records = res.data.user_course_records;
+      w_courses.map((item: any) => {
         arr.push(item.title);
       });
       arr.push("总计课时");
@@ -172,21 +182,23 @@ const MemberDepartmentProgressPage = () => {
 
       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) {
+        w_courses.map((it: any) => {
+          if (w_records && w_records[item.id] && w_records[item.id][it.id]) {
+            if (w_records && w_records[item.id][it.id].is_finished === 1) {
               arr.push("已学完");
             } else {
               arr.push(
-                records &&
-                  records[item.id][it.id].finished_count + " / " + it.class_hour
+                w_records &&
+                  w_records[item.id][it.id].finished_count +
+                    " / " +
+                    it.class_hour
               );
             }
           } else {
             arr.push(0 + " / " + it.class_hour);
           }
         });
-        arr.push(getFinishedHours(records[item.id]) + " / " + totalHour);
+        arr.push(getFinishedHours(w_records[item.id]) + " / " + w_totalHour);
         data.push(arr);
       });
 

src/pages/member/index.tsx

@@ -20,7 +20,7 @@ import {
 } from "@ant-design/icons";
 import { user } from "../../api/index";
 import { dateFormat } from "../../utils/index";
-import { Link, Navigate, useLocation } from "react-router-dom";
+import { Link, useLocation, useSearchParams } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { TreeDepartment, PerButton } from "../../compenents";
 import { MemberCreate } from "./compenents/create";
@@ -46,17 +46,34 @@ interface DataType {
   verify_at?: string;
 }
 
+interface LocalSearchParamsInterface {
+  page?: number;
+  size?: number;
+  nickname?: string;
+  email?: string;
+}
+
 const MemberPage = () => {
   const result = new URLSearchParams(useLocation().search);
-  const [loading, setLoading] = useState(true);
-  const [page, setPage] = useState(1);
-  const [size, setSize] = useState(10);
+
+  const [searchParams, setSearchParams] = useSearchParams({
+    page: "1",
+    size: "10",
+    nickname: "",
+    email: "",
+  });
+  const page = parseInt(searchParams.get("page") || "1");
+  const size = parseInt(searchParams.get("size") || "10");
+  const nickname = searchParams.get("nickname");
+  const email = searchParams.get("email");
+
+  const [loading, setLoading] = useState(false);
   const [list, setList] = useState<DataType[]>([]);
   const [total, setTotal] = useState(0);
+  const [pureTotal, setPureTotal] = useState(0);
   const [refresh, setRefresh] = useState(false);
+  const [depUserCount, setDepUserCount] = useState<KeyNumberObject>();
 
-  const [nickname, setNickname] = useState("");
-  const [email, setEmail] = useState("");
   const [dep_ids, setDepIds] = useState<number[]>([]);
   const [selLabel, setLabel] = useState<string>(
     result.get("label") ? String(result.get("label")) : "全部部门"
@@ -72,13 +89,13 @@ const MemberPage = () => {
   );
 
   useEffect(() => {
-    setDid(Number(result.get("did")));
-    if (Number(result.get("did"))) {
-      let arr = [];
-      arr.push(Number(result.get("did")));
-      setDepIds(arr);
+    if (result.get("refresh")) {
+      resetLocalSearchParams({
+        page: 1,
+      });
+      setRefresh(!refresh);
     }
-  }, [result.get("did")]);
+  }, [result.get("refresh")]);
 
   const columns: ColumnsType<DataType> = [
     {
@@ -211,30 +228,45 @@ const MemberPage = () => {
     getData();
   }, [refresh, page, size, dep_ids]);
 
+  useEffect(() => {
+    const handlePageBack = () => {
+      getData();
+    };
+    window.addEventListener("popstate", handlePageBack);
+    return () => {
+      window.removeEventListener("popstate", handlePageBack);
+    };
+  }, []);
+
   const getData = () => {
-    let depIds = dep_ids.join(",");
+    if (loading) {
+      return;
+    }
     setLoading(true);
     user
       .userList(page, size, {
         name: nickname,
         email: email,
-        id_card: "",
-        dep_ids: depIds,
+        dep_ids: dep_ids.join(","),
       })
       .then((res: any) => {
         setList(res.data.data);
         setDepartments(res.data.departments);
         setUserDepIds(res.data.user_dep_ids);
         setTotal(res.data.total);
+        setPureTotal(res.data.pure_total);
+        setDepUserCount(res.data.dep_user_count);
         setLoading(false);
       });
   };
 
   const resetData = () => {
-    setNickname("");
-    setEmail("");
-    setPage(1);
-    setSize(10);
+    resetLocalSearchParams({
+      page: 1,
+      size: 10,
+      nickname: "",
+      email: "",
+    });
     setList([]);
     setRefresh(!refresh);
   };
@@ -249,8 +281,31 @@ const MemberPage = () => {
   };
 
   const handlePageChange = (page: number, pageSize: number) => {
-    setPage(page);
-    setSize(pageSize);
+    resetLocalSearchParams({
+      page: page,
+      size: pageSize,
+    });
+  };
+
+  const resetLocalSearchParams = (params: LocalSearchParamsInterface) => {
+    setSearchParams(
+      (prev) => {
+        if (typeof params.nickname !== "undefined") {
+          prev.set("nickname", params.nickname);
+        }
+        if (typeof params.email !== "undefined") {
+          prev.set("email", params.email);
+        }
+        if (typeof params.page !== "undefined") {
+          prev.set("page", params.page + "");
+        }
+        if (typeof params.size !== "undefined") {
+          prev.set("size", params.size + "");
+        }
+        return prev;
+      },
+      { replace: true }
+    );
   };
 
   const delUser = (id: number) => {
@@ -282,12 +337,14 @@ const MemberPage = () => {
         <div className="left-box">
           <TreeDepartment
             selected={dep_ids}
-            refresh={refresh}
             showNum={true}
-            type=""
+            userCount={pureTotal}
+            depUserCount={depUserCount}
             text={"部门"}
             onUpdate={(keys: any, title: any) => {
-              setPage(1);
+              resetLocalSearchParams({
+                page: 1,
+              });
               setDepIds(keys);
               var index = title.indexOf("(");
               if (index !== -1) {
@@ -324,7 +381,6 @@ const MemberPage = () => {
                     class="mr-16"
                     icon={null}
                     p="user-store"
-                    onClick={() => null}
                     disabled={null}
                   />
                 </Link>
@@ -340,9 +396,7 @@ const MemberPage = () => {
                     type="default"
                     text="部门学员进度"
                     class="mr-16"
-                    icon={null}
                     p="department-user-learn"
-                    onClick={() => null}
                     disabled={null}
                   />
                 </Link>
@@ -352,9 +406,11 @@ const MemberPage = () => {
               <div className="d-flex mr-24">
                 <Typography.Text>姓名：</Typography.Text>
                 <Input
-                  value={nickname}
+                  value={nickname || ""}
                   onChange={(e) => {
-                    setNickname(e.target.value);
+                    resetLocalSearchParams({
+                      nickname: e.target.value,
+                    });
                   }}
                   style={{ width: 160 }}
                   placeholder="请输入姓名关键字"
@@ -364,9 +420,11 @@ const MemberPage = () => {
               <div className="d-flex mr-24">
                 <Typography.Text>邮箱：</Typography.Text>
                 <Input
-                  value={email}
+                  value={email || ""}
                   onChange={(e) => {
-                    setEmail(e.target.value);
+                    resetLocalSearchParams({
+                      email: e.target.value,
+                    });
                   }}
                   style={{ width: 160 }}
                   placeholder="请输入邮箱账号"
@@ -380,7 +438,9 @@ const MemberPage = () => {
                 <Button
                   type="primary"
                   onClick={() => {
-                    setPage(1);
+                    resetLocalSearchParams({
+                      page: 1,
+                    });
                     setRefresh(!refresh);
                   }}
                 >

src/pages/member/learn.tsx

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

src/pages/resource/resource-category/index.tsx

@@ -8,7 +8,8 @@ import type { DataNode, TreeProps } from "antd/es/tree";
 import { ResourceCategoryCreate } from "./compenents/create";
 import { ResourceCategoryUpdate } from "./compenents/update";
 import { useNavigate } from "react-router-dom";
-import { useSelector } from "react-redux";
+import { useSelector, useDispatch } from "react-redux";
+import { saveCategoriesAction } from "../../../store/system/systemConfigSlice";
 
 const { confirm } = Modal;
 
@@ -19,6 +20,7 @@ interface Option {
 }
 
 const ResourceCategoryPage = () => {
+  const dispatch = useDispatch();
   const navigate = useNavigate();
   const permissions = useSelector(
     (state: any) => state.loginUser.value.permissions
@@ -53,6 +55,7 @@ const ResourceCategoryPage = () => {
     setLoading(true);
     resourceCategory.resourceCategoryList().then((res: any) => {
       const categories: CategoriesBoxModel = res.data.categories;
+      dispatch(saveCategoriesAction(res.data.categories));
       if (JSON.stringify(categories) !== "{}") {
         const new_arr: Option[] = checkArr(categories, 0);
         setTreeData(new_arr);

src/pages/resource/videos/index.tsx

@@ -1,5 +1,14 @@
 import { useEffect, useState } from "react";
-import { Modal, Table, message, Space, Dropdown, Button } from "antd";
+import {
+  Modal,
+  Table,
+  message,
+  Space,
+  Dropdown,
+  Typography,
+  Input,
+  Button,
+} from "antd";
 import type { MenuProps } from "antd";
 import { resource } from "../../../api";
 import { useLocation } from "react-router-dom";
@@ -63,6 +72,7 @@ const ResourceVideosPage = () => {
   const [multiConfig, setMultiConfig] = useState(false);
   const [updateId, setUpdateId] = useState(0);
   const [playUrl, setPlayUrl] = useState("");
+  const [title, setTitle] = useState("");
 
   useEffect(() => {
     setCateId(Number(result.get("cid")));
@@ -231,7 +241,7 @@ const ResourceVideosPage = () => {
     setLoading(true);
     let categoryIds = category_ids.join(",");
     resource
-      .resourceList(page, size, "", "", "", "VIDEO", categoryIds)
+      .resourceList(page, size, "", "", title, "VIDEO", categoryIds)
       .then((res: any) => {
         setTotal(res.data.result.total);
         setVideoList(res.data.result.data);
@@ -250,6 +260,7 @@ const ResourceVideosPage = () => {
     setSize(10);
     setVideoList([]);
     setSelectedRowKeys([]);
+    setTitle("");
     setRefresh(!refresh);
   };
 
@@ -328,7 +339,34 @@ const ResourceVideosPage = () => {
                 删除
               </Button>
             </div>
-            <div className="d-flex"></div>
+            <div className="d-flex">
+              <div className="d-flex mr-24">
+                <Typography.Text>名称：</Typography.Text>
+                <Input
+                  value={title}
+                  onChange={(e) => {
+                    setTitle(e.target.value);
+                  }}
+                  allowClear
+                  style={{ width: 160 }}
+                  placeholder="请输入名称关键字"
+                />
+              </div>
+              <div className="d-flex">
+                <Button className="mr-16" onClick={resetVideoList}>
+                  重 置
+                </Button>
+                <Button
+                  type="primary"
+                  onClick={() => {
+                    setPage(1);
+                    setRefresh(!refresh);
+                  }}
+                >
+                  查 询
+                </Button>
+              </div>
+            </div>
           </div>
           <div className="float-left">
             {multiConfig ? (

src/pages/system/administrator/compenents/create.tsx

@@ -149,12 +149,12 @@ export const SystemAdministratorCreate: React.FC<PropInterface> = ({
               <Form.Item
                 label="邮箱"
                 name="email"
-                rules={[{ required: true, message: "请输入学员邮箱!" }]}
+                rules={[{ required: true, message: "请输入管理员邮箱!" }]}
               >
                 <Input
                   allowClear
                   style={{ width: 200 }}
-                  placeholder="请输入学员邮箱"
+                  placeholder="请输入管理员邮箱"
                 />
               </Form.Item>
               <Form.Item

src/pages/system/administrator/compenents/update.tsx

@@ -111,7 +111,7 @@ export const SystemAdministratorUpdate: React.FC<PropInterface> = ({
     <>
       {open ? (
         <Modal
-          title="编辑管理人员"
+          title="编辑管理员"
           centered
           forceRender
           open={true}
@@ -168,12 +168,12 @@ export const SystemAdministratorUpdate: React.FC<PropInterface> = ({
               <Form.Item
                 label="邮箱"
                 name="email"
-                rules={[{ required: true, message: "请输入学员邮箱!" }]}
+                rules={[{ required: true, message: "请输入管理员邮箱!" }]}
               >
                 <Input
                   allowClear
                   style={{ width: 200 }}
-                  placeholder="请输入学员邮箱"
+                  placeholder="请输入管理员邮箱"
                 />
               </Form.Item>
               <Form.Item label="密码" name="password">

src/pages/system/adminroles/compenents/create.tsx

@@ -39,86 +39,53 @@ export const SystemAdminrolesCreate: React.FC<PropInterface> = ({
 
   const getParams = () => {
     adminRole.createAdminRole().then((res: any) => {
-      const arr: Option[] = [
-        {
-          title: "学员",
-          value: "学员-n",
-          children: [],
-        },
-        {
-          title: "管理员",
-          value: "管理员-n",
-          children: [],
-        },
-      ];
-      const arr2: Option[] = [
-        {
-          title: "学员",
-          value: "学员-n",
-          children: [],
-        },
-        {
-          title: "管理员",
-          value: "管理员-n",
-          children: [],
-        },
-        {
-          title: "管理员日志",
-          value: "管理员日志-n",
-          children: [],
-        },
-        {
-          title: "管理员角色",
-          value: "管理员角色-n",
-          children: [],
-        },
-        {
-          title: "线上课",
-          value: "线上课-n",
-          children: [],
-        },
-        {
-          title: "资源分类",
-          value: "资源分类-n",
-          children: [],
-        },
-        {
-          title: "部门",
-          value: "部门-n",
-          children: [],
-        },
-        {
-          title: "系统配置",
-          value: "系统配置-n",
-          children: [],
-        },
-        {
-          title: "其它",
-          value: "其它-n",
-          children: [],
-        },
-      ];
+      const arr: any = [];
+      const arr2: any = [];
       let actions = res.data.perm_action.action;
       let permissions = res.data.perm_action.data;
       for (let i = 0; i < permissions.length; i++) {
-        arr.map((item: any) => {
-          if (item.title === permissions[i].group_name) {
-            item.children.push({
-              title: permissions[i].name,
-              value: permissions[i].id,
-            });
-          }
-        });
+        const key = arr.findIndex(
+          (it: any) => it.title === permissions[i].group_name
+        );
+        if (key >= 0) {
+          arr[key].children.push({
+            title: permissions[i].name,
+            value: permissions[i].id,
+          });
+        } else {
+          arr.push({
+            title: permissions[i].group_name,
+            value: permissions[i].group_name + "-n",
+            children: [
+              {
+                title: permissions[i].name,
+                value: permissions[i].id,
+              },
+            ],
+          });
+        }
       }
       for (let j = 0; j < actions.length; j++) {
-        arr2.map((item: any) => {
-          if (item.title === actions[j].group_name) {
-            item.children.push({
-              title: actions[j].name,
-              value: actions[j].id,
-            });
-          }
-        });
+        const key = arr2.findIndex(
+          (it: any) => it.title === actions[j].group_name
+        );
+        if (key >= 0) {
+          arr2[key].children.push({
+            title: actions[j].name,
+            value: actions[j].id,
+          });
+        } else {
+          arr2.push({
+            title: actions[j].group_name,
+            value: actions[j].group_name + "-n",
+            children: [
+              {
+                title: actions[j].name,
+                value: actions[j].id,
+              },
+            ],
+          });
+        }
       }
       setPermissions(arr);
       setActions(arr2);

src/pages/system/adminroles/compenents/update.tsx

@@ -53,86 +53,53 @@ export const SystemAdminrolesUpdate: React.FC<PropInterface> = ({
 
   const getParams = () => {
     adminRole.createAdminRole().then((res: any) => {
-      const arr: Option[] = [
-        {
-          title: "学员",
-          value: "学员-n",
-          children: [],
-        },
-        {
-          title: "管理员",
-          value: "管理员-n",
-          children: [],
-        },
-      ];
-      const arr2: Option[] = [
-        {
-          title: "学员",
-          value: "学员-n",
-          children: [],
-        },
-        {
-          title: "管理员",
-          value: "管理员-n",
-          children: [],
-        },
-        {
-          title: "管理员日志",
-          value: "管理员日志-n",
-          children: [],
-        },
-        {
-          title: "管理员角色",
-          value: "管理员角色-n",
-          children: [],
-        },
-        {
-          title: "线上课",
-          value: "线上课-n",
-          children: [],
-        },
-        {
-          title: "资源分类",
-          value: "资源分类-n",
-          children: [],
-        },
-        {
-          title: "部门",
-          value: "部门-n",
-          children: [],
-        },
-        {
-          title: "系统配置",
-          value: "系统配置-n",
-          children: [],
-        },
-        {
-          title: "其它",
-          value: "其它-n",
-          children: [],
-        },
-      ];
+      const arr: any = [];
+      const arr2: any = [];
       let actions = res.data.perm_action.action;
       let permissions = res.data.perm_action.data;
       for (let i = 0; i < permissions.length; i++) {
-        arr.map((item: any) => {
-          if (item.title === permissions[i].group_name) {
-            item.children.push({
-              title: permissions[i].name,
-              value: permissions[i].id,
-            });
-          }
-        });
+        const key = arr.findIndex(
+          (it: any) => it.title === permissions[i].group_name
+        );
+        if (key >= 0) {
+          arr[key].children.push({
+            title: permissions[i].name,
+            value: permissions[i].id,
+          });
+        } else {
+          arr.push({
+            title: permissions[i].group_name,
+            value: permissions[i].group_name + "-n",
+            children: [
+              {
+                title: permissions[i].name,
+                value: permissions[i].id,
+              },
+            ],
+          });
+        }
       }
       for (let j = 0; j < actions.length; j++) {
-        arr2.map((item: any) => {
-          if (item.title === actions[j].group_name) {
-            item.children.push({
-              title: actions[j].name,
-              value: actions[j].id,
-            });
-          }
-        });
+        const key = arr2.findIndex(
+          (it: any) => it.title === actions[j].group_name
+        );
+        if (key >= 0) {
+          arr2[key].children.push({
+            title: actions[j].name,
+            value: actions[j].id,
+          });
+        } else {
+          arr2.push({
+            title: actions[j].group_name,
+            value: actions[j].group_name + "-n",
+            children: [
+              {
+                title: actions[j].name,
+                value: actions[j].id,
+              },
+            ],
+          });
+        }
       }
       setPermissions(arr);
       setActions(arr2);

src/pages/system/config/index.tsx

@@ -14,13 +14,14 @@ import {
 } from "antd";
 import { appConfig, system } from "../../../api/index";
 import { UploadImageButton } from "../../../compenents";
-import { useDispatch } from "react-redux";
+import { useSelector, useDispatch } from "react-redux";
 import type { TabsProps } from "antd";
 import type { CheckboxChangeEvent } from "antd/es/checkbox";
 import {
   SystemConfigStoreInterface,
   saveConfigAction,
 } from "../../../store/system/systemConfigSlice";
+import logoIcon from "../../../assets/logo.png";
 
 const SystemConfigPage = () => {
   const dispatch = useDispatch();
@@ -33,6 +34,9 @@ const SystemConfigPage = () => {
   const [nameChecked, setNameChecked] = useState(false);
   const [emailChecked, setEmailChecked] = useState(false);
   const [idCardchecked, setIdCardChecked] = useState(false);
+  const memberDefaultAvatar = useSelector(
+    (state: any) => state.systemConfig.value.memberDefaultAvatar
+  );
 
   useEffect(() => {
     getDetail();
@@ -52,6 +56,8 @@ const SystemConfigPage = () => {
           });
           if (configData[i].key_value !== "") {
             setLogo(configData[i].key_value);
+          } else {
+            setLogo(logoIcon);
           }
         } else if (configData[i].key_name === "system.api_url") {
           form.setFieldsValue({
@@ -122,7 +128,11 @@ const SystemConfigPage = () => {
             "system.pc_index_footer_msg": configData[i].key_value,
           });
         } else if (configData[i].key_name === "member.default_avatar") {
-          setAvatar(configData[i].key_value);
+          if (configData[i].key_value !== "") {
+            setAvatar(configData[i].key_value);
+          } else {
+            setAvatar(memberDefaultAvatar);
+          }
           form.setFieldsValue({
             "member.default_avatar": configData[i].key_value,
           });
@@ -170,10 +180,6 @@ const SystemConfigPage = () => {
           form.setFieldsValue({
             "ldap.base_dn": configData[i].key_value,
           });
-        } else if (configData[i].key_name === "ldap.user_dn_prefix") {
-          form.setFieldsValue({
-            "ldap.user_dn_prefix": configData[i].key_value,
-          });
         }
       }
     });
@@ -259,6 +265,8 @@ const SystemConfigPage = () => {
         systemH5Url: res.data["system.h5_url"],
         memberDefaultAvatar: res.data["member.default_avatar"],
         courseDefaultThumbs: res.data["default.course_thumbs"],
+        departments: res.data["departments"],
+        resourceCategories: res.data["resource_categories"],
       };
       dispatch(saveConfigAction(data));
     });
@@ -729,7 +737,7 @@ const SystemConfigPage = () => {
                 />
               </Form.Item>
               <div className="helper-text">
-                （LDAP的对外服务地址。例如：ldap.example.com）
+                （LDAP的对外服务地址。例如：ldap://ldap.example.com:389）
               </div>
             </Space>
           </Form.Item>
@@ -763,21 +771,7 @@ const SystemConfigPage = () => {
                   placeholder="请填写基本DN"
                 />
               </Form.Item>
-              <div className="helper-text">（从LDAP根节点搜索用户）</div>
-            </Space>
-          </Form.Item>
-          <Form.Item style={{ marginBottom: 30 }} label="附件用户DN">
-            <Space align="baseline" style={{ height: 32 }}>
-              <Form.Item name="ldap.user_dn_prefix">
-                <Input
-                  style={{ width: 274 }}
-                  allowClear
-                  placeholder="请填写基本DN"
-                />
-              </Form.Item>
-              <div className="helper-text">
-                （搜索用户时，基于基础DN的搜索范围限制）
-              </div>
+              <div className="helper-text">（从此节点搜索用户）</div>
             </Space>
           </Form.Item>
           <Form.Item

src/playedu.d.ts

@@ -1,4 +1,8 @@
 declare global {
+  interface KeyNumberObject {
+    [key: number]: number;
+  }
+
   interface FileItem {
     id: string; //上传文件的唯一id
     file: File; //上传的文件资源

src/store/system/systemConfigSlice.ts

@@ -9,21 +9,32 @@ type SystemConfigStoreInterface = {
   systemName?: string;
   memberDefaultAvatar?: string;
   courseDefaultThumbs?: string[];
+  departments?: any;
+  resourceCategories?: any;
 };
 
+let defaultValue: SystemConfigStoreInterface = {};
+
 const systemConfigSlice = createSlice({
   name: "systemConfig",
   initialState: {
-    value: {},
+    value: defaultValue,
   },
   reducers: {
     saveConfigAction(stage, e) {
       stage.value = e.payload;
     },
+    saveDepartmentsAction(stage, e) {
+      stage.value.departments = e.payload;
+    },
+    saveCategoriesAction(stage, e) {
+      stage.value.resourceCategories = e.payload;
+    },
   },
 });
 
 export default systemConfigSlice.reducer;
-export const { saveConfigAction } = systemConfigSlice.actions;
+export const { saveConfigAction, saveDepartmentsAction, saveCategoriesAction } =
+  systemConfigSlice.actions;
 
 export type { SystemConfigStoreInterface };

src/utils/index.ts

@@ -24,22 +24,12 @@ export function timeFormat(dateStr: number) {
     return "-";
   }
   var d = moment.duration(dateStr, "seconds");
-  let value =
-    Math.floor(d.asDays()) +
-    "天" +
-    d.hours() +
-    "时" +
-    d.minutes() +
-    "分" +
-    d.seconds() +
-    "秒";
+  let value = d.hours() + "时" + d.minutes() + "分" + d.seconds() + "秒";
 
-  if (Math.floor(d.asDays()) === 0) {
-    if (d.hours() === 0) {
-      value = d.minutes() + "分" + d.seconds() + "秒";
-    } else {
-      value = d.hours() + "时" + d.minutes() + "分" + d.seconds() + "秒";
-    }
+  if (d.hours() === 0) {
+    value = d.minutes() + "分" + d.seconds() + "秒";
+  } else {
+    value = d.hours() + "时" + d.minutes() + "分" + d.seconds() + "秒";
   }
 
   return value;