.

config/routes.js

@@ -21,18 +21,21 @@ export default [
   {
     path: '/dashboard',
     name: '工作台',
+    access:'admin',
     icon: 'DashboardOutlined',
     component: './dashboard',
   },  
   {
     path: '/',
     name: '工作台',//暂定
+    access:'admin',
     redirect: '/person',
     hideInMenu: true,
   },
   {
     path: '/banner',
     name: '轮播图列表',
+    access:'admin',
     icon: 'PictureOutlined',
     component: '@/pages/banner',
   },
@@ -45,6 +48,7 @@ export default [
   {
     path: '/notice',
     name: '通知列表',
+    access:'admin',
     icon: 'BellOutlined',
     component: '@/pages/notice',
   },
@@ -57,6 +61,7 @@ export default [
   {
     path: '/applicationList',
     name: '申请列表',
+    access:'admin',
     icon: 'FieldTimeOutlined',
     component: '@/pages/applicationList',
   },
@@ -69,6 +74,7 @@ export default [
   {
     path: '/examine',
     name: '审核列表',
+    access:'auditor',
     icon: 'AuditOutlined',
     component: '@/pages/examine',
   },
@@ -81,6 +87,7 @@ export default [
   {
     path: '/certificateIssuance',
     name: '证件发放',
+    access:'maker',
     icon: 'FileDoneOutlined',
     component: '@/pages/certificateIssuance',
   },
@@ -93,36 +100,42 @@ export default [
   {
     path: '/cardNoList',
     name: '证件制卡',
+    access:'admin',
     icon: 'CreditCardOutlined',
     component: '@/pages/cardNoList',
   },
   {
     path: '/cardList',
     name: '证件列表',
+    access:'admin',
     icon: 'IdcardOutlined',
     component: '@/pages/cardList',
   },
   {
     path: '/cardList/detail.jsx',
     name: '证件详情',
+    access:'admin',
     hideInMenu: true,
     component: '@/pages/cardList/detail.jsx',
   },
   {
     path: '/userList',
     name: '犬主列表',
+    access:'admin',
     icon: 'SolutionOutlined',
     component: '@/pages/userList',
   },
   {
     path: '/person',
     name: '人员列表',
+    access:'admin',
     icon: 'UserOutlined',
     component: '@/pages/person',
   },
   {
     path: '/BasicParameters',
     name: '系统参数',
+    access:'admin',
     icon: 'SettingOutlined',
     component: '@/pages/BasicParameters',
   },

src/access.js

@@ -2,23 +2,26 @@
  * @see https://umijs.org/zh-CN/plugins/plugin-access
  * */
 export default function access(initialState) {
-  const { menuAccess,roleAlias } = initialState || {};
-  if(roleAlias=='org'){
+  const { currentUser } = initialState || {};
+  const { roleName } = currentUser || {};
+  if (roleName == 'maker') {
     return {
-      admin:false,
-      org:true
-    }
-  }else if(roleAlias=='admin'){
+      admin: false,
+      maker: true,
+      auditor: false,
+    };
+  } else if (roleName == 'auditor') {
     return {
-      admin:true,
-      org:false
-    }
-  }
-  return (menuAccess || []).reduce((acc, item) => {
-    const { permission, canAccess } = item;
+      admin: false,
+      maker: false,
+      auditor: true,
+    };
+  } else if (roleName == 'admin') {
     return {
-      ...acc,
-      [permission]: canAccess,
+      admin: true,
+      maker: true,
+      auditor: true,
     };
-  }, {});
+  }
+  return {};
 }

src/app.jsx

@@ -28,13 +28,9 @@ export async function getInitialState() {
 
   if (history.location.pathname !== loginPath) {
     const res = await fetchUserInfo();
-    localStorage.setItem('roleAlias', res.roleAlias);
     return {
       fetchUserInfo,
       currentUser: res.user,
-      menuAccess: res.menu,
-      report_url: res.report_url,
-      roleAlias: res.roleAlias,
       settings: {},
     };
   }

src/components/RightContent/QrCode/QrCode.jsx

@@ -1,34 +0,0 @@
-import React, {useState, useRef, useEffect, useCallback} from 'react'
-import { useModel } from 'umi'
-import { Button, Spin } from 'antd';
-import QRCode from '@/components/QRCode'
-import styles from './style.less';
-
-export default (props) => {
-  const { initialState } = useModel('@@initialState');
-  const [isLoading, setLoading] = useState(false);
-
-  const qrcodeRef = useRef()
-
-  const downloadQrcode = useCallback(() => {
-    if (qrcodeRef.current) {
-      qrcodeRef.current.download();
-    }
-  }, [])
-
-  return isLoading ?
-    <Spin
-      size="small"
-      style={{
-        marginLeft: 8,
-        marginRight: 8,
-      }}
-    />
-  : (
-      <div className={styles.qrcodebox}>
-        <p>疫情监测结果表入口</p>
-        <QRCode ref={qrcodeRef} width={200} content={initialState.report_url} />
-        <p><Button onClick={downloadQrcode}>下载</Button></p>
-      </div>
-    )
-}

src/components/RightContent/QrCode/index.jsx

@@ -1,16 +0,0 @@
-import React from 'react';
-import { QrcodeOutlined } from '@ant-design/icons';
-import HeaderDropdown from '@/components/HeaderDropdown';
-import QrCode from './QrCode';
-import styles from '../index.less';
-
-export default (props) => {
-
-  return (
-    <HeaderDropdown overlay={<QrCode />}>
-      <span className={`${styles.action} ${styles.account}`} style={{ padding: 0 }}>
-        <span className={`${styles.name} anticon`}><QrcodeOutlined style={{ fontSize: '24px' }} /></span>
-      </span>
-    </HeaderDropdown>
-  );
-};

src/components/RightContent/QrCode/style.less

@@ -1,7 +0,0 @@
-.qrcodebox{
-  padding: 16px;
-  text-align: center;
-  img{
-    margin: 16px 0;
-  }
-}

src/components/RightContent/index.jsx

@@ -1,16 +1,13 @@
 import { Space } from 'antd';
 import Avatar from './AvatarDropdown';
-import QRCode from './QrCode';
 import styles from './index.less';
 
 const GlobalHeaderRight = () => {
   let className = styles.right;
   className = `${styles.right}  ${styles.dark}`;
- 
   
   return (
     <Space className={className}>
-      <QRCode />
       <Avatar />      
     </Space>
   );

src/pages/user/Login/index.jsx

@@ -17,15 +17,11 @@ const Login = () => {
     setSubmitting(true);
     try {
       // 登录
-      const { user, menu, report_url, roleAlias } = await login({ ...values, password: md5(values.password) });
-      localStorage.setItem('roleAlias', roleAlias);
+      const { user } = await login({ ...values, password: md5(values.password) });
       await setInitialState((s) =>
       ({
         ...s,
         currentUser: user,
-        menuAccess: menu,
-        report_url: report_url,
-        roleAlias: roleAlias
       }));
       message.success('登录成功！');
       /** 此方法会跳转到 redirect 参数所在的位置 */