Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

dev_cs
hjm 5 years ago
commit 66f8edf62d

@ -17,7 +17,8 @@ class ShowAppraiseList extends Component{
render(){ render(){
let {data, work_comment,work_comment_hidden}=this.props; let {data, work_comment,work_comment_hidden}=this.props;
let work_commenttype=work_comment===undefined||work_comment===null||work_comment===""; let work_commenttype=work_comment===undefined||work_comment===null||work_comment==="";
let work_comment_hiddentype=work_comment===undefined||work_comment===null||work_comment===""; let work_comment_hiddentype=work_comment_hidden===undefined||work_comment_hidden===null||work_comment_hidden==="";
return( return(
<div> <div>
<style> <style>
@ -66,25 +67,28 @@ class ShowAppraiseList extends Component{
{this.props&&this.props.isAdmin()===true? {this.props&&this.props.isAdmin()===true?
<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30bt"> <div className="font-16 color-dark-21 shixunreporttitleboxbom pd30bt">
<div>
{work_commenttype===true?"":<div>
<span className={"z000"}>学生可见<span className={"z666"}>学生可查看老师的评阅内容</span></span> <span className={"z000"}>学生可见<span className={"z666"}>学生可查看老师的评阅内容</span></span>
</div> </div>}
<div className={"borderbom"} style={{minHeight:'40px'}}>
{work_comment===true?"":<div className={"personalsummary"}> {work_commenttype===true?"":<div className={work_comment_hiddentype===true?"":"borderbom"} style={{minHeight:'40px'}}>
<div className={"personalsummary"}>
<div className={"markdown-body"} <div className={"markdown-body"}
dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment).replace(/▁/g, "▁▁▁")}}></div> dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment).replace(/▁/g, "▁▁▁")}}></div>
</div>} </div>
</div> </div>}
<div> {work_comment_hiddentype===true?"":<div>
<span className={"z000"}>学生不可见<span className={"z666"}>仅对课堂老师可见</span></span> <span className={"z000"}>学生不可见<span className={"z666"}>仅对课堂老师可见</span></span>
</div> </div>}
<div style={{minHeight:'40px'}}>
{work_comment_hidden===true?"":<div className={"personalsummary"}> {work_comment_hiddentype===true?"":<div style={{minHeight:'40px'}}>
<div className={"personalsummary"}>
<div className={"markdown-body"} <div className={"markdown-body"}
dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment_hidden).replace(/▁/g, "▁▁▁")}}></div> dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment_hidden).replace(/▁/g, "▁▁▁")}}></div>
</div>} </div>
</div> </div>}
</div>:<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30"> </div>:<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
@ -109,7 +113,7 @@ class ShowAppraiseList extends Component{
return( return(
<div key={key}> <div key={key}>
{challenge_comment===false&&challenge_comment_hidden==false?<div className="stud-class-set mt17" > {challenge_comment===false||challenge_comment_hidden==false?<div className="stud-class-set mt17" >
<div className="clearfix edu-back-white poll_list"> <div className="clearfix edu-back-white poll_list">
<div className="font-16 color-dark-21 shixunreporttitleboxtop pd20 color333"> <div className="font-16 color-dark-21 shixunreporttitleboxtop pd20 color333">
@ -125,25 +129,27 @@ class ShowAppraiseList extends Component{
{this.props&&this.props.isAdmin()===true? {this.props&&this.props.isAdmin()===true?
<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30bt"> <div className="font-16 color-dark-21 shixunreporttitleboxbom pd30bt">
<div>
{challenge_comment===true?"":<div>
<span className={"z000"}>学生可见<span className={"z666"}>学生可查看老师的评阅内容</span></span> <span className={"z000"}>学生可见<span className={"z666"}>学生可查看老师的评阅内容</span></span>
</div> </div>}
<div className={"borderbom"} style={{minHeight:'40px'}}>
{challenge_comment===true?"":<div className={"personalsummary"}> {challenge_comment===true?"":<div className={challenge_comment_hidden===true?"":"borderbom"} style={{minHeight:'40px'}}>
<div className={"personalsummary"}>
<div className={"markdown-body"} <div className={"markdown-body"}
dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment).replace(/▁/g, "▁▁▁")}}></div> dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment).replace(/▁/g, "▁▁▁")}}></div>
</div>} </div>
</div> </div>}
<div> {challenge_comment_hidden===true?"":<div>
<span className={"z000"}>学生不可见<span className={"z666"}>仅对课堂老师可见</span></span> <span className={"z000"}>学生不可见<span className={"z666"}>仅对课堂老师可见</span></span>
</div> </div>}
<div style={{minHeight:'40px'}}> {challenge_comment_hidden===true?"":<div style={{minHeight:'40px'}}>
{challenge_comment_hidden===true?"":<div className={"personalsummary"}> <div className={"personalsummary"}>
<div className={"markdown-body"} <div className={"markdown-body"}
dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment_hidden).replace(/▁/g, "▁▁▁")}}></div> dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment_hidden).replace(/▁/g, "▁▁▁")}}></div>
</div>} </div>
</div> </div>}
</div>: <div className="font-16 color-dark-21 shixunreporttitleboxbom pd30"> </div>: <div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
<div style={{minHeight:'40px'}}> <div style={{minHeight:'40px'}}>

Loading…
Cancel
Save