调整新需求

dev_local_cqdsj
杨树林 5 years ago
parent 19e853f2df
commit bda1eb5fdc

@ -161,7 +161,8 @@ function buildColumns(that, student_works, studentData) {
render: (project_info, record) => ( render: (project_info, record) => (
<span> <span>
{project_info && project_info.name && <a href={project_info.id == -1 ? 'javascript:void(0)' : `/projects/${project_info.id}`} {project_info && project_info.name &&
<a href={project_info.id == -1 ? 'javascript:void(0)' : `/projects/${project_info.id}`}
target={ project_info.id == -1 ? '' : "_blank" } target={ project_info.id == -1 ? '' : "_blank" }
className="overflowHidden1" style={{color:'#4CACFF', width: that.state.anonymous_comment ? '80px' : '130px', margin: '0 auto', display: 'block'}} title={project_info.name} className="overflowHidden1" style={{color:'#4CACFF', width: that.state.anonymous_comment ? '80px' : '130px', margin: '0 auto', display: 'block'}} title={project_info.name}
>{project_info.name}</a>} >{project_info.name}</a>}
@ -201,6 +202,7 @@ function buildColumns(that, student_works, studentData) {
dataIndex: 'update_time', dataIndex: 'update_time',
key: 'update_time', key: 'update_time',
sorter: true, sorter: true,
defaultSortOrder: 'descend',
render: (update_time, record) => ( render: (update_time, record) => (
<span> <span>
<a href="javascript:;" style={{color:'#989898', cursor: 'default'}}>{update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'}</a> <a href="javascript:;" style={{color:'#989898', cursor: 'default'}}>{update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'}</a>
@ -252,7 +254,6 @@ function buildColumns(that, student_works, studentData) {
} }
if (that.state.anonymous_comment) { if (that.state.anonymous_comment) {
/** /**
开启了匿评的才显示此列悬浮TIP示例 开启了匿评的才显示此列悬浮TIP示例
@ -292,7 +293,7 @@ function buildColumns(that, student_works, studentData) {
render: (appeal_all_count, record) => ( render: (appeal_all_count, record) => (
<span> <span>
{ !!appeal_all_count && {!!appeal_all_count &&
<Tooltip placement="bottom" title={`共有${appeal_all_count}条匿评申诉,${record.appeal_deal_count}条待处理`}> <Tooltip placement="bottom" title={`共有${appeal_all_count}条匿评申诉,${record.appeal_deal_count}条待处理`}>
<span style={{ minWidth: '30px', display: 'inline-block', textAlign: 'center' }}> <span style={{ minWidth: '30px', display: 'inline-block', textAlign: 'center' }}>
{`${record.appeal_deal_count}/${appeal_all_count}`} {`${record.appeal_deal_count}/${appeal_all_count}`}
@ -317,7 +318,7 @@ function buildColumns(that, student_works, studentData) {
getScoreTip(work_score, getScoreTip(work_score,
<div> <div>
<div>{`${record.user_name}${record.user_login}`}</div> <div>{`${record.user_name}${record.user_login}`}</div>
{ record.ultimate_score ? {record.ultimate_score ?
<div>最终调整成绩{record.work_score}</div> : <div>最终调整成绩{record.work_score}</div> :
<div> <div>
{ record.final_score && <div>作业评分{record.final_score}</div> } { record.final_score && <div>作业评分{record.final_score}</div> }
@ -474,7 +475,6 @@ class CommonWorkList extends Component{
}) })
} }
teacherCommentOptionChange = (values, isAllChecked) => { teacherCommentOptionChange = (values, isAllChecked) => {
this.setState({arg_teacher_comment: isAllChecked ? [] : values, page: 1}, () => { this.setState({arg_teacher_comment: isAllChecked ? [] : values, page: 1}, () => {
@ -626,7 +626,7 @@ class CommonWorkList extends Component{
ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count, ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count,
late_penalty, absence_penalty, appeal_penalty late_penalty, absence_penalty, appeal_penalty
,end_immediately ,publish_immediately , end_immediately, publish_immediately
, homework_id, visible, work_group, project_info, is_leader , homework_id, visible, work_group, project_info, is_leader
} =this.state; } =this.state;
@ -793,57 +793,11 @@ class CommonWorkList extends Component{
} }
</span>} </span>}
{/* { isAdminOrStudent && student_works && !!student_works.length && <div className="fr color-grey-6 edu-menu-panel">
<p style={{color: '#989898'}} className="color-grey-6"><a data-remote="true" className="font-12">
{order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}</a><i
className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
<ul className="edu-menu-list" style={{ textAlign: 'center'}}>
<li onClick={(e)=>this.funorder("update_time")} ><a data-remote="true" className={order==="update_time"?"color-blue":""}>更新时间</a>
</li>
<li onClick={(e)=>this.funorder("work_score" )} ><a data-remote="true" className={order==="work_score"?"color-blue":""}>最终成绩</a>
</li>
<li onClick={(e)=>this.funorder("student_id" )} ><a data-remote="true" className={order==="student_id"?"color-blue":""}>学生学号</a>
</li>
</ul>
</div> } */}
{/*{*/}
{/* isAdminOrStudent && student_works && !!student_works.length &&*/}
{/* <div className="fr">*/}
{/* <li className="drop_down">*/}
{/* <span className="color-grey-9 font-12">*/}
{/* {order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}*/}
{/* </span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>*/}
{/* <ul className="drop_down_normal">*/}
{/* <li className={''} onClick={()=>this.funorder("update_time")}>更新时间</li>*/}
{/* <li className={''} onClick={()=>this.funorder("work_score")}>最终成绩</li>*/}
{/* <li className={''} onClick={()=>this.funorder("student_id")}>学生学号</li>*/}
{/* </ul>*/}
{/* </li>*/}
{/* </div>*/}
{/*}*/}
</div> </div>
</div> } </div> }
{/*
"commit_count": 10, //已交数(学生身份)
"uncommit_count": 12, //未交数(学生身份)
"left_time": { //学生身份剩余的时间和状态
"status": "剩余补交时间",
"time": "24 天 24分 23秒"
},
*/}
{/* { isStudent && <div id="graduation_work_list" style={{padding:'10px 30px 10px 40px'}}>
<div className="clearfix">
<span className="fl color-grey-6 font-12">
<span className="color-orange-tip">{commit_count}</span> {uncommit_count}
<span className="color-orange-tip">{left_time.time}</span>
</span>
</div>
</div> } */}
<style>{` <style>{`
.workListContent .ant-table-thead > tr > th { .workListContent .ant-table-thead > tr > th {
border-bottom: none; border-bottom: none;
@ -889,14 +843,7 @@ class CommonWorkList extends Component{
</Spin> </Spin>
: :
<React.Fragment> <React.Fragment>
{/* pagination={work_count > PAGE_SIZE ? { //分页
total: work_count, //数据总数量
pageSize: PAGE_SIZE, //显示几条一页
current: page,
} : false}
onChange={this.onTablePagination}
*/}
<Table <Table
className="stageTable" className="stageTable"
dataSource={student_works} dataSource={student_works}

@ -202,6 +202,7 @@ class Studentshavecompletedthelist extends Component {
className: "edu-txt-center font-14", className: "edu-txt-center font-14",
width:'175px', width:'175px',
sorter: true, sorter: true,
defaultSortOrder: 'descend',
render: (text, record) => ( render: (text, record) => (
<span style={{ <span style={{
width:'175px', width:'175px',
@ -935,6 +936,7 @@ class Studentshavecompletedthelist extends Component {
align: 'center', align: 'center',
className: "edu-txt-center font-14", className: "edu-txt-center font-14",
sorter: true, sorter: true,
defaultSortOrder: 'descend',
render: (text, record) => ( render: (text, record) => (
<span> <span>
{record.updatetime==="--"? {record.updatetime==="--"?

@ -823,6 +823,7 @@ class GraduationTaskssettinglist extends Component{
key: 'turnovertime', key: 'turnovertime',
className:'edu-txt-center', className:'edu-txt-center',
sorter: true, sorter: true,
defaultSortOrder: 'descend',
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:'#989898'}}> <a style={{color:'#989898'}}>

@ -293,6 +293,7 @@ class PollDetailTabFirst extends Component{
className:"edu-txt-center", className:"edu-txt-center",
width:160, width:160,
sorter: true, sorter: true,
defaultSortOrder: 'descend',
render:(time,item,index)=>{ render:(time,item,index)=>{
return( return(
item.time == null ? <span className="color-grey-9">--</span> : moment(item.time).format('YYYY-MM-DD HH:mm') item.time == null ? <span className="color-grey-9">--</span> : moment(item.time).format('YYYY-MM-DD HH:mm')
@ -374,10 +375,10 @@ class PollDetailTabFirst extends Component{
{ {
poll_end_at != "0" ? poll_end_at != "0" ?
<span className="color-grey-9"> 剩余提交时间<span className="color-orange-tip">{poll_end_at}</span></span> <span className="color-grey-9"> 剩余提交时间<span className="color-orange-tip">{poll_end_at}</span></span>
:"" : ""
} }
</span> </span>
:"" : ""
} }
{/*{*/} {/*{*/}
{/* isAdmin && */} {/* isAdmin && */}

Loading…
Cancel
Save