hjm 5 years ago
commit 762ec25477

@ -2675,7 +2675,7 @@ class Studentshavecompletedthelist extends Component {
{data === undefined ? "" : <Table
dataSource={data}
columns={columnstwo}
showHeader={false}
// showHeader={false}
pagination={false}
loading={false}

@ -110,34 +110,34 @@ class Testpapersettinghomepage extends Component{
groupyslsval:list
})
}
experiment=(url)=>{
axios.get(url).then((response) => {
console.log(response);
if(response.data.status&&response.data.status===-1){
}else if(response.data.status&&response.data.status===-2){
if(response.data.messages === "100"){
// 已超出文件导出的上限数量100 ),建议:
this.setState({
DownloadType:true,
DownloadMessageval:100
})
}else {
//因附件资料超过500M
this.setState({
DownloadType:true,
DownloadMessageval:500
})
}
}else {
window.open("/api"+url, '_blank');
}
}).catch((error) => {
console.log(error)
});
}
// experiment=(url)=>{
//
// axios.get(url).then((response) => {
// console.log(response);
// if(response.data.status&&response.data.status===-1){
//
// }else if(response.data.status&&response.data.status===-2){
// if(response.data.messages === "100"){
// // 已超出文件导出的上限数量100 ),建议:
// this.setState({
// DownloadType:true,
// DownloadMessageval:100
// })
// }else {
// //因附件资料超过500M
// this.setState({
// DownloadType:true,
// DownloadMessageval:500
// })
// }
// }else {
// window.open("/api"+url, '_blank');
// }
// }).catch((error) => {
// console.log(error)
// });
//
// }
setgameexercise=(url)=>{
@ -169,18 +169,18 @@ class Testpapersettinghomepage extends Component{
Loadtype:false
})
}
DownloadType=()=>{
this.setState({
DownloadType:false,
DownloadMessageval:undefined
})
}
Downloadcal=()=>{
this.setState({
DownloadType:false,
DownloadMessageval:undefined
})
}
// DownloadType=()=>{
// this.setState({
// DownloadType:false,
// DownloadMessageval:undefined
// })
// }
// Downloadcal=()=>{
// this.setState({
// DownloadType:false,
// DownloadMessageval:undefined
// })
// }
render(){
let {tab,visible,Commonheadofthetestpaper}=this.state;
const isAdmin =this.props.isAdmin();
@ -188,12 +188,12 @@ class Testpapersettinghomepage extends Component{
return(
<div className="newMain clearfix ">
<DownloadMessage
{...this.props}
value={this.state.DownloadMessageval}
modalCancel={this.Downloadcal}
modalsType={this.DownloadType}
/>
{/*<DownloadMessage*/}
{/* {...this.props}*/}
{/* value={this.state.DownloadMessageval}*/}
{/* modalCancel={this.Downloadcal}*/}
{/* modalsType={this.DownloadType}*/}
{/*/>*/}
<div className={"educontent mb20"} style={{width:"1200px"}}>
{/* 公用的提示弹框 */}
{this.state.Modalstype===true?<Modals

@ -656,7 +656,7 @@ class PollNew extends Component {
"question_title": "",
"question_type": 1,
"new": "new",
"newid":Whether=== true? id :this.state.poll_questions[newarr.length - 1].question.id + 1,
"newid":Whether=== true? id :ids+ 1,
"answers": [
{"answer_id": 1, "answer_position": 1, "answer_text": ""},
{"answer_id": 2, "answer_position": 2, "answer_text": ""},
@ -691,7 +691,7 @@ class PollNew extends Component {
"max_choices": 0,
"min_choices": 0,
"new": "new",
"newid":Whether=== true? id :this.state.poll_questions[newarr.length - 1].question.id + 1,
"newid":Whether=== true? id :ids+1,
"answers": [
{"answer_id": 1, "answer_position": 1, "answer_text": ""},
{"answer_id": 2, "answer_position": 2, "answer_text": ""},
@ -724,7 +724,7 @@ class PollNew extends Component {
"question_title": "",
"question_type": 3,
"new": "new",
"newid":Whether=== true? id :this.state.poll_questions[newarr.length - 1].question.id + 1,
"newid":Whether=== true? id :ids + 1,
"answers": []
};
question = {"question": questiontwo};

@ -597,6 +597,7 @@ class Listofworks extends Component {
componentDidMount() {
console.log("Listofworks");
console.log("componentDidMount");
this.props.triggerRef(this)
var homeworkid = this.props.match.params.homeworkid;
// console.log(homeworkid)
// this.Gettitleinformation(homeworkid);
@ -1156,6 +1157,7 @@ class Listofworks extends Component {
}
//立即截止
homeworkends = () => {
console.log("1160");
let homeworkid = this.props.match.params.homeworkid;
let url = "/homework_commons/" + homeworkid + "/end_groups.json";

@ -317,6 +317,7 @@ class Listofworksstudentone extends Component {
componentDidMount() {
console.log("Listofworksstudentone");
console.log("componentDidMount");
this.props.triggerRef(this);
var homeworkid = this.props.match.params.homeworkid;
this.Getalistofworks(homeworkid);
let query = this.props.location.pathname;

@ -18,18 +18,20 @@ import Workquestionandanswer from './Workquestionandanswer';
import CoursesListType from '../coursesPublic/CoursesListType';
import ShixunStudentWork from "./ShixunStudentWork";
import Startshixuntask from "../coursesPublic/Startshixuntask";
import HomeworkModal from "../coursesPublic/HomeworkModal";
import moment from 'moment';
import TPMMDEditor from "../../tpm/challengesnew/TPMMDEditor";
class ShixunHomeworkPage extends Component {
constructor(props) {
super(props);
// this.answerMdRef = React.createRef();
this.state = {
tab: ["0"],
jobsettingsdata: undefined,
teacherdata: undefined,
code_review: false,
view_report: false,
visible: false,
showmodel:false,
child:undefined,
}
}
@ -76,190 +78,33 @@ class ShixunHomeworkPage extends Component {
shixuntypes: types[3]
})
}
//立即发布
homeworkstart = () => {
debugger
let homeworkid = this.props.match.params.homeworkid;
let url = "/homework_commons/" + homeworkid + "/publish_groups.json";
axios.get(url).then((response) => {
if (response.status === 200) {
let starttime = this.props.getNowFormatDates(1);
let endtime = this.props.getNowFormatDates(2);
this.setState({
modalname: "立即发布",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
svisible: true,
Topval:"学生将立即收到作业",
// Botvalleft:"暂不发布",
Botval:`本操作只对"未发布"的分班有效`,
starttime: "发布时间:" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime: "截止时间:" + endtime,
starttimes:starttime,
typs:"start",
Cancelname: "暂不发布",
Savesname: "立即发布",
Cancel: this.homeworkhide,
Saves: this.homeworkstartend,
course_groups: response.data.course_groups,
})
confirmysl(child,url) {
child.confirmysl(url);
}
}).catch((error) => {
console.log(error)
});
homeworkendss(child){
child.homeworkends();
}
getcourse_groupslist = (id) => {
this.setState({
course_groupslist: id
})
}
homeworkstarts(child){
child.homeworkstart();
isupdatas = () => {
// var homeworkid = this.props.match.params.homeworkid;
// // this.Gettitleinformation(homeworkid);
// this.Getalistofworks(homeworkid);
}
homeworkhide = () => {
this.isupdatas()
this.setState({
modalname: undefined,
modaltype: undefined,
svisible: false,
Topval: undefined,
Topvalright: undefined,
Botvalleft: undefined,
Botval: undefined,
starttime: undefined,
endtime: undefined,
Cancelname: undefined,
Savesname: undefined,
Cancel: undefined,
Saves: undefined,
StudentList_value: undefined,
addname: undefined,
addnametype: false,
addnametab: undefined,
course_groupyslstwo: undefined,
typs:undefined,
starttimes:undefined,
})
}
// 立即发布
homeworkstartend = (ds,endtime) => {
var homeworkid = this.props.match.params.homeworkid;
let {course_groupslist} = this.state;
let coursesId = this.props.match.params.coursesId;
let url = "/courses/" + coursesId + "/homework_commons/publish_homework.json";
axios.post(url, {
homework_ids: [homeworkid],
group_ids: course_groupslist,
end_time:endtime,
}).then((result) => {
if (result.status === 200) {
if (result.data.status === 0) {
notification.open({
message: "提示",
description: result.data.message
});
this.homeworkhide()
}
}
}).catch((error) => {
console.log(error);
})
workshowmodels(child){
child.workshowmodel();
}
//立即截止
homeworkends = () => {
let homeworkid = this.props.match.params.homeworkid;
let url = "/homework_commons/" + homeworkid + "/end_groups.json";
axios.get(url).then((response) => {
if (response.status === 200) {
this.setState({})
this.setState({
modalname: "立即截止",
modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
svisible: true,
Topval:"学生将不能再提交作业",
// Botvalleft:"暂不截止",
Botval:`本操作只对"提交中"的分班有效`,
Cancelname: "暂不截止",
Savesname: "立即截止",
Cancel: this.homeworkhide,
Saves: this.coursetaskend,
starttime: undefined,
endtime: undefined,
course_groups: response.data.course_groups,
typs:"end",
})
}
}).catch((error) => {
console.log(error)
});
}
//立即截止确定按钮
coursetaskend = () => {
var homeworkid = this.props.match.params.homeworkid;
let {course_groupslist} = this.state;
const cid = this.props.match.params.coursesId;
let url = "/courses/" + cid + "/homework_commons/end_homework.json";
axios.post(url, {
group_ids: course_groupslist,
homework_ids: [homeworkid],
})
.then((response) => {
if (response.data.status == 0) {
notification.open({
message: "提示",
description: response.data.message
});
this.homeworkhide()
}
})
.catch(function (error) {
console.log(error);
});
}
bindRef = ref => { this.child = ref }
///////////////教师截止
render() {
let {tab, jobsettingsdata, teacherdata} = this.state;
let {tab, teacherdata, jobsettingsdata} = this.state;
const isAdmin = this.props.isAdmin();
return (
<div className="newMain clearfix ">
{/*立即发布*/}
<HomeworkModal
modaltype={this.state.modaltype}
modalname={this.state.modalname}
visible={this.state.svisible}
Topval={this.state.Topval}
Topvalright={this.state.Topvalright}
Botvalleft={this.state.Botvalleft}
Botval={this.state.Botval}
starttime={this.state.starttime}
endtime={this.state.endtime}
Cancelname={this.state.Cancelname}
Savesname={this.state.Savesname}
Cancel={this.state.Cancel}
Saves={this.state.Saves}
course_groups={this.state.course_groups}
getcourse_groupslist={(id) => this.getcourse_groupslist(id)}
starttimes={this.state.starttimes}
typs={this.state.typs}
/>
<div className={"educontent mb20"} style={{width: "1200px"}}>
<div className="educontent mb20">
@ -348,27 +193,27 @@ class ShixunHomeworkPage extends Component {
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
<li><a
onClick={() => this.confirmysl(`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)}>实训报告</a>
onClick={(child) => this.confirmysl(this.child,`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)}>实训报告</a>
</li>
<li><a
onClick={() => this.confirmysl(`/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx?group_id=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)}>学生成绩</a>
onClick={(child) => this.confirmysl(this.child,`/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx?group_id=${this.state.checkedValuesineinfo}&search=${this.state.searchtext}`)}>学生成绩</a>
</li>
</ul>
</li> : ""}
{this.props.isAdmin() ?
teacherdata && teacherdata.end_immediately === true ?
<a className="fr color-blue font-16" onClick={this.homeworkends}>立即截止</a>
<a className="fr color-blue font-16" onClick={(child)=>this.homeworkendss(this.child)}>立即截止</a>
: ""
: ""}
{this.props.isAdmin() ?
teacherdata && teacherdata.publish_immediately === true ?
<a className="fr color-blue font-16" onClick={this.homeworkstart}>立即发布</a>
<a className="fr color-blue font-16" onClick={(child)=>this.homeworkstarts(this.child)}>立即发布</a>
: ""
: ""}
{this.props.isAdmin() ?
teacherdata && teacherdata.code_review === true ?
<a className="fr color-blue font-16" onClick={this.workshowmodel}>代码查重</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"}
to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/shixun_work_report`}>
@ -392,21 +237,21 @@ class ShixunHomeworkPage extends Component {
{
// 教师列表
parseInt(tab) === 0 ? (isAdmin === true ?
<Listofworks {...this.props} {...this.state}
<Listofworks triggerRef={this.bindRef} {...this.props} {...this.state}
Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworks>
:
<Listofworksstudentone {...this.props} {...this.state}
<Listofworksstudentone triggerRef={this.bindRef} {...this.props} {...this.state}
Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>)
:
parseInt(tab) === 1 ?
<Workquestionandanswer {...this.props} {...this.state}
<Workquestionandanswer triggerRef={this.bindRef} {...this.props} {...this.state}
Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>
:
parseInt(tab) === 2 ?
<ShixunStudentWork {...this.props} {...this.state}
<ShixunStudentWork triggerRef={this.bindRef} {...this.props} {...this.state}
Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>
:
<Trainingjobsetting {...this.props} {...this.state}
<Trainingjobsetting triggerRef={this.bindRef} {...this.props} {...this.state}
Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>
}
</div>

@ -76,6 +76,7 @@ class ShixunStudentWork extends Component {
componentDidMount() {
console.log("ShixunStudentWork");
console.log("componentDidMount");
this.props.triggerRef(this);
this.getupdata();
this.getTrainingjobsetting();
}

@ -128,6 +128,7 @@ class Trainingjobsetting extends Component {
componentDidMount() {
console.log("Trainingjobsetting");
console.log("componentDidMount");
this.props.triggerRef(this);
this.getTrainingjobsetting();
let query = this.props.location.pathname;
const type = query.split('/');

@ -84,6 +84,7 @@ class Workquestionandanswer extends Component {
componentDidMount() {
console.log("Workquestionandanswer");
console.log("componentDidMount");
this.props.triggerRef(this);
var homeworkid = this.props.match.params.homeworkid;
// console.log(homeworkid)
this.Gettitleinformation(homeworkid)

@ -25,7 +25,6 @@ import '../courses/css/Courses.css';
import beijintulogontwo from '../../../src/images/login/beijintulogontwo.png';
import educodernet from '../../../src/images/login/educodernet.png';
import LoginRegisterComponent from '../user/LoginRegisterComponent';
import InterestpageComponent from '../user/Interestpage'
import FindPasswordComponent from '../user/FindPasswordComponent';
import passopen from "../../images/login/passopen.png";
//educoder登入页面

@ -69,7 +69,7 @@ class LoginRegisterComponent extends Component {
//这是判断是否手机正确
if(this.state.Phonenumberisnotcobool === true){
this.openNotification(this.state.Phonenumberisnotcos);
this.openNotification(this.state.Phonenumberisnotco);
this.setState({
Whethertoverify:this.state.Whethertoverify===true?false:true,
})
@ -211,6 +211,9 @@ class LoginRegisterComponent extends Component {
}
this.setState({
login: stirngt,
Phonenumberisnotco:undefined,
dragOk:false,
Whethertoverify:this.state.Whethertoverify===true?false:true,
})
}
loginInputonChanges = (e) => {

@ -41,7 +41,7 @@ class LoginRegisterComponent extends Component {
discodeBtn: false,
clearInterval: false,
autoLogin: true,
classpassbool: true,
classpassbool: false,
// 注册
readAgreement: false,
getverificationcodes: true,
@ -71,7 +71,7 @@ class LoginRegisterComponent extends Component {
discodeBtn: false,
clearInterval: false,
autoLogin: true,
classpassbool: true,
classpassbool: false,
// 注册
readAgreement: false,
getverificationcodes: true,
@ -251,9 +251,7 @@ class LoginRegisterComponent extends Component {
password: this.state.passwords,
code: this.state.codes,
}).then((result) => {
console.log(result);
try {
// this.onTabChange("1");
if(result){
this.setState({
logins: "",
dragOk: false,
@ -262,9 +260,6 @@ class LoginRegisterComponent extends Component {
Agreetotheterms: "",
})
this.props.history.push("/interesse");
// this.props.Setshowbool(2,this.state.logins,this.state.passwords);
} catch (e) {
}
}).catch((error) => {
@ -360,13 +355,13 @@ class LoginRegisterComponent extends Component {
console.log("显示于隐藏");
if (this.state.classpassbool === true) {
this.setState({
passopens: passoff,
passopens: passopen,
classpass: "text",
classpassbool: false,
})
} else {
this.setState({
passopens: passopen,
passopens: passoff ,
classpass: "password",
classpassbool: true,
})
@ -497,10 +492,15 @@ class LoginRegisterComponent extends Component {
Phonenumberisnotcos: undefined,
Phonenumberisnotcobool: false,
logins: stirngt,
dragOk:false,
Whethertoverify:this.state.Whethertoverify===true?false:true,
})
}else{
this.setState({
logins: stirngt,
Phonenumberisnotcos: undefined,
dragOk:false,
Whethertoverify:this.state.Whethertoverify===true?false:true,
})
}
@ -567,6 +567,7 @@ class LoginRegisterComponent extends Component {
tab,
dragOk,
Whethertoverify,
classpassbool,
// 注册
readAgreement,
} = this.state
@ -575,7 +576,7 @@ class LoginRegisterComponent extends Component {
// window.location.href='http://www.cnblogs.com/a-cat/';
}
// console.log(activeKey);
console.log(classpass);
return (
<div className="login_register_content" style={ parseInt(tab[0])==0?{height: "346px"} :{height: "490px"}}>
@ -759,7 +760,7 @@ class LoginRegisterComponent extends Component {
}
</style>
<Input className="loginInput font-14 mt25 color-grey-9 loginInputzhuche" placeholder="输入8~16位密码区分大小写"
type={classpass}
type={classpassbool===false?"text":"password"}
autoComplete="new-password"
onClick={this.changeType}

Loading…
Cancel
Save