部门管理部门列表

src/api/department.ts

@@ -26,7 +26,7 @@ export function updateDepartment(
   parentId: number,
   sort: number
 ) {
-  return client.post(`/backend/v1/department/${id}`, {
+  return client.put(`/backend/v1/department/${id}`, {
     name,
     parent_id: parentId,
     sort,

src/pages/department/index.tsx

@@ -3,10 +3,17 @@ import { Button, Space, Table, Popconfirm, message } from "antd";
 import type { ColumnsType } from "antd/es/table";
 import styles from "./index.module.less";
 import { PlusOutlined, ReloadOutlined } from "@ant-design/icons";
-import { adminRole } from "../../api/index";
+import { department } from "../../api/index";
 import { dateFormat } from "../../utils/index";
 import { Link, useNavigate } from "react-router-dom";
 
+interface Option {
+  id: string | number;
+  name: string;
+  created_at: string;
+  children?: Option[];
+}
+
 interface DataType {
   id: React.Key;
   name: string;
@@ -20,16 +27,16 @@ export const DepartmentPage: React.FC = () => {
   const [refresh, setRefresh] = useState(false);
 
   const columns: ColumnsType<DataType> = [
+    {
+      title: "部门名",
+      dataIndex: "name",
+      render: (text: string) => <span>{text}</span>,
+    },
     {
       title: "ID",
       key: "id",
       dataIndex: "id",
     },
-    {
-      title: "角色名",
-      dataIndex: "name",
-      render: (text: string) => <span>{text}</span>,
-    },
     {
       title: "时间",
       dataIndex: "created_at",
@@ -72,21 +79,45 @@ export const DepartmentPage: React.FC = () => {
 
   const getData = () => {
     setLoading(true);
-    adminRole.adminRoleList().then((res: any) => {
+    department.departmentList().then((res: any) => {
-      setList(res.data);
+      const departments = res.data.departments;
+      const new_arr: Option[] = checkArr(departments, 0);
+      setList(new_arr);
       setTimeout(() => {
         setLoading(false);
       }, 1000);
     });
   };
 
+  const checkArr = (departments: any[], id: number) => {
+    const arr = [];
+    for (let i = 0; i < departments[id].length; i++) {
+      if (!departments[departments[id][i].id]) {
+        arr.push({
+          name: departments[id][i].name,
+          id: departments[id][i].id,
+          created_at: departments[id][i].created_at,
+        });
+      } else {
+        const new_arr: Option[] = checkArr(departments, departments[id][i].id);
+        arr.push({
+          name: departments[id][i].name,
+          id: departments[id][i].id,
+          created_at: departments[id][i].created_at,
+          children: new_arr,
+        });
+      }
+    }
+    return arr;
+  };
+
   const resetData = () => {
     setList([]);
     setRefresh(!refresh);
   };
 
   const delUser = (id: any) => {
-    adminRole.destroyAdminRole(id).then((res: any) => {
+    department.destroyDepartment(id).then((res: any) => {
       setTimeout(() => {
         message.success("操作成功");
         setRefresh(!refresh);

src/pages/member/index.tsx

@@ -171,6 +171,8 @@ export const MemberPage: React.FC = () => {
   return (
     <>
       <Row>
+        <Col span={4}></Col>
+        <Col span={20}>
           <div className="playedu-main-body mb-24">
             <div className="float-left d-flex">
               <div className="d-flex mr-24">
@@ -222,8 +224,6 @@ export const MemberPage: React.FC = () => {
               </div>
             </div>
           </div>
-        <Col span={4}></Col>
-        <Col span={20}>
           <div className="playedu-main-body">
             <div className="float-left j-b-flex mb-24">
               <div className="d-flex">