diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 20a307ac6..5cd59f704 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -2675,7 +2675,7 @@ class Studentshavecompletedthelist extends Component { {data === undefined ? "" : { - - 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(
- + {/**/}
{/* 公用的提示弹框 */} {this.state.Modalstype===true? { + console.log("1160"); let homeworkid = this.props.match.params.homeworkid; let url = "/homework_commons/" + homeworkid + "/end_groups.json"; diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 8192e6a17..6d2f5c9c9 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -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; diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index a6663c600..1db93c2bd 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -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, - }) - } - }).catch((error) => { - console.log(error) - }); + confirmysl(child,url) { + child.confirmysl(url); } - getcourse_groupslist = (id) => { - this.setState({ - course_groupslist: id - }) - + homeworkendss(child){ + child.homeworkends(); } - isupdatas = () => { - // var homeworkid = this.props.match.params.homeworkid; - // // this.Gettitleinformation(homeworkid); - // this.Getalistofworks(homeworkid); - } + homeworkstarts(child){ + child.homeworkstart(); - 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); - }) - } - - - //立即截止 - 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) - }); + workshowmodels(child){ + child.workshowmodel(); } - //立即截止确定按钮 - 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 (
- {/*立即发布*/} - this.getcourse_groupslist(id)} - starttimes={this.state.starttimes} - typs={this.state.typs} - />
@@ -348,27 +193,27 @@ class ShixunHomeworkPage extends Component { 导出 : ""} {this.props.isAdmin() ? teacherdata && teacherdata.end_immediately === true ? - 立即截止 + this.homeworkendss(this.child)}>立即截止 : "" : ""} {this.props.isAdmin() ? teacherdata && teacherdata.publish_immediately === true ? - 立即发布 + this.homeworkstarts(this.child)}>立即发布 : "" : ""} {this.props.isAdmin() ? teacherdata && teacherdata.code_review === true ? - 代码查重 + this.workshowmodels(this.child)}>代码查重 : "" : ""} {this.state.view_report === true ? @@ -392,21 +237,21 @@ class ShixunHomeworkPage extends Component { { // 教师列表 parseInt(tab) === 0 ? (isAdmin === true ? - this.Getdataback(jobsettingsdata, teacherdata)}> : - this.Getdataback(jobsettingsdata, teacherdata)}>) : parseInt(tab) === 1 ? - this.Getdataback(jobsettingsdata, teacherdata)}> : parseInt(tab) === 2 ? - this.Getdataback(jobsettingsdata, teacherdata)}> : - this.Getdataback(jobsettingsdata, teacherdata)}> }
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index 17e51258f..37ea4d1c3 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -76,6 +76,7 @@ class ShixunStudentWork extends Component { componentDidMount() { console.log("ShixunStudentWork"); console.log("componentDidMount"); + this.props.triggerRef(this); this.getupdata(); this.getTrainingjobsetting(); } diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index ae1058d8a..411855491 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -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('/'); diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js index 52a214b7e..39a963023 100644 --- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js +++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js @@ -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) diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js index 124c047ff..8e8bfd112 100644 --- a/public/react/src/modules/login/EducoderLogin.js +++ b/public/react/src/modules/login/EducoderLogin.js @@ -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登入页面 diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js index 9609801b8..0526b0cb5 100644 --- a/public/react/src/modules/user/FindPasswordComponent.js +++ b/public/react/src/modules/user/FindPasswordComponent.js @@ -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) => { diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index d895297fc..707daf1ea 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -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,21 +251,16 @@ class LoginRegisterComponent extends Component { password: this.state.passwords, code: this.state.codes, }).then((result) => { - console.log(result); - try { - // this.onTabChange("1"); - this.setState({ - logins: "", - dragOk: false, - codes: "", - passwords: "", - Agreetotheterms: "", - }) - this.props.history.push("/interesse"); - // this.props.Setshowbool(2,this.state.logins,this.state.passwords); - } catch (e) { - - } + if(result){ + this.setState({ + logins: "", + dragOk: false, + codes: "", + passwords: "", + Agreetotheterms: "", + }) + this.props.history.push("/interesse"); + } }).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 (
@@ -759,7 +760,7 @@ class LoginRegisterComponent extends Component { }