feats

config/defaultSettings.js

@@ -7,7 +7,7 @@ const proSettings = {
   fixedHeader: false,
   fixSiderbar: true,
   colorWeak: false,
-  title: 'Ant Design Pro',
+  title: '禾生汇',
   pwa: false,
   iconfontUrl: '',
   menu: {

config/proxy.js

@@ -9,6 +9,7 @@ export default {
   dev: {
     '/api/': {
       target: 'http://127.0.0.1:8081/',
+      // target: 'https://api.medical.p.njyunzhi.com/',
       changeOrigin: true,
       pathRewrite: {
         '^': '',

src/components/GlobalFooter/index.jsx

@@ -0,0 +1,32 @@
+import React from 'react';
+import { DefaultFooter } from '@ant-design/pro-layout';
+
+export default (props) => {
+  return (
+    <DefaultFooter
+      copyright={`${new Date().getFullYear()} 云致科技`}
+      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,
+          // },
+        ]
+      }
+    />
+  )
+}

src/layouts/BasicLayout.jsx

@@ -3,7 +3,7 @@
  *
  * @see You can view component api by: https://github.com/ant-design/ant-design-pro-layout
  */
-import ProLayout, { DefaultFooter } from '@ant-design/pro-layout';
+import ProLayout from '@ant-design/pro-layout';
 import React, { useMemo } from 'react';
 // import { Link, useIntl, connect, history } from 'umi';
 import { Link, connect, history } from 'umi';
@@ -12,8 +12,9 @@ import { Result, Button } from 'antd';
 import Authorized from '@/utils/Authorized';
 import { getCurrentRoute } from '@/utils/utils';
 import RightContent from '@/components/GlobalHeader/RightContent';
+import GlobalFooter from '@/components/GlobalFooter';
 // import { getMatchMenu } from '@umijs/route-utils';
-import logo from '../assets/logo.svg';
+import logo from '../assets/logo.png';
 
 const noMatch = (
   <Result
@@ -44,33 +45,7 @@ const menuDataRender = (menuRoles) => (menuList) =>
     return Authorized.check(needAuth ? authority.split(',') : undefined, localItem, null);
   });
 
-const defaultFooterDom = (
-  <DefaultFooter
-    copyright={`${new Date().getFullYear()} 云致科技`}
-    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 defaultFooterDom = (<GlobalFooter />);
 
 const BasicLayout = (props) => {
   const {

src/layouts/UserLayout.jsx

@@ -1,9 +1,11 @@
-import { DefaultFooter, getMenuData, getPageTitle } from '@ant-design/pro-layout';
+import { getMenuData, getPageTitle } from '@ant-design/pro-layout';
 import { Helmet, HelmetProvider } from 'react-helmet-async';
 // import { Link, SelectLang, useIntl, connect, FormattedMessage } from 'umi';
 import { Link, connect } from 'umi';
 import React from 'react';
-import logo from '../assets/logo.svg';
+import GlobalFooter from '@/components/GlobalFooter'
+import setting from '../../config/defaultSettings';
+import logo from '../assets/logo.png';
 import styles from './UserLayout.less';
 
 const UserLayout = (props) => {
@@ -21,12 +23,14 @@ const UserLayout = (props) => {
   } = props;
   // const { formatMessage } = useIntl();
   const { breadcrumb } = getMenuData(routes);
+
   const title = getPageTitle({
     pathname: location.pathname,
-    formatMessage: (x) => x,
+    formatMessage: (x) => (typeof x === 'object' ? x.defaultMessage : x),
     breadcrumb,
     ...props,
   });
+
   return (
     <HelmetProvider>
       <Helmet>
@@ -43,7 +47,7 @@ const UserLayout = (props) => {
             <div className={styles.header}>
               <Link to="/">
                 <img alt="logo" className={styles.logo} src={logo} />
-                <span className={styles.title}>Ant Design</span>
+                <span className={styles.title}>{setting.title}</span>
               </Link>
             </div>
             <div className={styles.desc}>
@@ -51,12 +55,12 @@ const UserLayout = (props) => {
                 id="pages.layouts.userLayout.title"
                 defaultMessage="Ant Design 是西湖区最具影响力的 Web 设计规范"
               /> */}
-              Ant Design 是西湖区最具影响力的 Web 设计规范
+              禾生汇 一点康 管理平台
             </div>
           </div>
           {children}
         </div>
-        <DefaultFooter />
+        <GlobalFooter />
       </div>
     </HelmetProvider>
   );

src/layouts/UserLayout.less

@@ -49,8 +49,8 @@
 }
 
 .logo {
-  height: 44px;
-  margin-right: 16px;
+  height: 60px;
+  // margin-right: 16px;
   vertical-align: top;
 }
 
@@ -61,6 +61,8 @@
   font-weight: 600;
   font-size: 33px;
   font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif;
+  display: inline-block;
+  padding-top: 6px;
 }
 
 .desc {
@@ -68,4 +70,6 @@
   margin-bottom: 40px;
   color: @text-color-secondary;
   font-size: @font-size-base;
+  padding-top: 1em;
+  letter-spacing: 1px;
 }

src/pages/System/Role/Edit.jsx

@@ -25,9 +25,10 @@ export default (props) => {
   };
 
   const handleMenuSave = () => {
-    const data = menuData.map((m) => ({ roleId: id, menuId: m.menuId }));
+    const roleId = id || role.roleId
+    const data = menuData.map((m) => ({ roleId, menuId: m.menuId }));
     setSaveLoading(true);
-    request(`/role-menu/${id}`, { method: 'post', data })
+    request(`/role-menu/${roleId}`, { method: 'post', data })
       .then(() => {
         setRoleMenu(data);
         setMenuData([]);

src/pages/document.ejs

@@ -3,26 +3,12 @@
   <head>
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta
-      name="keywords"
-      content="antd,umi,umijs,ant design,脚手架,布局, Ant Design,项目,Pro,admin,控制台,主页,开箱即用,中后台,解决方案,组件库"
-    />
-    <meta
-      name="description"
-      content="
-    An out-of-box UI solution for enterprise applications as a React boilerplate."
-    />
-    <meta
-      name="description"
-      content="
-      开箱即用的中台前端/设计解决方案。"
-    />
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
     />
     <title>云致科技</title>
-    <link rel="icon" href="<%= context.config.publicPath +'favicon.ico'%>" type="image/x-icon" />
+    <link rel="icon" href="<%= context.config.publicPath +'f.png'%>" type="image/png" />
   </head>
   <body>
     <noscript>请启用 JavaScript 并使用现代浏览器 !</noscript>
@@ -190,7 +176,6 @@
           min-height: 420px;
         "
       >
-        <img src="<%= context.config.publicPath +'pro_icon.svg'%>" alt="logo" width="256" />
         <div class="page-loading-warp">
           <div class="ant-spin ant-spin-lg ant-spin-spinning">
             <span class="ant-spin-dot ant-spin-dot-spin"
@@ -205,7 +190,7 @@
             width="32"
             style="margin-right: 8px"
           />
-          Ant Design
+          禾生汇
         </div>
       </div>
     </div>

src/utils/request.js

@@ -34,6 +34,7 @@ const errorHandler = (error) => {
   } else if (error.code && error.message) {
     throw new Error(error.message);
   } else {
+    console.error(error)
     notification.error({
       description: '您的网络发生异常，无法连接服务器',
       message: '网络异常',