功能，路由权限

env/.env.production

 #请求接口地址
-VITE_REQUEST_BASE_URL='https://www.iuav.shop'
-#VITE_REQUEST_BASE_URL='https://test.iuav.shop'
+#VITE_REQUEST_BASE_URL='https://www.iuav.shop'
+VITE_REQUEST_BASE_URL='https://test.iuav.shop'
 #VITE_REQUEST_BASE_URL='/api'
 #旧版接口地址
 #VITE_REQUEST_BASE_URL='https://iuav.mmcuav.cn'

src/api/interface/commonType.ts

@@ -24,6 +24,11 @@ export type BackEndLoginType = InterFunction<
       phoneNum: string;
       remark: string;
     };
+    roleInfo: {
+      id: number;
+      roleName: string;
+      roleNo: string;
+    };
   }
 >;
 // 上传图片

src/api/interface/systemManageType.ts

@@ -45,6 +45,11 @@ export type listBAccountPageType = InterListFunction<
       phoneNum: string;
       remark: string;
     };
+    roleInfoDTO: {
+      id: number;
+      roleName: string;
+      roleNo: string;
+    };
   }
 >;
 // 账号-新增
@@ -62,6 +67,8 @@ export type insertBAccountType = InterFunction<
     provinceCode?: number;
     remark?: string;
     userName: string;
+    companyId: number;
+    roleId: number;
   },
   NonNullable<unknown>
 >;

src/components/goods/commonAddOrEdit/stockSku/index.tsx

@@ -16,7 +16,7 @@ interface selfProps {
   deleteSku: (record: specEntity) => void;
   isDetail: boolean;
 }
