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

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

@ -332,9 +332,9 @@ class ShixunWorkReport extends Component {
render() {
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 homework_common_id = data === undefined ? "" : data.homework_common_id;
let homeworkid = this.props.match.params.homeworkid;
let category_id=data===undefined?"":data.category===null?"":data.category.category_id;
let homework_common_id=data===undefined?"":data.homework_common_id;
let homeworkid=this.props.match.params.homeworkid;
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;
@ -362,15 +362,15 @@ class ShixunWorkReport extends Component {
{showAppraiseModaltype === true ? <AppraiseModal
{showAppraiseModaltype===true?<AppraiseModal
{...this.props}
{...this.state}
visible={showAppraiseModaltype}
Cancel={() => this.hideAppraiseModal()}
showCancel={(show, hidden, id, comment_id) => this.showAppraiseModals(show, hidden, id, comment_id)}
Cancel={()=>this.hideAppraiseModal()}
showCancel={(show,hidden,id,comment_id)=>this.showAppraiseModals(show,hidden,id,comment_id)}
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 ">
@ -406,12 +406,8 @@ class ShixunWorkReport extends Component {
> <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"
onClick={() => this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
> <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"
onClick={() => this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
> <Spin size="small" spinning={this.state.isspinning}>导出实训报告</Spin></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"*/}
@ -541,6 +537,8 @@ class ShixunWorkReport extends Component {
</p>
</div>
</div>
</div>
<ConclusionEvaluation
data={data}
@ -558,9 +556,9 @@ class ShixunWorkReport extends Component {
{...this.props}
data={data}
jumptopic={this.jumptopic}
getdatalist={() => this.getdatalist()}
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)}
getdatalist={()=>this.getdatalist()}
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)}
/>
</div>
@ -593,17 +591,17 @@ class ShixunWorkReport extends Component {
</style>
<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="font-16 color-dark-21 shixunreporttitleboxtop pd20 color333">
个人总结
</div>
<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
<div style={{ minHeight: '50px' }}>
<div style={{minHeight:'50px'}}>
<div className={"personalsummary"}>
<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>
@ -615,8 +613,8 @@ class ShixunWorkReport extends Component {
<ShowAppraiseList
{...this.props}
{...this.state}
isdeleteModal={(comment_id, visible_comment, type) => this.isdeleteModal(comment_id, visible_comment, type)}
showAppraiseModal={(type, id, show, hidden) => this.showAppraiseModal(type, id, show, hidden)}
isdeleteModal={(comment_id,visible_comment,type)=>this.isdeleteModal(comment_id,visible_comment,type)}
showAppraiseModal={(type,id,show,hidden)=>this.showAppraiseModal(type,id,show,hidden)}
/>
{
@ -656,7 +654,7 @@ class ShixunWorkReport extends Component {
</span>
<span className="fl mt3 font-14">
<span className="font-bd mr15">第{item.position}关</span>
<Link to={/tasks/ + item.game_identifier} >
<Link to={/tasks/+item.game_identifier} >
<span className={"font-14"}>{item.subject}</span>
</Link>
</span>
@ -716,4 +714,3 @@ class ShixunWorkReport extends Component {
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?
// 这里是文件下载 不能替换路由
<<<<<<< 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>
>>>>>>> 65f1f7ca73d06c88eeec624eaa865b259c525706
:""
}
</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);
});
}
<<<<<<< HEAD
=======
>>>>>>> 65f1f7ca73d06c88eeec624eaa865b259c525706
windowsgoblack = () => {

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

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

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

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

Write Preview
Loading…
Cancel
Save