From 9abfbe0e27583a27790e24c8304d1497eb8aa2f6 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Mon, 06 Apr 2020 17:06:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA

---
 src/index.js |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/index.js b/src/index.js
index 9005a38..5d29e21 100644
--- a/src/index.js
+++ b/src/index.js
@@ -21,8 +21,13 @@
 import Login from './pages/login/login';
 import JurisdictionPersonMgt from './pages/collect/jurisdictionPersonMgt'; //信息采集--辖区人口管理
 import Workbench from './pages/index/workbench'; //首页--工作台
-import System from './pages/index/System'; //首页--工作台
+import System from './pages/index/System'; //首页--工作制度
 import Announcement from './pages/index/Announcement'; //全部通知
+
+
+
+import DocumentEdit from './pages/document/DocumentEdit'; //新建文档
+
 
 
 const { Content } = Layout;
@@ -43,20 +48,22 @@
           </Switch>
           <Content>
             <Switch>
-              
+              {/* 新建文档 */}
+              <Route path="/document/create" component={DocumentEdit} />
+
+
               {/* 全部通知 */}
               <Route path="/index/workbench/announcement" component={Announcement} />
-              {/* 首页 */}
-              <Route path="/index/workbench" component={Workbench} />
-              <Route path="/index/system" component={System} />
               
-
+              {/* 首页 */}
+              <Route path="/index" component={Workbench} />
+             
+              {/* 规章制度 */}
+              <Route path="/index/rules" component={System} />
 
               <Route path="/login" component={Login} />
-
-              <Route path="/" component={Index} />
               {/* 路由的页面重定向 */}
-              <Redirect to="/" component={Index} />
+              <Redirect to="/" component={Workbench} />
             </Switch>
           </Content>
         </Layout>

--
Gitblit v1.8.0