feats

package.json

@@ -59,6 +59,7 @@
     "antd": "^4.17.0",
     "classnames": "^2.3.0",
     "echarts": "^5.3.2",
+    "html2canvas": "^1.4.1",
     "lodash": "^4.17.0",
     "md5": "^2.3.0",
     "moment": "^2.29.1",

src/app.jsx

@@ -4,7 +4,7 @@ import RightContent from '@/components/RightContent';
 import Footer from '@/components/Footer';
 import { currentUser as queryCurrentUser } from './services/user';
 import { requestConfig } from '@/utils/request';
-import myPath from './utils/myPath';
+import { getLoginPath } from './utils';
 
 const isDev = process.env.NODE_ENV === 'development';
 let loginPath = '/user/orgLogin';
@@ -21,7 +21,7 @@ export async function getInitialState() {
     try {
       return await queryCurrentUser();
     } catch (error) {
-      history.push(myPath());
+      history.push(getLoginPath());
     }
 
     return undefined;

src/components/Footer/index.jsx

@@ -2,38 +2,40 @@ import { useIntl } from 'umi';
 import { GithubOutlined } from '@ant-design/icons';
 import { DefaultFooter } from '@ant-design/pro-layout';
 
-const Footer = () => {
-  const intl = useIntl();
-  const defaultMessage = intl.formatMessage({
-    id: 'app.copyright.produced',
-    defaultMessage: '云致科技',
-  });
-  const currentYear = new Date().getFullYear();
-  return (
-    <DefaultFooter
-      copyright={`${currentYear} ${defaultMessage}`}
-    // links={[
-    //   {
-    //     key: 'Ant Design Pro',
-    //     title: 'Ant Design Pro',
-    //     href: 'https://pro.ant.design',
-    //     blankTarget: true,
-    //   },
-    //   {
-    //     key: 'github',
-    //     title: <GithubOutlined />,
-    //     href: 'https://github.com/ant-design/ant-design-pro',
-    //     blankTarget: true,
-    //   },
-    //   {
-    //     key: 'Ant Design',
-    //     title: 'Ant Design',
-    //     href: 'https://ant.design',
-    //     blankTarget: true,
-    //   },
-    // ]}
-    />
-  );
-};
+const Footer = () => <></>
+
+// const Footer = () => {
+//   const intl = useIntl();
+//   const defaultMessage = intl.formatMessage({
+//     id: 'app.copyright.produced',
+//     defaultMessage: '云致科技',
+//   });
+//   const currentYear = new Date().getFullYear();
+//   return (
+//     <DefaultFooter
+//       copyright={`${currentYear} ${defaultMessage}`}
+//     // links={[
+//     //   {
+//     //     key: 'Ant Design Pro',
+//     //     title: 'Ant Design Pro',
+//     //     href: 'https://pro.ant.design',
+//     //     blankTarget: true,
+//     //   },
+//     //   {
+//     //     key: 'github',
+//     //     title: <GithubOutlined />,
+//     //     href: 'https://github.com/ant-design/ant-design-pro',
+//     //     blankTarget: true,
+//     //   },
+//     //   {
+//     //     key: 'Ant Design',
+//     //     title: 'Ant Design',
+//     //     href: 'https://ant.design',
+//     //     blankTarget: true,
+//     //   },
+//     // ]}
+//     />
+//   );
+// };
 
 export default Footer;

src/components/QRCode/index.jsx

@@ -0,0 +1,9 @@
+import React from 'react'
+
+export default (props) => {
+  return (
+    <div>
+      <div></div>
+    </div>
+  )
+}

src/components/RightContent/AvatarDropdown.jsx

@@ -6,19 +6,20 @@ import { stringify } from 'querystring';
 import HeaderDropdown from '../HeaderDropdown';
 import ChangePassword from './ChangePassword';
 import styles from './index.less';
-import myPath from '@/utils/myPath';
+import { getLoginPath } from '@/utils';
 
 /**
  * 退出登录，并且将当前的 url 保存
  */
 const loginOut = async () => {
+  const loginPath = getLoginPath()
+  setInitialState((s) => ({ ...s, currentUser: undefined }));
   localStorage.removeItem('token');
-  localStorage.removeItem('orgId');
   const { query = {}, pathname } = history.location;
   const { redirect } = query;
   if (window.location.pathname !== '/user/login' && !redirect) {
     history.replace({
-      pathname: myPath(),
+      pathname: loginPath,
       search: stringify({
         redirect: pathname,
       }),
@@ -27,15 +28,14 @@ const loginOut = async () => {
 };
 const AvatarDropdown = ({ menu }) => {
   const [showPasswordModal, setShowPasswordModal] = useState(false);
-  const { initialState, setInitialState } = useModel('@@initialState');
+  const { initialState } = useModel('@@initialState');
 
   const onMenuClick = useCallback(
     (event) => {
       const { key } = event;
 
       if (key === 'logout') {
-        setInitialState((s) => ({ ...s, currentUser: undefined }));
-        loginOut('admin');
+        loginOut();
         return;
       }
 
@@ -44,13 +44,12 @@ const AvatarDropdown = ({ menu }) => {
         return;
       }
     },
-    [setInitialState],
+    [],
   );
 
   const handleChangeSuccessful = () => {
     message.success('密码修改成功');
     setShowPasswordModal(false);
-    setInitialState((s) => ({ ...s, currentUser: undefined }));
     loginOut();
     return;
   };

src/utils/myPath.js → src/utils/index.js

@@ -1,9 +1,9 @@
 
-export default function myPath(){
+export function getLoginPath(){
   let role = localStorage.getItem('roleAlias');
   if (role == 'admin') {
     return '/user/login'
   } else {
     return '/user/orgLogin'
   }
-}
+}