From f6971595d32773e339d1cf782fa38bc7138a500a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 30 Aug 2019 16:17:14 +0800
Subject: [PATCH] Merge branches 'dev_Ysl' and 'topic_bank' of
 https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

# Conflicts:
#	public/react/src/modules/courses/Index.js
---
 public/react/src/App.js                   | 55 ++++++++++++++++++++++
 public/react/src/modules/courses/Index.js | 57 +----------------------
 2 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/public/react/src/App.js b/public/react/src/App.js
index d37034052..bafaa898c 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -256,6 +256,31 @@ const Topicbank= Loadable({
 	loader: () => import('./modules/topic_bank/Topic_bank'),
 	loading: Loading,
 })
+//普通作业题库详情
+const Generaljobbankdetails =Loadable({
+	loader: () => import('./modules/courses/questionbank/Generaljobbankdetails'),
+	loading: Loading,
+});
+//分组作业题库详情
+const GroupjobbankPage =Loadable({
+	loader: () => import('./modules/courses/groupjobbank/GroupjobbankPage'),
+	loading: Loading,
+});
+//毕设选题详情
+const CompletetopicdePage =Loadable({
+	loader: () => import('./modules/courses/comtopicdetails/CompletetopicdePage'),
+	loading: Loading,
+});
+//毕设任务详情
+const Completetaskpage =Loadable({
+	loader: () => import('./modules/courses/completetaskdetails/Completetaskpage'),
+	loading: Loading,
+});
+//问卷编辑
+const PollNewQuestbank =Loadable({
+	loader: () => import('./modules/courses/poll/PollNewQuestbank'),
+	loading: Loading,
+});
 class App extends Component {
 	constructor(props) {
 		super(props)
@@ -347,6 +372,36 @@ class App extends Component {
           <Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.ModalCancelsy} ModalshowCancelsy={this.ModalshowCancelsy}/>
 					<Router>
 						<Switch>
+							{/*题库问卷编辑详情*/}
+							<Route path="/banks/gtpoll/:workid/edit"
+										 render={
+											 (props) => (<PollNewQuestbank {...this.props} {...props} {...this.state} />)
+										 }
+							></Route>
+							{/*毕设任务题库详情*/}
+							<Route path="/banks/gtask/:workid"
+										 render={
+											 (props) => (<Completetaskpage {...this.props} {...props} {...this.state} />)
+										 }
+							></Route>
+							{/*毕设内容题库详情*/}
+							<Route path="/banks/gtopic/:workid"
+										 render={
+											 (props) => (<CompletetopicdePage {...this.props} {...props} {...this.state} />)
+										 }
+							></Route>
+							{/*分组作业题库详情*/}
+							<Route path="/banks/group/:workid"
+										 render={
+											 (props) => (<GroupjobbankPage {...this.props} {...props} {...this.state} />)
+										 }
+							></Route>
+							{/*  普通作业题库详情*/}
+							<Route path="/banks/normal/:workid"
+										 render={
+											 (props) => (<Generaljobbankdetails {...this.props} {...props} {...this.state} />)
+										 }
+							></Route>
 							{/*题库*/}
 							<Route path="/topicbank/:username/:topicstype"
 										 render={
diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index 09d4bda97..fda68665e 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -263,31 +263,7 @@ const GraduationTasksSubmiteditApp=Loadable({
     loader: () => import('./graduation/tasks/GraduationTasksSubmitedit'),
     loading: Loading,
 })
-//普通作业题库详情
-const Generaljobbankdetails =Loadable({
-  loader: () => import('../../modules/courses/questionbank/Generaljobbankdetails'),
-  loading: Loading,
-});
-//分组作业题库详情
-const GroupjobbankPage =Loadable({
-  loader: () => import('../../modules/courses/groupjobbank/GroupjobbankPage'),
-  loading: Loading,
-});
-//毕设选题详情
-const CompletetopicdePage =Loadable({
-  loader: () => import('../../modules/courses/comtopicdetails/CompletetopicdePage'),
-  loading: Loading,
-});
-//毕设任务详情
-const Completetaskpage =Loadable({
-  loader: () => import('../../modules/courses/completetaskdetails/Completetaskpage'),
-  loading: Loading,
-});
-//问卷编辑
-const PollNewQuestbank =Loadable({
-  loader: () => import('../../modules/courses/poll/PollNewQuestbank'),
-  loading: Loading,
-});
+
 class CoursesIndex extends Component{
     constructor(props) {
         super(props)
@@ -466,36 +442,7 @@ class CoursesIndex extends Component{
         // console.log(commons)
         return (
             <Switch {...this.props}>
-              {/*题库问卷编辑详情*/}
-              <Route path="/courses/questreediting/:workid/edit"
-                     render={
-                       (props) => (<PollNewQuestbank {...this.props} {...props} {...this.state} />)
-                     }
-              ></Route>
-              {/*毕设任务题库详情*/}
-              <Route path="/banks/gtask/:workid"
-                     render={
-                       (props) => (<Completetaskpage {...this.props} {...props} {...this.state} />)
-                     }
-              ></Route>
-              {/*毕设内容题库详情*/}
-              <Route path="/banks/gtopic/:workid"
-                     render={
-                       (props) => (<CompletetopicdePage {...this.props} {...props} {...this.state} />)
-                     }
-              ></Route>
-              {/*分组作业题库详情*/}
-              <Route path="/banks/group/:workid"
-                     render={
-                       (props) => (<GroupjobbankPage {...this.props} {...props} {...this.state} />)
-                     }
-              ></Route>
-              {/*  普通作业题库详情*/}
-              <Route path="/banks/normal/:workid"
-                     render={
-                       (props) => (<Generaljobbankdetails {...this.props} {...props} {...this.state} />)
-                     }
-              ></Route>
+
                 {/* 资源列表页  */}
                 <Route path="/courses/:coursesId/file/:Id" exact
                        render={