-
+//机构列表
 const StockSku: React.FC<selfProps> = ({
   addOrEditSku,
   specData,

src/components/layout/menu/index.tsx

@@ -5,6 +5,7 @@ import { RouteObjectType, routerList } from '~/router/router';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { GetRouteByID, getRouteID, getRoutePid } from '~/utils/router';
 import { useSelector } from 'react-redux';
+import { authRouterList, routerItem } from '~/router';
 
 type MenuItem = Required<MenuProps>['items'][number];
 
@@ -30,11 +31,9 @@ export function MenuView() {
   // 点击侧边栏事件 onSelect改为onClick
   const onSelect: MenuProps['onClick'] = (keys) => {
     setSelectedKeys([keys.key]);
-    // setSelectedKeys(keys.selectedKeys);
     const id = Number(keys.key);
-    const current = GetRouteByID(id, routerList);
-    // console.log(current?.path);
-    if (current) navigate(current?.path);
+    const current: routerItem | undefined = GetRouteByID(id, routerList);
+    navigate({ pathname: current?.path });
   };
   // 递归将路由转换为侧边栏数据
   const getItem = (routerList: RouteObjectType[]) => {
@@ -61,7 +60,7 @@ export function MenuView() {
   // 组件挂载
   useEffect(() => {
     // 设置侧边栏数据
-    setItems(getItem(routerList));
+    setItems(getItem(authRouterList()));
     // 设置当前选中的项目
     setOpenKeys([getRoutePid(routerList, location.pathname).toString()]);
     // 设置当前选中的项目的subMenu
@@ -84,13 +83,6 @@ export function MenuView() {
         items={items}
         style={{ backgroundColor: ' #F3F6FF ' }}
       />
-      {/* <div className="sider-collapsed" onClick={() => setCollapsed(!collapsed)}> */}
-      {/*  <Button */}
-      {/*    className="collapsed-icon" */}
-      {/*    type="link" */}
-      {/*    icon={collapsed ? <RightOutlined /> : <LeftOutlined />} */}
-      {/*  /> */}
-      {/* </div> */}
     </Sider>
   );
 }

src/components/layout/title/index.tsx

@@ -5,6 +5,7 @@ import { Button, Dropdown, MenuProps, Modal } from 'antd';
 import Logo from '../../../assets/icon/logo_big.png';
 import './index.scss';
 import { REMOVE_MENU, REMOVE_MENU_ID, SET_COLLAPSE } from '~/store/module/menu';
+import { REMOVE_ROLE_LIST } from '~/store/module/userInfo';
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 import Cookies from 'js-cookie';
@@ -41,6 +42,7 @@ export function TitleView() {
                 Cookies.remove('SHAREFLY-TOKEN');
                 dispatch(REMOVE_MENU());
                 dispatch(REMOVE_MENU_ID());
+                dispatch(REMOVE_ROLE_LIST());
               },
             });
           }}

src/pages/common/login/index.tsx

@@ -6,15 +6,13 @@ import Cookies from 'js-cookie';
 import './index.scss';
 import { InterReqType } from '~/api/interface';
 import { BackEndLoginType } from '~/api/interface/commonType';
-import { CommonAPI } from '~/api';
+import { CommonAPI, SystemManageAPI } from '~/api';
 import { useDispatch } from 'react-redux';
-import { SET_USERINFO } from '~/store/module/userInfo';
+import { SET_USERINFO, SET_ROLE_LIST } from '~/store/module/userInfo';
 import { authRouterList } from '~/router';
 
 // 请求的类型
 type ReqType = InterReqType<BackEndLoginType>;
-// 返回的类型
-// type ResType = InterDataType<BackEndLoginType>;
 
 function LoginView() {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars,@typescript-eslint/ban-ts-comment
@@ -39,21 +37,17 @@ function LoginView() {
       Cookies.set('remember', String(values?.remember));
       // 存用户信息
       dispatch(SET_USERINFO(res.result));
-      // 获取用户的权限
-      await getFirstRoute();
-      // console.log('SXTB_TOKEN --->', Cookies.get('SXTB-TOKEN'));
+      SystemManageAPI.getListRoleMenuInfo({ roleId: res.result.roleInfo.id }).then(({ result }) => {
+        dispatch(SET_ROLE_LIST(result));
+        const routeList = authRouterList(result);
+        // 获取第一个路由
+        navigate({ pathname: routeList[0]?.children?.[0]?.path });
+      });
     } else {
       message.error('登录失败，请检查账号信息');
     }
   };
-  // 获取第一个路由
-  const getFirstRoute = () => {
-    // 获取可用的路由表
-    const routeList = authRouterList();
-    // 获取第一个路由
-    navigate(routeList[0]?.children?.[0]?.path);
-    // console.log('获取第一个路由--->', routeList[0]?.children?.[0]?.path);
-  };
+
   // componentDidMount
   useEffect(() => {
     // 是否保存密码

src/pages/orderManage/pilotTrainingOrder/index.tsx

+import SearchBox, { searchColumns } from '~/components/search-box';
+import { Table } from 'antd';
+import { ColumnsType } from 'antd/es/table';
+
+const PilotTrainingOrder = () => {
+  const search: searchColumns[] = [
+    { label: '买家账号', placeholder: '请输入买家账号', name: '', type: 'input' },
+    { label: '订单编号', placeholder: '请输入买家账号', name: '', type: 'input' },
+  ];
+  const tableColumns: ColumnsType<any> = [
+    {
+      title: '序号',
+      align: 'center',
+    },
+    {
+      title: '机构名称',
+      align: 'center',
+    },
+    {
+      title: '商品名称',
+      align: 'center',
+    },
+    {
+      title: '商品图片',
+      align: 'center',
+    },
+    {
+      title: '订单金额',
+      align: 'center',
+    },
+    {
+      title: '买家信息',
+      align: 'center',
+    },
+    {
+      title: '订单状态',
+      align: 'center',
+    },
+    {
+      title: '订单编号',
+      align: 'center',
+    },
+    {
+      title: '备注',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      align: 'center',
+    },
+  ];
+  return (
+    <div className='pilot-train-order'>
+      <SearchBox search={search} />
+      <Table bordered columns={tableColumns} />
+    </div>
+  );
+};
+export default PilotTrainingOrder;

src/pages/pilotTraining/ licensureExamination/addOrEditInstitution/components/baseInfo/index.tsx

+import { Form } from 'antd';
+
+const BaseInfo = () => {
+  return (
+    <Form>
+      <Form.Item label='机构主图'></Form.Item>
+      <Form.Item label='机构副图'></Form.Item>
+      <Form.Item label='机构视频'></Form.Item>
+      <Form.Item label='机构名称'></Form.Item>
+      <Form.Item label='机构地区'></Form.Item>
+      <Form.Item label='考点机构'></Form.Item>
+      <Form.Item label='机构规模'></Form.Item>
+      <Form.Item label='机构描述'></Form.Item>
+    </Form>
+  );
+};
+export default BaseInfo;

src/pages/pilotTraining/ licensureExamination/addOrEditInstitution/index.tsx

+import BaseInfo from './components/baseInfo';
+const AddOrEditInstitution = () => {
+  return (
+    <div className='institution-form'>
+      <BaseInfo />
+    </div>
+  );
+};
+export default AddOrEditInstitution;

src/pages/pilotTraining/ licensureExamination/institutionsList/index.tsx

+import SearchBox, { searchColumns } from '~/components/search-box';
+import { Button, Table } from 'antd';
+import { ColumnsType } from 'antd/es/table';
+import { PlusOutlined } from '@ant-design/icons';
+import { useNavigate } from 'react-router-dom';
+
+const InstitutionsList = () => {
+  const navigate = useNavigate();
+  const search: searchColumns[] = [
+    { label: '机构名称', name: '', placeholder: '请输入机构名称', type: 'input' },
+    { label: '培训类型', name: '', placeholder: '请选择培训类型', type: 'select', options: [] },
+    { label: '选择日期', name: '', placeholder: '请选择日期', type: 'rangePicker', options: [] },
+  ];
+  const tableColumns: ColumnsType<any> = [
+    {
+      title: '序号',
+      align: 'center',
+    },
+    {
+      title: '机构名称',
+      align: 'center',
+    },
+    {
+      title: '培训类型',
+      align: 'center',
+    },
+    {
+      title: '创建日期',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      align: 'center',
+    },
+  ];
+  const toAddInstitutions = () => {
+    navigate('/pilotTraining/institutionsList/add');
+  };
+  return (
+    <div className='institutions-list'>
+      <SearchBox
+        search={search}
+        child={
+          <Button icon={<PlusOutlined />} type='primary' onClick={toAddInstitutions}>
+            新增
+          </Button>
+        }
+      />
+      <Table bordered columns={tableColumns} />
+    </div>
+  );
+};
+export default InstitutionsList;

src/pages/systemManage/accountManage/comp/addEditModal/index.tsx

@@ -14,6 +14,7 @@ interface propType {
   open: boolean;
   closed: any;
   data?: TableType[0];
+  roleList: { label: string; value: number }[];
 }
 const AddEditModal: React.FC<propType> = (props) => {
   AddEditModal.defaultProps = {
@@ -77,7 +78,8 @@ const AddEditModal: React.FC<propType> = (props) => {
     if (!data) return;
     form.setFieldsValue({
       ...data,
-      companyId: companyList.find((i) => i.label === data.companyName)?.value || undefined,
+      companyId: companyList.find((i) => i.label === data.companyName)?.value,
+      roleId: data.roleInfoDTO.id,
     });
   }, [companyList]);
   return (
@@ -147,7 +149,7 @@ const AddEditModal: React.FC<propType> = (props) => {
               <Select
                 placeholder={'请选择角色'}
                 style={{ width: '168px' }}
-                options={[{ value: 1, label: '超级管理员' }]}
+                options={props.roleList}
               />
             </Form.Item>
           </Col>

src/pages/systemManage/accountManage/index.tsx

@@ -36,6 +36,8 @@ function AccountManageView() {
     current: 1,
     totalPage: 0,
   });
+  //角色列表
+  const [roleList, setRoleList] = useState<{ label: string; value: number }[]>([]);
   // 加载列表
   const getTableList = async (value = {}) => {
     // 只需要修改这个地方的接口即可
@@ -87,10 +89,17 @@ function AccountManageView() {
   const getEditAuth = (value: TableType[0]) => {
     return value.companyInfoVO.id !== userInfo.companyInfoVO.id && userInfo.companyInfoVO.id !== 1;
   };
+  //角色列表
+  const getRoleList = () => {
+    SystemManageAPI.getListRoleInfoPage({ pageNo: 1, pageSize: 9999 }).then(({ result }) => {
+      setRoleList((result.list || []).map((v) => ({ value: v.id, label: v.roleName })));
+    });
+  };
   // componentDidMount
   useEffect(() => {
     query = {};
     getTableList().then();
+    getRoleList();
   }, []);
   // 表格结构
   const columns: ColumnsType<TableType[0]> = [
@@ -126,9 +135,10 @@ function AccountManageView() {
       title: '角色',
       align: 'center',
       width: '10%',
+      render: (_text: string, record) => <div>{record.roleInfoDTO.roleName}</div>,
     },
     { title: '手机号', dataIndex: 'phoneNum', align: 'center', width: '150px' },
-    { title: '邮箱', align: 'center', width: '12%', dataIndex: 'email' },
+    { title: '邮箱', align: 'center', width: '18%', dataIndex: 'email' },
     {
       title: '备注',
       align: 'center',
@@ -217,7 +227,7 @@ function AccountManageView() {
             name: 'roleId',
             type: 'Select',
             placeholder: '请选择账号角色',
-            options: [],
+            options: roleList,
           },
           {
             label: '状态',
@@ -271,6 +281,7 @@ function AccountManageView() {
           setEditData(undefined);
           paginationChange(pagination.current, pagination.pageSize);
         }}
+        roleList={roleList}
       />
       <ChangeModal
         open={changeModalVisible}

src/pages/systemManage/limitManage/limitInfo/index.tsx

@@ -45,7 +45,7 @@ const LimitInfo = () => {
     return data.reduce((pre: number[], cur) => {
       pre.push(cur.id);
       if (cur.children) {
-        pre.push(...getChildKeys(cur.children));
+        pre.push(...getAllKeys(cur.children));
       }
       return pre;
     }, []);

src/router/index.ts

-import { createBrowserRouter, RouteObject } from 'react-router-dom';
+import { RouteObject } from 'react-router-dom';
 import { RouteObjectType, routerList, whiteRouterList } from '~/router/router';
+import { InterDataType } from '~/api/interface';
+import { listMenuInfoType } from '~/api/interface/systemManageType';
+//菜单类型
+type menuType = InterDataType<listMenuInfoType>;
 
 // 获取用户权限路由列表
-export const authRouterList = () => {
-  // TODO: 获取用户权限
-  // 模拟获取用户权限成功
-  // 获取用户能使用的全部路由
-  // TODO: 在此处对用户权限进行判断，返回不同的路由表
-  // 获取用户可用路由列表
-  return [...routerList];
+export const authRouterList = (data?: menuType) => {
+  const roleObj: menuType = data || JSON.parse(localStorage.getItem('roleObj') as string);
+  if (roleObj) {
+    const ids: number[] = getAllKeys([roleObj]);
+    const getRouteList = (data: RouteObjectType[]) => {
+      return data.reduce((pre: RouteObjectType[], cur) => {
+        if (ids.includes(cur.meta.id) || cur.meta.hidden) {
+          if (cur.children) {
+            cur.children = getRouteList(cur.children);
+          }
+          pre.push(cur);
+        }
+        return pre;
+      }, []);
+    };
+    return [...getRouteList(routerList)];
+  }
+  return [];
+};
+//获取全部节点
+const getAllKeys = (data: menuType[]) => {
+  return data.reduce((pre: number[], cur) => {
+    pre.push(cur.id);
+    if (cur.children) {
+      pre.push(...getAllKeys(cur.children));
+    }
+    return pre;
+  }, []);
 };
 // 整合路由数据
 export const routes = [...authRouterList(), ...whiteRouterList];
-// 导出路由表
-export const router = createBrowserRouter(routes);
 // 路由表类型
 export type routerItem = RouteObject & RouteObjectType;

src/router/privateRouter.tsx

-import { authRouterList, router } from '~/router/index';
-import { RouterProvider } from 'react-router-dom';
-import { useEffect } from 'react';
+import { routes } from '~/router/index';
+import { createBrowserRouter, RouterProvider } from 'react-router-dom';
+import { useEffect, useState } from 'react';
 import Cookies from 'js-cookie';
-import { message } from 'antd';
 
 function PrivateRouter() {
-  // 路由钩子
-  // const location = useLocation();
+  const [router, setRouter] = useState(createBrowserRouter(routes));
   // 在切换路由之前判断
   const beforeEach = () => {
     // TODO: 判断是否登录 (需要改为实时获取地址栏的路由)
@@ -16,17 +14,12 @@ function PrivateRouter() {
       location.replace('/login');
       return;
     }
-    // 如果该用户没有权限，跳转到登录页
-    if (authRouterList().length === 0) {
-      message.info('请先配置权限！', 2000).then(() => {
-        location.replace('/login');
-      });
-      return;
-    }
   };
   useEffect(() => {
     beforeEach();
+    setRouter(createBrowserRouter(routes)); //不同账号登录时，重新更新路由（有瑕疵）
   }, [location.pathname]);
+
   return <RouterProvider router={router} />;
 }
 

src/router/router.tsx

@@ -72,6 +72,7 @@ const ServiceOrderView = React.lazy(() => import('src/pages/orderManage/serviceO
 const ProductOrderDetail = React.lazy(() => import('~/pages/orderManage/productOrder/detail'));
 const ServiceOrderDetail = React.lazy(() => import('~/pages/orderManage/serviceOrder/detail'));
 const EquipmentOrderDetail = React.lazy(() => import('~/pages/orderManage/equipmentOrder/detail'));
+const PilotTrainingOrderView = React.lazy(() => import('~/pages/orderManage/pilotTrainingOrder'));
 
 //商品管理
 import CourseManageView from '~/pages/mallManage/courseManage'; //课程管理
@@ -101,6 +102,15 @@ const CategoryDetail = React.lazy(() => import('~/pages/categoryManage/category/
 // 目录管理
 const DirectoryManage = React.lazy(() => import('~/pages/categoryManage/directoryManage'));
 
+//飞手培训
+const InstitutionsListView = React.lazy(
+  () => import('~/pages/pilotTraining/ licensureExamination/institutionsList'),
+);
+//机构上传
+const AddInstitutionsView = React.lazy(
+  () => import('~/pages/pilotTraining/ licensureExamination/addOrEditInstitution'),
+);
+
 // 系统管理
 import AccountManageView from '~/pages/systemManage/accountManage';
 import TenderManageView from '~/pages/resourceManage/tenderManage';
@@ -411,6 +421,15 @@ export const routerList: Array<RouteObjectType> = [
           hidden: true,
         },
       },
+      {
+        path: '/orderManage/pilotTrainingOrder',
+        element: withLoadingComponent(<PilotTrainingOrderView />),
+        meta: {
+          id: 10040,
+          title: '培训订单',
+          icon: <CreditCardOutlined />,
+        },
+      },
     ],
   },
   {
@@ -832,6 +851,36 @@ export const routerList: Array<RouteObjectType> = [
   //   ],
   // },
   {
+    path: '/pilotTraining',
+    element: <LayoutView />,
+    errorElement: <ErrorPage />,
+    meta: {
+      id: 1500,
+      icon: <SettingOutlined />,
+      title: '飞手培训',
+    },
+    children: [
+      {
+        path: '/pilotTraining/institutionsList',
+        element: withLoadingComponent(<InstitutionsListView />),
+        meta: {
+          id: 1510,
+          title: '执照考试',
+          icon: <UserOutlined />,
+        },
+      },
+      {
+        path: '/pilotTraining/institutionsList/add',
+        element: withLoadingComponent(<AddInstitutionsView />),
+        meta: {
+          id: 1520,
+          title: '机构上传',
+          icon: <UserOutlined />,
+        },
+      },
+    ],
+  },
+  {
     path: '/systemManage',
     element: <LayoutView />,
     errorElement: <ErrorPage />,

src/store/module/userInfo/index.ts

@@ -2,6 +2,8 @@ import { createSlice } from '@reduxjs/toolkit';
 
 const initialState = {
   userInfo: JSON.parse(localStorage.getItem('SXTB-ADMIN-USER-INFO') as string) || [],
+  roleId: -1,
+  roleList: [],
 };
 
 export const userInfoSlice = createSlice({
@@ -12,9 +14,20 @@ export const userInfoSlice = createSlice({
       state.userInfo = action.payload;
       localStorage.setItem('SXTB-ADMIN-USER-INFO', JSON.stringify(action.payload));
     },
+    SET_ROLE_ID(state, action) {
+      state.roleId = action.payload;
+      localStorage.setItem('roleId', action.payload);
+    },
+    SET_ROLE_LIST(state, action) {
+      state.roleList = action.payload;
+      localStorage.setItem('roleObj', JSON.stringify(action.payload));
+    },
+    REMOVE_ROLE_LIST() {
+      localStorage.removeItem('roleObj');
+    },
   },
 });
 
-export const { SET_USERINFO } = userInfoSlice.actions;
+export const { SET_USERINFO, SET_ROLE_ID, SET_ROLE_LIST, REMOVE_ROLE_LIST } = userInfoSlice.actions;
 
 export const UserInfo = userInfoSlice.reducer;