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

Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_cs
cxt 6 years ago
parent a1aff1a891 a328375a97
commit 3478e78579
6 changed files with 797 additions and 713 deletions
Show Stats Download Patch File Download Diff File

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

@ -22,7 +22,7 @@ import 'moment/locale/zh-cn';
import './yslexercisetable.css'; import './yslexercisetable.css';
import {getImageUrl, toPath} from 'educoder'; import {getImageUrl, toPath} from 'educoder';
import CheckBoxGroup from "../../page/component/CheckBoxGroup"; import CheckBoxGroup from "../../page/component/CheckBoxGroup";
import NoneData from '../../../modules/courses/coursesPublic/NoneData'
const Search = Input.Search; const Search = Input.Search;
const RadioGroup = Radio.Group; const RadioGroup = Radio.Group;
const CheckboxGroup = Checkbox.Group; const CheckboxGroup = Checkbox.Group;
@ -1217,6 +1217,7 @@ class Studentshavecompletedthelist extends Component {
) )
}, },
], ],
exercise_status:0,
} }
// console.log("Studentshavecompletedthelist"); // console.log("Studentshavecompletedthelist");
// console.log(props.current_status); // console.log(props.current_status);
@ -1277,6 +1278,20 @@ class Studentshavecompletedthelist extends Component {
}catch (e) { }catch (e) {
} }
try {
if(this.props.Commonheadofthetestpaper.exercise_status !== undefined){
this.setState({
exercise_status:this.props.Commonheadofthetestpaper.exercise_status,
})
}else{
this.setState({
exercise_status:0,
})
}
}catch (e) {
}
} }
componentWillReceiveProps = (nextProps) => { componentWillReceiveProps = (nextProps) => {
@ -2065,11 +2080,11 @@ class Studentshavecompletedthelist extends Component {
this.setState({ this.setState({
loadingstate: false, loadingstate: false,
}) })
console.log(response); // console.log(response);
console.log(1997); // console.log(1997);
this.Generatenewdatasy(response.data.exercise_users, response); this.Generatenewdatasy(response.data.exercise_users, response);
}).catch((error) => { }).catch((error) => {
console.log(error) // console.log(error)
this.setState({ this.setState({
loadingstate: false, loadingstate: false,
}) })
@ -2472,7 +2487,7 @@ class Studentshavecompletedthelist extends Component {
render() { render() {
const isAdmin = this.props.isAdmin(); const isAdmin = this.props.isAdmin();
let {data, datas, page, columns, course_groupyslsthree, columnstwo, styletable, course_groupyslstwodatas, limit, course_groupysls, course_groupyslstwodata, course_groupyslstwo, teacherlists, Teacherliststudentlist, order, columnss, course_groupsdatas, course_groups, Evaluationarray, unlimited, unlimiteds, unlimitedtwo, teacherlist, searchtext, loadingstate, review, nocomment, commented, unsubmitted, submitted, columnsys, exercise_users,mylistansum} = this.state; let {data, datas, page, columns, course_groupyslsthree, columnstwo, styletable,exercise_status, course_groupyslstwodatas, limit, course_groupysls, course_groupyslstwodata, course_groupyslstwo, teacherlists, Teacherliststudentlist, order, columnss, course_groupsdatas, course_groups, Evaluationarray, unlimited, unlimiteds, unlimitedtwo, teacherlist, searchtext, loadingstate, review, nocomment, commented, unsubmitted, submitted, columnsys, exercise_users,mylistansum} = this.state;
// console.log("Studentshavecompletedthelist"); // console.log("Studentshavecompletedthelist");
// console.log(this.props.current_status); // console.log(this.props.current_status);
return ( return (
@ -2483,6 +2498,13 @@ class Studentshavecompletedthelist extends Component {
" min-width": " 1200px", " min-width": " 1200px",
}}> }}>
{/*老师*/} {/*老师*/}
{
exercise_status===0 || exercise_status===1 ?
<div className="edu-back-white">
<NoneData></NoneData>
</div>
:
<div>
<div className="edu-back-white" > <div className="edu-back-white" >
<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}> <ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
@ -2680,6 +2702,8 @@ class Studentshavecompletedthelist extends Component {
</div> </div>
: "" : ""
} }
</div>
}
</div> </div>
@ -2691,6 +2715,12 @@ class Studentshavecompletedthelist extends Component {
<div> <div>
<div className=" clearfix " <div className=" clearfix "
style={{"margin": "0 auto", "padding-bottom": "100px", " min-width": " 1200px"}}> style={{"margin": "0 auto", "padding-bottom": "100px", " min-width": " 1200px"}}>
{
exercise_status === 0 || exercise_status === 1 ?
<div className="edu-back-white">
<NoneData></NoneData>
</div>
:
<div className={"educontent mb20"}> <div className={"educontent mb20"}>
<div className="edu-back-white" id="graduation_work_list" <div className="edu-back-white" id="graduation_work_list"
@ -2754,7 +2784,7 @@ class Studentshavecompletedthelist extends Component {
</div> </div>
}
</div> </div>
</div> </div>
@ -2766,6 +2796,13 @@ class Studentshavecompletedthelist extends Component {
"padding-bottom": "100px", "padding-bottom": "100px",
" min-width": " 1200px" " min-width": " 1200px"
}}> }}>
{
exercise_status === 0 || exercise_status === 1 ?
<div className="edu-back-white">
<NoneData></NoneData>
</div>
:
<div>
<div className={"educontent mb20 edu-back-white"}> <div className={"educontent mb20 edu-back-white"}>
<style> <style>
{ {
@ -2903,6 +2940,8 @@ class Studentshavecompletedthelist extends Component {
: "" : ""
} }
</div> </div>
}
</div>
</div> </div>

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

@ -436,7 +436,7 @@ class Testpapersettinghomepage extends Component{
/> />
{ {
// 教师列表 // 教师列表
parseInt(tab[0])==0 && <Studentshavecompletedthelist {...this.props} {...this.state} triggerRef={this.bindRef} setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status}></Studentshavecompletedthelist> parseInt(tab[0])==0 && <Studentshavecompletedthelist {...this.props} {...this.state} triggerRef={this.bindRef} setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status} Commonheadofthetestpaper={this.state.Commonheadofthetestpaper}></Studentshavecompletedthelist>
} }
{/*统计结果*/} {/*统计结果*/}

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

@ -33,6 +33,8 @@ import Startshixuntask from "../coursesPublic/Startshixuntask";
import ModulationModal from "../coursesPublic/ModulationModal"; import ModulationModal from "../coursesPublic/ModulationModal";
import HomeworkModal from "../coursesPublic/HomeworkModal"; import HomeworkModal from "../coursesPublic/HomeworkModal";
import ShixunWorkModal from "./Shixunworkdetails/ShixunWorkModal"; import ShixunWorkModal from "./Shixunworkdetails/ShixunWorkModal";
import NoneData from '../../../modules/courses/coursesPublic/NoneData'
const Search = Input.Search; const Search = Input.Search;
const RadioGroup = Radio.Group; const RadioGroup = Radio.Group;
const CheckboxGroup = Checkbox.Group; const CheckboxGroup = Checkbox.Group;
@ -1451,6 +1453,7 @@ class Listofworksstudentone extends Component {
], ],
yslpros:false, yslpros:false,
datajs:[], datajs:[],
homework_status:[],
} }
} }
@ -1569,7 +1572,8 @@ class Listofworksstudentone extends Component {
allow_late:result.data.allow_late, allow_late:result.data.allow_late,
loadingstate: false, loadingstate: false,
computeTimetype:true, computeTimetype:true,
}) homework_status:result.data.homework_status,
});
this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1); 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) === "[]") {
@ -1626,7 +1630,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,
view_report:result.data.view_report, view_report:result.data.view_report,
}) homework_status:result.data.homework_status,
});
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 {
@ -2129,7 +2134,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,
view_report:result.data.view_report, view_report:result.data.view_report,
}) homework_status:result.data.homework_status,
});
this.seacthdata(result.data); this.seacthdata(result.data);
this.props.Getdataback(result,result.data); this.props.Getdataback(result,result.data);
} }
@ -2242,7 +2248,8 @@ class Listofworksstudentone extends Component {
end_immediately: result.data.end_immediately, end_immediately: result.data.end_immediately,
code_review: result.data.code_review, code_review: result.data.code_review,
challenges_count:result.data.challenges_count, challenges_count:result.data.challenges_count,
}) homework_status:result.data.homework_status,
});
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); this.props.Getdataback(result,result.data);
// } // }
@ -3037,7 +3044,7 @@ class Listofworksstudentone extends Component {
}) })
} }
render() { render() {
let {columns,course_groupysls,datajs,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu,columnsstu2, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state; let {columns,course_groupysls,datajs,isAdmin,homework_status, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu,columnsstu2, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />; const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
// console.log(this.state.student_works); // console.log(this.state.student_works);
@ -3068,8 +3075,8 @@ class Listofworksstudentone extends Component {
} }
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}
@ -3143,6 +3150,17 @@ class Listofworksstudentone extends Component {
starttimes={this.state.starttimes} starttimes={this.state.starttimes}
typs={this.state.typs} typs={this.state.typs}
/> />
{
homework_status.length===0?
<div className="edu-back-white">
<NoneData></NoneData>
</div>
:
homework_status.length>0 && homework_status[0]==="未发布"?
<div className="edu-back-white">
<NoneData></NoneData>
</div>
:
<div className={"educontent "}> <div className={"educontent "}>
@ -3387,11 +3405,10 @@ 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) === "[]" ?
@ -3473,6 +3490,19 @@ class Listofworksstudentone extends Component {
: "" : ""
} }
{
homework_status.length===0?
<div className=" clearfix edu-back-white" style={{margin: "auto" , minWidth:"1200px"}}>
<NoneData></NoneData>
</div>
:
homework_status.length>0 && homework_status[0]==="未发布"?
<div className=" clearfix edu-back-white " style={{margin: "auto" , minWidth:"1200px"}}>
<NoneData></NoneData>
</div>
:
<div className={"educontent "}> <div className={"educontent "}>
<div className="edu-back-white" style={{width: "1200"}}> <div className="edu-back-white" style={{width: "1200"}}>
@ -3593,7 +3623,7 @@ class Listofworksstudentone extends Component {
</div> </div>
</div> </div>
}
</div> </div>
: :
// 学生能查看别人的 // 学生能查看别人的
@ -3619,6 +3649,18 @@ class Listofworksstudentone extends Component {
Cancel={() => this.cancelModulationModels()} Cancel={() => this.cancelModulationModels()}
/> : "" /> : ""
} }
{
homework_status.length===0?
<div className=" clearfix edu-back-white" style={{margin: "auto" , minWidth:"1200px"}}>
<NoneData></NoneData>
</div>
:
homework_status.length>0 && homework_status[0]==="未发布"?
<div className=" clearfix edu-back-white" style={{margin: "auto" , minWidth:"1200px"}}>
<NoneData></NoneData>
</div>
:
<div className={"educontent mb20"}> <div className={"educontent mb20"}>
<div > <div >
@ -3807,10 +3849,12 @@ class Listofworksstudentone extends Component {
} }
</div> </div>
</div> </div>
}
</div> </div>
} }
</div> </div>
)
) )
} }

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

