Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA

Mr Ke

2020-04-06 d3933d29fe487cf091d933e75ffad8bd9028d6a4

 src/index.js

@@ -20,6 +20,10 @@
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'; //全部通知


const { Content } = Layout;
const history = createHashHistory();
@@ -39,12 +43,13 @@
          </Switch>
          <Content>
            <Switch>
              {/* 信息采集 */}
              <Route
                path="/collect/jurisdictionPersonMgt"
                component={JurisdictionPersonMgt}
              />

              
              {/* 全部通知 */}
              <Route path="/index/workbench/announcement" component={Announcement} />
              {/* 首页 */}
              <Route path="/index" component={Workbench} />
              <Route path="/index/system" component={System} />
              
              <Route path="/login" component={Login} />

              <Route path="/" component={Index} />