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

调整得分规则

Browse Source
dev_hjm_a
杨树明 5 years ago
parent 3dab4dca77
commit 92218bb829
5 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File

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

@ -308,15 +308,11 @@ class CommonWorkDetailIndex extends Component{
onClick={() => this.setState({moduleName: '参考答案'})} onClick={() => this.setState({moduleName: '参考答案'})}
className={`${childModuleName == '参考答案' ? 'active' : '' } `} className={`${childModuleName == '参考答案' ? 'active' : '' } `}
to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>} to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}
{this.props.isAdmin() ?
<Link <Link
onClick={() => this.setState({moduleName: '设置'})} onClick={() => this.setState({moduleName: '设置'})}
className={`${childModuleName == '设置' ? 'active' : '' } `} className={`${childModuleName == '设置' ? 'active' : '' } `}
style={{paddingLeft:'38px'}} style={{paddingLeft:'38px'}}
to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>设置</Link>: to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>
""
}
{/* { this.props.tabRightComponents } */} {/* { this.props.tabRightComponents } */}

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

@ -144,13 +144,11 @@ class WorkDetailPageHeader extends Component{
{view_answer == true && <Link {view_answer == true && <Link
className={`${childModuleName == '参考答案' ? 'active' : '' } `} className={`${childModuleName == '参考答案' ? 'active' : '' } `}
to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>} to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}
{this.props.isAdmin()?
<Link <Link
className={`${childModuleName == '设置' ? 'active' : '' } `} className={`${childModuleName == '设置' ? 'active' : '' } `}
style={{paddingLeft:'38px'}} style={{paddingLeft:'38px'}}
to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>设置</Link>: to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>
""
}
{ this.props.tabRightComponents } { this.props.tabRightComponents }

40
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -1535,6 +1535,7 @@ class Listofworksstudentone extends Component {
// console.log("获取作品列表"); // console.log("获取作品列表");
// console.log("935"); // console.log("935");
// debugger // debugger
let searchtype=this.props.history.location.search;
let urll = `/homework_commons/${homeworkid}/works_list.json`; let urll = `/homework_commons/${homeworkid}/works_list.json`;
var datasysl = { var datasysl = {
search: this.state.searchtext, search: this.state.searchtext,
@ -1587,13 +1588,14 @@ class Listofworksstudentone extends Component {
if(this.props.isAdmin() === true){ if(this.props.isAdmin() === true){
if(result.data.update_score===true){ if(result.data.update_score===true){
if(bool===true){ if(bool===true){
if(searchtype==="?tab=0"){
try { try {
this.props.yslslowCheckresults(); this.props.yslslowCheckresults();
}catch (e) { }catch (e) {
} }
this.setComputeTimet(); this.setComputeTimet();
}
} }
} }
} }
@ -3242,21 +3244,25 @@ class Listofworksstudentone extends Component {
{/*作品状态GraduationTaskssettinglist*/} {/*作品状态GraduationTaskssettinglist*/}
<ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}> <ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}>
<li className="clearfix " > <li className="clearfix " >
<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span> {/*<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
</li>
<li className="clearfix mt10">
<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}> <div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
{/*{course_is_end===true?"":<span>*/} {/*{course_is_end===true?"":<span>*/}
{/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/} {/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/}
{/* (this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>*/} {/* (this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>*/}
{/* 查看最新成绩*/} {/* 查看最新成绩*/}
{/* </div>:""):*/} {/* </div>:""):*/}
{/* teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/} {/* teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/}
{/* (this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/} {/* (this.props.isNotMember()===false?<div className={"computeTimes font-16"}>*/}
{/* 查看最新成绩*/} {/* 查看最新成绩*/}
{/* </div>:"")*/} {/* </div>:"")*/}
{/*}*/} {/*}*/}
{/*</span>}*/} {/*</span>}*/}
<span className="search-newyslw fr ml20"> <span className="search-newyslw fr ml20">
<Search <Search
placeholder="请输入姓名或学号搜索" placeholder="请输入姓名或学号搜索"
@ -3269,10 +3275,6 @@ class Listofworksstudentone extends Component {
></Search> ></Search>
</span> </span>
</div> </div>
</li>
<li className="clearfix mt10">
<span className="fl mr10 color-grey-8 ">作品状态：</span> <span className="fl mr10 color-grey-8 ">作品状态：</span>
<span className="fl "><a id="graduation_comment_no_limit" <span className="fl "><a id="graduation_comment_no_limit"
className={unlimited === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "} className={unlimited === 0 ? "pl10 pr10 mr20 check_on" : "pl10 pr10 mr20 "}
@ -3567,7 +3569,7 @@ class Listofworksstudentone extends Component {
<div className="fr"> <div className="fr">
<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span> {/*<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
{/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/} {/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/}
{/* {computeTimetype===true?*/} {/* {computeTimetype===true?*/}
{/* (this.props.isNotMember()===false?*/} {/* (this.props.isNotMember()===false?*/}
@ -3800,7 +3802,7 @@ class Listofworksstudentone extends Component {
</style> </style>
<div className="fr"> <div className="fr">
<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span> {/*<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>*/}
{/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/} {/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>*/}
{/* {computeTimetype===true?*/} {/* {computeTimetype===true?*/}

4
public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
Unescape View File

@ -250,10 +250,10 @@ class ShixunHomeworkPage extends Component {
` `
}</style> }</style>
:""} :""}
{this.props.isAdmin() ?
<a className={parseInt(tab) === 3 ? "active" : ""} <a className={parseInt(tab) === 3 ? "active" : ""}
onClick={(e) => this.ChangeTab(3)} onClick={(e) => this.ChangeTab(3)}
>设置</a>:""} >{this.props.isAdmin()?"设置":"得分规则"}</a>
{/*{this.props.isAdmin() ? <a*/} {/*{this.props.isAdmin() ? <a*/}
{/* className="fr color-blue font-16"*/} {/* className="fr color-blue font-16"*/}
{/* href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}*/} {/* href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}*/}

7
public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
Unescape View File

@ -147,7 +147,9 @@ class Trainingjobsetting extends Component {
if(this.props.isAdmin() === false){
this.cancelEdit()
}
} }
// componentWillReceiveProps(nextProps) { // componentWillReceiveProps(nextProps) {
// // console.log("+++++++++916"); // // console.log("+++++++++916");
@ -2077,6 +2079,9 @@ class Trainingjobsetting extends Component {
// console.log(this.state.code_review===false) // console.log(this.state.code_review===false)
// console.log("引入的分值"); // console.log("引入的分值");
// console.log(this.state.work_efficiencys); // console.log(this.state.work_efficiencys);
return ( return (
<div className=" clearfix " ref='targetElementTrainingjobsetting' style={{margin: "auto", minWidth:"1200px"}}> <div className=" clearfix " ref='targetElementTrainingjobsetting' style={{margin: "auto", minWidth:"1200px"}}>
{this.state.showmodel===true?<ShixunWorkModal {this.state.showmodel===true?<ShixunWorkModal

Write Preview
Loading…
Cancel
Save