diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js index 295f55fe1..ad755338c 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js @@ -185,7 +185,7 @@ class CommonWorkItem extends Component{ } - {this.props.isAdmin &&
+ {isAdmin &&
{ this.props.toEditPage(this.props.match.params, item.homework_id) }}>编辑 { this.props.toWorkSettingPage(this.props.match.params, item.homework_id) }}>设置
} diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index 11d26ebf1..7142d3d00 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -259,9 +259,9 @@ function buildColumns(that, student_works) {
最终调整成绩:{record.work_score}分
:
{ record.final_score &&
作业评分:{record.final_score}分
} - { !!that.state.late_penalty &&
迟交扣分:{that.state.late_penalty}分
} - { !!that.state.absence_penalty &&
缺评扣分:{that.state.absence_penalty}分
} - { !!that.state.appeal_penalty &&
违规匿评扣分:{that.state.appeal_penalty}分
} + { record.late_penalty >= 0 &&
迟交扣分:{record.late_penalty}分
} + { record.absence_penalty >= 0 &&
缺评扣分:{record.absence_penalty}分
} + { record.appeal_penalty >= 0 &&
违规匿评扣分:{record.appeal_penalty}分
}
最终成绩:{record.work_score}分
}
) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js index ab00f3c00..1574d692d 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js @@ -1018,7 +1018,7 @@ class CommonWorkSetting extends Component{ placeholder="请选择发布时间" id={"startime"} width={"210px"} - value={publish_time===null||publish_time===""?"":moment(publish_time, dateFormat)} + value={!publish_time?"":moment(publish_time, dateFormat)} onChange={this.onChangeTimepublish} // disabled={this.props.isSuperAdmin()?false:publish_time_type===true?true:false} disabled={moment(this.state.init_publish_time) < moment() || noAuth} @@ -1048,7 +1048,7 @@ class CommonWorkSetting extends Component{ placeholder="请选择截止时间" id={"endTime"} width={"210px"} - value={end_time===null||end_time===""?"":moment(end_time, dateFormat)} + value={!end_time?"":moment(end_time, dateFormat)} onChange={this.onChangeTimeend} disabled={this.props.isSuperAdmin()?false:end_time_type===true?true:false} disabled={moment(this.state.init_end_time) < moment() || noAuth} @@ -1117,7 +1117,7 @@ class CommonWorkSetting extends Component{ placeholder="请选择结束时间" id={"enTime"} width={"210px"} - value={late_time===null||late_time===""? undefined :moment(late_time, dateFormat)} + value={!late_time ? undefined :moment(late_time, dateFormat)} onChange={this.onChangeTimelatetime} disabledTime={disabledDateTime} disabled={!allow_late || noAuth || moment(init_late_time) < moment()} @@ -1165,7 +1165,7 @@ class CommonWorkSetting extends Component{ placeholder="请选择匿名开启时间" id={"startime"} width={"210px"} - value={evaluation_start===null||evaluation_start===""?"":moment(evaluation_start, dateFormat)} + value={!evaluation_start ?"":moment(evaluation_start, dateFormat)} onChange={this.onChangeEvaluationStart} disabled={ (anonymous_comment && !noAuth ? false : true) || moment(init_evaluation_start) < moment() } // disabledDate={ (evaluation_start) => @@ -1194,7 +1194,7 @@ class CommonWorkSetting extends Component{ placeholder="请选择匿名结束时间" id={"endtime"} width={"210px"} - value={evaluation_end===null||evaluation_end===""?"":moment(evaluation_end, dateFormat)} + value={!evaluation_end ?"":moment(evaluation_end, dateFormat)} onChange={this.onChangeEvaluationEnd} disabledTime={disabledDateTime} disabled={(anonymous_comment && !noAuth ? false : true) || moment(init_evaluation_end) < moment()} @@ -1289,7 +1289,7 @@ class CommonWorkSetting extends Component{ placeholder="请选择申诉结束时间" id={"endtime"} width={"210px"} - value={appeal_time===null||appeal_time===""?"":moment(appeal_time, dateFormat)} + value={!appeal_time?"":moment(appeal_time, dateFormat)} onChange={this.appeal_time_change} disabled={ (anonymous_appeal && !noAuth ? false : true) || moment(init_appeal_time) < moment()} /> diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js index d46b48038..58569554f 100644 --- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js +++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js @@ -656,7 +656,7 @@ class ExerciseReviewAndAnswer extends Component{ return(

- {parseInt(key+1)}、{type[item.question_type]}({item.question_score}分) + {exercise_questions.q_position}、{type[item.question_type]}({item.question_score}分) { // 填空(一直都有调分),和简答题调分:老师身份 已经评分的才能出现调分按钮 diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js index d28b8f697..acb8508b2 100644 --- a/public/react/src/modules/courses/graduation/tasks/index.js +++ b/public/react/src/modules/courses/graduation/tasks/index.js @@ -13,6 +13,7 @@ import Modals from '../../../modals/Modals'; import UseBank from "../../busyWork/UseBank"; import '../../css/members.css'; import '../style.css'; +import moment from 'moment' class GraduationTasks extends Component{ @@ -413,7 +414,7 @@ class GraduationTasks extends Component{ Topval:"本操作只对“未发布”的对象生效", Botvalleft:"暂不发布", Botval:"则通过后续手动设置,定时发布", - starttime:"发布时间:"+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), + starttime:"发布时间:"+moment(new Date()).format("YYYY-MM-DD HH:mm"), starttimes:this.props.getNowFormatDates(1), typs:"start", endtime:"截止时间:"+endtime, diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 955ae593f..ecbc8570b 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -707,18 +707,18 @@ submittojoinclass=(value)=>{ 注册 :

- +
) } diff --git a/public/react/src/modules/user/usersInfo/InfosBank.js b/public/react/src/modules/user/usersInfo/InfosBank.js index 39015681d..cf670063d 100644 --- a/public/react/src/modules/user/usersInfo/InfosBank.js +++ b/public/react/src/modules/user/usersInfo/InfosBank.js @@ -39,7 +39,7 @@ class InfosBank extends Component{ } getCourses=(category,type,page,sort_by,CoursesId)=>{ - let url=`/users/${this.props.login}/question_banks.json`; + let url=`/users/${this.props.match.params.username}/question_banks.json`; axios.get((url),{params:{ category, type, diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js index b864dff63..109a4d7b9 100644 --- a/public/react/src/modules/user/usersInfo/InfosCourse.js +++ b/public/react/src/modules/user/usersInfo/InfosCourse.js @@ -36,7 +36,7 @@ class InfosCourse extends Component{ } getCourses=(category,status,page)=>{ - let url=`/users/${this.props.login}/courses.json`; + let url=`/users/${this.props.match.params.username}/courses.json`; axios.get((url),{params:{ category, status, diff --git a/public/react/src/modules/user/usersInfo/InfosPath.js b/public/react/src/modules/user/usersInfo/InfosPath.js index 55422f208..ce3bcfba8 100644 --- a/public/react/src/modules/user/usersInfo/InfosPath.js +++ b/public/react/src/modules/user/usersInfo/InfosPath.js @@ -38,7 +38,7 @@ class InfosPath extends Component{ } getCourses=(category,status,sort_by,page,per_page)=>{ - let url=`/users/${this.props.login}/subjects.json`; + let url=`/users/${this.props.match.params.username}/subjects.json`; axios.get((url),{params:{ category, status, diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js index fab96f59e..99232b8ef 100644 --- a/public/react/src/modules/user/usersInfo/InfosProject.js +++ b/public/react/src/modules/user/usersInfo/InfosProject.js @@ -32,7 +32,7 @@ class InfosProject extends Component{ } getCourses=(category,status,page)=>{ - let url=`/users/${this.props.login}/projects.json`; + let url=`/users/${this.props.match.params.username}/projects.json`; axios.get((url),{params:{ category, status, diff --git a/public/react/src/modules/user/usersInfo/InfosShixun.js b/public/react/src/modules/user/usersInfo/InfosShixun.js index 90575f9f0..d6835098a 100644 --- a/public/react/src/modules/user/usersInfo/InfosShixun.js +++ b/public/react/src/modules/user/usersInfo/InfosShixun.js @@ -38,7 +38,7 @@ class InfosShixun extends Component{ } getCourses=(category,status,sort_by,page)=>{ - let url=`/users/${this.props.login}/shixuns.json`; + let url=`/users/${this.props.match.params.username}/shixuns.json`; axios.get((url),{params:{ category, status, diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css index 31bdd5a2c..0be9837bf 100644 --- a/public/react/src/modules/user/usersInfo/usersInfo.css +++ b/public/react/src/modules/user/usersInfo/usersInfo.css @@ -8,8 +8,20 @@ float: left; margin: 0px 40px; padding:0px; - height: 47px;line-height: 40px; + height: 45px; + line-height: 40px; font-size: 16px; + position: relative; +} +.navInfo li.active::after{ + position: absolute; + left: 0px; + height: 2px; + width: 100%; + content: ''; + bottom: 0px; + background: #05101A!important; + color: #666!important; } .navInfo li,.navInfo li.ant-menu-item-active{ border-bottom: none!important;