From 1ee43431d0418018cbc07a2369c56c3999de5e18 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 22 Jun 2019 14:04:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/Index.js        |  6 +++---
 .../react/src/modules/courses/ListPageIndex.js   | 16 +++++++++++++++-
 .../react/src/modules/courses/Resource/index.js  |  6 ++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index c385af3b7..840d1d617 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -442,14 +442,14 @@ class CoursesIndex extends Component{
             <Switch {...this.props}>
 
                 {/* 资源列表页  */}
-                <Route path="/courses/:coursesId/file/:Id"
+                <Route path="/courses/:coursesId/file/:Id" exact
                        render={
-                           (props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
                        }
                 ></Route>
                 <Route path="/courses/:coursesId/files/:main_id"
                        render={
-                         (props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
+                         (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
                        }
                 ></Route>
                 <Route exact path="/courses/:coursesId/boards/:boardId"
diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js
index 12237e177..abb8a8528 100644
--- a/public/react/src/modules/courses/ListPageIndex.js
+++ b/public/react/src/modules/courses/ListPageIndex.js
@@ -169,12 +169,26 @@ class ListPageIndex extends Component{
                                                     }
                                                 ></Route>
 
+                                                
+                                                <Route path="/courses/:coursesId/files/:main_id"
+                                                    render={
+                                                        (props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
+                                                    }
+                                                ></Route>
+                                                <Route path="/courses/:coursesId/file/:Id"
+                                                    render={
+                                                        (props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
+                                                    }
+                                                ></Route>
+                                                
+
+                                                {/* 默认 */}
                                                 <Route path="/courses/:coursesId"
                                                     render={
                                                         (props) => (<StudentsList {...this.props} {...props} {...this.state} />)
                                                     }
                                                 ></Route>
-                                                
+
                                               </Switch>
                                           </div>
                                       </div>
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 1cae3d559..6476ef2bb 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -573,7 +573,7 @@ class Fileslists extends Component{
 
 
     return(
-        <div>
+        <React.Fragment >
 
 
           {/*发送*/}
@@ -647,7 +647,6 @@ class Fileslists extends Component{
               has_course_groups={this.state.has_course_groups}
           />:""}
 
-          <CourseLayoutcomponent {...this.props}>
             <Titlesearchsection
                 title={name}
                 searchValue={ searchValue }
@@ -840,8 +839,7 @@ class Fileslists extends Component{
             </div>
 
 
-          </CourseLayoutcomponent>
-        </div>
+          </React.Fragment>
     )
   }
 }

From 12a0bcaf4555a8322adb3a88943ad9a0231a74eb Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 22 Jun 2019 14:13:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=AF=95=E8=AE=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/Index.js      |  8 ++++----
 .../react/src/modules/courses/ListPageIndex.js | 18 +++++++++++++++++-
 .../modules/courses/graduation/tasks/index.js  |  4 ++--
 .../modules/courses/graduation/topics/index.js |  4 ++--
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index 840d1d617..3dcdb1c18 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -491,9 +491,9 @@ class CoursesIndex extends Component{
                 ></Route>
 
                 {/* 毕设选题列表 */}
-                <Route path="/courses/:coursesId/graduation_topics/:Id"
+                <Route path="/courses/:coursesId/graduation_topics/:Id" exact
                        render={
-                           (props) => (<GraduationTopics {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
                        }></Route>
 
 
@@ -559,9 +559,9 @@ class CoursesIndex extends Component{
 
 
                 {/* 毕设任务列表 https://www.trustie.net/issues/19981 */}
-                <Route path="/courses/:coursesId/graduation_tasks/:Id"
+                <Route path="/courses/:coursesId/graduation_tasks/:Id" exact
                        render={
-                           (props) => (<GraduationTasks {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
                        }
                 ></Route>
 
diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js
index abb8a8528..1f8bf6b29 100644
--- a/public/react/src/modules/courses/ListPageIndex.js
+++ b/public/react/src/modules/courses/ListPageIndex.js
@@ -56,6 +56,14 @@ const ShixunHomework= Loadable({
     loading: Loading,
 })
 
+const GraduationTopics= Loadable({
+    loader: () => import('./graduation/topics'),
+    loading: Loading,
+})
+const GraduationTasks= Loadable({
+    loader: () => import('./graduation/tasks'),
+    loading: Loading,
+})
 class ListPageIndex extends Component{
   constructor(props) {
     super(props)
@@ -181,7 +189,15 @@ class ListPageIndex extends Component{
                                                     }
                                                 ></Route>
                                                 
-
+                                                <Route path="/courses/:coursesId/graduation_topics/:Id"
+                                                    render={
+                                                        (props) => (<GraduationTopics {...this.props} {...props} {...this.state} />)
+                                                }></Route>
+                                                <Route path="/courses/:coursesId/graduation_tasks/:Id"
+                                                    render={
+                                                        (props) => (<GraduationTasks {...this.props} {...props} {...this.state} />)
+                                                    }
+                                                ></Route>
                                                 {/* 默认 */}
                                                 <Route path="/courses/:coursesId"
                                                     render={
diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index 29610eb93..c044c1711 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -591,7 +591,7 @@ class GraduationTasks extends Component{
      // console.log(this.props.isCourseidentity()===isNotMember)
    // console.log(category_id)
     return(
-      <CourseLayoutcomponent {...this.props}>
+      <React.Fragment>
         {/*提示*/}
         <Modals
           modalsType={Modalstype}
@@ -775,7 +775,7 @@ class GraduationTasks extends Component{
 
         </div>
 
-      </CourseLayoutcomponent>
+      </React.Fragment>
       )
     }
 }
diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js
index aaba86e9e..391bcac18 100644
--- a/public/react/src/modules/courses/graduation/topics/index.js
+++ b/public/react/src/modules/courses/graduation/topics/index.js
@@ -341,7 +341,7 @@ onBoardsNew=()=>{
     // let {course_identity}=this.props.coursedata
     const isAdmin =this.props.isAdmin();
     return(
-      <CourseLayoutcomponent {...this.props}>
+      <React.Fragment >
         <ChooseGraduateTopicModal ref="chooseGraduateTopicModal"></ChooseGraduateTopicModal>
           <Titlesearchsection
             title="毕设选题"
@@ -446,7 +446,7 @@ onBoardsNew=()=>{
           
         <div>          
         </div>        
-      </CourseLayoutcomponent>
+      </React.Fragment>
       )
     }
 }