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
hjm 5 years ago
parent 72c1417c7b f7dafbeb52
commit a1716c13c6
27 changed files with 234 additions and 1309 deletions
Show Stats Download Patch File Download Diff File

4
public/react/src/App.js
Unescape View File

@ -333,8 +333,8 @@ class App extends Component {
<Route path="/fork_list" component={TPMshixunfork_listIndexComponent}> <Route path="/fork_list" component={TPMshixunfork_listIndexComponent}>
</Route> */} </Route> */}
<Route path="/forums" component={ForumsIndexComponent}> {/*<Route path="/forums" component={ForumsIndexComponent}>*/}
</Route> {/*</Route>*/}
{/*实训课程（原实训路径）*/} {/*实训课程（原实训路径）*/}

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

@ -89,10 +89,6 @@ const Trainingjobsetting= Loadable({
loading: Loading, loading: Loading,
}) })
//实训作业列表教师 //实训作业列表教师
const Listofworks= Loadable({
loader: () => import('./shixunHomework/Listofworks'),
loading: Loading,
})
// //实训作业列表学生未完成的 // //实训作业列表学生未完成的
// const Studentnotcompleted= Loadable({ // const Studentnotcompleted= Loadable({
@ -773,11 +769,6 @@ class CoursesIndex extends Component{
} }
></Route> ></Route>
{/*/!*实训作品列表教师*!/*/} {/*/!*实训作品列表教师*!/*/}
{/*<Route path="/courses/:coursesId/:homeworkid/list"*/}
{/* render={*/}
{/* (props) => (<Listofworks {...this.props} {...props} {...this.state} />)*/}
{/* }*/}
{/*></Route>*/}
{/*提交总结*/} {/*提交总结*/}
<Route path="/courses/:coursesId/shixun_homeworks/:id/commitsummary/:homeworkid" <Route path="/courses/:coursesId/shixun_homeworks/:id/commitsummary/:homeworkid"
render={ render={

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

@ -650,7 +650,7 @@ render(){
width: '375px', width: '375px',
height: '30px' height: '30px'
}}> }}>
<Checkbox value={item.user_id} checked={parseInt(task_status[key])===item.user_id?true:false} <Checkbox value={item.user_id} key={item.user_id} checked={parseInt(task_status[key])===item.user_id?true:false}
disabled={item.commit_status || item.user_id == this.props.current_user.user_id ===true?true:false} className="fl " disabled={item.commit_status || item.user_id == this.props.current_user.user_id ===true?true:false} className="fl "
></Checkbox> ></Checkbox>
<Tooltip placement="bottom" title={item.user_nam}><div className={"fl ml5 fonthidden"} style={{width: '70px'}}>{item.user_name}</div></Tooltip> <Tooltip placement="bottom" title={item.user_nam}><div className={"fl ml5 fonthidden"} style={{width: '70px'}}>{item.user_name}</div></Tooltip>

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

