diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index 251e39fcb..46d06e300 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -31,7 +31,7 @@ function renderScore(score, content) { } else if (score >= 60) { color = '#FF6800' } - return + return {score == null || score == undefined || score == '--' ? '--': (content || score)} } @@ -105,7 +105,7 @@ function buildColumns(that, student_works) { {record.student_id} ), @@ -121,7 +121,7 @@ function buildColumns(that, student_works) { render: (text, record) => ( - {record.group_name} + {record.group_name} ), } ) @@ -177,7 +177,7 @@ function buildColumns(that, student_works) { } return ( - + {status === 0 ? "未提交" : status === 1 ? "按时提交" : status === 2 ? "延时提交" : ""} @@ -190,7 +190,7 @@ function buildColumns(that, student_works) { render: (update_time, record) => ( - {update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'} + {update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'} ), }]) @@ -450,17 +450,17 @@ class CommonWorkList extends Component{ } teacherCommentOptionChange = (values, isAllChecked) => { - this.setState({arg_teacher_comment: isAllChecked ? [] : values}, () => { + this.setState({arg_teacher_comment: isAllChecked ? [] : values, page: 1}, () => { this.fetchList() }) } statusOptionChange = (values, isAllChecked) => { - this.setState({arg_work_status: isAllChecked ? [] : values}, () => { + this.setState({arg_work_status: isAllChecked ? [] : values, page: 1}, () => { this.fetchList() }) } courseGroupOptionChange = (values, isAllChecked) => { - this.setState({arg_course_group: isAllChecked ? [] : values}, () => { + this.setState({arg_course_group: isAllChecked ? [] : values, page: 1}, () => { this.fetchList() }) } @@ -648,7 +648,7 @@ class CommonWorkList extends Component{ - {options_course_group.length > 1 && } + {options_course_group.length > 1 && } {/* value={search} */} diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index 279a0a71d..5501ef499 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -216,7 +216,7 @@ export function TPMIndexHOC(WrappedComponent) { // 非课堂成员 isNotMember = () => { // return this.state.coursedata&&this.state.coursedata.course_identity >= 0 && - return this.state.coursedata&&this.state.coursedata.course_identity >6 + return this.state.coursedata&&this.state.coursedata.course_identity >= 6 } // setTrialapplication = ()=>{