From d99603fa4c5188d19991de978c185b2b9247c5af Mon Sep 17 00:00:00 2001
From: xuxj <hugeinfo123>
Date: Sat, 09 May 2020 09:22:02 +0800
Subject: [PATCH] Merge branch 'master' of http://git.hugeinfo.com.cn/r/nsjcy/frontEnd/nsjcy
---
SunshineIns/src/index.jsx | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/SunshineIns/src/index.jsx b/SunshineIns/src/index.jsx
index 73d63ab..23ee264 100644
--- a/SunshineIns/src/index.jsx
+++ b/SunshineIns/src/index.jsx
@@ -14,10 +14,13 @@
import BusDetail from './page/BusDetail';
import SupPerson from './page/SupPerson';
import Company from './page/Company';
-// 涉未成年负责部门组织
+// 社会组织维护
import UnderAgeList from './page/UnderAgeList';
+import KeyWord from './page/KeyWord';
import ActiveManage from './page/ActiveManage';
import ActiveManageEdit from './page/ActiveManageEdit';
+import ActiveManageEditquestionnaire from './page/ActiveManageEditquestionnaire';
+
import KnowledgeBase from './page/KnowledgeBase';
import ArticlePublish from './page/ArticlePublish';
import ArticleEidt from './page/ArticleEidt';
@@ -27,6 +30,8 @@
import SnapshotDetail from './page/SnapshotDetail';
import Sweeping from './page/Sweeping';
import SweepingDetail from './page/SweepingDetail';
+import LawSubscribe from './page/LawSubscribe';
+import LawSubscribeDetail from './page/LawSubscribeDetail';
import MsgDetail from './page/MsgDetail';
import UserManage from './page/UserManage';
import UserDetail from './page/UserDetail';
@@ -43,6 +48,10 @@
import Newly from './page/Newly';
import SignIn from './page/SignIn';
import QuestionDetail from './page/QuestionDetail';
+import QuestionPersonDetail from './page/QuestionPersonDetail';
+
+import NoInspectionReportList from './page/NoInspectionReportList';
+import NoInspectionReportDetail from './page/NoInspectionReportDetail';
import PoliceSecurity from './page/PoliceSecurity';
import policeSecurityEdit from './page/policeSecurityEdit';
@@ -59,6 +68,10 @@
<Route path="/bus/attachment/:busId/:attachmentId" component={AttTree} />
<Route path="/bus/attachment/:busId" component={AttTree} />
{/* <Route path='/questionnaire/newly' component={AttTree} /> */}
+ {/* 问卷详情 */}
+ <Route path='/activeManageEditquestionnaire/:id' component={null} />
+ {/* 签到墙 */}
+ <Route path='/signIn/:id' component={null} />
<Route component={Menu} />
</Switch>
<Switch>
@@ -76,16 +89,20 @@
<Route path='/supPerson' component={SupPerson} />
<Route path='/company' component={Company} />
<Route path='/underAgeList' component={UnderAgeList} />
+ <Route path='/dxWords' component={KeyWord} />
<Route path='/knowledgeBase' component={KnowledgeBase} />
<Route path='/articlePublish' component={ArticlePublish} />
<Route path='/articleEidt/:id' component={ArticleEidt} />
<Route path='/typeManage' component={TypeList} />
<Route path='/activeManage' component={ActiveManage} />
<Route path='/activeManageEdit/:id' component={ActiveManageEdit} />
+ <Route path='/activeManageEditquestionnaire/:id' component={ActiveManageEditquestionnaire} />
<Route path='/snapshot' component={Snapshot} />
<Route path='/snapshotDetail/:id/:flag' component={SnapshotDetail} />
<Route path='/sweeping' component={Sweeping} />
<Route path='/sweepingDetail/:id/:flag' component={SweepingDetail} />
+ <Route path='/lawSubscribe' component={LawSubscribe} />
+ <Route path='/lawSubscribeDetail/:id/:flag' component={LawSubscribeDetail} />
<Route path='/userDetail/:id/:flag' component={UserDetail} />
<Route path='/insideUser' component={InsideUser} />
<Route path='/updatePWD/:id' component={UpdatePWD} />
@@ -103,15 +120,23 @@
<Route path='/questionnaire/newly/:id' component={Newly} />
{/* 问卷详情 */}
<Route path='/questionnaire/detail/:id' component={QuestionDetail} />
+ {/* 小程序提交的任务详情 */}
+ <Route path='/questionnaire/persondetail/:id/:userId' component={QuestionPersonDetail} />
-
+
{/* 公安审核 */}
<Route path='/entry/policeSecurity' component={PoliceSecurity} />
<Route path='/entry/policeSecurityEdit/:id' component={policeSecurityEdit} />
{/* 签到墙 */}
<Route path='/signIn/:id' component={SignIn} />
-
+
+ {/* 未检举报(列表、详情) */}
+ <Route path='/noInspectionReportList' component={NoInspectionReportList} />
+ <Route path='/noInspectionReportDetail/:id/:flag' component={NoInspectionReportDetail} />
+
+
+
<Route path='/' component={Index} />
</Switch>
</Layout>
--
Gitblit v1.8.0