From b419b2add64d70bf1bdb2f491c3eb090dda2cfa3 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Wed, 27 May 2020 11:44:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
---
src/index.js | 2 ++
src/routeDom/oaRouteDom.jsx | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/index.js b/src/index.js
index cb0f05c..aa04fd0 100644
--- a/src/index.js
+++ b/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>
diff --git a/src/routeDom/oaRouteDom.jsx b/src/routeDom/oaRouteDom.jsx
index 8533dee..2d3a957 100644
--- a/src/routeDom/oaRouteDom.jsx
+++ b/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>
--
Gitblit v1.8.0