diff --git a/app/services/homeworks_service.rb b/app/services/homeworks_service.rb index 0dc814c89..1c57b7f12 100644 --- a/app/services/homeworks_service.rb +++ b/app/services/homeworks_service.rb @@ -346,7 +346,7 @@ class HomeworksService work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) unless work.ultimate_score #logger.info("#############work_score: #{score}") work.calculation_time = Time.now - work.save! + work.save(validate: false) end end end \ No newline at end of file diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index ab75b6c89..855f860ef 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -4005,7 +4005,7 @@ class Listofworksstudentone extends Component { height: 58px; } .ysltableows .ant-table-thead > tr > th, .ant-table-tbody > tr > td { - padding: 9px; + padding: 9px; } ` } diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js index 21041a59c..d8647870e 100644 --- a/public/react/src/modules/courses/statistics/Statistics.js +++ b/public/react/src/modules/courses/statistics/Statistics.js @@ -392,12 +392,13 @@ class Statistics extends Component{ ) } - // console.log(this.props.isAdmin) + // console.log("Statistics"); + // console.log(this.props.user.course_is_end) - - const operations = + const course_is_endismy=this.props&&this.props.user&&this.props.user.course_is_end; + const operations = {course_grouptype===false||this.state.course_groups.length===0?"": - this.state.activeKey==="1"? + this.props.isAdmin()===true? this.setComputeTimet(this.props.match.params.coursesId)}>获取最新成绩 + ( + course_is_endismy===false? + this.setComputeTimet(this.props.match.params.coursesId)}>获取最新成绩 + : + "" + ) :"" } { - this.state.activeKey==="1"? - this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出 + this.props.isAdmin()===true? + this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出 :"" } ; @@ -592,7 +598,7 @@ class Statistics extends Component{ } ` } - + {bomdata===undefined||bomdata===null?"":bomdata.length===0?:数据集 - :"" - ) - :"" } @@ -80,12 +75,8 @@ class TPMNav extends Component { 审核情况 : - is_teacher===true? 审核情况 - : - "" - ) diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js index 3bbc4bf8f..81959a30b 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js @@ -189,6 +189,7 @@ class Challengesjupyter extends Component { const business = this.props&&this.props.current_user&&this.props.current_user.business?this.props.current_user.business:false; //管理员 const admin = this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false; + let mysidentity =false; try { mysidentity =this.props.identity < 5 &&ChallengesDataList&& ChallengesDataList.shixun_status< 3?true:false;