m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix

Browse Source
dev_aliyun2
harry 5 years ago
parent 9f1393f745
commit ee62bbc3fc
2 changed files with 426 additions and 787 deletions
Show Stats Download Patch File Download Diff File

149
public/react/src/modules/courses/Index.js
Unescape View File

@ -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,112 +376,10 @@ 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 (
<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 (
<Switch {...this.props}>
{/*排序*/}

216
public/react/src/modules/courses/ListPageIndex.js
Unescape View File

@ -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 (
<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>
)
return ()
}
}
export default ListPageIndex;

Write Preview
Loading…
Cancel
Save