Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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"
@@ -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>
 

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)
@@ -169,12 +177,34 @@ 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/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={
                                                         (props) => (<StudentsList {...this.props} {...props} {...this.state} />)
                                                     }
                                                 ></Route>
-                                                
+
                                               </Switch>
                                           </div>
                                       </div>

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>
     )
   }
 }

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>
       )
     }
 }

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>
       )
     }
 }