调整课堂体验

competitions
杨树明 5 years ago
parent 22457350b4
commit 71a8709fb4

@ -275,18 +275,19 @@ class Fileslistitem extends Component{
` `
} }
</style> </style>
{discussMessage.course_groups.length===0?"": {/*资源分班*/}
<p className="color-grey panel-lightgrey mt8 fl lightgreybox ml30" style={{width:'100%'}}> {/*{discussMessage.course_groups.length===0?"":*/}
{discussMessage.course_groups.map((item,key)=>{ {/*<p className="color-grey panel-lightgrey mt8 fl lightgreybox ml30" style={{width:'100%'}}>*/}
return( {/*{discussMessage.course_groups.map((item,key)=>{*/}
<div className="mr50"> {/*return(*/}
<span className="mr15 color-dark">{item.course_group_name}</span> {/*<div className="mr50">*/}
<span className="mr15 color-grey9 ">将发布于 { moment(item.course_group_publish_time).format('YYYY-MM-DD HH:mm')}</span> {/*<span className="mr15 color-dark">{item.course_group_name}</span>*/}
</div> {/*<span className="mr15 color-grey9 ">将发布于 { moment(item.course_group_publish_time).format('YYYY-MM-DD HH:mm')}</span>*/}
) {/*</div>*/}
})} {/*)*/}
{/*})}*/}
</p>}
{/*</p>}*/}
<p className={this.props.isAdmin===true?"color-grey panel-lightgrey mt8 fl ml30":"color-grey panel-lightgrey mt8 fl ml13"} style={{width:'100%'}}> <p className={this.props.isAdmin===true?"color-grey panel-lightgrey mt8 fl ml30":"color-grey panel-lightgrey mt8 fl ml13"} style={{width:'100%'}}>
<span className="mr50"> <span className="mr50">

