dev_aliyun2
harry 5 years ago
parent 9f1393f745
commit ee62bbc3fc

@ -37,12 +37,6 @@ const BoardIndex = Loadable({
}) })
const GraduationTopics = Loadable({
loader: () => import('./graduation/topics'),
loading: Loading,
})
const GraduationTopicsDetail = Loadable({ const GraduationTopicsDetail = Loadable({
loader: () => import('./graduation/topics/GraduateTopicDetail'), loader: () => import('./graduation/topics/GraduateTopicDetail'),
loading: Loading, loading: Loading,
@ -56,17 +50,6 @@ const GraduateTopicNew = Loadable({
loading: Loading, loading: Loading,
}) })
const GraduationTasks = Loadable({
loader: () => import('./graduation/tasks'),
loading: Loading,
})
// 资源
const Resourcelist = Loadable({
loader: () => import('./Resource/index'),
loading: Loading,
})
//新建实训 //新建实训
const WrappedCoursesNewApp = Loadable({ const WrappedCoursesNewApp = Loadable({
loader: () => import('./new/CoursesNew'), loader: () => import('./new/CoursesNew'),
@ -87,35 +70,11 @@ const ShixunHomework = Loadable({
loading: Loading, 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({ const CommitSummary = Loadable({
loader: () => import('./shixunHomework/CommitSummary'), loader: () => import('./shixunHomework/CommitSummary'),
loading: Loading, loading: Loading,
}) })
//实训作业设置
const Workquestionandanswer = Loadable({
loader: () => import('./shixunHomework/Workquestionandanswer'),
loading: Loading,
})
//实训报告 //实训报告
@ -157,12 +116,6 @@ const PollDetail = Loadable({
loading: Loading, loading: Loading,
}) })
//试卷
const Exercise = Loadable({
loader: () => import('./exercise/Exercise'),
loading: Loading,
})
const Testpapersettinghomepage = Loadable({ const Testpapersettinghomepage = Loadable({
loader: () => import('./exercise/Testpapersettinghomepage'), loader: () => import('./exercise/Testpapersettinghomepage'),
loading: Loading, loading: Loading,
@ -423,112 +376,10 @@ class CoursesIndex extends Component {
indexs: val, 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() { render() {
const common = { const common = {
previousPathName: this.historyArray && this.historyArray[1] 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 (
<Switch {...this.props}>
{/*排序*/}
<Route path="/courses/:coursesId/ordering/:ordering_type/:main_id"
render={
(props) => (<Ordering {...this.props} {...props} {...this.state} />)
} }
></Route>
{/*视频列表*/}
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 ( return (
<Switch {...this.props}> <Switch {...this.props}>
{/*排序*/} {/*排序*/}
@ -551,23 +402,23 @@ class CoursesIndex extends Component {
{/* 资源列表页 */} {/* 资源列表页 */}
<Route path="/classrooms/:coursesId/file/:Id" exact <Route path="/classrooms/:coursesId/file/:Id" exact
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/classrooms/:coursesId/files/:main_id" <Route path="/classrooms/:coursesId/files/:main_id"
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route exact path="/classrooms/:coursesId/boards/:boardId" <Route exact path="/classrooms/:coursesId/boards/:boardId"
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*课堂讨论*/} {/*课堂讨论*/}
<Route path="/classrooms/:coursesId/boards/:boardId" <Route path="/classrooms/:coursesId/boards/:boardId"
render={ render={
(props) => (<BoardIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<BoardIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
@ -575,32 +426,32 @@ class CoursesIndex extends Component {
{/* 毕设问答 */} {/* 毕设问答 */}
<Route path="/classrooms/:coursesId/graduation_topics/postwork/new" <Route path="/classrooms/:coursesId/graduation_topics/postwork/new"
render={ render={
(props) => (<GraduateTopicPostWorksNew {...this.props} {...props} {...this.state} {...common}/>) (props) => (<GraduateTopicPostWorksNew {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 毕设选题新建页 */} {/* 毕设选题新建页 */}
<Route path="/classrooms/:coursesId/graduation_topics/new" <Route path="/classrooms/:coursesId/graduation_topics/new"
render={ render={
(props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} {...common}/>) (props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} {...common} />)
}></Route> }></Route>
{/* 毕设选题编辑页*/} {/* 毕设选题编辑页*/}
<Route path="/classrooms/:coursesId/graduation_topics/:topicId/edit" <Route path="/classrooms/:coursesId/graduation_topics/:topicId/edit"
render={ render={
(props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} {...common}/>) (props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} {...common} />)
}></Route> }></Route>
{/* 毕设选题详情页 */} {/* 毕设选题详情页 */}
<Route path="/classrooms/:course_id/graduation_topics/:graduation_topic_id/detail" <Route path="/classrooms/:course_id/graduation_topics/:graduation_topic_id/detail"
render={ render={
(props)=>(<GraduationTopicsDetail {...this.props} {...props} {...this.state}></GraduationTopicsDetail>) (props) => (<GraduationTopicsDetail {...this.props} {...props} {...this.state}></GraduationTopicsDetail>)
} }
></Route> ></Route>
{/* 毕设选题列表 */} {/* 毕设选题列表 */}
<Route path="/classrooms/:coursesId/graduation_topics/:Id" exact <Route path="/classrooms/:coursesId/graduation_topics/:Id" exact
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
}></Route> }></Route>
@ -608,21 +459,21 @@ class CoursesIndex extends Component {
{/* 作品评阅 https://www.trustie.net/issues/19981 */} {/* 作品评阅 https://www.trustie.net/issues/19981 */}
<Route path="/classrooms/:coursesId/graduation_tasks/:category_id/appraise" <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/appraise"
render={ render={
(props) => (<GraduationTasksappraise {...this.props} {...props} {...this.state} {...common}/>) (props) => (<GraduationTasksappraise {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 新建作品 */} {/* 新建作品 */}
<Route path="/classrooms/:coursesId/graduation_tasks/:category_id/works/:task_Id/new" <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/works/:task_Id/new"
render={ render={
(props) => (<GraduationTasksSubmitnewApp {...this.props} {...props} {...this.state} {...common}/>) (props) => (<GraduationTasksSubmitnewApp {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 修改作品 */} {/* 修改作品 */}
<Route path="/classrooms/:coursesId/graduation_tasks/:category_id/works/:work_Id/edit" <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/works/:work_Id/edit"
render={ render={
(props) => (<GraduationTasksSubmiteditApp {...this.props} {...props} {...this.state} {...common}/>) (props) => (<GraduationTasksSubmiteditApp {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
@ -643,7 +494,7 @@ class CoursesIndex extends Component {
<Route path="/classrooms/:coursesId/graduation_tasks/:category_id/detail/:task_Id" <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/detail/:task_Id"
render={ render={
(props) => (<GraduationTaskssettinglist {...this.props} {...props} {...this.state} {...common}/>) (props) => (<GraduationTaskssettinglist {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
@ -651,7 +502,7 @@ class CoursesIndex extends Component {
{/* 修改毕设任务 https://www.trustie.net/issues/19981 */} {/* 修改毕设任务 https://www.trustie.net/issues/19981 */}
<Route path="/classrooms/:coursesId/graduation_tasks/:category_id/edit" <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/edit"
render={ render={
(props) => (<GraduationTaskseditApp {...this.props} {...props} {...this.state} {...common}/>) (props) => (<GraduationTaskseditApp {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
@ -665,7 +516,7 @@ class CoursesIndex extends Component {
{/* 新建毕设任务 https://www.trustie.net/issues/19981 */} {/* 新建毕设任务 https://www.trustie.net/issues/19981 */}
<Route path="/classrooms/:coursesId/graduation_tasks/:category_id/new" <Route path="/classrooms/:coursesId/graduation_tasks/:category_id/new"
render={ render={
(props) => (<GraduationTasksnewApp {...this.props} {...props} {...this.state} {...common}/>) (props) => (<GraduationTasksnewApp {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
@ -679,7 +530,7 @@ class CoursesIndex extends Component {
{/* 毕设任务列表 https://www.trustie.net/issues/19981 */} {/* 毕设任务列表 https://www.trustie.net/issues/19981 */}
<Route path="/classrooms/:coursesId/graduation_tasks/:Id" exact <Route path="/classrooms/:coursesId/graduation_tasks/:Id" exact
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
@ -699,76 +550,76 @@ class CoursesIndex extends Component {
{/* 教师列表*/} {/* 教师列表*/}
<Route path="/classrooms/:coursesId/teachers" <Route path="/classrooms/:coursesId/teachers"
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 学生列表*/} {/* 学生列表*/}
<Route path="/classrooms/:coursesId/students" <Route path="/classrooms/:coursesId/students"
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 分班列表 */} {/* 分班列表 */}
<Route path="/classrooms/:coursesId/course_groups/:course_group_id" <Route path="/classrooms/:coursesId/course_groups/:course_group_id"
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/classrooms/:coursesId/course_groups" <Route path="/classrooms/:coursesId/course_groups"
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 普通作业 */} {/* 普通作业 */}
<Route path="/classrooms/:coursesId/common_homeworks/:category_id" exact <Route path="/classrooms/:coursesId/common_homeworks/:category_id" exact
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 子目录普通作业 */} {/* 子目录普通作业 */}
<Route path="/classrooms/:coursesId/common_homework/:category_id" exact <Route path="/classrooms/:coursesId/common_homework/:category_id" exact
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 分组作业 */} {/* 分组作业 */}
<Route path="/classrooms/:coursesId/group_homeworks/:category_id" exact <Route path="/classrooms/:coursesId/group_homeworks/:category_id" exact
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 分组作业 */} {/* 分组作业 */}
<Route path="/classrooms/:coursesId/group_homework/:category_id" exact <Route path="/classrooms/:coursesId/group_homework/:category_id" exact
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 普通作业 */} {/* 普通作业 */}
<Route path="/classrooms/:coursesId/common_homeworks/" strict <Route path="/classrooms/:coursesId/common_homeworks/" strict
render={ render={
(props) => (<CommonWork {...this.props} {...props} {...this.state} {...common}/>) (props) => (<CommonWork {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 子普通作业 */} {/* 子普通作业 */}
<Route path="/classrooms/:coursesId/common_homework/" strict <Route path="/classrooms/:coursesId/common_homework/" strict
render={ render={
(props) => (<CommonWork {...this.props} {...props} {...this.state} {...common}/>) (props) => (<CommonWork {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 分组作业 */} {/* 分组作业 */}
<Route path="/classrooms/:coursesId/group_homeworks/" strict <Route path="/classrooms/:coursesId/group_homeworks/" strict
render={ render={
(props) => (<GroupWork {...this.props} {...props} {...this.state} {...common}/>) (props) => (<GroupWork {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 分组作业 */} {/* 分组作业 */}
<Route path="/classrooms/:coursesId/group_homework/" strict <Route path="/classrooms/:coursesId/group_homework/" strict
render={ render={
(props) => (<GroupWork {...this.props} {...props} {...this.state} {...common}/>) (props) => (<GroupWork {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
@ -776,21 +627,21 @@ class CoursesIndex extends Component {
{/* 问卷答题 */} {/* 问卷答题 */}
<Route path="/classrooms/:coursesId/polls/:pollId/users/:login" <Route path="/classrooms/:coursesId/polls/:pollId/users/:login"
render={ render={
(props) => (<PollInfo {...this.props} {...props} {...this.state} {...common}/>) (props) => (<PollInfo {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 问卷详情 */} {/* 问卷详情 */}
<Route path="/classrooms/:coursesId/polls/:pollId/detail" <Route path="/classrooms/:coursesId/polls/:pollId/detail"
render={ render={
(props) => (<PollDetail {...this.props} {...props} {...this.state} {...common}/>) (props) => (<PollDetail {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 问卷新建 */} {/* 问卷新建 */}
<Route path="/classrooms/:coursesId/polls/:pollid/:news" <Route path="/classrooms/:coursesId/polls/:pollid/:news"
render={ render={
(props) => (<PollNew {...this.props} {...props} {...this.state} {...common}/>) (props) => (<PollNew {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*/!* 问卷编辑 *!/*/} {/*/!* 问卷编辑 *!/*/}
@ -802,7 +653,7 @@ class CoursesIndex extends Component {
{/* 问卷 */} {/* 问卷 */}
<Route path="/classrooms/:coursesId/polls/:Id" <Route path="/classrooms/:coursesId/polls/:Id"
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
@ -810,20 +661,20 @@ class CoursesIndex extends Component {
{/* 试卷查看/评阅 */} {/* 试卷查看/评阅 */}
<Route exact path="/classrooms/:coursesId/exercises/:Id/users/:userId" <Route exact path="/classrooms/:coursesId/exercises/:Id/users/:userId"
render={ render={
(props)=>(<ExerciseReviewAndAnswer {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ExerciseReviewAndAnswer {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*试卷新建 */} {/*试卷新建 */}
<Route exact path="/classrooms/:coursesId/exercises/new" <Route exact path="/classrooms/:coursesId/exercises/new"
render={ render={
(props) => (<ExerciseNew {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ExerciseNew {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*试卷新建 */} {/*试卷新建 */}
<Route exact path="/classrooms/:coursesId/exercises/:Id/edit" <Route exact path="/classrooms/:coursesId/exercises/:Id/edit"
render={ render={
(props) => (<ExerciseNew {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ExerciseNew {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
@ -831,7 +682,7 @@ class CoursesIndex extends Component {
<Route path="/classrooms/:coursesId/exercises/:Id/student_exercise_list" <Route path="/classrooms/:coursesId/exercises/:Id/student_exercise_list"
render={ render={
(props) => (<Testpapersettinghomepage {...this.props} {...props} {...this.state} {...common}/>) (props) => (<Testpapersettinghomepage {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
@ -840,14 +691,14 @@ class CoursesIndex extends Component {
<Route <Route
path="/classrooms/:coursesId/exercises/:Id/Studentshavecompletedthelist" path="/classrooms/:coursesId/exercises/:Id/Studentshavecompletedthelist"
render={ render={
(props) => (<Studentshavecompletedthelist {...this.props} {...props} {...this.state} {...common}/>) (props) => (<Studentshavecompletedthelist {...this.props} {...props} {...this.state} {...common} />)
} }
> >
</Route> </Route>
{/* 试卷 */} {/* 试卷 */}
<Route path="/classrooms/:coursesId/exercises/:Id" <Route path="/classrooms/:coursesId/exercises/:Id"
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
@ -855,65 +706,65 @@ class CoursesIndex extends Component {
{/*实训查重详情*/} {/*实训查重详情*/}
<Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/review_detail/:userid" <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/review_detail/:userid"
render={ render={
(props) => (<ShixunWorkDetails {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunWorkDetails {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/review_detail/:userid" <Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/review_detail/:userid"
render={ render={
(props) => (<ShixunWorkDetails {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunWorkDetails {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*实训查重列表*/} {/*实训查重列表*/}
<Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/student_work" <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/student_work"
render={ render={
(props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/student_work" <Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/student_work"
render={ render={
(props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*实训报告*/} {/*实训报告*/}
<Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/shixun_work_report" <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/shixun_work_report"
render={ render={
(props) => (<ShixunWorkReport {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunWorkReport {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/shixun_work_report" <Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/shixun_work_report"
render={ render={
(props) => (<ShixunWorkReport {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunWorkReport {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*教师列表*/} {/*教师列表*/}
<Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/list" <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/list"
render={ render={
(props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/list" <Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/list"
render={ render={
(props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*实训作业page*/} {/*实训作业page*/}
<Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/Page" <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/Page"
render={ render={
(props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*实训作业设置*/} {/*实训作业设置*/}
<Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/settings" <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/settings"
render={ render={
(props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
<Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/settings" <Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/settings"
render={ render={
(props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*/!*实训作品列表教师*!/*/} {/*/!*实训作品列表教师*!/*/}
@ -952,21 +803,21 @@ class CoursesIndex extends Component {
{/*实训作业问答主目录*/} {/*实训作业问答主目录*/}
<Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/questions" <Route path="/classrooms/:coursesId/shixun_homeworks/:homeworkid/questions"
render={ render={
(props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*实训作业问答子目录*/} {/*实训作业问答子目录*/}
<Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/questions" <Route path="/classrooms/:coursesId/shixun_homework/:homeworkid/questions"
render={ render={
(props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ShixunHomeworkPage {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*新建课堂*/} {/*新建课堂*/}
<Route path="/classrooms/new" <Route path="/classrooms/new"
render={ render={
(props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} {...common}/>) (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*新建精品课堂*/} {/*新建精品课堂*/}
@ -974,33 +825,33 @@ class CoursesIndex extends Component {
{/*id 是否是私有或者公有*/} {/*id 是否是私有或者公有*/}
<Route path="/classrooms/news/:subjectid/newgold/:id" <Route path="/classrooms/news/:subjectid/newgold/:id"
render={ render={
(props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} {...common}/>) (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*修改精品课堂*/} {/*修改精品课堂*/}
<Route path="/classrooms/:coursesId/newgolds/settings" <Route path="/classrooms/:coursesId/newgolds/settings"
render={ render={
(props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} {...common}/>) (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*修改课堂*/} {/*修改课堂*/}
<Route path="/classrooms/:coursesId/settings" <Route path="/classrooms/:coursesId/settings"
render={ render={
(props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} {...common}/>) (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 实训作业子页面*/} {/* 实训作业子页面*/}
<Route path="/classrooms/:coursesId/shixun_homework/:category_id" <Route path="/classrooms/:coursesId/shixun_homework/:category_id"
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/* 实训作业页面*/} {/* 实训作业页面*/}
<Route path="/classrooms/:coursesId/shixun_homeworks/:main_id" <Route path="/classrooms/:coursesId/shixun_homeworks/:main_id"
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
@ -1015,14 +866,14 @@ class CoursesIndex extends Component {
{/*/!*实训作业and课堂详情页*!/*/} {/*/!*实训作业and课堂详情页*!/*/}
<Route path="/classrooms/:coursesId" <Route path="/classrooms/:coursesId"
render={ render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*课堂首页*/} {/*课堂首页*/}
<Route path="/classrooms" <Route path="/classrooms"
render={ render={
(props) => (<CoursesHome {...this.props} {...props} {...this.state} {...common}/>) (props) => (<CoursesHome {...this.props} {...props} {...this.state} {...common} />)
} }
></Route> ></Route>
{/*<Route exact path="/classrooms" component={CoursesHome} {...this.props} {...props} {...this.state} ></Route>*/} {/*<Route exact path="/classrooms" component={CoursesHome} {...this.props} {...props} {...this.state} ></Route>*/}
@ -1032,4 +883,4 @@ class CoursesIndex extends Component {
} }
} }
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)))));

@ -1,10 +1,8 @@
import React, { Component } from 'react'; 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 { Loadable } from 'educoder';
import Loading from '../../Loading'; import Loading from '../../Loading';
import Guide from "../../modules/courses/shixunHomework/Guide";
//业务组件 //业务组件
import CoursesBanner from "./coursesDetail/CoursesBanner"; import CoursesBanner from "./coursesDetail/CoursesBanner";
import Coursesleftnav from "./coursesDetail/CoursesLeftNav"; import Coursesleftnav from "./coursesDetail/CoursesLeftNav";
@ -179,217 +177,7 @@ class ListPageIndex extends Component {
this.refs.CoursesBanner.updatabanner() this.refs.CoursesBanner.updatabanner()
} }
render() { render() {
let { yslGuideone } = this.state; return ()
// 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 (
<div>
<div className="newMain clearfix">
{/*头部banner*/}
<CoursesBanner ref={"CoursesBanner"} {...this.props} ispostexcellenttype={(excellent)=>this.ispostexcellenttype(excellent)}></CoursesBanner>
{/*下面是指引哦*/}
{/*{yslGuideone!==undefined?*/}
{/*(*/}
{/* yslGuideone===true?*/}
{/* <Guide*/}
{/* setwindowlocal={(b)=>this.setwindowlocal(b)}*/}
{/* >*/}
{/* </Guide>*/}
{/* :""*/}
{/* )*/}
{/* :""*/}
{/*}*/}
<div className="educontent clearfix" style={{flex: "1 0 auto"}}>
<div className="stud-class-set">
<div className="news">
<div className="edu-class-inner container clearfix">
<div className="member for-content-0 for-content">
<div className="people clearfix mb60">
{/*left_nav*/}
<div className={"with22 fl setleft"} style={{width:'264px',minHeight:'500px'}}>
<Coursesleftnav {...this.props} {...this.state} comyslElearning={(i)=>this.comyslElearning(i)}/>
</div>
{/*right_concent*/}
<div className="with78 fl">
<div className={"ml20 clearfix"}>
<Switch {...this.props}>
{/* --------------------------------------------------------------------- */}
{/* 作业设置 */}
{/* http://localhost:3007/classrooms/1309/homework/9300/setting */}
{/* 普通作业 */}
<Route path="/classrooms/:coursesId/common_homeworks/:category_id"
render={
(props) => (<CommonWork {...this.props} {...props} {...this.state} />)
}
></Route>
{/* 普通作业 */}
<Route path="/classrooms/:coursesId/common_homework/:category_id"
render={
(props) => (<CommonWork {...this.props} {...props} {...this.state} />)
}
></Route>
{/* 作品列表 */}
<Route path="/classrooms/:coursesId/group_homeworks/:category_id"
render={
(props) => (<CommonWork {...this.props} {...props} {...this.state} />)
}
></Route>
{/* 作品列表 */}
<Route path="/classrooms/:coursesId/group_homework/:category_id"
render={
(props) => (<CommonWork {...this.props} {...props} {...this.state} />)
}
></Route>
<Route exact path="/classrooms/:coursesId/boards/:boardId"
render={
(props) => (<Boards {...this.props} {...props} {...this.state} />)
}
></Route>
{/*视频列表*/}
<Route path="/classrooms/:coursesId/course_video/:videoId"
render={
(props) => (<CourseVideo {...this.props} {...props} {...this.state} />)
}
></Route>
<Route path="/classrooms/:coursesId/course_videos"
render={
(props) => (<CourseVideo {...this.props} {...props} {...this.state} />)
}
></Route>
<Route path="/classrooms/:coursesId/teachers"
render={
(props) => (<TeacherList updatabanners={()=>this.updatabanners()} {...this.props} {...props} {...this.state} />)
}
></Route>
{/* 学生列表*/}
<Route path="/classrooms/:coursesId/students"
render={
(props) => (<StudentsList {...this.props} {...props} {...this.state} />)
}
></Route>
<Route path="/classrooms/:coursesId/course_groups/:course_group_id"
render={
(props) => (<StudentsList {...this.props} {...props} {...this.state} />)
}
></Route>
<Route path="/classrooms/:coursesId/course_groups"
render={
(props) => (<CourseGroupList {...this.props} {...props} {...this.state} />)
}
></Route>
<Route path="/classrooms/:coursesId/exercises/:Id"
render={
(props) => (<Exercise {...this.props} {...props} {...this.state} />)
}
></Route>
<Route path="/classrooms/:coursesId/polls/:Id"
render={
(props) => (<Poll {...this.props} {...props} {...this.state} />)
}
></Route>
{/* <Route path="/classrooms/:coursesId/file/:Id"
render={
(props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
}
></Route> */}
{/* 实训作业子页面*/}
<Route path="/classrooms/:coursesId/shixun_homework/:category_id"
render={
(props) => (<ShixunHomework {...this.props} {...props} {...this.state} />)
}
></Route>
{/*课堂统计列表2019.10.29 */}
<Route path="/classrooms/:coursesId/statistics"
render={
(props) => (<Statistics {...this.props} {...props} {...this.state} />)
}
></Route>
{/*公告栏列表*/}
<Route path="/classrooms/:coursesId/informs"
render={
(props) => (<Eduinforms {...this.props} {...props} {...this.state} />)
}
></Route>
{/*在线学习*/}
<Route
path="/classrooms/:coursesId/online_learning"
render={
(props) => (<Elearning {...this.props} {...props} {...this.state} comyslElearning={(i)=>this.comyslElearning(i)} />)
}
>
</Route>
{/* 实训作业页面*/}
<Route path="/classrooms/:coursesId/shixun_homeworks/:main_id"
render={
(props) => (<ShixunHomework {...this.props} {...props} {...this.state} />)
}
></Route>
<Route path="/classrooms/:coursesId/files/:main_id"
render={
(props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
}
></Route>
<Route path="/classrooms/:coursesId/file/:Id"
render={
(props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
}
></Route>
<Route path="/classrooms/:coursesId/graduation_topics/:Id"
render={
(props) => (<GraduationTopics {...this.props} {...props} {...this.state} />)
}></Route>
<Route path="/classrooms/:coursesId/graduation_tasks/:Id"
render={
(props) => (<GraduationTasks {...this.props} {...props} {...this.state} />)
}
></Route>
{/* 默认 */}
<Route path="/classrooms/:coursesId"
render={
(props) => (<StudentsList {...this.props} {...props} {...this.state} />)
}
></Route>
</Switch>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
)
} }
} }
export default ListPageIndex; export default ListPageIndex;

Loading…
Cancel
Save