dev_aliyun2
harry 5 years ago
parent 39b575f91d
commit 1c7e2fea2b

@ -1,6 +1,7 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { SnackbarHOC } from 'educoder'; import { SnackbarHOC } from 'educoder';
import { Route, Switch } from 'react-router-dom'; import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
import { withRouter } from 'react-router' import { withRouter } from 'react-router'
import { Loadable } from 'educoder'; import { Loadable } from 'educoder';
import Loading from '../../Loading'; import Loading from '../../Loading';
@ -37,6 +38,12 @@ 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,
@ -50,6 +57,17 @@ 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'),
@ -70,11 +88,35 @@ 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,
})
//实训报告 //实训报告
@ -116,6 +158,12 @@ 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,
@ -290,8 +338,7 @@ class CoursesIndex extends Component {
// let id=this.props.match.params.coursesId; // let id=this.props.match.params.coursesId;
let url ="/courses/"+id+"/left_banner.json" let url ="/courses/"+id+"/left_banner.json"
axios.get(url, axios.get(url,
{ {params:
params:
dataqueryss dataqueryss
} }
).then((response) => { ).then((response) => {
@ -367,6 +414,8 @@ class CoursesIndex extends Component {
} }
}) })
}
} }
unlocationNavfun=(val)=>{ unlocationNavfun=(val)=>{
@ -525,13 +574,6 @@ class CoursesIndex extends Component {
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>) (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
}></Route> }></Route>
{/*————————————————————————————————————————————————————————————————————————————————————*/}
{/* 作品评阅 https://www.trustie.net/issues/19981 */}
<Route path="/classrooms/:coursesId/graduation_tasks/:category_id/appraise"
render={
(props) => (<GraduationTasksappraise {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
{/*————————————————————————————————————————————————————————————————————————————————————*/} {/*————————————————————————————————————————————————————————————————————————————————————*/}
{/* 作品评阅 https://www.trustie.net/issues/19981 */} {/* 作品评阅 https://www.trustie.net/issues/19981 */}
@ -584,12 +626,6 @@ class CoursesIndex extends Component {
} }
></Route> ></Route>
{/* 修改毕设任务 https://www.trustie.net/issues/19981 */}
<Route path="/courses/:coursesId/graduation_tasks/:category_id/edit"
render={
(props) => (<GraduationTaskseditApp {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
{/* 新建毕设任务 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"
@ -598,12 +634,6 @@ class CoursesIndex extends Component {
} }
></Route> ></Route>
{/* 新建毕设任务 https://www.trustie.net/issues/19981 */}
<Route path="/courses/:coursesId/graduation_tasks/:category_id/new"
render={
(props) => (<GraduationTasksnewApp {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
{/* 毕设任务列表 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
@ -735,24 +765,6 @@ class CoursesIndex extends Component {
} }
></Route> ></Route>
{/* 问卷新建 */}
<Route path="/classrooms/:coursesId/polls/:pollid/:news"
render={
(props) => (<PollNew {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
{/*/!* 问卷编辑 *!/*/}
{/*<Route path="/classrooms/:coursesId/polls/:pollid/:news"*/}
{/*render={*/}
{/*(props) => (<PollNew {...this.props} {...props} {...this.state} {...common} />)*/}
{/*}*/}
{/*></Route>*/}
{/* 问卷 */}
<Route path="/classrooms/:coursesId/polls/:Id"
render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
{/* 试卷查看/评阅 */} {/* 试卷查看/评阅 */}
<Route exact path="/classrooms/:coursesId/exercises/:Id/users/:userId" <Route exact path="/classrooms/:coursesId/exercises/:Id/users/:userId"
@ -774,18 +786,7 @@ class CoursesIndex extends Component {
} }
></Route> ></Route>
{/*试卷新建 */} {/*试卷设置主页*/}
<Route exact path="/classrooms/:coursesId/exercises/new"
render={
(props) => (<ExerciseNew {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
{/*试卷新建 */}
<Route exact path="/classrooms/:coursesId/exercises/:Id/edit"
render={
(props) => (<ExerciseNew {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
<Route path="/classrooms/:coursesId/exercises/:Id/student_exercise_list" <Route path="/classrooms/:coursesId/exercises/:Id/student_exercise_list"
render={ render={
@ -793,11 +794,6 @@ class CoursesIndex extends Component {
} }
></Route> ></Route>
<Route path="/classrooms/:coursesId/exercises/:Id/student_exercise_list"
render={
(props) => (<Testpapersettinghomepage {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
{/*学生完成列表*/} {/*学生完成列表*/}
<Route <Route
@ -967,32 +963,7 @@ class CoursesIndex extends Component {
} }
></Route> ></Route>
{/*新建课堂*/} {/*课堂统计列表2019.10.29 */}
<Route path="/classrooms/new"
render={
(props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
{/*新建精品课堂*/}
{/*coursesId 课堂id */}
{/*id 是否是私有或者公有*/}
<Route path="/classrooms/news/:subjectid/newgold/:id"
render={
(props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
{/*修改精品课堂*/}
<Route path="/classrooms/:coursesId/newgolds/settings"
render={
(props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
{/*修改课堂*/}
<Route path="/classrooms/:coursesId/settings"
render={
(props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
<Route path="/classrooms/:coursesId/statistics" <Route path="/classrooms/:coursesId/statistics"
render={ render={
@ -1022,27 +993,6 @@ class CoursesIndex extends Component {
></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>*/}
<Route path="/classrooms/:coursesId/statistics"
render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
}
></Route>
{/*/!*实训作业and课堂详情页*!/*/}
<Route path="/classrooms/:coursesId"
render={
(props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
{/*课堂首页*/}
<Route path="/classrooms"
render={
(props) => (<CoursesHome {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
{/*<Route exact path="/classrooms" component={CoursesHome} {...this.props} {...props} {...this.state} ></Route>*/}
</Switch> </Switch>
) )
} }

@ -1,9 +1,9 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { SnackbarHOC } from 'educoder'; import { SnackbarHOC } from 'educoder';
import {BrowserRouter as Router,Route,Switch} from 'react-router-dom'; import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
import Loadable from 'react-loadable'; import { Loadable } from 'educoder';
import Loading from '../../../Loading'; import Loading from '../../../Loading';
import { CNotificationHOC } from '../common/CNotificationHOC' import CNotificationHOC from '../common/CNotificationHOC'
import { RouteHOC } from './common' import { RouteHOC } from './common'
import "../css/busyWork.css" import "../css/busyWork.css"
//引入对应跳转的组件 //引入对应跳转的组件

Loading…
Cancel
Save