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

调整设置

Browse Source
dev_hjm_a
杨树明 5 years ago
parent f8ca6f1792
commit d97f251e02
10 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File

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

@ -311,7 +311,7 @@ class CommonWorkDetailIndex extends Component{
<Link <Link
onClick={() => this.setState({moduleName: '设置'})} onClick={() => this.setState({moduleName: '设置'})}
className={`${childModuleName == '设置' ? 'active' : '' } `} className={`${childModuleName == '设置' ? 'active' : '' } `}
style={{paddingLeft:'38px'}} style={{paddingLeft:this.props.isAdmin()?'38px':'20px'}}
to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link> to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>

20
public/react/src/modules/courses/busyWork/CommonWorkSetting.js
Unescape View File

@ -1055,7 +1055,7 @@ class CommonWorkSetting extends Component{
{/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":publish_time_type===true?"发布时间已过，则不能修改":""}> {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":publish_time_type===true?"发布时间已过，则不能修改":""}>
</Tooltip> */} </Tooltip> */}
<ConditionToolTip condition={moment(this.state.init_publish_time) < this.fetchMoment} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(this.state.init_publish_time) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
<span> <span>
<DatePicker <DatePicker
@ -1087,7 +1087,7 @@ class CommonWorkSetting extends Component{
<span>截止时间：</span> <span>截止时间：</span>
{/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":end_time_type===true?"截止时间已过，则不能修改":""}> {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":end_time_type===true?"截止时间已过，则不能修改":""}>
</Tooltip> */} </Tooltip> */}
<ConditionToolTip condition={moment(this.state.init_end_time) < this.fetchMoment} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(this.state.init_end_time) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
<span> <span>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
@ -1210,8 +1210,8 @@ class CommonWorkSetting extends Component{
{/* 开启时间 */} {/* 开启时间 */}
<div className={"h20 mb30 ml60"}> <div className={"h20 mb30 ml60"}>
<span>开启时间：</span> <span>开启时间：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
<ConditionToolTip condition={moment(init_evaluation_start) < this.fetchMoment} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(init_evaluation_start) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
<span> <span>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
@ -1244,7 +1244,7 @@ class CommonWorkSetting extends Component{
{/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
</Tooltip> */} </Tooltip> */}
<ConditionToolTip condition={moment(init_evaluation_end) < this.fetchMoment} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(init_evaluation_end) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
<span> <span>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
@ -1283,7 +1283,7 @@ class CommonWorkSetting extends Component{
{/* 匿评数量 */} {/* 匿评数量 */}
<div className={"h20 mb30 ml60"}> <div className={"h20 mb30 ml60"}>
<span>匿评数量：</span> <span>匿评数量：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
<span> <span>
<Input type="number" className="mr10" style={{width:"100px" }} value={evaluation_num} onInput={this.evaluation_num_change} <Input type="number" className="mr10" style={{width:"100px" }} value={evaluation_num} onInput={this.evaluation_num_change}
disabled={anonymous_comment && !noAuth? false : true} min={0} max={100} disabled={anonymous_comment && !noAuth? false : true} min={0} max={100}
@ -1296,7 +1296,7 @@ class CommonWorkSetting extends Component{
<div className={"h20 mb30 ml60"}> <div className={"h20 mb30 ml60"}>
<span>缺评扣分：</span> <span>缺评扣分：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
<span> <span>
<Input type="number" className="mr10" style={{width:"100px" }} value={absence_penalty} onInput={this.absence_penalty_change} <Input type="number" className="mr10" style={{width:"100px" }} value={absence_penalty} onInput={this.absence_penalty_change}
disabled={ anonymous_comment && !noAuth ? false : true} min={0} max={100} disabled={ anonymous_comment && !noAuth ? false : true} min={0} max={100}
@ -1343,7 +1343,7 @@ class CommonWorkSetting extends Component{
<span>结束时间：</span> <span>结束时间：</span>
{/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
</Tooltip> */} </Tooltip> */}
<ConditionToolTip condition={moment(init_appeal_time) < this.fetchMoment} title={"时间已过，不能再修改"}> <ConditionToolTip condition={moment(init_appeal_time) < this.fetchMoment} title={this.props.isAdmin()?"时间已过，不能再修改":""}>
<span> <span>
<DatePicker <DatePicker
dropdownClassName="hideDisable" dropdownClassName="hideDisable"
@ -1371,7 +1371,7 @@ class CommonWorkSetting extends Component{
{/* 违规匿评扣分： */} {/* 违规匿评扣分： */}
<div className={"h20 mb30 ml60"}> <div className={"h20 mb30 ml60"}>
<span>违规匿评扣分：</span> <span>违规匿评扣分：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
<span> <span>
<Input type="number" className="mr10" style={{width:"100px" }} value={appeal_penalty} onInput={this.appeal_penalty_change} <Input type="number" className="mr10" style={{width:"100px" }} value={appeal_penalty} onInput={this.appeal_penalty_change}
disabled={ anonymous_appeal && !noAuth ? false : true} min={0} max={100} disabled={ anonymous_appeal && !noAuth ? false : true} min={0} max={100}
@ -1393,7 +1393,7 @@ class CommonWorkSetting extends Component{
</div> </div>
<div className={"mb30 ml60"}> <div className={"mb30 ml60"}>
<Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?this.props.isAdmin()?"发布时间已过，则不能修改":"":""}>
<RadioGroup onChange={this.ta_mode_change} value={ta_mode}> <RadioGroup onChange={this.ta_mode_change} value={ta_mode}>
<Radio style={radioStyle} value={1} disabled={noAuth}> <Radio style={radioStyle} value={1} disabled={noAuth}>
普通模式<span className={"font-14 color-grey-9 ml10"}>（选中，则取各助教最终评分的平均分）</span> 普通模式<span className={"font-14 color-grey-9 ml10"}>（选中，则取各助教最终评分的平均分）</span>

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

@ -147,7 +147,7 @@ class WorkDetailPageHeader extends Component{
<Link <Link
className={`${childModuleName == '设置' ? 'active' : '' } `} className={`${childModuleName == '设置' ? 'active' : '' } `}
style={{paddingLeft:'38px'}} style={{paddingLeft:this.props.isAdmin()?'38px':'20px'}}
to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link> to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}</Link>

4
public/react/src/modules/courses/coursesPublic/AppraiseModal.js
Unescape View File

@ -153,7 +153,7 @@ class AppraiseModal extends Component{
</style> </style>
<div className="clearfix"> <div className="clearfix">
<p className={"font mt10 mb10 ml10"}> <p className={"font mt10 mb10 ml10"}>
可见:(学生可查看老师的评阅内容） 可见(学生可查看老师的评阅内容）
</p> </p>
{/*<Radio.Group onChange={this.onChanges} value={this.state.valuetype}>*/} {/*<Radio.Group onChange={this.onChanges} value={this.state.valuetype}>*/}
{/*<Radio value={0} style={radioStyle} className={"newfont"}>可见 (学生查看老师的评阅内容）</Radio>*/} {/*<Radio value={0} style={radioStyle} className={"newfont"}>可见 (学生查看老师的评阅内容）</Radio>*/}
@ -167,7 +167,7 @@ class AppraiseModal extends Component{
/> />
<p className={"font mt10 mb10 ml10"}> <p className={"font mt10 mb10 ml10"}>
不可见:(仅对课堂老师可见） 不可见(仅对课堂老师可见）
</p> </p>
<WordNumberTextarea <WordNumberTextarea
placeholder={"请填写评阅内容"} placeholder={"请填写评阅内容"}

2
public/react/src/modules/courses/graduation/tasks/GraduationAcross.js
Unescape View File

@ -395,7 +395,7 @@ class GraduationAcross extends Component{
` `
} }
</style>:""} </style>:""}
<div id="closeIcon" onClick={()=>this.props.modalCloss()}> <div id="closeIcon" onClick={this.props.modalCloss}>
<i className="iconfont icon-shanchudiao"></i> <i className="iconfont icon-shanchudiao"></i>
</div> </div>
<style> <style>

1
public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
Unescape View File

@ -93,6 +93,7 @@ class GraduationTaskDetail extends Component{
this.setState({ this.setState({
acrossVisible:false acrossVisible:false
}) })
this.getdatas()
} }

4
public/react/src/modules/courses/poll/PollDetailTabForth.js
Unescape View File

@ -550,7 +550,7 @@ class PollDetailTabForth extends Component{
<div className="clearfix mb5"> <div className="clearfix mb5">
<span className="font-16 mr15 fl mt6">发布时间：</span> <span className="font-16 mr15 fl mt6">发布时间：</span>
<div className="fl"> <div className="fl">
<Tooltip placement="bottom" title={un_change_unified ? "发布时间已过，不能再修改":""}> <Tooltip placement="bottom" title={un_change_unified ?this.props.isAdmin()? "发布时间已过，不能再修改":"":""}>
<span> <span>
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -579,7 +579,7 @@ class PollDetailTabForth extends Component{
<div className="clearfix"> <div className="clearfix">
<span className="mr15 fl mt10 font-16">截止时间：</span> <span className="mr15 fl mt10 font-16">截止时间：</span>
<div className="fl"> <div className="fl">
<Tooltip placement="bottom" title={un_change_end ? "截止时间已过，不能再修改":""}> <Tooltip placement="bottom" title={un_change_end ? this.props.isAdmin()?"截止时间已过，不能再修改":"":""}>
<span> <span>
<DatePicker <DatePicker
showToday={false} showToday={false}

4
public/react/src/modules/courses/poll/PollDetailTabForthRules.js
Unescape View File

@ -413,7 +413,7 @@ class PollDetailTabForthRules extends Component{
</div> </div>
</div> </div>
<div className="fl pr20 with25 yskspickersy"> <div className="fl pr20 with25 yskspickersy">
<Tooltip placement="bottom" title={rule.e_timeflag ? "发布时间已过，不能再修改":""}> <Tooltip placement="bottom" title={rule.e_timeflag ? this.props.isAdmin()?"发布时间已过，不能再修改":"":""}>
<span> <span>
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -439,7 +439,7 @@ class PollDetailTabForthRules extends Component{
</p> </p>
</div> </div>
<div className="fl mr20 yskspickersy"> <div className="fl mr20 yskspickersy">
<Tooltip placement="bottom" title={rule.e_timeflag ? "截止时间已过，不能再修改":""}> <Tooltip placement="bottom" title={rule.e_timeflag ? this.props.isAdmin()?"截止时间已过，不能再修改":"":""}>
<span> <span>
<DatePicker <DatePicker
showToday={false} showToday={false}

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

@ -236,7 +236,7 @@ class ShixunHomeworkPage extends Component {
onClick={(e) => this.ChangeTab(2)}> onClick={(e) => this.ChangeTab(2)}>
代码查重</a> : ""} 代码查重</a> : ""}
{parseInt(tab) === 3? {parseInt(tab) === 3?
<style>{ <style>{this.props.isAdmin()?
` `
.poll_list a.active:after { .poll_list a.active:after {
content: ''; content: '';
@ -247,7 +247,7 @@ class ShixunHomeworkPage extends Component {
background-color: #4CACFF; background-color: #4CACFF;
position: absolute; position: absolute;
} }
` `:""
}</style> }</style>
:""} :""}

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

@ -2078,7 +2078,7 @@ class Trainingjobsetting extends Component {
// console.log(this.props.isAdmin()) // console.log(this.props.isAdmin())
// 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);
@ -2186,7 +2186,7 @@ class Trainingjobsetting extends Component {
<div> <div>
<div className="clearfix mb5 ml15"> <div className="clearfix mb5 ml15">
<span className="font-16 fl mt3" style={{color:"#999999"}}>发布时间：</span> <span className="font-16 fl mt3" style={{color:"#999999"}}>发布时间：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true && publish_timebool === true?"发布时间已过，则不能修改": ""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true && publish_timebool === true?this.props.isAdmin()?"发布时间已过，则不能修改":"": ""}>
<div className="fl yskspickers"> <div className="fl yskspickers">
<DatePicker <DatePicker
showToday={false} showToday={false}
@ -2219,7 +2219,7 @@ class Trainingjobsetting extends Component {
</p> </p>
<div className="clearfix ml15 mb5"> <div className="clearfix ml15 mb5">
<span className=" fl mt3 font-16" style={{color:"#999999"}}>截止时间：</span> <span className=" fl mt3 font-16" style={{color:"#999999"}}>截止时间：</span>
<Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true&&end_timebool===true?"截止时间已过，则不能修改": ""}> <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true&&end_timebool===true?this.props.isAdmin()?"截止时间已过，则不能修改":"": ""}>
<div className="fl yskspickers"> <div className="fl yskspickers">
<DatePicker <DatePicker
showToday={false} showToday={false}

Write Preview
Loading…
Cancel
Save