From fc68f6006949a91fced69951778a7c88859cbb6c Mon Sep 17 00:00:00 2001 From: Mr Ke <kelq@hugeinfo.com.cn> Date: Wed, 06 May 2020 10:49:07 +0800 Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA --- src/index.js | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/index.js b/src/index.js index b701614..e9f3628 100644 --- a/src/index.js +++ b/src/index.js @@ -1,3 +1,4 @@ +/* eslint-disable */ import React from 'react'; import ReactDOM from 'react-dom'; import './index.css'; @@ -19,11 +20,16 @@ // 引进页面(pages) import Index from './pages/Index'; 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 Announcement from './pages/index/Announcement'; //全部通知 +import Workbench from './pages/index/workbench';//首页--工作台 +import System from './pages/index/System';//首页--工作制度 +import Announcement from './pages/index/Announcement';//全部通知 +import DocumentEdit from './pages/document/DocumentEdit';//新建文档 +import DocumentDetail from './pages/document/DocumentDetail';//文档详情 +import BrowseLog from './pages/logManage/browseLog';//浏览日志 +import OperLog from './pages/logManage/operLog';//操作日志 +import Rawler from './pages/logManage/Rawler';//爬虫词条管理 +import Information from './pages/personal/information';//个人信息 const { Content } = Layout; const history = createHashHistory(); @@ -43,18 +49,32 @@ </Switch> <Content> <Switch> - + {/* 新建文档 */} + <Route path="/document/create/:id?" component={DocumentEdit} /> + {/* 文档、通知详情 */} + <Route path="/document/detail/:id" component={DocumentDetail} /> + {/* 全部通知 */} <Route path="/index/workbench/announcement" component={Announcement} /> + {/* 规章制度 */} + <Route path="/index/rules" component={System} /> {/* 首页 */} <Route path="/index" component={Workbench} /> - <Route path="/index/system" component={System} /> - - <Route path="/login" component={Login} /> - <Route path="/" component={Index} /> + {/* 浏览日志 */} + <Route path="/logManage/browseLog" component={BrowseLog} /> + {/* 操作日志 */} + <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 to="/" component={Index} /> + <Redirect to="/" component={Workbench} /> </Switch> </Content> </Layout> -- Gitblit v1.8.0