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

fix

Browse Source
dev_aliyun2
harry 5 years ago
parent 4130592750
commit 478f86a066
5 changed files with 131 additions and 143 deletions
Show Stats Download Patch File Download Diff File

263
public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
Unescape View File

@ -332,9 +332,9 @@ class ShixunWorkReport extends Component {
render() { render() {
let {data, showAppraiseModaltype, work_comment_hidden, work_comment, has_commit,shixun_detail,view_tpi,myshixun_id,myshixun_identifier,homework_end} = this.state; let {data, showAppraiseModaltype, work_comment_hidden, work_comment, has_commit,shixun_detail,view_tpi,myshixun_id,myshixun_identifier,homework_end} = this.state;
let category_id = data === undefined ? "" : data.category === null ? "" : data.category.category_id; let category_id=data===undefined?"":data.category===null?"":data.category.category_id;
let homework_common_id = data === undefined ? "" : data.homework_common_id; let homework_common_id=data===undefined?"":data.homework_common_id;
let homeworkid = this.props.match.params.homeworkid; let homeworkid=this.props.match.params.homeworkid;
const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />; const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
// let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment===null||work_comment===undefined?false:true:work_comment===null||work_comment===undefined?false:true; // let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment===null||work_comment===undefined?false:true:work_comment===null||work_comment===undefined?false:true;
@ -362,15 +362,15 @@ class ShixunWorkReport extends Component {
{showAppraiseModaltype === true ? <AppraiseModal {showAppraiseModaltype===true?<AppraiseModal
{...this.props} {...this.props}
{...this.state} {...this.state}
visible={showAppraiseModaltype} visible={showAppraiseModaltype}
Cancel={() => this.hideAppraiseModal()} Cancel={()=>this.hideAppraiseModal()}
showCancel={(show, hidden, id, comment_id) => this.showAppraiseModals(show, hidden, id, comment_id)} showCancel={(show,hidden,id,comment_id)=>this.showAppraiseModals(show,hidden,id,comment_id)}
work_comment={this.state.work_comment} work_comment={this.state.work_comment}
work_type={work_comment === null || work_comment === undefined ? this.state.work_type : work_comment_hidden === true ? 1 : 0} work_type={work_comment===null||work_comment===undefined?this.state.work_type:work_comment_hidden===true?1:0}
/> : ""} />:""}
<div className="newMain clearfix "> <div className="newMain clearfix ">
@ -406,14 +406,10 @@ class ShixunWorkReport extends Component {
> <Spin size="small" spinning={this.state.isspinning}>导出实训报告</Spin></a>: > <Spin size="small" spinning={this.state.isspinning}>导出实训报告</Spin></a>:
parseInt(this.props&&this.props.user.user_id)===parseInt(data&&data.user_id)?<a parseInt(this.props&&this.props.user.user_id)===parseInt(data&&data.user_id)?<a
className=" color-blue font-14 fr ml20 mt15" className=" color-blue font-14 fr ml20 mt15"
onClick={() => this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)} onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
> <Spin size="small" spinning={this.state.isspinning}>导出实训报告</Spin></a> : > <Spin size="small" spinning={this.state.isspinning}>导出实训报告</Spin></a>:""
parseInt(this.props && this.props.user.user_id) === parseInt(data && data.user_id) ? <a }
className=" color-blue font-14 fr ml20 mt15" {/*{this.props.isAdmin() ?work_comment_hidden===true? "":<a*/}
onClick={() => this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
> <Spin size="small" spinning={this.state.isspinning}>导出实训报告</Spin></a> : ""
}
{/*{this.props.isAdmin() ?work_comment_hidden===true? "":<a*/}
{/*className=" color-blue font-14 fr ml20 mt15"*/} {/*className=" color-blue font-14 fr ml20 mt15"*/}
{/*onClick={()=>this.showAppraiseModal(1)}*/} {/*onClick={()=>this.showAppraiseModal(1)}*/}
{/*>评阅</a> : ""}*/} {/*>评阅</a> : ""}*/}
@ -430,9 +426,9 @@ class ShixunWorkReport extends Component {
</div> </div>
{/*{work_comment===null||work_comment===undefined?"评阅":"编辑评阅"}*/} {/*{work_comment===null||work_comment===undefined?"评阅":"编辑评阅"}*/}
<style>{ <style>{
` `
.shixunreporttitleboxtop { .shixunreporttitleboxtop {
border-bottom: 2px solid #fafafa; border-bottom: 2px solid #fafafa;
text-align: justify; text-align: justify;
@ -541,34 +537,36 @@ class ShixunWorkReport extends Component {
</p> </p>
</div> </div>
</div>
<ConclusionEvaluation
data={data}
/>
</div>
</div> </div>
<ConclusionEvaluation
data={data}
/>
</div> </div>
</div>
<div className="stud-class-set mt19"> <div className="stud-class-set mt19">
<div className="clearfix edu-back-white poll_list"> <div className="clearfix edu-back-white poll_list">
<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">阶段成绩</div> <div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">阶段成绩</div>
<OfficialAcademicTranscript <OfficialAcademicTranscript
{...this.props} {...this.props}
data={data} data={data}
jumptopic={this.jumptopic} jumptopic={this.jumptopic}
getdatalist={() => this.getdatalist()} getdatalist={()=>this.getdatalist()}
setupdalist={(challenge_score, overall_appraisal, work_score) => this.setupdalist(challenge_score, overall_appraisal, work_score)} setupdalist={(challenge_score,overall_appraisal,work_score)=>this.setupdalist(challenge_score,overall_appraisal,work_score)}
showAppraiseModal={(type, id, show, hidden) => this.showAppraiseModal(type, id, show, hidden)} showAppraiseModal={(type,id,show,hidden)=>this.showAppraiseModal(type,id,show,hidden)}
/> />
</div>
</div> </div>
</div>
<style> <style>
{` {`
.personalsummary{ .personalsummary{
border-radius:2px; border-radius:2px;
} }
@ -590,53 +588,53 @@ class ShixunWorkReport extends Component {
padding: 30px; padding: 30px;
} }
`} `}
</style> </style>
<div className="stud-class-set mt17" <div className="stud-class-set mt17"
style={{ display: data && data.work_description === null ? "none" : "" }} style={{display:data&&data.work_description===null?"none":""}}
> >
<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">
个人总结 个人总结
</div> </div>
<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30"> <div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
<div style={{ minHeight: '50px' }}> <div style={{minHeight:'50px'}}>
<div className={"personalsummary"}> <div className={"personalsummary"}>
<div className={"markdown-body"} <div className={"markdown-body"}
dangerouslySetInnerHTML={{ __html: markdownToHTML(data === undefined ? "" : data.work_description).replace(/▁/g, "▁▁▁") }} dangerouslySetInnerHTML={{__html: markdownToHTML(data===undefined?"":data.work_description).replace(/▁/g, "▁▁▁")}}
></div> ></div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
<ShowAppraiseList <ShowAppraiseList
{...this.props} {...this.props}
{...this.state} {...this.state}
isdeleteModal={(comment_id, visible_comment, type) => this.isdeleteModal(comment_id, visible_comment, type)} isdeleteModal={(comment_id,visible_comment,type)=>this.isdeleteModal(comment_id,visible_comment,type)}
showAppraiseModal={(type, id, show, hidden) => this.showAppraiseModal(type, id, show, hidden)} showAppraiseModal={(type,id,show,hidden)=>this.showAppraiseModal(type,id,show,hidden)}
/> />
{ {
has_commit === false ? "" : has_commit === false ? "" :
<div> <div>
<div className="stud-class-set bor-bottom-greyE mt17"> <div className="stud-class-set bor-bottom-greyE mt17">
<div className="clearfix edu-back-white poll_list"> <div className="clearfix edu-back-white poll_list">
<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">图形统计</div> <div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">图形统计</div>
<Shixunechart <Shixunechart
data={data} data={data}
/> />
</div>
</div> </div>
</div>
<div className="stud-class-set bor-bottom-greyE"> <div className="stud-class-set bor-bottom-greyE">
<div className="clearfix edu-back-white poll_list pad40px"> <div className="clearfix edu-back-white poll_list pad40px">
<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">实训详情</div> <div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">实训详情</div>
<style> <style>
{` {`
.poll_list a{ .poll_list a{
padding:0px !important; padding:0px !important;
} }
@ -644,71 +642,71 @@ class ShixunWorkReport extends Component {
background: #4CACFF; background: #4CACFF;
} }
`} `}
</style> </style>
{ {
data && data.shixun_detail === undefined ? "" : data.shixun_detail.map((item, key) => { data && data.shixun_detail === undefined ? "" : data.shixun_detail.map((item, key) => {
return ( return (
<div id={"id" + item.position} key={key} className={"mb20"}> <div id={"id" + item.position} key={key} className={"mb20"}>
<div className="font-16 color-dark-21 ml20 mr20">
<p className="clearfix mb20">
<span className="panel-inner-icon mr15 fl mt3 backgroud4CACFF">
<i className="fa fa-code font-16 color_white"></i>
</span>
<span className="fl mt3 font-14">
<span className="font-bd mr15">第{item.position}关</span>
<Link to={/tasks/+item.game_identifier} >
<span className={"font-14"}>{item.subject}</span>
</Link>
</span>
</p>
<Coursesshixundetails
data={item.outputs}
/>
</div>
{item.st === 0 ? item.passed_code === null ? "" :
<div className="font-16 color-dark-21 ml20 mr20"> <div className="font-16 color-dark-21 ml20 mr20">
<p className="clearfix mb20"> <div className="bor-grey-e mt15">
<span className="panel-inner-icon mr15 fl mt3 backgroud4CACFF"> <p className="clearfix pt5 pb5 pl15 pr15 back-f6-grey codebox">
<i className="fa fa-code font-16 color_white"></i> <span className="fl">最近通过的代码</span>
</span> <span className="fr codeboxright">{item.path}</span>
<span className="fl mt3 font-14"> </p>
<span className="font-bd mr15">第{item.position}关</span>
<Link to={/tasks/ + item.game_identifier} > <div className="test-code bor-top-greyE">
<span className={"font-14"}>{item.subject}</span> <li className="clearfix">
</Link> <CodeMirror
</span> value={item.passed_code}
</p> options={{
<Coursesshixundetails // mode: 'xml',
data={item.outputs} theme: 'default',
/> lineNumbers: true,
</div> // extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
indentUnit: 4, //代码缩进为一个tab的距离
{item.st === 0 ? item.passed_code === null ? "" : matchBrackets: true,
<div className="font-16 color-dark-21 ml20 mr20"> autoRefresh: true,
<div className="bor-grey-e mt15"> smartIndent: true,//智能换行
<p className="clearfix pt5 pb5 pl15 pr15 back-f6-grey codebox"> styleActiveLine: true,
<span className="fl">最近通过的代码</span> lint: true,
<span className="fr codeboxright">{item.path}</span> readOnly: "nocursor"
</p> }}
/>
<div className="test-code bor-top-greyE"> </li>
<li className="clearfix">
<CodeMirror
value={item.passed_code}
options={{
// mode: 'xml',
theme: 'default',
lineNumbers: true,
// extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
indentUnit: 4, //代码缩进为一个tab的距离
matchBrackets: true,
autoRefresh: true,
smartIndent: true,//智能换行
styleActiveLine: true,
lint: true,
readOnly: "nocursor"
}}
/>
</li>
</div>
</div> </div>
</div> : ""} </div>
</div> </div> : ""}
) </div>
}) )
} })
</div> }
</div> </div>
</div> </div>
} </div>
}
</div>
</div> </div>
</Spin> </div>
</Spin>
) )
} }
@ -716,4 +714,3 @@ class ShixunWorkReport extends Component {
export default ShixunWorkReport; export default ShixunWorkReport;

4
public/react/src/modules/courses/statistics/Statistics.js
Unescape View File

@ -422,11 +422,7 @@ class Statistics extends Component{
{ {
this.props.isAdmin()===true? this.props.isAdmin()===true?
// 这里是文件下载 不能替换路由 // 这里是文件下载 不能替换路由
<<<<<<< HEAD
<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/classrooms/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
=======
<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a> <a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
>>>>>>> 65f1f7ca73d06c88eeec624eaa865b259c525706
:"" :""
} }
</React.Fragment>; </React.Fragment>;

4
public/react/src/modules/ecs/subroute/ecStudentList/EcStudentList.js
Unescape View File

@ -126,10 +126,6 @@ class EcStudentList extends Component {
console.log(error); console.log(error);
}); });
} }
<<<<<<< HEAD
=======
>>>>>>> 65f1f7ca73d06c88eeec624eaa865b259c525706
windowsgoblack = () => { windowsgoblack = () => {

2
public/react/src/modules/login/LoginDialog.js
Unescape View File

@ -430,7 +430,7 @@ class LoginDialog extends Component {
console.log(error) console.log(error)
}) })
}; })};
setNotcompleteds = () => { setNotcompleteds = () => {
this.setState({ this.setState({
Notcompleteds: true, Notcompleteds: true,

1
public/react/src/modules/modals/Modals.js
Unescape View File

@ -59,7 +59,6 @@ class Modals extends Component {
} }
</div> </div>
} }
</div>
</Spin> </Spin>
</Modal> </Modal>
) )

Write Preview
Loading…
Cancel
Save