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

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

Browse Source
dev_forum
caishi 6 years ago
parent 58bf03e694 109d266f70
commit 28b21e7cd6
17 changed files with 514 additions and 414 deletions
Show Stats Download Patch File Download Diff File

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

@ -259,9 +259,9 @@ function buildColumns(that, student_works) {
<div>最终调整成绩：{record.work_score}分</div> : <div>最终调整成绩：{record.work_score}分</div> :
<div> <div>
{ record.final_score && <div>作业评分：{record.final_score}分</div> } { record.final_score && <div>作业评分：{record.final_score}分</div> }
{ !!that.state.late_penalty && <div>迟交扣分：{that.state.late_penalty}分</div>} { record.late_penalty >= 0 && <div>迟交扣分：{record.late_penalty}分</div>}
{ !!that.state.absence_penalty && <div>缺评扣分：{that.state.absence_penalty}分</div>} { record.absence_penalty >= 0 && <div>缺评扣分：{record.absence_penalty}分</div>}
{ !!that.state.appeal_penalty && <div>违规匿评扣分：{that.state.appeal_penalty}分</div>} { record.appeal_penalty >= 0 && <div>违规匿评扣分：{record.appeal_penalty}分</div>}
<div>最终成绩：{record.work_score}分</div> <div>最终成绩：{record.work_score}分</div>
</div> } </div> }
</div>) </div>)

9
public/react/src/modules/courses/busyWork/ConnectProject.js
Unescape View File

