Merge branches 'dev_aliyun' and 'dev_newshixunModel' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_newshixunModel

dev_cs
杨树明 5 years ago
commit 4946fb3045

@ -5,6 +5,8 @@ if identity == Course::STUDENT
json.task_operation task_operation_url(myshixun, shixun) json.task_operation task_operation_url(myshixun, shixun)
json.view_report work.work_status > 0 json.view_report work.work_status > 0
json.commit_des commit_des_status(work, homework) json.commit_des commit_des_status(work, homework)
json.redo_work (homework.end_or_late ? false : student_redo_work(work, homework))
json.myshixun_identifier myshixun&.identifier
else else
json.work_statuses student_work_status(homework, work.user_id, homework.course, work) json.work_statuses student_work_status(homework, work.user_id, homework.course, work)
end end

@ -40,8 +40,6 @@ elsif @user_course_identity == Course::STUDENT
json.efficiency work_score_format(@work.efficiency, true, @score_open) json.efficiency work_score_format(@work.efficiency, true, @score_open)
json.eff_score work_score_format(@work.eff_score, true, @score_open) json.eff_score work_score_format(@work.eff_score, true, @score_open)
json.complete_count @work.myshixun.try(:passed_count) json.complete_count @work.myshixun.try(:passed_count)
json.redo_work (@homework.end_or_late ? false : student_redo_work(@work, @homework))
json.myshixun_identifier @work.myshixun&.identifier
else else
json.(@work, :id, :work_status, :update_time, :ultimate_score) json.(@work, :id, :work_status, :update_time, :ultimate_score)

@ -683,7 +683,7 @@ class studentsList extends Component{
{isAdmin && <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onDelete}>删除</a></li>} {isAdmin && <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onDelete}>删除</a></li>}
{isAdmin && <li className="drop_down"> {isAdmin && <li className="drop_down">
移动到...<i className="iconfont icon-xiajiantou font-12 ml2"></i> 移动到...<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right":"0px","left":"unset", minWidth: '160px', maxHeight: '324px', overflowY: 'auto'}}> <ul className="drop_down_menu" style={{"right":"0px","left":"unset", width: '200px', maxHeight: '324px', overflowY: 'auto'}}>
{ {
course_groups && course_groups.length > 9 ? course_groups && course_groups.length > 9 ?
(<p className="drop_down_search"> (<p className="drop_down_search">

Loading…
Cancel
Save