forked from huge/frontEnd/hugeOA

liyj
2020-05-27 b419b2add64d70bf1bdb2f491c3eb090dda2cfa3
Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
2 files modified
4 ■■■■ changed files
src/index.js 2 ●●●●● patch | view | raw | blame | history
src/routeDom/oaRouteDom.jsx 2 ●●●●● patch | view | raw | blame | history
src/index.js
@@ -17,6 +17,7 @@
// 公用结构组件
import Menu from './module/menu/menu';
import Header from './components/common/HeadView';
import Login from './module/login/login';
// oa路由映射
import OaRouteDom from './routeDom/oaRouteDom';
@@ -107,6 +108,7 @@
                  <Content>
                    {context.role == 'oa' && <OaRouteDom />}
                    {context.role == 'user' && <UserRouteDom />}
                    <Route path="/login" component={Login} />
                  </Content>
                </Layout>
              </Layout>
src/routeDom/oaRouteDom.jsx
@@ -9,7 +9,6 @@
import { Switch, Route, Redirect } from 'react-router-dom';
// 引进页面(pages)
import Login from '../module/login/login';
import Workbench from '../module/oa/index/workbench'; //首页--工作台
import System from '../module/oa/index/System'; //首页--工作制度
import Announcement from '../module/oa/index/Announcement'; //全部通知
@@ -34,7 +33,6 @@
    <Route path="/logManage/operLog" component={OperLog} />
    <Route path="/logManage/rawler" component={Rawler} />
    <Route path="/personal/information" component={Information} />
    <Route path="/login" component={Login} />
    {/* <Route path="/" component={Workbench} /> */}
    <Redirect from="/" to="/index" component={Workbench} />
  </Switch>