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

Merge branch 'dev_hjm_a' into dev_aliyun

Browse Source
dev_newshixunModel
hjm 5 years ago
parent 3c42f80482 2282090093
commit 6750732350
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
Unescape View File

@ -286,8 +286,8 @@ class CommonWorkDetailIndex extends Component{
seeworks={undefined} seeworks={undefined}
reviseAttachmentUrl={`/student_works/${work_id || studentWorkId}/revise_attachment.json`} reviseAttachmentUrl={`/student_works/${work_id || studentWorkId}/revise_attachment.json`}
/>:""} />:""}
<a className={"fr color-blue font-16 mt7"} href={"javascript:void(0)"} <a className={"fr color-blue font-16 "} href={"javascript:void(0)"}
onClick={this.addAccessory} onClick={this.addAccessory} style={{ 'marginTop': '-4px' }}
>补交附件</a> >补交附件</a>
</React.Fragment> </React.Fragment>

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

@ -640,6 +640,8 @@ class CommonWorkList extends Component{
} else if (time_status === 4) { } else if (time_status === 4) {
timeMsg = '申诉剩余时间' timeMsg = '申诉剩余时间'
} }
const hasData = student_works && !!student_works.length && page == 1
// console.log(StudentData) // console.log(StudentData)
// console.log(student_works) // console.log(student_works)
@ -691,7 +693,7 @@ class CommonWorkList extends Component{
} }
`}</style> `}</style>
<div style={{ background: '#fff'}} className="workListContent"> <div style={{ background: '#fff'}} className="workListContent">
{ isAdmin && <ul className="clearfix" style={{padding: "20px 40px 10px", position: 'relative', paddingLeft: '24px'}}> { isAdmin && hasData && <ul className="clearfix" style={{padding: "20px 40px 10px", position: 'relative', paddingLeft: '24px'}}>
<CheckAllGroup options={options_teacher_comment} label={'你的评阅：'} onChange={this.teacherCommentOptionChange}></CheckAllGroup> <CheckAllGroup options={options_teacher_comment} label={'你的评阅：'} onChange={this.teacherCommentOptionChange}></CheckAllGroup>
<CheckAllGroup options={options_status} label={'作品状态：'} onChange={this.statusOptionChange}></CheckAllGroup> <CheckAllGroup options={options_status} label={'作品状态：'} onChange={this.statusOptionChange}></CheckAllGroup>
@ -713,7 +715,7 @@ class CommonWorkList extends Component{
{ <div id="graduation_work_list" style={{padding: isStudent ? '10px 24px 10px 24px' : '0px 24px 10px 24px'}}> { <div id="graduation_work_list" style={{padding: isStudent ? '10px 24px 10px 24px' : '0px 24px 10px 24px'}}>
<div className="clearfix"> <div className="clearfix">
<span className="fl color-grey-6 font-12"> {hasData && <span className="fl color-grey-6 font-12">
{ isAdmin ? { isAdmin ?
(!!all_member_count) && <React.Fragment> (!!all_member_count) && <React.Fragment>
<span className="color-orange-tip">{work_count || '0'}</span>个检索结果（{all_member_count} 学生） <span className="color-orange-tip">{work_count || '0'}</span>个检索结果（{all_member_count} 学生）
@ -725,7 +727,7 @@ class CommonWorkList extends Component{
<span className="color-orange-tip">{left_time.time}</span> <span className="color-orange-tip">{left_time.time}</span>
</React.Fragment> </React.Fragment>
} }
</span> </span>}
{/* { isAdminOrStudent && student_works && !!student_works.length && <div className="fr color-grey-6 edu-menu-panel"> {/* { 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"> <p style={{color: '#989898'}} className="color-grey-6"><a data-remote="true" className="font-12">

4
public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
Unescape View File

@ -125,8 +125,8 @@ class WorkDetailPageHeader extends Component{
seeworks={undefined} seeworks={undefined}
reviseAttachmentUrl={`/student_works/${work_id || studentWorkId}/revise_attachment.json`} reviseAttachmentUrl={`/student_works/${work_id || studentWorkId}/revise_attachment.json`}
/>:""} />:""}
<a className={"fr color-blue font-16 mt7"} href={"javascript:void(0)"} <a className={"fr color-blue font-16 "} href={"javascript:void(0)"}
onClick={this.addAccessory} onClick={this.addAccessory} style={{ 'marginTop': '-4px' }}
>补交附件</a> >补交附件</a>
</React.Fragment> </React.Fragment>

7
public/react/src/modules/courses/common/comments/CCommentItem.js
Unescape View File

@ -238,7 +238,8 @@ class CCommentItem extends Component{
<div className="comment_content clearfix" id={`reply_content_${item.id}`}> <div className="comment_content clearfix" id={`reply_content_${item.id}`}>
<div className="color-grey-3" id={`reply_content_${item.id}`}> <div className="color-grey-3" id={`reply_content_${item.id}`}>
<div className={"break_word_comments markdown-body"} dangerouslySetInnerHTML={{__html: item.content}}></div> <div className={"break_word_comments markdown-body"}
dangerouslySetInnerHTML={{__html: this.parseCommentContent(item.content)}}></div>
<div className="cl"></div> <div className="cl"></div>
</div> </div>
</div> </div>
@ -373,8 +374,8 @@ class CCommentItem extends Component{
</Tooltip> </Tooltip>
: ''} */} : ''} */}
</div> </div>
{/* style={{ height: '130px'}} */} {/* 去掉了orig_reply 影响到i标签 */}
<p className="orig_reply" > <p className="" >
{/* 第二排右侧按钮区域 */} {/* 第二排右侧按钮区域 */}
{/* ${this.state.show_reply ? '回复' : '申诉'} */} {/* ${this.state.show_reply ? '回复' : '申诉'} */}
{(show_reply || show_appeal) && {(show_reply || show_appeal) &&

Write Preview
Loading…
Cancel
Save