@ -23,7 +23,12 @@ class ConnectProject extends Component{
} }
onSubmit = () => { onSubmit = () => {
const { radioValue } = this.state; const { radioValue, projects } = this.state;
if (projects.length === 0) {
this.closeConnectionProject()
return;
}
if (!radioValue) { if (!radioValue) {
this.props.showNotification('请先在下面的列表中选择项目') this.props.showNotification('请先在下面的列表中选择项目')
return; return;
@ -115,7 +120,7 @@ class ConnectProject extends Component{
> >
<div className="newupload_conbox clearfix"> <div className="newupload_conbox clearfix">
{ {
projects && projects.length && projects && !!projects.length &&
<div> <div>
<Search placeholder="请输入项目名称进行搜索" className="with100" <Search placeholder="请输入项目名称进行搜索" className="with100"
value={this.state.keyword} onInput={(e) => {this.setState({keyword: e.target.value})}} value={this.state.keyword} onInput={(e) => {this.setState({keyword: e.target.value})}}

9
public/react/src/modules/courses/exercise/Exercise.js
Unescape View File

@ -8,6 +8,7 @@ import '../css/members.css'
import { WordsBtn } from 'educoder' import { WordsBtn } from 'educoder'
import '../css/busyWork.css' import '../css/busyWork.css'
import _ from 'lodash'; import _ from 'lodash';
import moment from 'moment'
import UseBank from "../busyWork/UseBank"; import UseBank from "../busyWork/UseBank";
import ImmediatelyPublish from "../poll/pollPublicBtn/ImmediatelyPublish"; import ImmediatelyPublish from "../poll/pollPublicBtn/ImmediatelyPublish";
import ImmediatelyEnd from "../poll/pollPublicBtn/ImmediatelyEnd"; import ImmediatelyEnd from "../poll/pollPublicBtn/ImmediatelyEnd";
@ -187,7 +188,7 @@ class Exercise extends Component{
} }
// 题库选用成功后刷新页面 // 题库选用成功后刷新页面
useBankSuccess=(checkValue,value)=>{ useBankSuccess=(checkValue,value)=>{
debugger
let{type,StudentList_value,page,limit}=this.state; let{type,StudentList_value,page,limit}=this.state;
let coursesId=this.props.match.params.coursesId; let coursesId=this.props.match.params.coursesId;
let url=`/courses/${coursesId}/exercises/publish_modal.json`; let url=`/courses/${coursesId}/exercises/publish_modal.json`;
@ -210,9 +211,9 @@ class Exercise extends Component{
modalname:"立即发布", modalname:"立即发布",
modaltype:response.data.un_publish > 0 ? 1 : 2, modaltype:response.data.un_publish > 0 ? 1 : 2,
visible:true, visible:true,
Topval:"本操作只对“未发布”的对象生效", Topval:"学生将立即收到试卷",
Botvalleft:"暂不发布", // Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2), endtime:"截止时间："+this.props.getNowFormatDates(2),

12
public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
Unescape View File

@ -412,9 +412,9 @@ class GraduationTaskssettingapp extends Component{
this.setState({ this.setState({
modalname:"立即发布", modalname:"立即发布",
visibles:true, visibles:true,
Topval:"发布设置均可修改", Topval:"学生将立即收到毕设任务",
Botvalleft:"点击修改", // Botvalleft:"点击修改",
Botval:"此设置将对所有分班生效", Botval:`本操作只对"未发布"的分班有效`,
starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") , starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
typs:"start", typs:"start",
@ -787,9 +787,9 @@ class GraduationTaskssettingapp extends Component{
this.setState({ this.setState({
modalname:"立即截止", modalname:"立即截止",
visibles:true, visibles:true,
Topval:"本操作只对“提交中”的对象生效", Topval:"学生将不能再提交作品",
Botvalleft:"暂不截止", // Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止", Botval:`本操作只对"提交中"的分班有效`,
Cancelname:"暂不截止", Cancelname:"暂不截止",
Savesname:"立即截止", Savesname:"立即截止",
Cancel:this.cancelmodel, Cancel:this.cancelmodel,

180
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
Unescape View File

@ -92,7 +92,6 @@ class GraduationTaskssettinglist extends Component{
if (worklists.length != 0) { if (worklists.length != 0) {
for (var i = 0; i < worklists.length; i++) { for (var i = 0; i < worklists.length; i++) {
datalist.push({ datalist.push({
name: worklists[i].name, name: worklists[i].name,
number: (parseInt(page)-1)*parseInt(limit)+(i+1), number: (parseInt(page)-1)*parseInt(limit)+(i+1),
@ -101,7 +100,7 @@ class GraduationTaskssettinglist extends Component{
grouping: result.data.have_grouping === true ? worklists[i].grouping_name : null, grouping: result.data.have_grouping === true ? worklists[i].grouping_name : null,
submitstate: worklists[i].status === 0 ? "未提交" : worklists[i].status === 1 ? "按时提交" : worklists[i].status === 2 ? "延时提交" : "", submitstate: worklists[i].status === 0 ? "未提交" : worklists[i].status === 1 ? "按时提交" : worklists[i].status === 2 ? "延时提交" : "",
turnovertime:worklists[i].update_time, turnovertime:worklists[i].update_time,
associationitems: worklists[i].project_info === undefined ?"--": worklists[i].project_info.name , associationitems:result.data.have_grouping==false?"": {name:worklists[i].project_info === undefined ?"--": worklists[i].project_info.name,id:worklists[i].project_info.id},
teacherrating: worklists[i].teacher_comment_score, teacherrating: worklists[i].teacher_comment_score,
crossrating: worklists[i].cross_comment_score, crossrating: worklists[i].cross_comment_score,
finalscore: worklists[i].final_score.work_score === null ? "--" : worklists[i].final_score.work_score, finalscore: worklists[i].final_score.work_score === null ? "--" : worklists[i].final_score.work_score,
@ -310,9 +309,9 @@ class GraduationTaskssettinglist extends Component{
this.setState({ this.setState({
modalname:"立即截止", modalname:"立即截止",
visible:true, visible:true,
Topval:"本操作只对“提交中”的对象生效", Topval:"学生将不能再提交作品",
Botvalleft:"暂不截止", // Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止", Botval:`本操作只对"提交中"的分班有效`,
Cancelname:"暂不截止", Cancelname:"暂不截止",
Savesname:"立即截止", Savesname:"立即截止",
Cancel:this.cancelmodel, Cancel:this.cancelmodel,
@ -329,9 +328,9 @@ class GraduationTaskssettinglist extends Component{
this.setState({ this.setState({
modalname:"立即发布", modalname:"立即发布",
visible:true, visible:true,
Topval:"发布设置均可修改", Topval:"学生将立即收到毕设任务",
Botvalleft:"点击修改", // Botvalleft:"点击修改",
Botval:"此设置将对所有分班生效", Botval:`本操作只对"未发布"的分班有效`,
starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") , starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
typs:"start", typs:"start",
@ -662,9 +661,11 @@ class GraduationTaskssettinglist extends Component{
key: 'associationitems', key: 'associationitems',
render: (text, record) => ( render: (text, record) => (
<span> <div>
<a style={{color:'#4CACFF'}}>{record.associationitems}</a> <a style={{color:'#4CACFF'}} href={"/projects/"+record.associationitems.id} target={"_blank"}>
</span> <div className={"projectsdiv"} title={record.associationitems.name}>{record.associationitems.name}</div>
</a>
</div>
), ),
},{ },{
title: '提交状态', title: '提交状态',
@ -695,7 +696,9 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.teacherrating==="--"||record.crossrating==="未批阅"?0:record.teacherrating)}</a> <Tooltip placement="bottom" title={record.teacherrating==="--"||record.teacherrating==="未批阅"?"未评阅":""}>
<a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{record.teacherrating==="--"||record.teacherrating==="未批阅"?"--":parseInt(record.teacherrating)}</a>
</Tooltip>
</span> </span>
), ),
}, { }, {
@ -705,7 +708,9 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.crossrating==="--"||record.crossrating==="未批阅"?0:record.crossrating)}</a> <Tooltip placement="bottom" title={record.crossrating==="--"||record.crossrating==="未批阅"?"未评阅":""}>
<a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{record.crossrating==="--"||record.crossrating==="未批阅"?"--":parseInt(record.crossrating)}</a>
</Tooltip>
</span> </span>
), ),
}, { }, {
@ -715,7 +720,9 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{parseInt(record.finalscore==="--"?0:record.finalscore)}</a> <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":""}>
<a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{record.finalscore==="--"?"--":parseInt(record.finalscore)}</a>
</Tooltip>
</span> </span>
), ),
}, { }, {
@ -735,8 +742,9 @@ class GraduationTaskssettinglist extends Component{
</a> </a>
: :
<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}} <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""} onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}>
>{tag.status===0?"":tag.name}</a> {tag.status===0?"":tag.name}
</a>
} }
</Tooltip> </Tooltip>
@ -794,9 +802,11 @@ class GraduationTaskssettinglist extends Component{
key: 'associationitems', key: 'associationitems',
render: (text, record) => ( render: (text, record) => (
<span> <div>
<a style={{color:'#4CACFF'}}>{record.associationitems}</a> <a style={{color:'#4CACFF'}} href={"/projects/"+record.associationitems.id} target={"_blank"}>
</span> <div className={"projectsdiv"} title={record.associationitems.name}>{record.associationitems.name}</div>
</a>
</div>
), ),
},{ },{
title: '提交状态', title: '提交状态',
@ -827,17 +837,21 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.teacherrating==="--"||record.crossrating==="未批阅"?0:record.teacherrating)}</a> <Tooltip placement="bottom" title={record.teacherrating==="--"||record.teacherrating==="未批阅"?"未评阅":""}>
<a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{record.teacherrating==="--"||record.teacherrating==="未批阅"?"--":parseInt(record.teacherrating)}</a>
</Tooltip>
</span> </span>
), ),
}, { }, {
title: '交叉评分', title: '交叉评分',
key: 'crossrating', key: 'crossrating',
dataIndex: 'crossrating', dataIndex: 'crossrating',
className:'none',
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.crossrating==="--"||record.crossrating==="未批阅"?0:record.crossrating)}</a> <Tooltip placement="bottom" title={record.crossrating==="--"||record.crossrating==="未批阅"?"未评阅":""}>
<a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{record.crossrating==="--"||record.crossrating==="未批阅"?"--":parseInt(record.crossrating)}</a>
</Tooltip>
</span> </span>
), ),
}, { }, {
@ -847,7 +861,9 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{parseInt(record.finalscore==="--"?0:record.finalscore)}</a> <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":""}>
<a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{record.finalscore==="--"?"--":parseInt(record.finalscore)}</a>
</Tooltip>
</span> </span>
), ),
}, { }, {
@ -859,10 +875,8 @@ class GraduationTaskssettinglist extends Component{
{this.props.isAdmin()?operation.map((tag,key) => { {this.props.isAdmin()?operation.map((tag,key) => {
return( return(
<div key={key}> <div key={key}>
<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/> <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
其它历史评分将全部失效</pre>:""}> 其它历史评分将全部失效</pre>:""}>
{tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} > {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
{tag.name} {tag.name}
</a> </a>
@ -944,9 +958,12 @@ class GraduationTaskssettinglist extends Component{
key: 'associationitems', key: 'associationitems',
render: (text, record) => ( render: (text, record) => (
<span> <div>
<a style={{color:'#4CACFF'}}>{record.associationitems}</a> <a style={{color:'#4CACFF'}} href={"/projects/"+record.associationitems.id} target={"_blank"}>
</span> <div className={"projectsdiv"} title={record.associationitems.name}>{record.associationitems.name}
</div>
</a>
</div>
), ),
},{ },{
title: '提交状态', title: '提交状态',
@ -977,7 +994,9 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.teacherrating==="--"||record.crossrating==="未批阅"?0:record.teacherrating)}</a> <Tooltip placement="bottom" title={record.teacherrating==="--"||record.teacherrating==="未批阅"?"未评阅":""}>
<a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{record.teacherrating==="--"||record.teacherrating==="未批阅"?"--":parseInt(record.teacherrating)}</a>
</Tooltip>
</span> </span>
), ),
}, { }, {
@ -987,7 +1006,9 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.crossrating==="--"||record.crossrating==="未批阅"?0:record.crossrating)}</a> <Tooltip placement="bottom" title={record.crossrating==="--"||record.crossrating==="未批阅"?"未评阅":""}>
<a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{record.crossrating==="--"||record.crossrating==="未批阅"?"--":parseInt(record.crossrating)}</a>
</Tooltip>
</span> </span>
), ),
}, { }, {
@ -997,7 +1018,9 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{parseInt(record.finalscore==="--"?0:record.finalscore)}</a> <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":""}>
<a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{record.finalscore==="--"?"--":parseInt(record.finalscore)}</a>
</Tooltip>
</span> </span>
), ),
}, { }, {
@ -1021,7 +1044,6 @@ class GraduationTaskssettinglist extends Component{
>{tag.status===0?"":tag.name}</a> >{tag.status===0?"":tag.name}</a>
} }
</Tooltip> </Tooltip>
}
</div> </div>
) )
}):""} }):""}
@ -1078,9 +1100,13 @@ class GraduationTaskssettinglist extends Component{
key: 'associationitems', key: 'associationitems',
render: (text, record) => ( render: (text, record) => (
<span> <div className={"projectsdiv"} >
<a style={{color:'#4CACFF'}}>{record.associationitems}</a> <a style={{color:'#4CACFF'}} href={"/projects/"+record.associationitems.id} target={"_blank"}>
</span> <div title={record.associationitems.name}>
{record.associationitems.name}
</div>
</a>
</div>
), ),
},{ },{
title: '提交状态', title: '提交状态',
@ -1111,7 +1137,9 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.teacherrating==="--"||record.crossrating==="未批阅"?0:record.teacherrating)}</a> <Tooltip placement="bottom" title={record.teacherrating==="--"||record.teacherrating==="未批阅"?"未评阅":""}>
<a style={{color:parseInt(record.teacherrating)>90?'#DD1717':parseInt(record.teacherrating)>60&&parseInt(record.teacherrating)<90?"#FF6800":'#747A7F'}}>{record.teacherrating==="--"||record.teacherrating==="未批阅"?"--":parseInt(record.teacherrating)}</a>
</Tooltip>
</span> </span>
), ),
}, { }, {
@ -1121,7 +1149,9 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{parseInt(record.crossrating==="--"||record.crossrating==="未批阅"?0:record.crossrating)}</a> <Tooltip placement="bottom" title={record.crossrating==="--"||record.crossrating==="未批阅"?"未评阅":""}>
<a style={{color:parseInt(record.crossrating)>90?'#DD1717':parseInt(record.crossrating)>60&&parseInt(record.crossrating)<90?"#FF6800":'#747A7F'}}>{record.crossrating==="--"||record.crossrating==="未批阅"?"--":parseInt(record.crossrating)}</a>
</Tooltip>
</span> </span>
), ),
}, { }, {
@ -1131,7 +1161,9 @@ class GraduationTaskssettinglist extends Component{
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{parseInt(record.finalscore==="--"?0:record.finalscore)}</a> <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":""}>
<a style={{color:parseInt(record.finalscore)>90?'#DD1717':parseInt(record.finalscore)>60&&parseInt(record.finalscore)<90?"#FF6800":'#747A7F'}}>{record.finalscore==="--"?"--":parseInt(record.finalscore)}</a>
</Tooltip>
</span> </span>
), ),
}, { }, {
@ -1141,6 +1173,9 @@ class GraduationTaskssettinglist extends Component{
render: operation => ( render: operation => (
<div> <div>
{this.props.isAdmin()?operation.map((tag,key) => { {this.props.isAdmin()?operation.map((tag,key) => {
console.log("1179");
console.log(key);
console.log(tag);
return( return(
<div key={key}> <div key={key}>
@ -1155,7 +1190,6 @@ class GraduationTaskssettinglist extends Component{
>{tag.status===0?"":tag.name}</a> >{tag.status===0?"":tag.name}</a>
} }
</Tooltip> </Tooltip>
}
</div> </div>
) )
}):""} }):""}
@ -1184,12 +1218,63 @@ class GraduationTaskssettinglist extends Component{
let position=this.props.match.params.position; let position=this.props.match.params.position;
let category_id=this.props.match.params.category_id; let category_id=this.props.match.params.category_id;
let task_Id = this.props.match.params.task_Id; let task_Id = this.props.match.params.task_Id;
// console.log("task_statustask_statustask_status");
// console.log(task_status); if(taskslistdata&&taskslistdata.cross_comment===false){
columns.map((item,key)=>{
if(item.title==="交叉评分"){
columns.splice(key,1)
}
})
if(taskslistdata&&taskslistdata.have_grouping===false){
columns.map((item,key)=>{
if(item.title==="关联项目"){
columns.splice(key,1)
}
})
columns.map((item,key)=>{
if(item.title==="分组"){
columns.splice(key,1)
}
})
}
}else{
if(taskslistdata&&taskslistdata.have_grouping===false){
columns.map((item,key)=>{
if(item.title==="关联项目"){
columns.splice(key,1)
}
})
columns.map((item,key)=>{
if(item.title==="分组"){
columns.splice(key,1)
}
})
}
}
console.log(columns)
return( return(
<React.Fragment> <React.Fragment>
<div> <div>
<style>
{
`
.projectsdiv{
width: 100px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
`
}
</style>
{/*提示*/} {/*提示*/}
<Modals <Modals
modalsType={Modalstype} modalsType={Modalstype}
@ -1453,11 +1538,12 @@ class GraduationTaskssettinglist extends Component{
<div id="graduation_work_list" style={{padding:'0px 40px 10px 40px'}}> <div id="graduation_work_list" style={{padding:'0px 40px 10px 40px'}}>
<div className="clearfix"> <div className="clearfix">
<span className="fl color-grey-6 font-12"><span className="color-orange-tip">{taskslistdata&&taskslistdata.work_count}</span>个检索结果（{taskslistdata&&taskslistdata.work_count} 学生） </span> {this.props.isAdmin()?<span className="fl color-grey-6 font-12"><span className="color-orange-tip">{taskslistdata&&taskslistdata.work_count}</span>个检索结果（{taskslistdata&&taskslistdata.work_count} 学生） </span>:""}
<div className="fr color-grey-6 edu-menu-panel"> {this.props.isAdmin()?<div className="fr color-grey-6 edu-menu-panel">
<p><a data-remote="true"> <p>
{order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a><i <a data-remote="true">
className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p> {order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a>
<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
<ul className="edu-menu-list"> <ul className="edu-menu-list">
<li onClick={(e)=>this.funorder("updated_at")}><a data-remote="true">更新时间</a> <li onClick={(e)=>this.funorder("updated_at")}><a data-remote="true">更新时间</a>
</li> </li>
@ -1466,7 +1552,7 @@ class GraduationTaskssettinglist extends Component{
<li onClick={(e)=>this.funorder("student_id" )}><a data-remote="true">学生学号</a> <li onClick={(e)=>this.funorder("student_id" )}><a data-remote="true">学生学号</a>
</li> </li>
</ul> </ul>
</div> </div>:""}
</div> </div>
</div> </div>

12
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
Unescape View File

@ -59,9 +59,9 @@ class GraduationTasksquestions extends Component{
this.setState({ this.setState({
modalname:"立即截止", modalname:"立即截止",
visible:true, visible:true,
Topval:"本操作只对“提交中”的对象生效", Topval:"学生将不能再提交作品",
Botvalleft:"暂不截止", // Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止", Botval:`本操作只对"提交中"的分班有效`,
Cancelname:"暂不截止", Cancelname:"暂不截止",
Savesname:"立即截止", Savesname:"立即截止",
Cancel:this.cancelmodel, Cancel:this.cancelmodel,
@ -78,9 +78,9 @@ class GraduationTasksquestions extends Component{
this.setState({ this.setState({
modalname:"立即发布", modalname:"立即发布",
visible:true, visible:true,
Topval:"发布设置均可修改", Topval:"学生将立即收到毕设任务",
Botvalleft:"点击修改", // Botvalleft:"点击修改",
Botval:"此设置将对所有分班生效", Botval:`本操作只对"未发布"的分班有效`,
starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") , starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
typs:"start", typs:"start",

18
public/react/src/modules/courses/graduation/tasks/index.js
Unescape View File

@ -6,14 +6,13 @@ import Titlesearchsection from '../../common/titleSearch/TitleSearchSection';
import HomeworkModal from "../../coursesPublic/HomeworkModal"; import HomeworkModal from "../../coursesPublic/HomeworkModal";
import { WordsBtn } from 'educoder'; import { WordsBtn } from 'educoder';
import axios from 'axios'; import axios from 'axios';
import _ from 'lodash' import moment from 'moment';
import GraduateTaskItem from './GraduateTaskItem'; import GraduateTaskItem from './GraduateTaskItem';
import TaskPublishModal from "./TaskPublishModal"; import TaskPublishModal from "./TaskPublishModal";
import Modals from '../../../modals/Modals'; import Modals from '../../../modals/Modals';
import UseBank from "../../busyWork/UseBank"; import UseBank from "../../busyWork/UseBank";
import '../../css/members.css'; import '../../css/members.css';
import '../style.css'; import '../style.css';
import moment from 'moment'
class GraduationTasks extends Component{ class GraduationTasks extends Component{
@ -34,6 +33,7 @@ class GraduationTasks extends Component{
isSpin:false, isSpin:false,
typs:undefined, typs:undefined,
starttimes:undefined, starttimes:undefined,
} }
} }
fetchAll = (search,page,order,count) => { fetchAll = (search,page,order,count) => {
@ -411,9 +411,9 @@ class GraduationTasks extends Component{
this.setState({ this.setState({
modalname:"立即发布", modalname:"立即发布",
visible:true, visible:true,
Topval:"本操作只对“未发布”的对象生效", Topval:"学生将立即收到毕设任务",
Botvalleft:"暂不发布", // Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+moment(new Date()).format("YYYY-MM-DD HH:mm"), starttime:"发布时间："+moment(new Date()).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
typs:"start", typs:"start",
@ -477,9 +477,9 @@ class GraduationTasks extends Component{
this.setState({ this.setState({
modalname:"立即截止", modalname:"立即截止",
visible:true, visible:true,
Topval:"本操作只对“提交中”的对象生效", Topval:"学生将不能再提交作品",
Botvalleft:"暂不截止", // Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止", Botval:`本操作只对"提交中"的分班有效`,
Cancelname:"暂不截止", Cancelname:"暂不截止",
Savesname:"立即截止", Savesname:"立即截止",
Cancel:this.publishcanner, Cancel:this.publishcanner,
@ -604,7 +604,6 @@ class GraduationTasks extends Component{
{/*立即发布*/} {/*立即发布*/}
<HomeworkModal <HomeworkModal
modaltype={modaltype}
modalname={modalname} modalname={modalname}
visible={visible} visible={visible}
Topval={Topval} Topval={Topval}
@ -622,6 +621,7 @@ class GraduationTasks extends Component{
course_groups={this.state.course_groups} course_groups={this.state.course_groups}
modaltype={this.state.modaltype} modaltype={this.state.modaltype}
getcourse_groupslist={(id) => this.getcourse_groupslist(id)} getcourse_groupslist={(id) => this.getcourse_groupslist(id)}
/> />

12
public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js
Unescape View File

@ -70,9 +70,9 @@ class ImmediatelyEnd extends Component{
modalname:"立即截止", modalname:"立即截止",
modaltype:response.data.on_commiting > 0 ? 1 : 2, modaltype:response.data.on_commiting > 0 ? 1 : 2,
visible:true, visible:true,
Topval:"本操作只对“提交中”的对象生效", Topval:"学生将不能再提交试卷",
Botvalleft:"暂不截止", // Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止", Botval:`本操作只对"提交中"的分班有效`,
// starttime:"发布时间："+getNowFormatDate(1), // starttime:"发布时间："+getNowFormatDate(1),
// endtime:"截止时间："+getNowFormatDate(2), // endtime:"截止时间："+getNowFormatDate(2),
Cancelname:"暂不截止", Cancelname:"暂不截止",
@ -112,9 +112,9 @@ class ImmediatelyEnd extends Component{
modalname:"立即截止", modalname:"立即截止",
modaltype:response.data.on_commiting > 0 ? 1 : 2, modaltype:response.data.on_commiting > 0 ? 1 : 2,
visible:true, visible:true,
Topval:"本操作只对“提交中”的对象生效", Topval:"学生将不能再提交问卷",
Botvalleft:"暂不截止", // Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止", Botval:`本操作只对"提交中"的分班有效`,
// starttime:"发布时间："+getNowFormatDate(1), // starttime:"发布时间："+getNowFormatDate(1),
// endtime:"截止时间："+getNowFormatDate(2), // endtime:"截止时间："+getNowFormatDate(2),
Cancelname:"暂不截止", Cancelname:"暂不截止",

12
public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js
Unescape View File

@ -78,9 +78,9 @@ class Immediatelypublish extends Component{
modalname:"立即发布", modalname:"立即发布",
modaltype:response.data.un_publish > 0 ? 1 : 2, modaltype:response.data.un_publish > 0 ? 1 : 2,
visible:true, visible:true,
Topval:"本操作只对“未发布”的对象生效", Topval:"学生将立即收到试卷",
Botvalleft:"暂不发布", // Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2), endtime:"截止时间："+this.props.getNowFormatDates(2),
@ -117,9 +117,9 @@ class Immediatelypublish extends Component{
modalname:"立即发布", modalname:"立即发布",
modaltype:response.data.un_publish > 0 ? 1 : 2, modaltype:response.data.un_publish > 0 ? 1 : 2,
visible:true, visible:true,
Topval:"本操作只对“未发布”的对象生效", Topval:"学生将立即收到问卷",
Botvalleft:"暂不发布", // Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1), starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2), endtime:"截止时间："+this.props.getNowFormatDates(2),

12
public/react/src/modules/courses/shixunHomework/Listofworks.js
Unescape View File

@ -818,9 +818,9 @@ class Listofworks extends Component {
modalname: "立即发布", modalname: "立即发布",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1, modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
svisible: true, svisible: true,
Topval: "本操作只对“未发布”的对象生效", Topval:"学生将立即收到作业",
Botvalleft: "暂不发布", // Botvalleft:"暂不发布",
Botval: "则通过后续手动设置，定时发布", Botval:`本操作只对"未发布"的分班有效`,
starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime: "截止时间：" + endtime, endtime: "截止时间：" + endtime,
starttimes:starttime, starttimes:starttime,
@ -850,9 +850,9 @@ class Listofworks extends Component {
modalname: "立即截止", modalname: "立即截止",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1, modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
svisible: true, svisible: true,
Topval: "本操作只对“提交中”的对象生效", Topval:"学生将不能再提交作业",
Botvalleft: "暂不截止", // Botvalleft:"暂不截止",
Botval: "则将根据已设置的截止时间，定时截止", Botval:`本操作只对"提交中"的分班有效`,
Cancelname: "暂不截止", Cancelname: "暂不截止",
Savesname: "立即截止", Savesname: "立即截止",
Cancel: this.homeworkhide, Cancel: this.homeworkhide,

12
public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
Unescape View File

@ -301,9 +301,9 @@ class ShixunStudentWork extends Component {
modalname:"立即发布", modalname:"立即发布",
modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1, modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
visible:true, visible:true,
Topval:"本操作只对“未发布”的对象生效", Topval:"学生将立即收到作业",
Botvalleft:"暂不发布", // Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime:"截止时间："+endtime, endtime:"截止时间："+endtime,
Cancelname:"暂不发布", Cancelname:"暂不发布",
@ -335,9 +335,9 @@ class ShixunStudentWork extends Component {
modalname:"立即截止", modalname:"立即截止",
modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1, modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
visible:true, visible:true,
Topval:"本操作只对“提交中”的对象生效", Topval:"学生将不能再提交作业",
Botvalleft:"暂不截止", // Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止", Botval:`本操作只对"提交中"的分班有效`,
Cancelname:"暂不截止", Cancelname:"暂不截止",
Savesname:"立即截止", Savesname:"立即截止",
Cancel:this.homeworkhide, Cancel:this.homeworkhide,

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

@ -637,11 +637,14 @@ class Trainingjobsetting extends Component {
//允许补交 //允许补交
onChanges = (e) => { onChanges = (e) => {
// debugger
if(e.target.value ==="允许补交"){ if(e.target.value ==="允许补交"){
if(this.state.end_time !== null && this.state.end_time!== undefined){ if(this.state.end_time !== null && this.state.end_time!== undefined){
// console.log(this.state.end_time);
var times = this.state.end_time.format('YYYY-MM-DD HH:mm');
this.setState({ this.setState({
late_time:moment(handleDateString(this.state.end_time)).add(1, 'months'), late_time:moment(handleDateString(times)).add(1, 'months'),
late_times:moment(handleDateString(this.state.end_time)).add(1, 'months').format('YYYY-MM-DD HH:mm'), late_times:moment(handleDateString(times)).add(1, 'months').format('YYYY-MM-DD HH:mm'),
}) })
} }
@ -1080,7 +1083,7 @@ class Trainingjobsetting extends Component {
} }
// console.log(value); // console.log(value);
// console.log(dateString); console.log(dateString);
// console.log(handleDateString(dateString)); // console.log(handleDateString(dateString));
this.onChangedata('publish_time', value, dateString); this.onChangedata('publish_time', value, dateString);
if(this.state.allowreplenishment === "允许补交") { if(this.state.allowreplenishment === "允许补交") {
@ -1234,9 +1237,9 @@ class Trainingjobsetting extends Component {
modalname: "立即发布", modalname: "立即发布",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1, modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
visible: true, visible: true,
Topval: "本操作只对“未发布”的对象生效", Topval:"学生将立即收到作业",
Botvalleft: "暂不发布", // Botvalleft:"暂不发布",
Botval: "则通过后续手动设置，定时发布", Botval:`本操作只对"未发布"的分班有效`,
starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime, starttimes:starttime,
typs:"start", typs:"start",
@ -1266,9 +1269,9 @@ class Trainingjobsetting extends Component {
modalname: "立即截止", modalname: "立即截止",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1, modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
visible: true, visible: true,
Topval: "本操作只对“提交中”的对象生效", Topval:"学生将不能再提交作业",
Botvalleft: "暂不截止", // Botvalleft:"暂不截止",
Botval: "则将根据已设置的截止时间，定时截止", Botval:`本操作只对"提交中"的分班有效`,
Cancelname: "暂不截止", Cancelname: "暂不截止",
Savesname: "立即截止", Savesname: "立即截止",
Cancel: this.homeworkhide, Cancel: this.homeworkhide,

12
public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
Unescape View File

@ -145,9 +145,9 @@ class Workquestionandanswer extends Component {
modalname: "立即发布", modalname: "立即发布",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1, modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
visible: true, visible: true,
Topval: "本操作只对“未发布”的对象生效", Topval:"学生将立即收到作业",
Botvalleft: "暂不发布", // Botvalleft:"暂不发布",
Botval: "则通过后续手动设置，定时发布", Botval:`本操作只对"未发布"的分班有效`,
starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime: "截止时间：" + endtime, endtime: "截止时间：" + endtime,
Cancelname: "暂不发布", Cancelname: "暂不发布",
@ -177,9 +177,9 @@ class Workquestionandanswer extends Component {
modalname: "立即截止", modalname: "立即截止",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1, modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
visible: true, visible: true,
Topval: "本操作只对“提交中”的对象生效", Topval:"学生将不能再提交作业",
Botvalleft: "暂不截止", // Botvalleft:"暂不截止",
Botval: "则将根据已设置的截止时间，定时截止", Botval:`本操作只对"提交中"的分班有效`,
Cancelname: "暂不截止", Cancelname: "暂不截止",
Savesname: "立即截止", Savesname: "立即截止",
Cancel: this.homeworkhide, Cancel: this.homeworkhide,

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

@ -8,7 +8,7 @@ import ShixunModal from "../coursesPublic/ShixunModal";
import PathModal from "../coursesPublic/PathModal"; import PathModal from "../coursesPublic/PathModal";
import AddcoursesNav from "../coursesPublic/AddcoursesNav"; import AddcoursesNav from "../coursesPublic/AddcoursesNav";
import Modals from '../../modals/Modals'; import Modals from '../../modals/Modals';
import moment from 'moment';
import '../css/members.css'; import '../css/members.css';
import '../css/busyWork.css' import '../css/busyWork.css'
import ShixunhomeWorkItem from "./ShixunhomeWorkItem"; import ShixunhomeWorkItem from "./ShixunhomeWorkItem";
@ -206,9 +206,9 @@ class ShixunHomework extends Component{
modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1, modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
visible:true, visible:true,
typs:"start", typs:"start",
Topval:"本操作只对“未发布”的对象生效", Topval:"学生将立即收到作业",
Botvalleft:"暂不发布", // Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime, starttimes:starttime,
endtime:"截止时间："+endtime, endtime:"截止时间："+endtime,
@ -301,9 +301,9 @@ class ShixunHomework extends Component{
modalname:"立即截止", modalname:"立即截止",
modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1, modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
visible:true, visible:true,
Topval:"本操作只对“提交中”的对象生效", Topval:"学生将不能再提交作业",
Botvalleft:"暂不截止", // Botvalleft:"暂不截止",
Botval:"则将根据已设置的截止时间，定时截止", Botval:`本操作只对"提交中"的分班有效`,
Cancelname:"暂不截止", Cancelname:"暂不截止",
Savesname:"立即截止", Savesname:"立即截止",
Cancel:this.homeworkhide, Cancel:this.homeworkhide,
@ -400,9 +400,9 @@ class ShixunHomework extends Component{
course_groups:response.data.course_groups, course_groups:response.data.course_groups,
modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1, modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1,
visible:true, visible:true,
Topval:"本操作只对“未发布”的对象生效", Topval:"学生将立即收到作业",
Botvalleft:"暂不发布", // Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布", Botval:`本操作只对"未发布"的分班有效`,
starttime:"发布时间："+ moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttime:"发布时间："+ moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime, starttimes:starttime,
typs:"start", typs:"start",

6
public/react/src/modules/login/Trialapplication.js
Unescape View File

@ -79,10 +79,10 @@ class Trialapplication extends Component {
}); });
console.log("89"); console.log("89");
try { try {
if (this.state.props.user !== undefined) { if (this.state.props.user_phone_binded !== undefined) {
console.log(this.state.props.user && this.state.props.user.user_phone_binded); console.log(this.state.props.user_phone_binded);
this.setState({ this.setState({
user_phone_binded: this.state.props.user.user_phone_binded, user_phone_binded: this.state.props.user_phone_binded,
}) })
} }

2
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -171,7 +171,6 @@ class NewHeader extends Component {
isRender:false, isRender:false,
isRenders:false, isRenders:false,
showTrial:false, showTrial:false,
user:undefined,
} }
console.log("176") console.log("176")
console.log(props); console.log(props);
@ -583,7 +582,6 @@ submittojoinclass=(value)=>{
/> />
{/* :""*/} {/* :""*/}
{/*}*/} {/*}*/}
<Trialapplication {...this.state}></Trialapplication>
{/*{*/} {/*{*/}
{/* isRenders&&isRenders===true?*/} {/* isRenders&&isRenders===true?*/}

15
public/react/src/modules/tpm/TPMIndexHOC.js
Unescape View File

@ -9,6 +9,7 @@ import { getUrl } from 'educoder'
import axios from 'axios'; import axios from 'axios';
import './TPMIndex.css' import './TPMIndex.css'
import Trialapplication from "../login/Trialapplication";
// import "antd/dist/antd.css"; // import "antd/dist/antd.css";
// import '../../css/educoder/edu-common.css' // import '../../css/educoder/edu-common.css'
// import '../../css/educoder/edu-all.css' // import '../../css/educoder/edu-all.css'
@ -246,9 +247,9 @@ export function TPMIndexHOC(WrappedComponent) {
} }
*/ */
if (response.data) { if (response.data) {
this.initCommonState(response.data) this.initCommonState(response.data)
this.setState({ this.setState({
user_phone_binded:response.data.user_phone_binded,
tpmLoading: false, tpmLoading: false,
coursedata: { coursedata: {
course_identity: response.data.course_identity >= 0 ? response.data.course_identity : undefined, course_identity: response.data.course_identity >= 0 ? response.data.course_identity : undefined,
@ -266,7 +267,7 @@ export function TPMIndexHOC(WrappedComponent) {
}) })
} }
render() { render() {
let{Headertop,Footerdown}=this.state; let{Headertop,Footerdown,user_phone_binded}=this.state;
const common = { const common = {
isSuperAdmin:this.isSuperAdmin, isSuperAdmin:this.isSuperAdmin,
isAdminOrCreator:this.isAdminOrCreator, isAdminOrCreator:this.isAdminOrCreator,
@ -278,10 +279,16 @@ export function TPMIndexHOC(WrappedComponent) {
isNotMember: this.isNotMember, isNotMember: this.isNotMember,
isUserid:this.state.coursedata&&this.state.coursedata.userid isUserid:this.state.coursedata&&this.state.coursedata.userid
} }
return ( return (
<div> <div>
{
user_phone_binded === undefined?
""
:
<Trialapplication {...this.state} user_phone_binded={user_phone_binded}></Trialapplication>
}
<SiderBar <SiderBar
Headertop={Headertop} Headertop={Headertop}
/> />

Write Preview
Loading…
Cancel
Save