@ -181,23 +181,27 @@ class Fileslists extends Component{
course_second_category_id:id course_second_category_id:id
} }
}).then((result)=>{ }).then((result)=>{
// console.log(result) if(result!=undefined){
if(result.status===200){
if(result.status===200){ if(result.data.status===0){
if(result.data.status===0){ let list=result.data.data;
let list=result.data.data; this.setState({
this.setState({ total_count:list.total_count,
total_count:list.total_count, publish_count:list.publish_count,
publish_count:list.publish_count, unpublish_count:list.unpublish_count,
unpublish_count:list.unpublish_count, files:list.files,
files:list.files, filesId:list.id,
filesId:list.id, name:list.name,
name:list.name, course_is_public:result.data.data.course_is_public,
course_is_public:result.data.data.course_is_public, isSpin:false
isSpin:false })
}) }
} }
} }else{
this.setState({
isSpin:false
})
}
}).catch((error)=>{ }).catch((error)=>{
console.log(error) console.log(error)
this.setState({ this.setState({

@ -400,11 +400,13 @@ class CoursesBanner extends Component {
if(sum===1){ if(sum===1){
let url =`/courses/${id}/switch_to_student.json`; let url =`/courses/${id}/switch_to_student.json`;
axios.post(url).then((response) => { axios.post(url).then((response) => {
if(response.data.status===0){ if(response!=undefined){
// window.location.href = "/users/" + this.props.current_user.login; if(response.data.status===0){
// this.props.history.replace(newurl); // window.location.href = "/users/" + this.props.current_user.login;
window.location.href=newurl // this.props.history.replace(newurl);
} window.location.href=newurl
}
}
}) })
} }
@ -412,11 +414,13 @@ class CoursesBanner extends Component {
if(sum===2){ if(sum===2){
let url =`/courses/${id}/switch_to_teacher.json`; let url =`/courses/${id}/switch_to_teacher.json`;
axios.post(url).then((response) => { axios.post(url).then((response) => {
if(response.data.status===0){ if(response!=undefined){
// window.location.href = "/users/" + this.props.current_user.login; if(response.data.status===0){
// this.props.history.replace(newurl); // window.location.href = "/users/" + this.props.current_user.login;
window.location.href=newurl // this.props.history.replace(newurl);
} window.location.href=newurl
}
}
}) })
} }

@ -238,6 +238,37 @@ class Coursesleftnav extends Component{
this.props.updataleftNavfun() this.props.updataleftNavfun()
} }
componentDidUpdate=(prevProps)=>{
if(prevProps!=this.props){
let courstype=this.props.match.url;
courstype = courstype.split('/');
courstype=courstype[3];
const query =this.props.location.search;
let category_id;
if(courstype==="board"){
category_id=parseInt(this.props.match.params.boardId);
}else{
category_id=parseInt(this.props.match.params.category_id);
}
if(query===""){
this.setState({
positiontype:courstype,
})
}else{
if(isNaN(category_id)){
this.setState({
positiontype:courstype,
})
}else{
this.setState({
positiontype:courstype,
})
}
}
}
}
setnavid=(e,key,id,type,url)=>{ setnavid=(e,key,id,type,url)=>{
// this.props.getleftNavid && this.props.getleftNavid(key,type); // this.props.getleftNavid && this.props.getleftNavid(key,type);
// let {selectnavid,navid}=this.state; // let {selectnavid,navid}=this.state;
@ -493,7 +524,8 @@ class Coursesleftnav extends Component{
navidtype=true navidtype=true
} }
saveNavmodapost=(url,value)=>{ saveNavmodapost=(url,value,positiontype,coursesId)=>{
axios.post(url, axios.post(url,
{name:value}).then((result)=>{ {name:value}).then((result)=>{
if(result.data.status===0){ if(result.data.status===0){
@ -505,6 +537,10 @@ class Coursesleftnav extends Component{
description:result.data.message description:result.data.message
}); });
trigger('updateNavSuccess') trigger('updateNavSuccess')
if(positiontype==="files"){
window.location.href=`/courses/${coursesId}/file/${result.data.category_id}`;
// this.props.history.push(`/courses/${coursesId}/file/${result.data.category_id}`)
}
} }
}).catch((error)=>{ }).catch((error)=>{
console.log(error) console.log(error)
@ -556,9 +592,8 @@ class Coursesleftnav extends Component{
} }
if(Navmodaltypename===1){ if(Navmodaltypename===1){
let url="/course_modules/"+id+"/add_second_category.json" let url="/course_modules/"+id+"/add_second_category.json"
this.saveNavmodapost(url,NavmodalValue) this.saveNavmodapost(url,NavmodalValue,this.state.positiontype,this.props.match.params.coursesId)
} else if(Navmodaltypename===2){ } else if(Navmodaltypename===2){

@ -121,6 +121,7 @@ class CommitSummary extends Component{
const {getFieldDecorator} = this.props.form; const {getFieldDecorator} = this.props.form;
let {contents,data}=this.state; let {contents,data}=this.state;
// console.log(this.props); // console.log(this.props);
document.title=data === undefined ? "" :data.course_name===undefined?"": data.course_name;
return ( return (
<div> <div>
<div className="newMain clearfix"> <div className="newMain clearfix">

@ -182,6 +182,7 @@ class ShixunHomeworkPage extends Component {
const isAdmin = this.props.isAdmin(); const isAdmin = this.props.isAdmin();
// console.log(119) // console.log(119)
// console.log(jobsettingsdatapage); // console.log(jobsettingsdatapage);
document.title=jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name;
return ( return (
<div className="newMain clearfix "> <div className="newMain clearfix ">
<Modals <Modals

@ -133,10 +133,16 @@ class ShixunHomework extends Component{
category:id category:id
} }
}).then((result)=>{ }).then((result)=>{
this.setState({ if(result!=undefined){
isSpin:false, this.setState({
datas:result.data, isSpin:false,
}) datas:result.data,
})
}else{
this.setState({
isSpin:false,
})
}
}).catch((error)=>{ }).catch((error)=>{
console.log(error); console.log(error);
}) })
@ -188,19 +194,18 @@ class ShixunHomework extends Component{
category: category_id===undefined?undefined:category_id category: category_id===undefined?undefined:category_id
} }
}).then((result)=>{ }).then((result)=>{
if(result.status===200){ if(result!=undefined){
// if(checkedtype===true&&page>1){ if(result.status===200){
// for(var value of result.data.homeworks){ this.setState({
// checkBoxValues.push(value.homework_id) datas:result.data,
// } isSpin:false
// } })
this.setState({ }
datas:result.data, }else{
isSpin:false this.setState({
}) isSpin:false
})
}
}
}).catch((error)=>{ }).catch((error)=>{
console.log(error); console.log(error);
}) })

Loading…
Cancel
Save