From 71c1fa3bfa21baaf733189495cdd64deb0cf6551 Mon Sep 17 00:00:00 2001
From: liuwh <liuwh@hugeinfo.com.cn>
Date: Thu, 27 Feb 2020 08:44:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy
---
SunshineIns/src/index.jsx | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/SunshineIns/src/index.jsx b/SunshineIns/src/index.jsx
index 816d599..73d63ab 100644
--- a/SunshineIns/src/index.jsx
+++ b/SunshineIns/src/index.jsx
@@ -42,6 +42,7 @@
import NewlyList from './page/NewlyList';
import Newly from './page/Newly';
import SignIn from './page/SignIn';
+import QuestionDetail from './page/QuestionDetail';
import PoliceSecurity from './page/PoliceSecurity';
import policeSecurityEdit from './page/policeSecurityEdit';
@@ -53,11 +54,11 @@
ReactDOM.render(
<LocaleProvider locale={zh_CN}>
<Router history={hashHistory()}>
- <Layout style={{ minHeight: '100vh' }}>
+ <Layout style={{ height: '100%' }}>
<Switch>
<Route path="/bus/attachment/:busId/:attachmentId" component={AttTree} />
<Route path="/bus/attachment/:busId" component={AttTree} />
- <Route path='/signIn/:id' component={null} />
+ {/* <Route path='/questionnaire/newly' component={AttTree} /> */}
<Route component={Menu} />
</Switch>
<Switch>
@@ -99,7 +100,10 @@
{/* 问卷管理部分 */}
<Route path='/questionnaire/newlyList' component={NewlyList} />
- <Route path='/questionnaire/newly' component={Newly} />
+ <Route path='/questionnaire/newly/:id' component={Newly} />
+ {/* 问卷详情 */}
+ <Route path='/questionnaire/detail/:id' component={QuestionDetail} />
+
{/* 公安审核 */}
<Route path='/entry/policeSecurity' component={PoliceSecurity} />
--
Gitblit v1.8.0