diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 8f93f780b..2100ebe8d 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -102,6 +102,7 @@ export function initAxiosInterceptors(props) { if(response===undefined){ return } + const config = response.config if (response.data.status === -1) { // console.error('error:', response.data.message) // throw new Error() diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js index 4e3214e50..b16fd6d32 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js @@ -243,6 +243,12 @@ class CommonWorkDetailIndex extends Component{ {work_statuses && work_statuses.indexOf('提交作品') != -1 && { this.props.toWorkPostPage(this.props.match.params)}} >提交作品} + + { work_statuses && work_statuses.indexOf('补交作品') != -1 && + { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}}> + 补交作品 } + {work_statuses && work_statuses.indexOf('修改作品') != -1 && { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}} >修改作品} diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index 2243310a2..34c2d6154 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -234,7 +234,7 @@ function buildColumns(that, student_works) { + that.state.is_evaluation ? `你的评阅分数：${record.student_score}分` :
{record.student_comment_count &&
{`${record.student_comment_count}名学生进行了匿评`}
}
有效平均分：{record.student_score}分
@@ -334,7 +334,7 @@ const orderMap = { work_score: 'asc', student_id: 'asc', } -const PAGE_SIZE = 50 +const PAGE_SIZE = 20 // 类似页面 http://localhost:3007/courses/1309/graduation/graduation_tasks/48/76/setting class CommonWorkList extends Component{ @@ -564,6 +564,19 @@ class CommonWorkList extends Component{ } }) + // time_status int 时间对应的状态: 0：未发布，1:提交中，2:补交中，3:匿评中，4:申诉中，5:评阅中，6:已结束 + + let timeMsg = '提交剩余时间' + if (time_status === 1) { + + } else if (time_status === 2) { + timeMsg = '补交剩余时间' + } else if (time_status === 3) { + timeMsg = '匿评剩余时间' + } else if (time_status === 4) { + timeMsg = '申诉剩余时间' + } + // console.log(StudentData) // console.log(student_works) return( @@ -638,7 +651,7 @@ class CommonWorkList extends Component{ (!!commit_count || !!uncommit_count) && {commit_count}已交　{uncommit_count}未交　 - {time_status===5?"":"剩余提交时间"} + {timeMsg || ''} {left_time.time} } diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js index cc4aff4f9..7fbe33a67 100644 --- a/public/react/src/modules/courses/busyWork/commonWork.js +++ b/public/react/src/modules/courses/busyWork/commonWork.js @@ -88,10 +88,14 @@ class commonWork extends Component{ let {page,search,order}=this.state; this.getList(page,search,order); } - useBankSuccess = () => { + useBankSuccess = (checkBoxValues, newWorkIdArray) => { this.setState({ - page:1 + page:1, + checkBoxValues: newWorkIdArray + }, () => { + this.refs['publishModalRef'].open() }) + let {search, order}=this.state; this.getList(1, search, order); } @@ -418,7 +422,7 @@ class commonWork extends Component{ onClick={this.onWorkDelete}>删除
  • -
  • diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js index 07b2909b3..ec685c39f 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js @@ -160,7 +160,6 @@ class GraduationTasksappraiseReply extends Component{ {comment_scores.length===0&&isStudent===true||comment_scores.length===0&&isNotMember===true? "":
    {isStudent===true? - - : - this.showModulationtype(id)} saveModulationModal={(value,num)=>this.saveModulationModal(value,num)} diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js index bd58e555b..4e92f75ee 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js @@ -80,10 +80,11 @@ class GraduateTopicDetailTable extends Component{ } sureAgreeTopic=(count)=>{ if(count > 0){ + debugger let{tableData}=this.props; let{operationId,classesId}=this.state let courseId=this.props.match.params.course_id; - let name=tableData.group_list.filter(item=>item.course_group_id==classesId)[0].group_name; + let name=tableData.group_list.filter(item=>item.group_id==classesId)[0].group_name; this.agreeChoose(courseId,operationId,classesId,name); }else{ this.setState({ diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index bece9862f..12d21fb53 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -1747,7 +1747,7 @@ class Trainingjobsetting extends Component {
    发布时间： - +
    +     (学生收到作业的时间)
    截止时间： - +
    +     (学生“按时”提交作品的时间截点)
    @@ -1924,7 +1926,7 @@ class Trainingjobsetting extends Component { checked={this.state.completionefficiencyscore} style={{"color":"#666666"}}>效率分(选中，则学生最终成绩包含效率分)
    -
    +
    分值
    - + { needUpdateScript ?