diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 170d3d95e..8b7bc5ad2 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1490,12 +1490,12 @@ class Listofworksstudentone extends Component { isupdatas = () => { var homeworkid = this.props.match.params.homeworkid; // this.Gettitleinformation(homeworkid); - this.Getalistofworks(homeworkid); + this.Getalistofworks(homeworkid,false); } Isupdatass = () => { var homeworkid = this.props.match.params.homeworkid; // this.Gettitleinformation(homeworkid); - this.Getalistofworks(homeworkid); + this.Getalistofworks(homeworkid,false); } /////////老师操作 // tearchar=()=>{ @@ -1515,7 +1515,7 @@ class Listofworksstudentone extends Component { // debugger var homeworkid = this.props.match.params.homeworkid; - this.Getalistofworks(homeworkid); + this.Getalistofworks(homeworkid,true); let query = this.props.location.pathname; const type = query.split('/'); this.setState({ @@ -1531,7 +1531,7 @@ class Listofworksstudentone extends Component { } // 获取作品列表 - Getalistofworks = (homeworkid) => { + Getalistofworks = (homeworkid,bool) => { // console.log("获取作品列表"); // console.log("935"); // debugger @@ -1546,7 +1546,7 @@ class Listofworksstudentone extends Component { course_group: this.state.checkedValuesineinfo, } axios.post(urll, datasysl).then((result) => { - console.log("980000000____________________"); + // console.log("980000000____________________"); if(result === undefined){ return @@ -1573,6 +1573,7 @@ class Listofworksstudentone extends Component { loadingstate: false, computeTimetype:true, homework_status:result.data.homework_status, + update_score:result.data.update_score }); this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1); @@ -1581,6 +1582,19 @@ class Listofworksstudentone extends Component { } else { this.seacthdatas(result.data, result.data.student_works); } + //开始自动计算成绩刷新 老师才有权限 + try { + if(this.props.isAdmin() === true){ + if(result.data.update_score===true){ + if(bool===true){ + this.setComputeTimet(); + } + } + } + }catch (e) { + + } + this.props.Getdataback(result,result.data); }).catch((error) => { @@ -2185,7 +2199,7 @@ class Listofworksstudentone extends Component { if(response.data.status===0) { this.props.showNotification(`${response.data.message}`); // var homeworkid = this.props.match.params.homeworkid; - this.Getalistofworks(homeworkid); + this.Getalistofworks(homeworkid,false); // this.props.history.replace(matchurl); } } @@ -2942,7 +2956,7 @@ class Listofworksstudentone extends Component { } setComputeTimet=()=>{ - + console.log("老师开始计算成绩了1111111"); let matchurl = this.props.match.url; this.setState({ @@ -2960,7 +2974,7 @@ class Listofworksstudentone extends Component { this.setState({ loadingstate: true }) - this.Getalistofworks(homeworkid); + this.Getalistofworks(homeworkid,false); this.props.showNotification(`${response.data.message}`); } // this.props.history.replace( matchurl ); @@ -3207,17 +3221,17 @@ class Listofworksstudentone extends Component {
- {course_is_end===true?"": - {teacherdata&&teacherdata.update_score===true&&computeTimetype===true? - (this.props.isNotMember()===false?
- 查看最新成绩 -
:""): - teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": - (this.props.isNotMember()===false?
- 查看最新成绩 -
:"") - } -
} + {/*{course_is_end===true?"":*/} + {/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/} + {/* (this.props.isNotMember()===false?
*/} + {/* 查看最新成绩*/} + {/*
:""):*/} + {/* teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/} + {/* (this.props.isNotMember()===false?
*/} + {/* 查看最新成绩*/} + {/*
:"")*/} + {/*}*/} + {/*
}*/} 计算成绩时间:{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')} - { course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"": - {computeTimetype===true? - (this.props.isNotMember()===false? - ( - teacherdata&&teacherdata.update_score===true? -
- 查看最新成绩 -
- :"" - ) - :"") - : - (teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": - this.props.isNotMember()===false? -
- 查看最新成绩 -
- :"") - } -
} + {/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":*/} + {/* {computeTimetype===true?*/} + {/* (this.props.isNotMember()===false?*/} + {/* (*/} + {/* teacherdata&&teacherdata.update_score===true?*/} + {/*
*/} + {/* 查看最新成绩*/} + {/*
*/} + {/* :""*/} + {/* )*/} + {/* :"")*/} + {/* :*/} + {/* (teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/} + {/* this.props.isNotMember()===false?*/} + {/*
*/} + {/* 查看最新成绩*/} + {/*
*/} + {/* :"")*/} + {/* }*/} + {/*
}*/}
@@ -3762,23 +3776,23 @@ class Listofworksstudentone extends Component {
计算成绩时间:{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')} - { course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"": - {computeTimetype===true? - - (this.props.isNotMember()===false? - ( - teacherdata&&teacherdata.update_score===true? -
- 查看最新成绩 -
:"" - ) - :""): - teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": - (this.props.isNotMember()===false?
- 查看最新成绩 -
:"") - } -
} + {/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":*/} + {/* {computeTimetype===true?*/} + + {/* (this.props.isNotMember()===false?*/} + {/* (*/} + {/* teacherdata&&teacherdata.update_score===true?*/} + {/*
*/} + {/* 查看最新成绩*/} + {/*
:""*/} + {/* )*/} + {/* :""):*/} + {/* teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/} + {/* (this.props.isNotMember()===false?
*/} + {/* 查看最新成绩*/} + {/*
:"")*/} + {/* }*/} + {/*
}*/}