系统配置优化

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

@@ -3,7 +3,7 @@ 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";
-import { TreeCategory, UploadCoursewareButton } from "../../compenents";
+import { TreeCategory } from "../../compenents";
 
 interface VideoItem {
   id: number;
@@ -181,12 +181,7 @@ export const UploadCoursewareSub = (props: PropsInterface) => {
         <Col span={17}>
           <Row style={{ marginBottom: 24, paddingLeft: 10 }}>
             <div className="float-left  j-b-flex">
-              <UploadCoursewareButton
+              <div className="d-flex"></div>
-                categoryIds={category_ids}
-                onUpdate={() => {
-                  resetVideoList();
-                }}
-              ></UploadCoursewareButton>
               <div className="d-flex">
                 <div className="d-flex mr-24">
                   <Typography.Text>名称：</Typography.Text>

src/compenents/upload-video-float-button/index.tsx

@@ -64,7 +64,18 @@ export const UploadVideoFloatButton = () => {
 
   const uploadProps = {
     multiple: true,
-    beforeUpload: async (file: File) => {
+    beforeUpload: async (file: File, fileList: any) => {
+      if (file.size > 2 * 1024 * 1024 * 1024) {
+        message.error(`${file.name} 大小超过2G`);
+        return Upload.LIST_IGNORE;
+      }
+      if (fileList.length > 10) {
+        message.config({ maxCount: 1 });
+        message.error("单次最多上传10个视频");
+        return Upload.LIST_IGNORE;
+      } else {
+        message.config({ maxCount: 10 });
+      }
       if (file.type === "video/mp4") {
         // 视频封面解析 || 视频时长解析
         let videoInfo = await parseVideo(file);
@@ -175,7 +186,7 @@ export const UploadVideoFloatButton = () => {
                   </p>
                   <p className="ant-upload-text">请将视频拖拽到此处上传</p>
                   <p className="ant-upload-hint">
-                    支持一次上传多个 / 支持 mp4 格式视频
+                    支持一次上传多个 / 支持2G以内的mp4文件
                   </p>
                 </Dragger>
               </Col>

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

@@ -3,7 +3,6 @@ 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";
-import { UploadVideoButton } from "../upload-video-button";
 import { DurationText, TreeCategory } from "../../compenents";
 
 interface VideoItem {
@@ -173,12 +172,7 @@ export const UploadVideoSub = (props: PropsInterface) => {
         <Col span={17}>
           <Row style={{ marginBottom: 24, paddingLeft: 10 }}>
             <div className="float-left  j-b-flex">
-              <UploadVideoButton
+              <div className="d-flex"></div>
-                categoryIds={category_ids}
-                onUpdate={() => {
-                  resetVideoList();
-                }}
-              ></UploadVideoButton>
               <div className="d-flex">
                 <div className="d-flex mr-24">
                   <Typography.Text>名称：</Typography.Text>

src/pages/course/compenents/create.tsx

@@ -10,6 +10,7 @@ import {
   message,
   Image,
   TreeSelect,
+  Spin,
 } from "antd";
 import styles from "./create.module.less";
 import { useSelector } from "react-redux";
@@ -52,6 +53,7 @@ export const CourseCreate: React.FC<PropInterface> = ({
   const defaultThumb2 = courseDefaultThumbs[1];
   const defaultThumb3 = courseDefaultThumbs[2];
   const [loading, setLoading] = useState(false);
+  const [init, setInit] = useState(true);
   const [departments, setDepartments] = useState<Option[]>([]);
   const [categories, setCategories] = useState<Option[]>([]);
   const [thumb, setThumb] = useState("");
@@ -71,9 +73,9 @@ export const CourseCreate: React.FC<PropInterface> = ({
   const [attachments, setAttachments] = useState<number[]>([]);
 
   useEffect(() => {
+    setInit(true);
     if (open) {
-      getParams();
+      initData();
-      getCategory();
     }
   }, [open, cateIds, depIds]);
 
@@ -96,43 +98,48 @@ export const CourseCreate: React.FC<PropInterface> = ({
     setShowDrop(false);
   }, [form, open]);
 
-  const getParams = () => {
+  const initData = async () => {
-    department.departmentList().then((res: any) => {
+    await getParams();
-      const departments = res.data.departments;
+    await getCategory();
-      const departCount: DepIdsModel = res.data.dep_user_count;
+    setInit(false);
-      if (JSON.stringify(departments) !== "{}") {
+  };
-        const new_arr: any = checkArr(departments, 0, departCount);
+
-        setDepartments(new_arr);
+  const getParams = async () => {
-      }
+    let res: any = await department.departmentList();
-      let type = "open";
+    const departments = res.data.departments;
-      if (depIds.length !== 0 && depIds[0] !== 0) {
+    const departCount: DepIdsModel = res.data.dep_user_count;
-        type = "elective";
+    if (JSON.stringify(departments) !== "{}") {
-        let item = checkChild(res.data.departments, depIds[0]);
+      const new_arr: any = checkArr(departments, 0, departCount);
-        let arr: any[] = [];
+      setDepartments(new_arr);
-        if (item === undefined) {
+    }
-          arr.push(depIds[0]);
+    let type = "open";
-        } else if (item.parent_chain === "") {
+    if (depIds.length !== 0 && depIds[0] !== 0) {
-          arr.push(depIds[0]);
+      type = "elective";
-        } else {
+      let item = checkChild(res.data.departments, depIds[0]);
-          let new_arr = item.parent_chain.split(",");
+      let arr: any[] = [];
-          new_arr.map((num: any) => {
+      if (item === undefined) {
-            arr.push(Number(num));
+        arr.push(depIds[0]);
-          });
+      } else if (item.parent_chain === "") {
-          arr.push(depIds[0]);
+        arr.push(depIds[0]);
-        }
-        form.setFieldsValue({
-          dep_ids: arr,
-        });
       } else {
-        form.setFieldsValue({
+        let new_arr = item.parent_chain.split(",");
-          dep_ids: depIds,
+        new_arr.map((num: any) => {
+          arr.push(Number(num));
         });
+        arr.push(depIds[0]);
       }
       form.setFieldsValue({
-        type: type,
+        dep_ids: arr,
       });
-      setType(type);
+    } else {
+      form.setFieldsValue({
+        dep_ids: depIds,
+      });
+    }
+    form.setFieldsValue({
+      type: type,
     });
+    setType(type);
   };
 
   const checkChild = (departments: any[], id: number) => {
@@ -145,37 +152,36 @@ export const CourseCreate: React.FC<PropInterface> = ({
     }
   };
 
-  const getCategory = () => {
+  const getCategory = async () => {
-    course.createCourse().then((res: any) => {
+    let res: any = await course.createCourse();
-      const categories = res.data.categories;
+    const categories = res.data.categories;
-      if (JSON.stringify(categories) !== "{}") {
+    if (JSON.stringify(categories) !== "{}") {
-        const new_arr: any = checkArr(categories, 0, null);
+      const new_arr: any = checkArr(categories, 0, null);
-        setCategories(new_arr);
+      setCategories(new_arr);
-      }
+    }
 
-      if (cateIds.length !== 0 && cateIds[0] !== 0) {
+    if (cateIds.length !== 0 && cateIds[0] !== 0) {
-        let item = checkChild(res.data.categories, cateIds[0]);
+      let item = checkChild(res.data.categories, cateIds[0]);
-        let arr: any[] = [];
+      let arr: any[] = [];
-        if (item === undefined) {
+      if (item === undefined) {
-          arr.push(cateIds[0]);
+        arr.push(cateIds[0]);
-        } else if (item.parent_chain === "") {
+      } else if (item.parent_chain === "") {
-          arr.push(cateIds[0]);
+        arr.push(cateIds[0]);
-        } else {
-          let new_arr = item.parent_chain.split(",");
-          new_arr.map((num: any) => {
-            arr.push(Number(num));
-          });
-          arr.push(cateIds[0]);
-        }
-        form.setFieldsValue({
-          category_ids: arr,
-        });
       } else {
-        form.setFieldsValue({
+        let new_arr = item.parent_chain.split(",");
-          category_ids: cateIds,
+        new_arr.map((num: any) => {
+          arr.push(Number(num));
         });
+        arr.push(cateIds[0]);
       }
-    });
+      form.setFieldsValue({
+        category_ids: arr,
+      });
+    } else {
+      form.setFieldsValue({
+        category_ids: cateIds,
+      });
+    }
   };
 
   const getNewTitle = (title: any, id: number, counts: any) => {
@@ -503,7 +509,15 @@ export const CourseCreate: React.FC<PropInterface> = ({
           }
           width={634}
         >
-          <div className="float-left mt-24">
+          {init && (
+            <div className="float-left text-center mt-30">
+              <Spin></Spin>
+            </div>
+          )}
+          <div
+            className="float-left mt-24"
+            style={{ display: init ? "none" : "block" }}
+          >
             <SelectResource
               defaultKeys={
                 chapterType == 0 ? hours : changeChapterHours(chapterHours)

src/pages/course/compenents/update.tsx

@@ -103,7 +103,6 @@ export const CourseUpdate: React.FC<PropInterface> = ({
       setType(type);
       setThumb(res.data.course.thumb);
       setInit(false);
-      console.log(dayjs(res.data.course.published_at, "YYYY-MM-DD HH:mm:ss"));
     });
   };
 

src/pages/department/compenents/create.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect } from "react";
-import { Modal, Form, Input, Cascader, message } from "antd";
+import { Modal, Form, Input, Cascader, message, Spin } from "antd";
 import styles from "./create.module.less";
 import { department } from "../../../api/index";
 
@@ -19,11 +19,13 @@ export const DepartmentCreate: React.FC<PropInterface> = ({
   onCancel,
 }) => {
   const [form] = Form.useForm();
+  const [init, setInit] = useState(true);
   const [loading, setLoading] = useState(false);
   const [departments, setDepartments] = useState<any>([]);
   const [parent_id, setParentId] = useState<number>(0);
 
   useEffect(() => {
+    setInit(true);
     if (open) {
       getParams();
     }
@@ -54,6 +56,7 @@ export const DepartmentCreate: React.FC<PropInterface> = ({
         });
         setDepartments(new_arr);
       }
+      setInit(false);
     });
   };
 
@@ -125,7 +128,15 @@ export const DepartmentCreate: React.FC<PropInterface> = ({
           maskClosable={false}
           okButtonProps={{ loading: loading }}
         >
-          <div className="float-left mt-24">
+          {init && (
+            <div className="float-left text-center mt-30">
+              <Spin></Spin>
+            </div>
+          )}
+          <div
+            className="float-left mt-24"
+            style={{ display: init ? "none" : "block" }}
+          >
             <Form
               form={form}
               name="basic"

src/pages/member/compenents/create.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import { Modal, Form, TreeSelect, Input, message } from "antd";
+import { Modal, Form, TreeSelect, Input, message, Spin } from "antd";
 import styles from "./create.module.less";
 import { useSelector } from "react-redux";
 import { user, department } from "../../../api/index";
@@ -24,6 +24,7 @@ export const MemberCreate: React.FC<PropInterface> = ({
   onCancel,
 }) => {
   const [form] = Form.useForm();
+  const [init, setInit] = useState(true);
   const [loading, setLoading] = useState(false);
   const [departments, setDepartments] = useState<any>([]);
   const memberDefaultAvatar = useSelector(
@@ -32,6 +33,7 @@ export const MemberCreate: React.FC<PropInterface> = ({
   const [avatar, setAvatar] = useState<string>(memberDefaultAvatar);
 
   useEffect(() => {
+    setInit(true);
     if (open) {
       getParams();
     }
@@ -56,6 +58,7 @@ export const MemberCreate: React.FC<PropInterface> = ({
         const new_arr: Option[] = checkArr(departments, 0);
         setDepartments(new_arr);
       }
+      setInit(false);
     });
   };
 
@@ -125,7 +128,15 @@ export const MemberCreate: React.FC<PropInterface> = ({
           maskClosable={false}
           okButtonProps={{ loading: loading }}
         >
-          <div className="member-form float-left mt-24">
+          {init && (
+            <div className="float-left text-center mt-30">
+              <Spin></Spin>
+            </div>
+          )}
+          <div
+            className="float-left mt-24"
+            style={{ display: init ? "none" : "block" }}
+          >
             <Form
               form={form}
               name="create-basic"
@@ -203,13 +214,6 @@ export const MemberCreate: React.FC<PropInterface> = ({
                   placeholder="请选择学员所属部门"
                 />
               </Form.Item>
-              <Form.Item label="身份证号" name="idCard">
-                <Input
-                  style={{ width: 274 }}
-                  allowClear
-                  placeholder="请填写学员身份证号"
-                />
-              </Form.Item>
             </Form>
           </div>
         </Modal>

src/pages/member/compenents/update.tsx

@@ -239,13 +239,6 @@ export const MemberUpdate: React.FC<PropInterface> = ({
                   placeholder="请选择学员所属部门"
                 />
               </Form.Item>
-              <Form.Item label="身份证号" name="idCard">
-                <Input
-                  allowClear
-                  style={{ width: 274 }}
-                  placeholder="请填写学员身份证号"
-                />
-              </Form.Item>
             </Form>
           </div>
         </Modal>

src/pages/resource/resource-category/compenents/create.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect } from "react";
-import { Modal, Form, Input, Cascader, message } from "antd";
+import { Modal, Form, Input, Cascader, message, Spin } from "antd";
 import styles from "./create.module.less";
 import { resourceCategory } from "../../../../api/index";
 
@@ -19,11 +19,13 @@ export const ResourceCategoryCreate: React.FC<PropInterface> = ({
   onCancel,
 }) => {
   const [form] = Form.useForm();
+  const [init, setInit] = useState(true);
   const [loading, setLoading] = useState(false);
   const [categories, setCategories] = useState<any>([]);
   const [parent_id, setParentId] = useState<number>(0);
 
   useEffect(() => {
+    setInit(true);
     if (open) {
       getParams();
     }
@@ -54,6 +56,7 @@ export const ResourceCategoryCreate: React.FC<PropInterface> = ({
         });
         setCategories(new_arr);
       }
+      setInit(false);
     });
   };
 
@@ -125,7 +128,15 @@ export const ResourceCategoryCreate: React.FC<PropInterface> = ({
           onCancel={() => onCancel()}
           okButtonProps={{ loading: loading }}
         >
-          <div className="float-left mt-24">
+          {init && (
+            <div className="float-left text-center mt-30">
+              <Spin></Spin>
+            </div>
+          )}
+          <div
+            className="float-left mt-24"
+            style={{ display: init ? "none" : "block" }}
+          >
             <Form
               form={form}
               name="basic"

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import { Modal, Select, Switch, Form, Input, message } from "antd";
+import { Modal, Select, Switch, Form, Input, message, Spin } from "antd";
 import styles from "./create.module.less";
 import { adminUser } from "../../../../api/index";
 
@@ -22,10 +22,12 @@ export const SystemAdministratorCreate: React.FC<PropInterface> = ({
   onCancel,
 }) => {
   const [form] = Form.useForm();
+  const [init, setInit] = useState(true);
   const [loading, setLoading] = useState(false);
   const [roles, setRoles] = useState<selRoleModel[]>([]);
 
   useEffect(() => {
+    setInit(true);
     if (open) {
       getParams();
     }
@@ -56,6 +58,7 @@ export const SystemAdministratorCreate: React.FC<PropInterface> = ({
         });
       }
       setRoles(arr);
+      setInit(false);
     });
   };
 
@@ -110,7 +113,15 @@ export const SystemAdministratorCreate: React.FC<PropInterface> = ({
           maskClosable={false}
           okButtonProps={{ loading: loading }}
         >
-          <div className="float-left mt-24">
+          {init && (
+            <div className="float-left text-center mt-30">
+              <Spin></Spin>
+            </div>
+          )}
+          <div
+            className="float-left mt-24"
+            style={{ display: init ? "none" : "block" }}
+          >
             <Form
               form={form}
               name="basic"

src/pages/system/adminlog/index.tsx

@@ -107,10 +107,10 @@ const SystemLogPage = () => {
       render: (_, record: any) => <span>{record.title}</span>,
     },
     {
-      title: "IP地区",
+      title: "IP",
       width: 250,
-      dataIndex: "ip_area",
+      dataIndex: "ip",
-      render: (ip_area: string) => <span>{ip_area}</span>,
+      render: (ip: string) => <span>{ip}</span>,
     },
     {
       title: "时间",

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

@@ -1,5 +1,14 @@
 import React, { useState, useEffect } from "react";
-import { Drawer, TreeSelect, Space, Button, Form, Input, message } from "antd";
+import {
+  Drawer,
+  TreeSelect,
+  Space,
+  Button,
+  Form,
+  Input,
+  message,
+  Spin,
+} from "antd";
 import styles from "./create.module.less";
 import { adminRole } from "../../../../api/index";
 
@@ -19,11 +28,13 @@ export const SystemAdminrolesCreate: React.FC<PropInterface> = ({
   onCancel,
 }) => {
   const [form] = Form.useForm();
+  const [init, setInit] = useState(true);
   const [loading, setLoading] = useState(false);
   const [permissions, setPermissions] = useState<Option[]>([]);
   const [actions, setActions] = useState<Option[]>([]);
 
   useEffect(() => {
+    setInit(true);
     if (open) {
       getParams();
     }
@@ -89,6 +100,7 @@ export const SystemAdminrolesCreate: React.FC<PropInterface> = ({
       }
       setPermissions(arr);
       setActions(arr2);
+      setInit(false);
     });
   };
 
@@ -148,7 +160,15 @@ export const SystemAdminrolesCreate: React.FC<PropInterface> = ({
           }
           width={634}
         >
-          <div className="float-left mt-24">
+          {init && (
+            <div className="float-left text-center mt-30">
+              <Spin></Spin>
+            </div>
+          )}
+          <div
+            className="float-left mt-24"
+            style={{ display: init ? "none" : "block" }}
+          >
             <Form
               form={form}
               name="adminroles-create"

src/pages/system/config/index.tsx

@@ -302,9 +302,9 @@ const SystemConfigPage = () => {
           {logo && (
             <Form.Item
               style={{ marginBottom: 30 }}
-              label="网站Logo"
+              label="PC学员端Logo"
               name="system.logo"
-              labelCol={{ style: { marginTop: 4, marginLeft: 54 } }}
+              labelCol={{ style: { marginTop: 4, marginLeft: 24 } }}
             >
               <div className="d-flex">
                 <Image preview={false} height={40} src={logo} />
@@ -326,7 +326,7 @@ const SystemConfigPage = () => {
           {!logo && (
             <Form.Item
               style={{ marginBottom: 30 }}
-              label="网站Logo"
+              label="PC学员端Logo"
               name="system.logo"
             >
               <div className="d-flex">
@@ -354,38 +354,38 @@ const SystemConfigPage = () => {
           </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}
-            label="PC端访问地址"
+            label="PC学员端地址"
             name="system.pc_url"
           >
-            <Input style={{ width: 274 }} placeholder="请填写PC端访问地址" />
+            <Input style={{ width: 274 }} placeholder="请填写PC学员端地址" />
           </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}
-            label="H5端访问地址"
+            label="H5学员端地址"
             name="system.h5_url"
           >
-            <Input style={{ width: 274 }} placeholder="请填写H5端访问地址" />
+            <Input style={{ width: 274 }} placeholder="请填写H5学员端地址" />
           </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}
-            label="网站标题"
+            label="学员端标题"
             name="system.name"
           >
             <Input
               style={{ width: 274 }}
               allowClear
-              placeholder="请填写网站标题"
+              placeholder="请填写学员端标题"
             />
           </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}
-            label="网站页脚"
+            label="学员端页脚"
             name="system.pc_index_footer_msg"
           >
             <Input
               style={{ width: 274 }}
               allowClear
-              placeholder="请填写网站页脚"
+              placeholder="请填写学员端页脚"
             />
           </Form.Item>
           <Form.Item
@@ -467,13 +467,6 @@ const SystemConfigPage = () => {
               >
                 邮箱
               </Checkbox>
-              <Checkbox
-                checked={idCardchecked}
-                className="ml-24"
-                onChange={addIdCard}
-              >
-                身份证号
-              </Checkbox>
             </Space>
           </Form.Item>
           <Form.Item