m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整新需求

Browse Source
dev_local_cqdsj
杨树林 6 years ago
parent 19e853f2df
commit bda1eb5fdc
4 changed files with 61 additions and 110 deletions
Show Stats Download Patch File Download Diff File

89
public/react/src/modules/courses/busyWork/CommonWorkList.js
Unescape View File

@ -97,7 +97,7 @@ function buildColumns(that, student_works, studentData) {
}} title={text && text.length > 5 ? text : ''}> }} title={text && text.length > 5 ? text : ''}>
{/* <Tooltip placement="bottom" title={text}> {/* <Tooltip placement="bottom" title={text}>
</Tooltip> */} </Tooltip> */}
{record.is_leader ? {record.is_leader ?
<div style={{ display: 'flex', 'flex-direction': 'column', 'align-items': 'center'}}> <div style={{ display: 'flex', 'flex-direction': 'column', 'align-items': 'center'}}>
<div >{text}</div> <div >{text}</div>
<LeaderIcon></LeaderIcon> <LeaderIcon></LeaderIcon>
@ -116,8 +116,8 @@ function buildColumns(that, student_works, studentData) {
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a href="javascript:;" <a href="javascript:;"
title={text && text.length > 12 ? text : ''} title={text && text.length > 12 ? text : ''}
style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'width': '98px', display: 'block', overflow: 'hidden' style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'width': '98px', display: 'block', overflow: 'hidden'
, margin: '0 auto', cursor: 'default'}} , margin: '0 auto', cursor: 'default'}}
>{record.student_id}</a> >{record.student_id}</a>
</span> </span>
@ -161,9 +161,10 @@ 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 &&
target={ project_info.id == -1 ? '' : "_blank" } <a href={project_info.id == -1 ? 'javascript:void(0)' : `/projects/${project_info.id}`}
className="overflowHidden1" style={{color:'#4CACFF', width: that.state.anonymous_comment ? '80px' : '130px', margin: '0 auto', display: 'block'}} title={project_info.name} 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}
>{project_info.name}</a>} >{project_info.name}</a>}
</span> </span>
), ),
@ -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>
@ -232,7 +234,7 @@ function buildColumns(that, student_works, studentData) {
/** /**
* 2名助教进行了评分 * 2名助教进行了评分
平均分：85.0分 平均分：85.0分
* *
*/ */
render: (teaching_asistant_score, record) => ( render: (teaching_asistant_score, record) => (
<span> <span>
@ -252,10 +254,9 @@ function buildColumns(that, student_works, studentData) {
} }
if (that.state.anonymous_comment) { if (that.state.anonymous_comment) {
/** /**
开启了匿评的才显示此列，悬浮TIP示例： 开启了匿评的才显示此列，悬浮TIP示例：
3名学生进行了匿评 3名学生进行了匿评
有效平均分：80.0分 有效平均分：80.0分
*/ */
@ -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,8 +318,8 @@ 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> }
{ record.late_penalty >= 0 && <div>迟交扣分：{record.late_penalty}分</div>} { record.late_penalty >= 0 && <div>迟交扣分：{record.late_penalty}分</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;
@ -739,7 +739,7 @@ class CommonWorkList extends Component{
/> />
{/* 内容区 */} {/* 内容区 */}
<style>{` <style>{`
.ant-table-thead > tr > th, .ant-table-tbody > tr > td { .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
text-align: center; text-align: center;
@ -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,15 +843,8 @@ class CommonWorkList extends Component{
</Spin> </Spin>
: :
<React.Fragment> <React.Fragment>
{/* pagination={work_count > PAGE_SIZE ? { //分页
total: work_count, //数据总数量 <Table
pageSize: PAGE_SIZE, //显示几条一页
current: page,
} : false}
onChange={this.onTablePagination}
*/}
<Table
className="stageTable" className="stageTable"
dataSource={student_works} dataSource={student_works}
columns={columns} columns={columns}
@ -912,7 +859,7 @@ class CommonWorkList extends Component{
</div> </div>
</div> </div>
{work_count > PAGE_SIZE && <Pagination {work_count > PAGE_SIZE && <Pagination
style={{ textAlign: 'center', marginBottom: '20px' }} style={{ textAlign: 'center', marginBottom: '20px' }}
showQuickJumper pageSize={PAGE_SIZE} onChange={this.onTablePagination} current={page} total={work_count} />} showQuickJumper pageSize={PAGE_SIZE} onChange={this.onTablePagination} current={page} total={work_count} />}

2
public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
Unescape View File

@ -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==="--"?

3
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
Unescape View File

@ -66,7 +66,7 @@ class GraduationTaskssettinglist extends Component{
this.props.triggerRef(this) this.props.triggerRef(this)
}catch(e){ }catch(e){
} }
} }
goback=()=>{ goback=()=>{
@ -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'}}>

13
public/react/src/modules/courses/poll/PollDetailTabFirst.js
Unescape View File

@ -289,10 +289,11 @@ class PollDetailTabFirst extends Component{
}, { }, {
title: '提交时间', title: '提交时间',
dataIndex: 'time', dataIndex: 'time',
key: 'time', key: 'time',
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')
@ -352,7 +353,7 @@ class PollDetailTabFirst extends Component{
</div> </div>
</div> </div>
{ {
course_groups && course_groups.length > 1 ? course_groups && course_groups.length > 1 ?
<div className="mt15"> <div className="mt15">
<CheckAllGroup options={options_Class} label={'分班情况：'} onChange={this.classOptionsChange}></CheckAllGroup> <CheckAllGroup options={options_Class} label={'分班情况：'} onChange={this.classOptionsChange}></CheckAllGroup>
</div> </div>
@ -367,17 +368,17 @@ class PollDetailTabFirst extends Component{
isAdmin ? <span className="fl color-grey-3 font-12"><span className="color-orange-tip">{poll_types && poll_types.total_users}</span>个检索结果（{poll_types && poll_types.poll_users_count} 学生）</span> :"" isAdmin ? <span className="fl color-grey-3 font-12"><span className="color-orange-tip">{poll_types && poll_types.total_users}</span>个检索结果（{poll_types && poll_types.poll_users_count} 学生）</span> :""
} }
{ {
isStudent ? isStudent ?
<span className="fl color-grey-3 font-12"> <span className="fl color-grey-3 font-12">
{poll_types && poll_types.answer_users===undefined?"":<span className="mr15"><span className="color-orange-tip">{poll_types && poll_types.answer_users}</span> 已交</span>} {poll_types && poll_types.answer_users===undefined?"":<span className="mr15"><span className="color-orange-tip">{poll_types && poll_types.answer_users}</span> 已交</span>}
{poll_types && poll_types.unanswer_users===undefined?"":<span className="mr15">{poll_types && poll_types.unanswer_users} 未交</span>} {poll_types && poll_types.unanswer_users===undefined?"":<span className="mr15">{poll_types && poll_types.unanswer_users} 未交</span>}
{ {
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 && */}
@ -399,7 +400,7 @@ class PollDetailTabFirst extends Component{
} }
</div> </div>
{ {
poll_types && poll_types.total_users && poll_types.total_users > limit ? poll_types && poll_types.total_users && poll_types.total_users > limit ?
<div className="edu-txt-center mt30 mb50"> <div className="edu-txt-center mt30 mb50">
<Pagination showQuickJumper current={page} onChange={this.changePage} pageSize={limit} total={poll_types.total_users}></Pagination> <Pagination showQuickJumper current={page} onChange={this.changePage} pageSize={limit} total={poll_types.total_users}></Pagination>
</div>:"" </div>:""

Write Preview
Loading…
Cancel
Save