@ -1064,8 +1064,7 @@ class ShixunHomework extends Component{
<div className="edu-back-white"> <div className="edu-back-white">
<p className="clearfix padding30 bor-bottom-greyE"> <p className="clearfix padding30 bor-bottom-greyE">
<p style={{height: '20px'}}> <p style={{height: '20px'}}>
{/*<span className="font-18 fl color-dark-21">{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}</span>*/} <span className="font-18 fl color-dark-21">{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}</span>
<span className="font-18 fl color-dark-21">实训作业</span>
<li className="fr"> <li className="fr">
{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdminOrCreator()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null? {datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdminOrCreator()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
<span> <span>

28
public/react/src/modules/ecs/subroute/ecStudentList/EcStudentList.js
Unescape View File

@ -39,20 +39,20 @@ class EcStudentList extends Component {
let major_id=this.props.match.params.major_id; let major_id=this.props.match.params.major_id;
let year_id=this.props.match.params.year_id; let year_id=this.props.match.params.year_id;
const url ='/ec_major_schools/'+major_id+'/academic_years/'+year_id+'/student_lists_data'; // const url ='/ec_major_schools/'+major_id+'/academic_years/'+year_id+'/student_lists_data';
axios.get(url, { // axios.get(url, {
withCredentials: true, // withCredentials: true,
}).then((response) => { // }).then((response) => {
if(response.status===200){ // if(response.status===200){
this.setState({ // this.setState({
majorschoollist:response.data, // majorschoollist:response.data,
ismanager:response.data.ismanager, // ismanager:response.data.ismanager,
}) // })
} // }
}) // })
.catch(function (error) { // .catch(function (error) {
console.log(error); // console.log(error);
}); // });
// let majorschoollist={ // let majorschoollist={
// ec_students: [{index: 1, student_name: "同意", student_id: "s20111458"}, // ec_students: [{index: 1, student_name: "同意", student_id: "s20111458"},
// {index: 1, student_name: "同意", student_id: "s20111458"}, // {index: 1, student_name: "同意", student_id: "s20111458"},

2
public/react/src/modules/message/js/MessagSub.js
Unescape View File

@ -479,6 +479,8 @@ class MessagSub extends Component{
return ''; return '';
case "PublicCourseStart": case "PublicCourseStart":
return window.open(`/courses/${item.container_id}/informs`); return window.open(`/courses/${item.container_id}/informs`);
case "SubjectStartCourse":
return window.open(`/paths/${item.container_id}`);
default : default :
return window.open("/") return window.open("/")
} }

Write Preview
Loading…
Cancel
Save