diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js index f70d748eb..86fcec1ad 100644 --- a/public/react/src/modules/courses/Index.js +++ b/public/react/src/modules/courses/Index.js @@ -37,12 +37,6 @@ const BoardIndex = Loadable({ }) - - -const GraduationTopics = Loadable({ - loader: () => import('./graduation/topics'), - loading: Loading, -}) const GraduationTopicsDetail = Loadable({ loader: () => import('./graduation/topics/GraduateTopicDetail'), loading: Loading, @@ -56,17 +50,6 @@ const GraduateTopicNew = Loadable({ loading: Loading, }) -const GraduationTasks = Loadable({ - loader: () => import('./graduation/tasks'), - loading: Loading, -}) - -// 资源 -const Resourcelist = Loadable({ - loader: () => import('./Resource/index'), - loading: Loading, -}) - //新建实训 const WrappedCoursesNewApp = Loadable({ loader: () => import('./new/CoursesNew'), @@ -87,35 +70,11 @@ const ShixunHomework = Loadable({ loading: Loading, }) -//实训作业设置 -const Trainingjobsetting = Loadable({ - loader: () => import('./shixunHomework/Trainingjobsetting'), - loading: Loading, -}) -//实训作业列表教师 - -// //实训作业列表学生未完成的 -// const Studentnotcompleted= Loadable({ -// loader: () => import('./shixunHomework/Listofworksstudentone'), -// loading: Loading, -// }) -//实训作业列表完成的 -const Studenthascompleted = Loadable({ - loader: () => import('./shixunHomework/Listofworksstudentone'), - loading: Loading, -}) - - //实训作业提交总结 const CommitSummary = Loadable({ loader: () => import('./shixunHomework/CommitSummary'), loading: Loading, }) -//实训作业设置 -const Workquestionandanswer = Loadable({ - loader: () => import('./shixunHomework/Workquestionandanswer'), - loading: Loading, -}) //实训报告 @@ -157,12 +116,6 @@ const PollDetail = Loadable({ loading: Loading, }) - -//试卷 -const Exercise = Loadable({ - loader: () => import('./exercise/Exercise'), - loading: Loading, -}) const Testpapersettinghomepage = Loadable({ loader: () => import('./exercise/Testpapersettinghomepage'), loading: Loading, @@ -423,212 +376,110 @@ class CoursesIndex extends Component { indexs: val, }) } - // // 老师、管理员等 - // isAdmin = () => { - // return this.state.coursedata && this.state.coursedata.course_identity < 4 - // } - // // 学生 - // isStudent = () => { - // return this.state.coursedata && this.state.coursedata.course_identity === 4 - // } - // isAdminOrStudent = () => { - // return this.state.coursedata && this.state.coursedata.course_identity <= 4 - // } - // // 非课堂成员 - // isNotMember = () => { - // return this.state.coursedata && this.state.coursedata.course_identity === 5 - // } - - - // isCourseidentity = () => { - // - // if(this.state.coursedata&&this.state.coursedata.course_identity < 4){ - // return "isAdmin" - // // 老师、管理员等 - // }else if(this.state.coursedata&&this.state.coursedata.course_identity === 4){ - // return "isStudent" - // // 学生 - // }else if(this.state.coursedata&&this.state.coursedata.course_identity === 5){ - // return "isNotMember" - // // 非课堂成员 - // } - // - // } - - - // componentDidMount(){ - // // console.log(this.props.location.pathname) - // let query=this.props.location.pathname; - // const type = query.split('/'); - // if (!type[2]) { - // return; - // } - // let id=parseInt(type[2]) - // - // let url="/courses/"+id+"/top_banner.json" - // axios.get(url).then((result)=>{ - // if(result.status===200){ - // let data=result.data; - // this.setState({ - // coursedata:data - // }) - // - // // console.log(data) - // } - // }).catch((error)=>{ - // console.log(error); - // }) - - // } - render() { const common = { previousPathName: this.historyArray && this.historyArray[1] - // isAdmin: this.isAdmin, - // isStudent: this.isStudent, - // isAdminOrStudent: this.isAdminOrStudent, - - // isNotMember: this.isNotMember, - // isCourseidentity:this.isCourseidentity } - // const commons = { - // admind: this.props.user, - // // isAdminOrStudent: this.isAdminOrStudent, - // - // // isNotMember: this.isNotMember, - // // isCourseidentity:this.isCourseidentity - // } - // console.log("commonscommons") - // console.log(commons) return ( {/*排序*/} - () } > {/*视频列表*/} + () + } + > + () + } + > + {/* 资源列表页 */} + () + } + > + () + } + > + () + } + > + {/*课堂讨论*/} + () + } + > - render() { - const common = { - previousPathName: this.historyArray && this.historyArray[1] - // isAdmin: this.isAdmin, - // isStudent: this.isStudent, - // isAdminOrStudent: this.isAdminOrStudent, - - // isNotMember: this.isNotMember, - // isCourseidentity:this.isCourseidentity - } - // const commons = { - // admind: this.props.user, - // // isAdminOrStudent: this.isAdminOrStudent, - // - // // isNotMember: this.isNotMember, - // // isCourseidentity:this.isCourseidentity - // } - // console.log("commonscommons") - // console.log(commons) - return ( - - {/*排序*/} - () - } - > - {/*视频列表*/} - () - } - > - () - } - > - {/* 资源列表页 */} - () - } - > - () - } - > - () - } - > - {/*课堂讨论*/} - () - } - > - - {/* 毕业设计 */} - {/* 毕设问答 */} - () - } - > + {/* 毕业设计 */} + {/* 毕设问答 */} + () + } + > - {/* 毕设选题新建页 */} - () - }> - {/* 毕设选题编辑页*/} - () - }> + {/* 毕设选题新建页 */} + () + }> + {/* 毕设选题编辑页*/} + () + }> - {/* 毕设选题详情页 */} - () - } - > + {/* 毕设选题详情页 */} + () + } + > - {/* 毕设选题列表 */} - () - }> + {/* 毕设选题列表 */} + () + }> - {/*————————————————————————————————————————————————————————————————————————————————————*/} - {/* 作品评阅 https://www.trustie.net/issues/19981 */} - () - } - > + {/*————————————————————————————————————————————————————————————————————————————————————*/} + {/* 作品评阅 https://www.trustie.net/issues/19981 */} + () + } + > - {/* 新建作品 */} - () - } - > + {/* 新建作品 */} + () + } + > - {/* 修改作品 */} - () - } - > + {/* 修改作品 */} + () + } + > {/* 设置毕设任务 https://www.trustie.net/issues/19981 */} - {/* () } @@ -641,19 +492,19 @@ class CoursesIndex extends Component { }> */} - () - } - > + () + } + > - {/* 修改毕设任务 https://www.trustie.net/issues/19981 */} - () - } - > + {/* 修改毕设任务 https://www.trustie.net/issues/19981 */} + () + } + > {/* 修改毕设任务 https://www.trustie.net/issues/19981 */} - {/* 新建毕设任务 https://www.trustie.net/issues/19981 */} - () - } - > + {/* 新建毕设任务 https://www.trustie.net/issues/19981 */} + () + } + > {/* 新建毕设任务 https://www.trustie.net/issues/19981 */} - {/* 毕设任务列表 https://www.trustie.net/issues/19981 */} - () - } - > + {/* 毕设任务列表 https://www.trustie.net/issues/19981 */} + () + } + > - {/*/!* 毕业设计主 https://www.trustie.net/issues/19981 *!/*/} - {/* ()*/} - {/*}*/} - {/*>*/} - - {/*/!* 资源子目录 https://www.trustie.net/issues/19917 *!/*/} - {/* ()*/} - {/*}*/} - {/*>*/} - {/* 教师列表*/} - () - } - > - {/* 学生列表*/} - () - } - > - {/* 分班列表 */} - () - } - > - () - } - > + {/*/!* 毕业设计主 https://www.trustie.net/issues/19981 *!/*/} + {/* ()*/} + {/*}*/} + {/*>*/} + + {/*/!* 资源子目录 https://www.trustie.net/issues/19917 *!/*/} + {/* ()*/} + {/*}*/} + {/*>*/} + {/* 教师列表*/} + () + } + > + {/* 学生列表*/} + () + } + > + {/* 分班列表 */} + () + } + > + () + } + > - {/* 普通作业 */} - () - } - > - {/* 子目录普通作业 */} - () - } - > - {/* 分组作业 */} - () - } - > - {/* 分组作业 */} - () - } - > - - {/* 普通作业 */} - () - } - > - {/* 子普通作业 */} - () - } - > - - {/* 分组作业 */} - () - } - > + {/* 普通作业 */} + () + } + > + {/* 子目录普通作业 */} + () + } + > + {/* 分组作业 */} + () + } + > + {/* 分组作业 */} + () + } + > - {/* 分组作业 */} - () - } - > + {/* 普通作业 */} + () + } + > + {/* 子普通作业 */} + () + } + > + {/* 分组作业 */} + () + } + > - {/* 问卷答题 */} - () - } - > + {/* 分组作业 */} + () + } + > - {/* 问卷详情 */} - () - } - > - {/* 问卷新建 */} - () - } - > - {/*/!* 问卷编辑 *!/*/} - {/* ()*/} - {/*}*/} - {/*>*/} - {/* 问卷 */} - () - } - > + {/* 问卷答题 */} + () + } + > + + {/* 问卷详情 */} + () + } + > + {/* 问卷新建 */} + () + } + > + {/*/!* 问卷编辑 *!/*/} + {/* ()*/} + {/*}*/} + {/*>*/} + {/* 问卷 */} + () + } + > - {/* 试卷查看/评阅 */} - () - } - > - {/*试卷新建 */} - () - } - > - {/*试卷新建 */} - () - } - > + {/* 试卷查看/评阅 */} + () + } + > + + {/*试卷新建 */} + () + } + > + {/*试卷新建 */} + () + } + > {/*试卷设置主页*/} - () - } - > + () + } + > - {/*学生完成列表*/} - () - } - > - - {/* 试卷 */} - () - } - > + {/*学生完成列表*/} + () + } + > + + {/* 试卷 */} + () + } + > - {/*实训查重详情*/} - () - } - > - () - } - > - - {/*实训查重列表*/} - () - } - > - () - } - > - - {/*实训报告*/} - () - } - > - () - } - > - - {/*教师列表*/} - () - } - > - () - } - > - {/*实训作业page*/} - () - } - > - {/*实训作业设置*/} - () - } - > - () - } - > - {/*/!*实训作品列表教师*!/*/} - {/*提交总结*/} - () - } - > - () - } - > - {/*实训作品列表学生未公布*/} - {/* ()*/} - {/* }*/} - {/*>*/} - {/*实训学生作品列表已公布*/} - {/* ()*/} - {/* }*/} - {/* >*/} - {/*/!*实训学生作品列表已公布*!/*/} - {/* ()*/} - {/* }*/} - {/*>*/} - - - - {/*实训作业问答主目录*/} - () - } - > + {/*实训查重详情*/} + () + } + > + () + } + > - {/*实训作业问答子目录*/} - () - } - > + {/*实训查重列表*/} + () + } + > + () + } + > - {/*新建课堂*/} - () - } - > - {/*新建精品课堂*/} - {/*coursesId 课堂id */} - {/*id 是否是私有或者公有*/} - () - } - > - {/*修改精品课堂*/} - () - } - > - {/*修改课堂*/} - () - } - > + {/*实训报告*/} + () + } + > + () + } + > - {/* 实训作业子页面*/} - () - } - > + {/*教师列表*/} + () + } + > + () + } + > + {/*实训作业page*/} + () + } + > + {/*实训作业设置*/} + () + } + > + () + } + > + {/*/!*实训作品列表教师*!/*/} + {/*提交总结*/} + () + } + > + () + } + > + {/*实训作品列表学生未公布*/} + {/* ()*/} + {/* }*/} + {/*>*/} + {/*实训学生作品列表已公布*/} + {/* ()*/} + {/* }*/} + {/* >*/} + {/*/!*实训学生作品列表已公布*!/*/} + {/* ()*/} + {/* }*/} + {/*>*/} + + + + {/*实训作业问答主目录*/} + () + } + > - {/* 实训作业页面*/} - () - } - > + {/*实训作业问答子目录*/} + () + } + > + + {/*新建课堂*/} + () + } + > + {/*新建精品课堂*/} + {/*coursesId 课堂id */} + {/*id 是否是私有或者公有*/} + () + } + > + {/*修改精品课堂*/} + () + } + > + {/*修改课堂*/} + () + } + > + + {/* 实训作业子页面*/} + () + } + > + + {/* 实训作业页面*/} + () + } + > {/*课堂统计列表2019.10.29 */} - () - } - > - - {/*/!*实训作业and课堂详情页*!/*/} - () - } - > + () + } + > - {/*课堂首页*/} - () - } - > - {/**/} + {/*/!*实训作业and课堂详情页*!/*/} + () + } + > + + {/*课堂首页*/} + () + } + > + {/**/} ) } } -export default withRouter(ImageLayerOfCommentHOC({imgSelector: '.imageLayerParent img, .imageLayerParent .imageTarget', parentSelector: '.newMain'}) (CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(CoursesIndex) )))); +export default withRouter(ImageLayerOfCommentHOC({ imgSelector: '.imageLayerParent img, .imageLayerParent .imageTarget', parentSelector: '.newMain' })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(CoursesIndex))))); diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js index 1bb79d28f..575941d91 100644 --- a/public/react/src/modules/courses/ListPageIndex.js +++ b/public/react/src/modules/courses/ListPageIndex.js @@ -1,10 +1,8 @@ import React, { Component } from 'react'; -import { BrowserRouter as Router, Route, Switch } from 'react-router-dom'; +import { Route, Switch } from 'react-router-dom'; -import { Input, Pagination, Tooltip } from 'antd'; import { Loadable } from 'educoder'; import Loading from '../../Loading'; -import Guide from "../../modules/courses/shixunHomework/Guide"; //业务组件 import CoursesBanner from "./coursesDetail/CoursesBanner"; import Coursesleftnav from "./coursesDetail/CoursesLeftNav"; @@ -179,217 +177,7 @@ class ListPageIndex extends Component { this.refs.CoursesBanner.updatabanner() } render() { - let { yslGuideone } = this.state; - // console.log("98"); - // console.log(yslGuideone); - // console.log(this.props.isAdmin()); - // // var yslGuideones = window.sessionStorage.getItem('yslGuideone'); - // console.log(this.props); - // console.log(this.props.location.search); - return ( -
-
- {/*头部banner*/} - this.ispostexcellenttype(excellent)}> - {/*下面是指引哦*/} - {/*{yslGuideone!==undefined?*/} - {/*(*/} - {/* yslGuideone===true?*/} - {/* this.setwindowlocal(b)}*/} - {/* >*/} - {/* */} - {/* :""*/} - {/* )*/} - {/* :""*/} - {/*}*/} -
- -
-
-
-
-
- - {/*left_nav*/} -
- this.comyslElearning(i)}/> -
- - {/*right_concent*/} -
-
- - {/* --------------------------------------------------------------------- */} - - {/* 作业设置 */} - {/* http://localhost:3007/classrooms/1309/homework/9300/setting */} - {/* 普通作业 */} - () - } - > - {/* 普通作业 */} - () - } - > - - {/* 作品列表 */} - () - } - > - {/* 作品列表 */} - () - } - > - - () - } - > - {/*视频列表*/} - () - } - > - () - } - > - (this.updatabanners()} {...this.props} {...props} {...this.state} />) - } - > - {/* 学生列表*/} - () - } - > - () - } - > - () - } - > - - () - } - > - - () - } - > - {/* () - } - > */} - - {/* 实训作业子页面*/} - () - } - > - - {/*课堂统计列表2019.10.29 */} - - () - } - > - - - {/*公告栏列表*/} - - () - } - > - {/*在线学习*/} - (this.comyslElearning(i)} />) - } - > - - {/* 实训作业页面*/} - () - } - > - - - () - } - > - () - } - > - - () - }> - () - } - > - {/* 默认 */} - () - } - > - - -
-
- -
-
-
-
- -
-
-
-
- - - - - - ) + return () } } export default ListPageIndex;