no message

@@ -21,6 +21,7 @@
     "rc-animate": "^2.8.3",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
+    "react-iframe": "^1.8.0",
     "react-loadable": "^5.5.0",
     "react-redux": "^7.1.0",
     "react-router": "^5.0.1",

@@ -105,8 +105,8 @@ class SysMenu extends React.Component {
         });
     }
     render() {
-        const { uaa_perms, openKeys, selectedKeys } = this.props;
-        const menus = formatMenu(uaa_perms);
+        const { system_menu_perms, openKeys, selectedKeys } = this.props;
+        const menus = formatMenu(system_menu_perms);
         return (
             <Menu className={cx('system_wrap')}
                 onClick={this.handleClick}
@@ -146,14 +146,14 @@ class SysMenu extends React.Component {
 const mapState = (state) => {
     const {
         router = {},
-        // system: { system_menu_selected_keys: { openKeys, selectedKeys } }
+        system: { system_menu_selected_keys: { openKeys = [], selectedKeys = [] }, system_menu_perms = [] }
     } = state;
     return {
         router,
         uaa_tenant: {},
-        uaa_perms: [],
-        openKeys: [],
-        selectedKeys: []
+        system_menu_perms,
+        openKeys,
+        selectedKeys
     };
 };
 export default connect(mapState)(SysMenu);
\ No newline at end of file

@@ -27,14 +27,6 @@ class Login extends React.Component {
         api.postLogin(values).then(data => {
             console.log(data);
         })
-        console.log("#########:::::::", values);
-        // if (values.grant_type == 'password') {    //密码登录
-        //     dispatch(login(values));
-        // } else if (values.grant_type == 'smscode') {//验证码登录
-        //     dispatch(login(values));
-        // } else if (values.grant_type == 'change_tenant') {//选择tenant
-        //     dispatch(changeTenant(values));
-        // }
     }
     backLogin() {
         const { dispatch } = this.props;

+import React from 'react';
+import Iframe from 'react-iframe'
+import { connect } from 'react-redux';
+import { Layout } from 'antd';
+import cx from 'classnames';
+
+class StatisticsContainer extends React.Component {
+    static propTypes = {
+    }
+    constructor(props) {
+        super(props);
+    }
+    componentDidMount() {
+    }
+    render() {
+        return (
+            <div className={cx('statistics_wrap')} style={{ width: '100%', height: '100%', overflowY: 'hidden' }}>
+                <Iframe url="https://www.baidu.com"
+                    width="100%"
+                    height="100%"
+                    id="myId"
+                    className="myClassname"
+                    display="initial"
+                    frameBorder={0}
+                    position="relative" />
+            </div>
+        );
+    }
+}
+
+
+
+const mapState = (state) => {
+    const { router: { location = {} } } = state;
+    return {
+        location
+    };
+};
+export default connect(mapState)(StatisticsContainer);

@@ -6,4 +6,119 @@
     width: 100vw;
     height: 100vh;
     overflow: hidden;
+}
+.layout-header-wrap{
+    height: 52px;
+    line-height: 52px;
+}
+.layout-content-wrap{
+    position:absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    top: 52px;
+    overflow: hidden;
+}
+.layout-sider-wrap{
+    height: 100%;
+    position: relative;
+    overflow-y: hidden;
+    overflow-x: hidden;
+    background: #ffffff;
+}
+.layout-sider-wrap:hover{ 
+    overflow-y: auto; 
+}
+.app-routes-wrap{
+    width: 100%;
+    height: 100%;
+    background-color: transparent;
+}
+
+
+//loading
+.sk-folding-cube {
+  margin: 20px auto;
+  width: 40px;
+  height: 40px;
+  position: relative;
+  -webkit-transform: rotateZ(45deg);
+          transform: rotateZ(45deg);
+}
+.sk-folding-cube .sk-cube {
+  float: left;
+  width: 50%;
+  height: 50%;
+  position: relative;
+  -webkit-transform: scale(1.1);
+      -ms-transform: scale(1.1);
+          transform: scale(1.1); 
+}
+.sk-folding-cube .sk-cube:before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: #333;
+  -webkit-animation: sk-foldCubeAngle 2.4s infinite linear both;
+          animation: sk-foldCubeAngle 2.4s infinite linear both;
+  -webkit-transform-origin: 100% 100%;
+      -ms-transform-origin: 100% 100%;
+          transform-origin: 100% 100%;
+}
+.sk-folding-cube .sk-cube2 {
+  -webkit-transform: scale(1.1) rotateZ(90deg);
+          transform: scale(1.1) rotateZ(90deg);
+}
+.sk-folding-cube .sk-cube3 {
+  -webkit-transform: scale(1.1) rotateZ(180deg);
+          transform: scale(1.1) rotateZ(180deg);
+}
+.sk-folding-cube .sk-cube4 {
+  -webkit-transform: scale(1.1) rotateZ(270deg);
+          transform: scale(1.1) rotateZ(270deg);
+}
+.sk-folding-cube .sk-cube2:before {
+  -webkit-animation-delay: 0.3s;
+          animation-delay: 0.3s;
+}
+.sk-folding-cube .sk-cube3:before {
+  -webkit-animation-delay: 0.6s;
+          animation-delay: 0.6s; 
+}
+.sk-folding-cube .sk-cube4:before {
+  -webkit-animation-delay: 0.9s;
+          animation-delay: 0.9s;
+}
+@-webkit-keyframes sk-foldCubeAngle {
+  0%, 10% {
+    -webkit-transform: perspective(140px) rotateX(-180deg);
+            transform: perspective(140px) rotateX(-180deg);
+    opacity: 0; 
+  } 25%, 75% {
+    -webkit-transform: perspective(140px) rotateX(0deg);
+            transform: perspective(140px) rotateX(0deg);
+    opacity: 1; 
+  } 90%, 100% {
+    -webkit-transform: perspective(140px) rotateY(180deg);
+            transform: perspective(140px) rotateY(180deg);
+    opacity: 0; 
+  } 
+} 
+@keyframes sk-foldCubeAngle {
+  0%, 10% {
+    -webkit-transform: perspective(140px) rotateX(-180deg);
+            transform: perspective(140px) rotateX(-180deg);
+    opacity: 0; 
+  } 25%, 75% {
+    -webkit-transform: perspective(140px) rotateX(0deg);
+            transform: perspective(140px) rotateX(0deg);
+    opacity: 1; 
+  } 90%, 100% {
+    -webkit-transform: perspective(140px) rotateY(180deg);
+            transform: perspective(140px) rotateY(180deg);
+    opacity: 0; 
+  }
 }
\ No newline at end of file

@@ -7,4 +7,5 @@ export const FETCH_X_REQUEST_ID = 'FETCH_X_REQUEST_ID';
 export const FETCH_FORM_NAME = 'FETCH_FORM_NAME';
 
 /*系统操作 */
-export const SYSTEM_MENU_SELECTED_KEYS = 'SYSTEM_MENU_SELECTED_KEYS';
\ No newline at end of file
+export const SYSTEM_MENU_SELECTED_KEYS = 'SYSTEM_MENU_SELECTED_KEYS';//选中菜单
+export const SYSTEM_MENU_PERMS = 'SYSTEM_MENU_PERMS';//系统菜单权限
\ No newline at end of file

@@ -32,9 +32,8 @@ function* handldRouter() {
         const { payload = {} } = routerAction;
         const { location = {} } = payload;
         const { pathname = '' } = location;
-        // const { uaa: { uaa_perms = [] } } = state;
-        // yield selectSysMenus(uaa_perms);
-        yield selectSysMenus([]);
+        const { system: { system_menu_perms = [] } } = state;
+        yield selectSysMenus(system_menu_perms);
     }
 }
 

@@ -3,7 +3,18 @@ import * as types from '../actionTypes';
 import { typeToLowerCase, reducerFactory } from '../../utils/commonUtils';
 
 const initialState = {
-    [typeToLowerCase(types.SYSTEM_MENU_SELECTED_KEYS)]: { openKeys: [], selectedKeys: [] }
+    [typeToLowerCase(types.SYSTEM_MENU_SELECTED_KEYS)]: { openKeys: [], selectedKeys: [] },
+    [typeToLowerCase(types.SYSTEM_MENU_PERMS)]: [{
+        module: "home",
+        module_name: "首页",
+        parent_module: "",
+        parent_module_name: ""
+    }, {
+        module: "statistics",
+        module_name: "统计",
+        parent_module: "",
+        parent_module_name: ""
+    }]
 };
 
 export default reduceReducers(initialState, reducerFactory);
\ No newline at end of file

@@ -6,12 +6,17 @@ import asyncComponent from '../AsyncComponent';
 const HomeContainer = asyncComponent(
     () => import(/* webpackChunkName: "home" */'../../containers/home')
 );
+//统计
+const StatisticsContainer = asyncComponent(
+    () => import(/* webpackChunkName: "home" */'../../containers/home/StatisticsContainer')
+);
 
 const homeRoute = (match) => {
     return (
         <Switch>
             {/* 首页 */}
             <Route exact={true} path={`${match.path}/home`} component={HomeContainer} />
+            <Route exact={true} path={`${match.path}/statistics`} component={StatisticsContainer} />
         </Switch>
     );
 };

@@ -50,7 +50,7 @@ class LayoutRoute extends React.Component {
                     headcccc
                     <a href="/signOut">退出</a>
                 </Header>
-                <Layout className={cx("layout-content-wrap")}>
+                <Layout className={cx("layout-content-wrap")} >
                     <Sider className="layout-sider-wrap" collapsedWidth={0} collapsible={false} width={180}>
                         <div>
                             <SysMenu></SysMenu>