@ -278,7 +278,7 @@ class UseBank extends Component{
*/ */
return ( return (
<p className="clearfix mb7" key={item.id}> <p className="clearfix mb7" key={item.id}>
<Checkbox className="fl" value={item.id}></Checkbox> <Checkbox className="fl" value={item.id} key={item.id}></Checkbox>
<span className="fl with65"> <span className="fl with65">
<label className="task-hide fl" title={item.name && item.name.length > 30 ? item.name:""} style={{"maxWidth":"100%"}}>{item.name}</label> <label className="task-hide fl" title={item.name && item.name.length > 30 ? item.name:""} style={{"maxWidth":"100%"}}>{item.name}</label>
</span> </span>

16
public/react/src/modules/courses/coursesPublic/ShixunModal.js
Unescape View File

@ -80,7 +80,7 @@ class ShixunModal extends Component{
//勾选实训 //勾选实训
shixunhomeworkedit=(list)=>{ shixunhomeworkedit=(list)=>{
debugger
let newpatheditarry=[]; let newpatheditarry=[];
if (this.props.singleChoose == true) { if (this.props.singleChoose == true) {
if (list.length > 0) { if (list.length > 0) {
@ -99,6 +99,7 @@ class ShixunModal extends Component{
} }
contentViewScrolledit=(e)=>{ contentViewScrolledit=(e)=>{
//滑动到底判断 //滑动到底判断
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
let {Searchvalue,type,page}=this.state; let {Searchvalue,type,page}=this.state;
@ -122,9 +123,9 @@ class ShixunModal extends Component{
this.setState({ this.setState({
page:1, page:1,
}) })
this.props.funpatheditarry([])
this.setupdatalist(value,type,true,1) this.setupdatalist(value,type,true,1)
this.props.funpatheditarry([])
} }
//tag //tag
@ -135,9 +136,9 @@ class ShixunModal extends Component{
page:1, page:1,
newshixunmodallist:undefined newshixunmodallist:undefined
}) })
this.props.funpatheditarry([])
this.setupdatalist(Searchvalue,types,true,1) this.setupdatalist(Searchvalue,types,true,1)
this.props.funpatheditarry([])
} }
@ -353,11 +354,14 @@ class ShixunModal extends Component{
<Checkbox.Group style={{ width: '100%' }} value={patheditarry} onChange={this.shixunhomeworkedit}> <Checkbox.Group style={{ width: '100%' }} value={patheditarry} onChange={this.shixunhomeworkedit}>
{ {
newshixunmodallist === undefined ? "": newshixunmodallist.map((item,key)=>{ newshixunmodallist === undefined ? "": newshixunmodallist.map((item,key)=>{
console.log(item)
return( return(
<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}> <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
<li className="fl with40 edu-txt-left task-hide paddingl5 newtaskhide"> <li className="fl with40 edu-txt-left task-hide paddingl5 newtaskhide">
<Checkbox <Checkbox
id={"shixun_input_"+item.shixun_id} value={item.shixun_id} id={"shixun_input_"+item.shixun_id}
value={item.shixun_id}
key={item.shixun_id}
className=" task-hide edu-txt-left newtaskhide" className=" task-hide edu-txt-left newtaskhide"
style={{"width":"280px"}} style={{"width":"280px"}}
name="shixun_homework[]" name="shixun_homework[]"

1
public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
Unescape View File

@ -193,6 +193,7 @@ class Ecerciseallbackagain extends Component{
className="fl task-hide edu-txt-left" className="fl task-hide edu-txt-left"
name="shixun_homework[]" name="shixun_homework[]"
value={item.user_id} value={item.user_id}
key={item.user_id}
> >
<label style={{"textAlign": "left", "color": "#05101A"}} <label style={{"textAlign": "left", "color": "#05101A"}}
className="task-hide color-grey-name" title="frerere">{item.user_name}</label> className="task-hide color-grey-name" title="frerere">{item.user_name}</label>

1
public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
Unescape View File

@ -122,6 +122,7 @@ class Exercisestatisticalresult extends Component {
return ( return (
<span key={key}> <span key={key}>
<Checkbox value={item.exercise_group_id} <Checkbox value={item.exercise_group_id}
key={item.exercise_group_id}
// checked={course_group_info === undefined ? false : course_group_info[key].course_group_id === item.course_group_id ? true : false} // checked={course_group_info === undefined ? false : course_group_info[key].course_group_id === item.course_group_id ? true : false}
className="fl ">{item.exercise_group_name} className="fl ">{item.exercise_group_name}
<span>({item.exercise_group_students})</span> <span>({item.exercise_group_students})</span>

4
public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
Unescape View File

@ -2404,6 +2404,7 @@ class Studentshavecompletedthelist extends Component {
course_groupyslstwodata.map((item, key) => { course_groupyslstwodata.map((item, key) => {
return ( return (
<span key={key}><Checkbox className="fl mt5" <span key={key}><Checkbox className="fl mt5"
key={item.id}
value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users})</span></Checkbox></span> value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users})</span></Checkbox></span>
) )
}) })
@ -2435,6 +2436,7 @@ class Studentshavecompletedthelist extends Component {
course_groupyslstwodatas.map((item, key) => { course_groupyslstwodatas.map((item, key) => {
return ( return (
<span key={key}><Checkbox className="fl mt5" <span key={key}><Checkbox className="fl mt5"
key={item.id}
value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unreview_counts : Teacherliststudentlist.exercise_types.review_counts})</span></Checkbox></span> value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unreview_counts : Teacherliststudentlist.exercise_types.review_counts})</span></Checkbox></span>
) )
}) })
@ -2464,6 +2466,7 @@ class Studentshavecompletedthelist extends Component {
course_groupyslstwodata.map((item, key) => { course_groupyslstwodata.map((item, key) => {
return ( return (
<span key={key}><Checkbox className="fl mt5" <span key={key}><Checkbox className="fl mt5"
key={item.id}
value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users})</span></Checkbox></span> value={item.id}>{item.tu}<span>({Teacherliststudentlist === undefined ? "0" : key === 0 ? Teacherliststudentlist.exercise_types.unanswer_users : Teacherliststudentlist.exercise_types.answer_users})</span></Checkbox></span>
) )
}) })
@ -2492,6 +2495,7 @@ class Studentshavecompletedthelist extends Component {
course_groups.map((item, key) => { course_groups.map((item, key) => {
return ( return (
<span key={key}><Checkbox className="fl mt5" <span key={key}><Checkbox className="fl mt5"
key={item.exercise_group_id}
value={item.exercise_group_id}>{item.exercise_group_name}<span>({item.exercise_group_students})</span></Checkbox></span> value={item.exercise_group_id}>{item.exercise_group_name}<span>({item.exercise_group_students})</span></Checkbox></span>
) )
}) })

4
public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
Unescape View File

@ -334,8 +334,8 @@ class Testpapersettinghomepage extends Component{
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i> 导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}> <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
<li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`)}>学生成绩</a></li> <li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`)}>学生成绩</a></li>
<li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li> {/*<li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li>*/}
<li><a onClick={()=>this.confirmysl(`/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval===null||this.state.groupyslsval===undefined?null:this.state.groupyslsval}`)}>学生答题试卷</a></li> {/*<li><a onClick={()=>this.confirmysl(`/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval===null||this.state.groupyslsval===undefined?null:this.state.groupyslsval}`)}>学生答题试卷</a></li>*/}
</ul> </ul>
</li>:""} </li>:""}
</div> </div>

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

@ -737,7 +737,7 @@ render(){
width: '375px', width: '375px',
height: '30px' height: '30px'
}}> }}>
<Checkbox value={item.user_id} checked={ <Checkbox value={item.user_id} key={item.user_id} checked={
task_status.map((item,key)=>{ task_status.map((item,key)=>{
return parseInt(task_status[key])===item.user_id?true:false return parseInt(task_status[key])===item.user_id?true:false
}) })

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

@ -1188,7 +1188,7 @@ class GraduationTaskssettinglist extends Component{
{taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.map((item,key)=>{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.map((item,key)=>{
return( return(
<span key={key}> <span key={key}>
<Checkbox value={item.id} className="fl ">{item.name} <Checkbox value={item.id} key={item.id} className="fl ">{item.name}
<span>({item.count})</span> <span>({item.count})</span>
</Checkbox> </Checkbox>
</span> </span>
@ -1211,7 +1211,7 @@ class GraduationTaskssettinglist extends Component{
{taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{
return( return(
<span key={key}> <span key={key}>
<Checkbox value={item.course_group_id} className="fl ">{item.group_group_name} <Checkbox value={item.course_group_id} key={item.course_group_id} className="fl ">{item.group_group_name}
<span>({item.count})</span> <span>({item.count})</span>
</Checkbox> </Checkbox>
</span> </span>
@ -1423,7 +1423,7 @@ class GraduationTaskssettinglist extends Component{
{taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.map((item,key)=>{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.map((item,key)=>{
return( return(
<span key={key}> <span key={key}>
<Checkbox value={item.id} className="fl ">{item.name} <Checkbox value={item.id} key={item.id} className="fl ">{item.name}
<span>({item.count})</span> <span>({item.count})</span>
</Checkbox> </Checkbox>
</span> </span>
@ -1456,7 +1456,7 @@ class GraduationTaskssettinglist extends Component{
{taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.map((item,key)=>{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.task_status.map((item,key)=>{
return( return(
<span key={key}> <span key={key}>
<Checkbox value={item.id} className="fl ">{item.name} <Checkbox value={item.id} key={item.id} className="fl ">{item.name}
<span>({item.count})</span> <span>({item.count})</span>
</Checkbox> </Checkbox>
</span> </span>
@ -1479,7 +1479,7 @@ class GraduationTaskssettinglist extends Component{
{taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{
return( return(
<span key={key}> <span key={key}>
<Checkbox value={item.course_group_id} className="fl ">{item.group_group_name} <Checkbox value={item.course_group_id} key={item.course_group_id} className="fl ">{item.group_group_name}
<span>({item.count})</span> <span>({item.count})</span>
</Checkbox> </Checkbox>
</span> </span>

2
public/react/src/modules/courses/poll/PollNew.js
Unescape View File

@ -2596,7 +2596,7 @@ class PollNew extends Component {
{item.question.answers === undefined ? "" : item.question.answers.map((items, i) => { {item.question.answers === undefined ? "" : item.question.answers.map((items, i) => {
return ( return (
<div className="mt10 pt20 " style={{"clear": "both"}}> <div className="mt10 pt20 " style={{"clear": "both"}}>
<Checkbox value={i} className={"fl"} style={{"text-align": "left"}}></Checkbox> <Checkbox value={i} key={i} className={"fl"} style={{"text-align": "left"}}></Checkbox>
<span className={" flex1"} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1120px"}}>{items.answer_text}</span> <span className={" flex1"} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1120px"}}>{items.answer_text}</span>
</div> </div>
) )

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

File diff suppressed because it is too large Load Diff

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

@ -66,7 +66,7 @@ class Listofworksstudentone extends Component {
pages: 1, pages: 1,
limit: 20, limit: 20,
loadingstate: true, loadingstate: true,
order: "updated_at", order: "update_time",
search: null, search: null,
day: 0, day: 0,
hour: 0, hour: 0,
@ -96,23 +96,23 @@ class Listofworksstudentone extends Component {
<span> <span>
{record.number === undefined ? {record.number === undefined ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
"text-align": "center" textAlign: "center"
}}> --</span> }}> --</span>
: record.number === "" ? : record.number === "" ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
"text-align": "center" textAlign: "center"
}}>--</span> }}>--</span>
: record.number === "--" ? : record.number === "--" ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
"text-align": "center" textAlign: "center"
}}>--</span> }}>--</span>
: :
<span style={{ <span style={{
"color": '#07111B', color: '#07111B',
"text-align": "center" textAlign: "center"
}}> {record.number}</span> }}> {record.number}</span>
} }
</span> </span>
@ -900,6 +900,8 @@ class Listofworksstudentone extends Component {
}, },
], ],
yslpros:false, yslpros:false,
datajs:[],
} }
// console.log("902"); // console.log("902");
// console.log("902"); // console.log("902");
@ -912,40 +914,52 @@ class Listofworksstudentone extends Component {
console.log(info); console.log(info);
} }
componentWillReceiveProps(nextProps) { // componentWillReceiveProps(nextProps) {
console.log("+++++++++916"); // console.log("+++++++++916");
console.log(nextProps); // console.log(nextProps);
console.log(this.props) // console.log(this.props)
// console.log(this.props.isAdmin()); // // console.log(this.props.isAdmin());
if (nextProps.code_review != this.props.code_review) { // if (nextProps.code_review != this.props.code_review) {
if (nextProps.code_review !== undefined) { // if (nextProps.code_review !== undefined) {
console.log("diaoyonglwangluo1"); // console.log("diaoyonglwangluo1");
if(this.props.isAdmin() === true){ // if(this.props.isAdmin() === true){
this.tearchar(); // this.tearchar();
}else{ // }else{
this.student(); // this.student();
} // }
} // }
} // }
//
} // }
componentDidMount() { componentDidMount() {
console.log("componentDidMount"); // console.log("componentDidMount ");
// console.log("调用子组件 ");
// console.log(this.props.isAdmin()); // console.log(this.props);
if(this.props.isAdmin() === true){ // console.log(this.props.isAdmin())
this.tearchar(); this.student();
// console.log("909");
}else{
this.student();
// console.log("911");
}
} }
isupdatas = () => {
var homeworkid = this.props.match.params.homeworkid;
// this.Gettitleinformation(homeworkid);
this.Getalistofworks(homeworkid);
}
/////////老师操作
// tearchar=()=>{
// var homeworkid = this.props.match.params.homeworkid;
// // console.log(homeworkid)
// // this.Gettitleinformation(homeworkid);
// this.Getalistofworkst(homeworkid);
// let query = this.props.location.pathname;
// const type = query.split('/');
// this.setState({
// shixuntypes: type[3]
// })
// this.props.triggerRef(this)
// }
student=()=>{ student=()=>{
// console.log("914"); // console.log("914");
// debugger // debugger
this.props.triggerRef(this);
var homeworkid = this.props.match.params.homeworkid; var homeworkid = this.props.match.params.homeworkid;
this.Getalistofworks(homeworkid); this.Getalistofworks(homeworkid);
let query = this.props.location.pathname; let query = this.props.location.pathname;
@ -953,6 +967,7 @@ class Listofworksstudentone extends Component {
this.setState({ this.setState({
shixuntypes: type[3] shixuntypes: type[3]
}) })
this.props.triggerRef(this);
} }
@ -977,12 +992,11 @@ class Listofworksstudentone extends Component {
course_group: "", course_group: "",
} }
axios.post(urll, data).then((result) => { axios.post(urll, data).then((result) => {
console.log("980000000____________________");
if(result === undefined){ if(result === undefined){
return return
} }
// console.log("951");
// console.log(result);
// debugger
this.setState({ this.setState({
teacherdata: result.data, teacherdata: result.data,
task_status: result.data.task_status, task_status: result.data.task_status,
@ -996,13 +1010,17 @@ class Listofworksstudentone extends Component {
code_review: result.data.code_review, code_review: result.data.code_review,
challenges_count: result.data.challenges_count, challenges_count: result.data.challenges_count,
view_report: result.data.view_report, view_report: result.data.view_report,
allow_late:result.data.allow_late,
loadingstate: false,
}) })
this.props.Getdataback(result,result.data); this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1);
if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") { if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
this.seacthdata(result.data); this.seacthdata(result.data);
} else { } else {
this.seacthdatas(result.data, result.data.student_works); this.seacthdatas(result.data, result.data.student_works);
} }
this.props.Getdataback(result,result.data);
}).catch((error) => { }).catch((error) => {
console.log(error); console.log(error);
@ -1052,12 +1070,12 @@ class Listofworksstudentone extends Component {
challenges_count:result.data.challenges_count, challenges_count:result.data.challenges_count,
view_report:result.data.view_report, view_report:result.data.view_report,
}) })
this.props.Getdataback(result,result.data);
if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") { if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
this.seacthdata(result.data); this.seacthdata(result.data);
} else { } else {
this.seacthdatas(result.data,result.data.student_works); this.seacthdatas(result.data,result.data.student_works);
} }
this.props.Getdataback(result,result.data);
} }
}).catch((error) => { }).catch((error) => {
@ -1152,7 +1170,8 @@ class Listofworksstudentone extends Component {
if (student_works !== undefined) { if (student_works !== undefined) {
for (var i = 0; i <student_works.length; i++) { for (var i = 0; i <student_works.length; i++) {
// console.log("11157==--=-=-=-=");
// console.log(student_works);
var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm'); var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm');
datalists.push({ datalists.push({
myid: student_works[i].id, myid: student_works[i].id,
@ -1413,8 +1432,8 @@ class Listofworksstudentone extends Component {
challenges_count:result.data.challenges_count, challenges_count:result.data.challenges_count,
view_report:result.data.view_report, view_report:result.data.view_report,
}) })
this.props.Getdataback(result,result.data);
this.seacthdata(result.data); this.seacthdata(result.data);
this.props.Getdataback(result,result.data);
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -1468,77 +1487,6 @@ class Listofworksstudentone extends Component {
} }
/////////老师操作
tearchar=()=>{
this.props.triggerRef(this)
var homeworkid = this.props.match.params.homeworkid;
// console.log(homeworkid)
// this.Gettitleinformation(homeworkid);
this.Getalistofworkst(homeworkid);
let query = this.props.location.pathname;
const type = query.split('/');
this.setState({
shixuntypes: type[3]
})
}
isupdatas = () => {
var homeworkid = this.props.match.params.homeworkid;
// this.Gettitleinformation(homeworkid);
this.Getalistofworkst(homeworkid);
}
// 获取作品列表
Getalistofworkst = (homeworkid) => {
// console.log("获取作品列表");7009
// debugger
let urll = `/homework_commons/${homeworkid}/works_list.json`;
// console.log(homeworkid);
// search:搜索关键字
// order:排序方式：更新时间：update_time，最终成绩：work_score，学号：student_id
// b_order:desc：倒序 ， asc：顺序
// work_status:0:未提交， 1:按时提交， 2:延时提交，“”不限
// course_group:分班情况 [232, 231]， []:不限（空数组）
var data = {
search: "",
order: this.state.orders,
b_order: "desc",
work_status: "",
course_group: "",
page:1,
limit:20,
}
axios.post(urll, data).then((result) => {
if (result) {
// console.log(url)
// console.log("作品列表6789077")
// console.log(JSON.stringify(result))
this.setState({
teacherdata: result.data,
task_status: result.data.task_status,
allow_late:result.data.allow_late,
course_group_info: result.data.course_group_info,
loadingstate: false,
jobsettingsdata: result,
publish_immediately: result.data.publish_immediately,
work_efficiency: result.data.work_efficiency,
end_immediately: result.data.end_immediately,
code_review: result.data.code_review,
challenges_count:result.data.challenges_count,
})
this.props.Getdataback(result,result.data);
this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1);
}
}).catch((error) => {
console.log(error)
this.setState({
loadingstate: false,
})
})
}
//开始排序操作 //开始排序操作
Startsortingt = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit) => { Startsortingt = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit) => {
//要提交的作品状态checkedValuesine //要提交的作品状态checkedValuesine
@ -1587,8 +1535,8 @@ class Listofworksstudentone extends Component {
code_review: result.data.code_review, code_review: result.data.code_review,
challenges_count:result.data.challenges_count, challenges_count:result.data.challenges_count,
}) })
this.props.Getdataback(result,result.data);
this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page); this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page);
this.props.Getdataback(result,result.data);
// } // }
} }
}).catch((error) => { }).catch((error) => {
@ -1607,14 +1555,19 @@ class Listofworksstudentone extends Component {
seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => { seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => {
let {page, limit} = this.state; let {page, limit} = this.state;
let datalist = []; let datalistjs = [];
let columns = this.state.columns; let columns = this.state.columns;
var columns2=[]; var columns2js=[];
if (teacherdata !== undefined) { // console.log("1614++++++++++++++++++++++=");
// console.log(student_works);
// console.log(teacherdata);
if (student_works !== undefined) {
// console.log("1618____________________");
// console.log(student_works);
// console.log("1588"); // console.log("1588");
for (var i = 0; i < student_works.length; i++) { for (var i = 0; i < student_works.length; i++) {
var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm'); var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm');
datalist.push({ datalistjs.push({
myid: student_works[i].id, myid: student_works[i].id,
number: (parseInt(page) - 1) * parseInt(limit) + (i + 1), number: (parseInt(page) - 1) * parseInt(limit) + (i + 1),
name: student_works[i].user_name, name: student_works[i].user_name,
@ -1635,8 +1588,6 @@ class Listofworksstudentone extends Component {
user_name: student_works[i].user_name, user_name: student_works[i].user_name,
user_login: student_works[i].user_login, user_login: student_works[i].user_login,
}) })
// console.log(datalist);
// console.log("1612");
} }
@ -1659,7 +1610,7 @@ class Listofworksstudentone extends Component {
else if(this.props.isNotMember()===true&&item.title==="学号") { else if(this.props.isNotMember()===true&&item.title==="学号") {
}else{ }else{
columns2.push(item); columns2js.push(item);
} }
} }
@ -1677,7 +1628,7 @@ class Listofworksstudentone extends Component {
else if(this.props.isNotMember()===true&&item.title==="学号") { else if(this.props.isNotMember()===true&&item.title==="学号") {
}else{ }else{
columns2.push(item); columns2js.push(item);
} }
} }
@ -1691,7 +1642,7 @@ class Listofworksstudentone extends Component {
else if(this.props.isNotMember()===true&&item.title==="学号") { else if(this.props.isNotMember()===true&&item.title==="学号") {
}else{ }else{
columns2.push(item); columns2js.push(item);
} }
} }
} }
@ -1707,7 +1658,7 @@ class Listofworksstudentone extends Component {
else if(this.props.isNotMember()===true&&item.title==="学号") { else if(this.props.isNotMember()===true&&item.title==="学号") {
}else{ }else{
columns2.push(item); columns2js.push(item);
} }
} }
@ -1723,11 +1674,11 @@ class Listofworksstudentone extends Component {
else if(this.props.isNotMember()===true&&item.title==="学号") { else if(this.props.isNotMember()===true&&item.title==="学号") {
}else{ }else{
columns2.push(item); columns2js.push(item);
} }
} }
} }
columns2=this.state.columnss; columns2js=this.state.columnss;
} }
} }
@ -1737,8 +1688,8 @@ class Listofworksstudentone extends Component {
// console.log(datalist); // console.log(datalist);
// console.log("1712"); // console.log("1712");
this.setState({ this.setState({
data: datalist, datajs: datalistjs,
columns: columns2, columns: columns2js,
loadingstate: false, loadingstate: false,
}) })
} }
@ -1928,9 +1879,8 @@ class Listofworksstudentone extends Component {
.then((response) => { .then((response) => {
if (response.data.status == '0') { if (response.data.status == '0') {
this.setState({visible: false}); this.setState({visible: false});
this.props.showNotification(`调分成功`);
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit); this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
this.props.showNotification(`调分成功`);
} }
}) })
.catch(function (error) { .catch(function (error) {
@ -1991,8 +1941,6 @@ class Listofworksstudentone extends Component {
axios.get(url).then((response) => { axios.get(url).then((response) => {
if (response.status === 200) { if (response.status === 200) {
let starttime = this.props.getNowFormatDates(1);
let endtime = this.props.getNowFormatDates(2);
this.setState({ this.setState({
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,
@ -2010,6 +1958,8 @@ class Listofworksstudentone extends Component {
Saves: this.homeworkstartend, Saves: this.homeworkstartend,
course_groups: response.data.course_groups, course_groups: response.data.course_groups,
}) })
let starttime = this.props.getNowFormatDates(1);
let endtime = this.props.getNowFormatDates(2);
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -2183,11 +2133,11 @@ class Listofworksstudentone extends Component {
let url = "/homework_commons/"+homeworkid+"/update_score.json"; let url = "/homework_commons/"+homeworkid+"/update_score.json";
axios.get(url).then((response) => { axios.get(url).then((response) => {
this.props.showNotification(`${response.data.message}`);
this.setState({ this.setState({
loadingstate: true loadingstate: true
}) })
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit); this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.props.showNotification(`${response.data.message}`);
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
}); });
@ -2266,18 +2216,19 @@ class Listofworksstudentone extends Component {
}) })
} }
render() { render() {
let {columns,course_groupysls,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state; let {columns,course_groupysls,datajs,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
// console.log(this.state.data); // console.log(this.state.student_works);
// console.log("841"); // console.log("841");
// console.log(this.state.columns); // console.log(this.state.columns);
// console.log(data); // console.log(datajs);
// console.log("2202"); // console.log("2202");
// console.log(this.props.isAdmin()); // console.log(this.props.isAdmin());
return ( return (
this.props.isAdmin() === true ? this.props.isAdmin() === true ?
(
<div className=" clearfix " style={{margin: "auto" , minWidth:"1200px"}}> <div className=" clearfix " style={{margin: "auto" , minWidth:"1200px"}}>
{visible === true ? <ModulationModal {visible === true ? <ModulationModal
visible={visible} visible={visible}
@ -2451,6 +2402,7 @@ class Listofworksstudentone extends Component {
return ( return (
<span key={key}> <span key={key}>
<Checkbox value={item.id} <Checkbox value={item.id}
key={item.id}
className="fl ">{item.name} className="fl ">{item.name}
<span>({item.count})</span> <span>({item.count})</span>
</Checkbox> </Checkbox>
@ -2482,6 +2434,7 @@ class Listofworksstudentone extends Component {
return ( return (
<span key={key}> <span key={key}>
<Checkbox value={item.course_group_id} <Checkbox value={item.course_group_id}
key={item.course_group_id}
className="fl ">{item.group_group_name} className="fl ">{item.group_group_name}
<span>({item.count})</span> <span>({item.count})</span>
</Checkbox> </Checkbox>
@ -2517,9 +2470,9 @@ class Listofworksstudentone extends Component {
{orders === "update_time" ? "时间" : orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序</a> {orders === "update_time" ? "时间" : orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序</a>
<i className="iconfont icon-xiajiantou ml5 font-12 "></i> <i className="iconfont icon-xiajiantou ml5 font-12 "></i>
<ul className="edu-position-hide undis mt10"> <ul className="edu-position-hide undis mt10">
<li> <a onClick={(e) => this.funordert("update_time")} data-remote="true" className=" font-12" style={{"text-align": "center "}}>更新时间</a></li> <li> <a onClick={(e) => this.funordert("update_time")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>更新时间</a></li>
<li> <a onClick={(e) => this.funordert("work_score")} data-remote="true" className=" font-12" style={{"text-align": "center "}}>最终成绩</a></li> <li> <a onClick={(e) => this.funordert("work_score")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>最终成绩</a></li>
<li> <a onClick={(e) => this.funordert("student_id")} data-remote="true" className=" font-12" style={{"text-align": "center "}}>学生学号</a></li> <li> <a onClick={(e) => this.funordert("student_id")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>学生学号</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
@ -2530,13 +2483,13 @@ class Listofworksstudentone extends Component {
</div> </div>
{ {
JSON.stringify(data) === "[]" ? JSON.stringify(datajs) === "[]" ?
<div id="forum_list" className="forum_table"> <div id="forum_list" className="forum_table">
<div className="mh650 edu-back-white"> <div className="mh650 edu-back-white">
<div className="edu-tab-con-box clearfix edu-txt-center"> <div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/> <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb30">没有数据可以显示！</p> <p className="edu-nodata-p mb30">没有数据可以显示.！</p>
</div> </div>
</div> </div>
@ -2557,8 +2510,8 @@ class Listofworksstudentone extends Component {
} }
`}</style> `}</style>
<div className="edu-table edu-back-white ant-tables"> <div className="edu-table edu-back-white ant-tables">
{data === undefined ? "" : <Table {datajs === undefined ? "" : <Table
dataSource={data} dataSource={datajs}
columns={columns} columns={columns}
pagination={false} pagination={false}
loading={loadingstate} loading={loadingstate}
@ -2581,7 +2534,9 @@ class Listofworksstudentone extends Component {
</div> </div>
</div> </div>
)
: :
(
<div> <div>
{ {
teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ? teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ?
@ -2678,8 +2633,8 @@ class Listofworksstudentone extends Component {
<div> <div>
<div id="graduation_work_list" <div id="graduation_work_list"
style={{ style={{
"padding": '20px 20px 10px 20px', padding: '20px 20px 10px 20px',
"margin-bottom": "10px" marginBottom: "10px"
}}> }}>
<div className="clearfix"> <div className="clearfix">
@ -2693,7 +2648,7 @@ class Listofworksstudentone extends Component {
} }
{teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" : {teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" :
<span className="ml20" <span className="ml20"
style={{"color": '#FF6800'}}>{teacherdata.left_time.time}</span> style={{color: '#FF6800'}}>{teacherdata.left_time.time}</span>
} }
</span> </span>
@ -2746,7 +2701,7 @@ class Listofworksstudentone extends Component {
<div className="edu-tab-con-box clearfix edu-txt-center"> <div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" <img className="edu-nodata-img mb20"
src={getImageUrl("images/educoder/nodata.png")}/> src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb30">没有数据可以显示！</p> <p className="edu-nodata-p mb30">没有数据可以显示,,！</p>
</div> </div>
</div> </div>
@ -2807,8 +2762,8 @@ class Listofworksstudentone extends Component {
{JSON.stringify(datas) !== "[]" ? {JSON.stringify(datas) !== "[]" ?
<div> <div>
<div id="graduation_work_list" style={{ <div id="graduation_work_list" style={{
"padding": '20px 20px 10px 20px', padding: '20px 20px 10px 20px',
"margin-bottom": "10px" marginBottom: "10px"
}}> }}>
<div className="clearfix"> <div className="clearfix">
<span className="fl color-grey-6 font-12"> <span className="fl color-grey-6 font-12">
@ -2820,7 +2775,7 @@ class Listofworksstudentone extends Component {
<span className="ml20">{teacherdata.left_time.status}</span>} <span className="ml20">{teacherdata.left_time.status}</span>}
{teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" : {teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" :
<span className="ml20" <span className="ml20"
style={{"color": '#FF6800'}}>{teacherdata.left_time.time}</span>} style={{color: '#FF6800'}}>{teacherdata.left_time.time}</span>}
</span> </span>
<style> <style>
@ -2936,7 +2891,7 @@ class Listofworksstudentone extends Component {
<div className="edu-tab-con-box clearfix edu-txt-center"> <div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" <img className="edu-nodata-img mb20"
src={getImageUrl("images/educoder/nodata.png")}/> src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb30">没有数据可以显示！</p> <p className="edu-nodata-p mb30">没有数据可以显示..！</p>
</div> </div>
</div> </div>
@ -2954,6 +2909,7 @@ class Listofworksstudentone extends Component {
</div> </div>
} }
</div> </div>
)
) )
} }

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

@ -25,8 +25,8 @@ class ShixunHomeworkPage extends Component {
// this.answerMdRef = React.createRef(); // this.answerMdRef = React.createRef();
this.state = { this.state = {
tab: ["0"], tab: ["0"],
jobsettingsdata: undefined, jobsettingsdatapage: undefined,
teacherdata: undefined, teacherdatapage: undefined,
code_review: false, code_review: false,
view_report: false, view_report: false,
visible: false, visible: false,
@ -59,14 +59,15 @@ class ShixunHomeworkPage extends Component {
// console.log(teacherdata); // console.log(teacherdata);
this.setState({ this.setState({
jobsettingsdata: jobsettingsdata, jobsettingsdatapage: jobsettingsdata,
teacherdata: teacherdata, teacherdatapage: teacherdata,
code_review: teacherdata.code_review, code_review: teacherdata.code_review,
view_report: teacherdata.view_report, view_report: teacherdata.view_report,
}) })
} }
componentDidMount() { componentDidMount() {
console.log("父组件加载框");
const query = this.props.location.search; const query = this.props.location.search;
const type = query.split('?tab='); const type = query.split('?tab=');
// let sum = [] // let sum = []
@ -112,7 +113,7 @@ class ShixunHomeworkPage extends Component {
///////////////教师截止 ///////////////教师截止
render() { render() {
let {tab, teacherdata, jobsettingsdata} = this.state; let {tab, teacherdatapage, jobsettingsdatapage} = this.state;
const isAdmin = this.props.isAdmin(); const isAdmin = this.props.isAdmin();
@ -123,26 +124,26 @@ class ShixunHomeworkPage extends Component {
<div className="educontent mb20"> <div className="educontent mb20">
<p className="clearfix mb20 mt10"> <p className="clearfix mb20 mt10">
<ActionBtn className=" btn colorgrey fl hovercolorblue " <ActionBtn className=" btn colorgrey fl hovercolorblue "
to={`/courses/${this.props.match.params.coursesId}/students`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.course_name}</ActionBtn> to={`/courses/${this.props.match.params.coursesId}/students`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</ActionBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<ActionBtn <ActionBtn
className=" btn colorgrey fl hovercolorblue " className=" btn colorgrey fl hovercolorblue "
to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id === undefined ? "" : jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name}</ActionBtn> to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</ActionBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn className="fl">作业详情</WordsBtn> <WordsBtn className="fl">作业详情</WordsBtn>
</p> </p>
</div> </div>
<div className="educontent mb20"> <div className="educontent mb20">
<p className=" fl color-black summaryname" style={{heigth: "33px"}}> <p className=" fl color-black summaryname" style={{heigth: "33px"}}>
{teacherdata === undefined ? "" : teacherdata.homework_name} {teacherdatapage === undefined ? "" : teacherdatapage.homework_name}
</p> </p>
<CoursesListType <CoursesListType
typelist={teacherdata === undefined ? [""] : teacherdata.homework_status} typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
/> />
<a className="color-grey-9 fr font-16 summaryname ml20 mr20" <a className="color-grey-9 fr font-16 summaryname ml20 mr20"
href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id === undefined ? "" : jobsettingsdata.data.category.category_id}`}>返回</a> href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>返回</a>
<a className="color-grey-9 fr font-16 mr20" <a className="color-grey-9 fr font-16 mr20"
href={`/shixuns/${teacherdata === undefined ? "" : teacherdata.shixun_identifier}/challenges`} href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
target={"_blank"}>实训详情</a> target={"_blank"}>实训详情</a>
@ -154,7 +155,7 @@ class ShixunHomeworkPage extends Component {
<a className={parseInt(tab) === 0 ? "active" : ""} onClick={(e) => this.ChangeTab(0)}>作品列表</a> <a className={parseInt(tab) === 0 ? "active" : ""} onClick={(e) => this.ChangeTab(0)}>作品列表</a>
<a className={parseInt(tab) === 1 ? "active" : ""} onClick={(e) => this.ChangeTab(1)}>作业问答</a> <a className={parseInt(tab) === 1 ? "active" : ""} onClick={(e) => this.ChangeTab(1)}>作业问答</a>
{this.props.isAdmin() ? {this.props.isAdmin() ?
this.state.code_review === true || jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status[0] === "未发布" ? "" : this.state.code_review === true || jobsettingsdatapage === undefined ? [""] : jobsettingsdatapage.data.homework_status[0] === "未发布" ? "" :
<a <a
className={parseInt(tab) === 2 ? "active" : ""} className={parseInt(tab) === 2 ? "active" : ""}
onClick={(e) => this.ChangeTab(2)}> onClick={(e) => this.ChangeTab(2)}>
@ -203,9 +204,9 @@ class ShixunHomeworkPage extends Component {
<li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding": "0 20px"}}> <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding": "0 20px"}}>
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i> 导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}> <ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
<li><a {/*<li><a*/}
onClick={(child,i) => this.confirmysl(this.child,1)}>实训报告</a> {/* onClick={(child,i) => this.confirmysl(this.child,1)}>实训报告</a>*/}
</li> {/*</li>*/}
<li><a <li><a
onClick={(child,i) => this.confirmysl(this.child,2)}>学生成绩</a> onClick={(child,i) => this.confirmysl(this.child,2)}>学生成绩</a>
</li> </li>
@ -213,32 +214,32 @@ class ShixunHomeworkPage extends Component {
</ul> </ul>
</li> : ""} </li> : ""}
{this.props.isAdmin() ? {this.props.isAdmin() ?
teacherdata && teacherdata.end_immediately === true ? teacherdatapage && teacherdatapage.end_immediately === true ?
<a className="fr color-blue font-16" onClick={(child)=>this.homeworkendss(this.child)}>立即截止</a> <a className="fr color-blue font-16" onClick={(child)=>this.homeworkendss(this.child)}>立即截止</a>
: "" : ""
: ""} : ""}
{this.props.isAdmin() ? {this.props.isAdmin() ?
teacherdata && teacherdata.publish_immediately === true ? teacherdatapage && teacherdatapage.publish_immediately === true ?
<a className="fr color-blue font-16" onClick={(child)=>this.homeworkstarts(this.child)}>立即发布</a> <a className="fr color-blue font-16" onClick={(child)=>this.homeworkstarts(this.child)}>立即发布</a>
: "" : ""
: ""} : ""}
{this.props.isAdmin() ? {this.props.isAdmin() ?
teacherdata && teacherdata.code_review === true ? teacherdatapage && teacherdatapage.code_review === true ?
<a className="fr color-blue font-16" onClick={(child)=>this.workshowmodels(this.child)}>代码查重</a> <a className="fr color-blue font-16" onClick={(child)=>this.workshowmodels(this.child)}>代码查重</a>
: "" : ""} : "" : ""}
{this.state.view_report === true ? <Link className="fr color-blue font-16" target={"_blank"} {this.state.view_report === true ? <Link className="fr color-blue font-16" target={"_blank"}
to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata&&teacherdata.work_id}/shixun_work_report`}> to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdatapage&&teacherdatapage.work_id}/shixun_work_report`}>
查看实训报告 查看实训报告
</Link> : ""} </Link> : ""}
{ {
teacherdata === undefined ? "" teacherdatapage === undefined ? ""
: teacherdata.commit_des === null || teacherdata.commit_des === undefined ? "" : : teacherdatapage.commit_des === null || teacherdatapage.commit_des === undefined ? "" :
<a className="fr color-blue font-16" <a className="fr color-blue font-16"
href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata === undefined ? "" : teacherdata.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdata.commit_des}</a> href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
} }
{teacherdata === undefined ? "" : <Startshixuntask {teacherdatapage === undefined ? "" : <Startshixuntask
{...this.props} {...this.props}
data={teacherdata} data={teacherdatapage}
/>} />}
</div> </div>
</div> </div>
@ -253,7 +254,7 @@ class ShixunHomeworkPage extends Component {
{/*/>*/} {/*/>*/}
{parseInt(tab) === 0 ?<Listofworksstudentone triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>:""} {parseInt(tab) === 0 ?<Listofworksstudentone triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>:""}
{parseInt(tab) === 1 ?<Workquestionandanswer triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>:""} {parseInt(tab) === 1 ?<Workquestionandanswer triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>:""}
{parseInt(tab) === 2 ?<ShixunStudentWork triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>:""} {parseInt(tab) === 2 ?<ShixunStudentWork triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>:""}
{parseInt(tab) === 3 ?<Trainingjobsetting triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""} {parseInt(tab) === 3 ?<Trainingjobsetting triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""}

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

@ -78,22 +78,23 @@ class ShixunStudentWork extends Component {
componentDidMount() { componentDidMount() {
console.log("ShixunStudentWork"); console.log("ShixunStudentWork");
console.log("componentDidMount"); console.log("componentDidMount");
this.props.triggerRef(this);
this.getTrainingjobsettings(); this.getTrainingjobsettings();
} this.props.triggerRef(this);
componentWillReceiveProps(nextProps) {
// console.log("+++++++++916");
// console.log(nextProps);
// console.log(this.props)
// console.log(this.props.isAdmin());
if (nextProps.code_review != this.props.code_review) {
if (nextProps.code_review !== undefined) {
console.log("diaoyonglwangluo1");
this.getTrainingjobsettings();
}
}
} }
// componentWillReceiveProps(nextProps) {
// // console.log("+++++++++916");
// // console.log(nextProps);
// // console.log(this.props)
// // console.log(this.props.isAdmin());
// if (nextProps.code_review != this.props.code_review) {
// if (nextProps.code_review !== undefined) {
// console.log("diaoyonglwangluo1");
// this.getTrainingjobsettings();
// }
// }
//
// }
getTrainingjobsettings=()=>{ getTrainingjobsettings=()=>{
@ -780,7 +781,7 @@ class ShixunStudentWork extends Component {
{data&&data.group_info === undefined ? "" : data&&data.group_info.map((item, key) => { {data&&data.group_info === undefined ? "" : data&&data.group_info.map((item, key) => {
return ( return (
<span key={key}> <span key={key}>
<Checkbox value={item.id}className="fl "> <Checkbox value={item.id} key={item.id} className="fl ">
<span> <span>
{item.name}({item.members_count}) {item.name}({item.members_count})
</span> </span>

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

@ -136,10 +136,10 @@ class ShixunWorkReport extends Component {
<div style={{ width:'100%',height:'75px'}} > <div style={{ width:'100%',height:'75px'}} >
<p className=" fl color-black mt25 summaryname">{data&&data.shixun_name}</p> <p className=" fl color-black mt25 summaryname">{data&&data.shixun_name}</p>
{/*{this.props.isAdmin()?<a className=" fr font-14 ml30 mt10 mr20 color-grey-9 ">导出实训报告数据</a>:""}*/} {/*{this.props.isAdmin()?<a className=" fr font-14 ml30 mt10 mr20 color-grey-9 ">导出实训报告数据</a>:""}*/}
{this.props.isAdmin() ? <a {/*{this.props.isAdmin() ? <a*/}
className="fr color-blue font-16" {/*className="fr color-blue font-16"*/}
onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)} {/*onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}*/}
>导出实训报告数据</a> : ""} {/*>导出实训报告数据</a> : ""}*/}
</div> </div>
<div className="stud-class-set bor-bottom-greyE"> <div className="stud-class-set bor-bottom-greyE">

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

@ -291,7 +291,7 @@ class ShixunhomeWorkItem extends Component{
} }
`}</style> `}</style>
<h6> <h6>
{/*/courses/1309/9373/listofworks*/}
{/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/} {/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/}
{ {
this.props.isAdmin?<a href={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0"} this.props.isAdmin?<a href={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0"}

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

@ -131,31 +131,32 @@ class Trainingjobsetting extends Component {
componentDidMount() { componentDidMount() {
console.log("Trainingjobsetting"); console.log("Trainingjobsetting");
console.log("componentDidMount"); console.log("componentDidMount");
this.props.triggerRef(this);
this.getTrainingjobsetting(); this.getTrainingjobsetting();
let query = this.props.location.pathname; let query = this.props.location.pathname;
const type = query.split('/'); const type = query.split('/');
this.setState({ this.setState({
shixuntypes:type[3] shixuntypes:type[3]
}) })
this.props.triggerRef(this);
}
componentWillReceiveProps(nextProps) {
// console.log("+++++++++916");
// console.log(nextProps);
// console.log(this.props)
// console.log(this.props.isAdmin());
if (nextProps.code_review != this.props.code_review) {
if (nextProps.code_review !== undefined) {
console.log("diaoyonglwangluo4");
this.getTrainingjobsetting()
}
}
} }
// componentWillReceiveProps(nextProps) {
// // console.log("+++++++++916");
// // console.log(nextProps);
// // console.log(this.props)
// // console.log(this.props.isAdmin());
// if (nextProps.code_review != this.props.code_review) {
// if (nextProps.code_review !== undefined) {
// console.log("diaoyonglwangluo4");
// this.getTrainingjobsetting()
//
// }
// }
//
// }
// 获取数据地方 // 获取数据地方
getTrainingjobsetting = () => { getTrainingjobsetting = () => {
@ -167,7 +168,7 @@ class Trainingjobsetting extends Component {
// console.log(url); // console.log(url);
// console.log(result); // console.log(result);
if (result!=undefined) { if (result!=undefined) {
this.props.Getdataback(result,result.data);
// console.log(result.data.code_review) // console.log(result.data.code_review)
// console.log("设置页") // console.log("设置页")
// console.log(JSON.stringify(result)) // console.log(JSON.stringify(result))
@ -285,6 +286,7 @@ class Trainingjobsetting extends Component {
challenge_settings: result.data.challenge_settings, challenge_settings: result.data.challenge_settings,
code_review:result.data.code_review code_review:result.data.code_review
}) })
this.props.Getdataback(result,result.data);
} }
}) })
@ -2131,7 +2133,7 @@ class Trainingjobsetting extends Component {
}} disabled={!flagPageEdit} className="c_grey mt20 ml30" }} disabled={!flagPageEdit} className="c_grey mt20 ml30"
value={"自定义分值"} style={{"color":"#666666"}}>自定义分值 value={"自定义分值"} style={{"color":"#666666"}}>自定义分值
{testscripttiptype===true? {testscripttiptype===true?
<div className="invite-tipysls clearfix " id="test_script_tip" style={{left: '148px',width: '322px',zIndex: '10'}}> <div className="invite-tipysls clearfix " id="test_script_tip" style={{left: '158px',width: '322px',zIndex: '10'}}>
<span className="right-black-trangles"></span> <span className="right-black-trangles"></span>
<div className="padding20 invitecontent clearfix"> <div className="padding20 invitecontent clearfix">
<p className="font-12 edu-txt-left"> <p className="font-12 edu-txt-left">

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

@ -84,7 +84,6 @@ class Workquestionandanswer extends Component {
componentDidMount() { componentDidMount() {
console.log("Workquestionandanswer"); console.log("Workquestionandanswer");
console.log("componentDidMount"); console.log("componentDidMount");
this.props.triggerRef(this);
var homeworkid = this.props.match.params.homeworkid; var homeworkid = this.props.match.params.homeworkid;
// console.log(homeworkid) // console.log(homeworkid)
this.Gettitleinformation(homeworkid) this.Gettitleinformation(homeworkid)
@ -93,22 +92,24 @@ class Workquestionandanswer extends Component {
this.setState({ this.setState({
shixuntypes: type[3] shixuntypes: type[3]
}) })
} this.props.triggerRef(this);
componentWillReceiveProps(nextProps) {
// console.log("+++++++++916");
// console.log(nextProps);
// console.log(this.props)
// console.log(this.props.isAdmin());
if (nextProps.code_review != this.props.code_review) {
if (nextProps.code_review !== undefined) {
console.log("diaoyonglwangluo2");
var homeworkid = this.props.match.params.homeworkid;
// console.log(homeworkid)
this.Gettitleinformation(homeworkid)
}
}
} }
// componentWillReceiveProps(nextProps) {
// // console.log("+++++++++916");
// // console.log(nextProps);
// // console.log(this.props)
// // console.log(this.props.isAdmin());
// if (nextProps.code_review != this.props.code_review) {
// if (nextProps.code_review !== undefined) {
// console.log("diaoyonglwangluo2");
// var homeworkid = this.props.match.params.homeworkid;
// // console.log(homeworkid)
// this.Gettitleinformation(homeworkid)
// }
// }
//
// }
isupdatas = () => { isupdatas = () => {
var homeworkid = this.props.match.params.homeworkid; var homeworkid = this.props.match.params.homeworkid;

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

@ -271,7 +271,7 @@ class Trialapplication extends Component {
// console.log(result); // console.log(result);
// this.onTabChange("1"); // this.onTabChange("1");
if(result !== undefined){ if(result !== undefined){
this.props.showNotification(`试用申请已提交，我们将尽快完成审核`); // this.props.showNotification(`试用申请已提交，我们将尽快完成审核`);
if (this.state.showTrial === false) { if (this.state.showTrial === false) {
window.location.href = "/"; window.location.href = "/";
this.setState({ this.setState({

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

@ -287,7 +287,7 @@ class Trialapplicationysl extends Component {
// console.log(result); // console.log(result);
// this.onTabChange("1"); // this.onTabChange("1");
if(result !== undefined){ if(result !== undefined){
this.props.showNotification(`试用申请已提交，我们将尽快完成审核`); // this.props.showNotification(`试用申请已提交，我们将尽快完成审核`);
// if (this.state.showTrial === false) { // if (this.state.showTrial === false) {
window.location.href = "/"; window.location.href = "/";
this.setState({ this.setState({

2
public/react/src/modules/paths/PathDetail/sendPanel.js
Unescape View File

@ -181,7 +181,7 @@ class sendPanel extends Component{
item.shixuns.map((items,keys)=>{ item.shixuns.map((items,keys)=>{
return( return(
<div className="mt5" key={keys}> <div className="mt5" key={keys}>
<Checkbox name={key} value={items.shixun_id}>{items.shixun_name}</Checkbox> <Checkbox name={key} value={items.shixun_id} key={items.shixun_id}>{items.shixun_name}</Checkbox>
</div> </div>
) )
}) })

7
public/react/src/modules/user/usersInfo/InfosCourse.js
Unescape View File

@ -101,7 +101,6 @@ class InfosCourse extends Component{
totalCount, totalCount,
isSpin isSpin
} = this.state; } = this.state;
let isStudent = this.props.isStudent();
let is_current=this.props.is_current; let is_current=this.props.is_current;
console.log(this.props.current_user&&this.props.current_user.user_identity==="学生") console.log(this.props.current_user&&this.props.current_user.user_identity==="学生")
@ -127,11 +126,11 @@ class InfosCourse extends Component{
</p> </p>
<div className="square-list clearfix"> <div className="square-list clearfix">
{ {
!isStudent && page == 1 && !category && is_current && page == 1 && is_current &&
this.props.current_user&&this.props.current_user.user_identity==="学生"?"":<Create href={"/courses/new"} name={"新建课堂"} index="1"></Create> this.props.current_user && this.props.current_user.user_identity != "学生" ? <Create href={"/courses/new"} name={"新建课堂"} index="1"></Create> : ""
} }
{ {
(!data || data.courses.length==0) && (isStudent || category) && <NoneData></NoneData> (!data || data.courses.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" || category) && <NoneData></NoneData>
} }
{ {
data && data.courses && data.courses.map((item,key)=>{ data && data.courses && data.courses.map((item,key)=>{

6
public/react/src/modules/user/usersInfo/InfosPath.js
Unescape View File

@ -148,11 +148,11 @@ class InfosPath extends Component{
</div> </div>
<div className="square-list clearfix"> <div className="square-list clearfix">
{ {
!isStudent && page == 1 && !category && is_current && page == 1 && is_current &&
<Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create> this.props.current_user && this.props.current_user.user_identity != "学生" ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>:""
} }
{ {
(!data || data.subjects.length==0) && (isStudent || category) && <NoneData></NoneData> (!data || data.subjects.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" || category) && <NoneData></NoneData>
} }
{ {
data && data.subjects && data.subjects.map((item,key)=>{ data && data.subjects && data.subjects.map((item,key)=>{

6
public/react/src/modules/user/usersInfo/InfosProject.js
Unescape View File

@ -121,11 +121,11 @@ class InfosProject extends Component{
</p> </p>
<div className="square-list clearfix"> <div className="square-list clearfix">
{ {
!isStudent && page == 1 && !category && is_current && page == 1 && is_current && this.props.current_user && this.props.current_user.user_identity != "学生" ?
<Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建项目"} index="4"></Create> <Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建项目"} index="4"></Create>:""
} }
{ {
(!data || data.projects.length==0) && (isStudent || category) && <NoneData></NoneData> (!data || data.projects.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" || category) && <NoneData></NoneData>
} }
{ {
data && data.projects && data.projects.map((item,key)=>{ data && data.projects && data.projects.map((item,key)=>{

6
public/react/src/modules/user/usersInfo/InfosShixun.js
Unescape View File

@ -157,11 +157,11 @@ class InfosShixun extends Component{
</div> </div>
<div className="square-list clearfix"> <div className="square-list clearfix">
{ {
!isStudent && page == 1 && !category && is_current && page == 1 && is_current && this.props.current_user && this.props.current_user.user_identity != "学生" ?
<Create href={"/shixuns/new"} name={"新建实训"} index="2"></Create> <Create href={"/shixuns/new"} name={"新建实训"} index="2"></Create>:""
} }
{ {
(!data || data.shixuns.length==0) && (isStudent || category) && <NoneData></NoneData> (!data || data.shixuns.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" || category) && <NoneData></NoneData>
} }
{ {
data && data.shixuns && data.shixuns.map((item,key)=>{ data && data.shixuns && data.shixuns.map((item,key)=>{

Write Preview
Loading…
Cancel
Save