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 6 years ago
parent a18a3a63d6 1c0af7967e
commit 8ea08cd9fc
19 changed files with 1952 additions and 1722 deletions

2
public/react/src/AppConfig.js
Unescape View File

@ -21,7 +21,7 @@ function locationurl(list){
const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' : const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin' window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
window._debugType = debugType; window._debugType = debugType;
// const debugType ="";
export function initAxiosInterceptors(props) { export function initAxiosInterceptors(props) {
// TODO 避免重复的请求 https://github.com/axios/axios#cancellation // TODO 避免重复的请求 https://github.com/axios/axios#cancellation

1
public/react/src/context/TPIContextProvider.js
Unescape View File

@ -892,6 +892,7 @@ pop_box_new(htmlvalue, 480, 182);
<Dialog <Dialog
id="tpi-dialog" id="tpi-dialog"
open={this.state.gDialogOpen} open={this.state.gDialogOpen}
disableEscapeKeyDown={true}
onClose={() => this.handleGdialogClose()} onClose={() => this.handleGdialogClose()}
> >
<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle> <DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>

4
public/react/src/index.css
Unescape View File

@ -34,3 +34,7 @@ body {
.anticon anticon-paper-clip{ .anticon anticon-paper-clip{
color: #29bd8b !important; color: #29bd8b !important;
} }
.MuiModal-root-15{
z-index: 1000 !important;
}

2
public/react/src/modules/comment/Comments.js
Unescape View File

@ -505,6 +505,7 @@ class Comments extends Component {
</Modals> : </Modals> :
<Dialog <Dialog
open={dialogOpen} open={dialogOpen}
disableEscapeKeyDown={true}
onClose={this.handleDialogClose} onClose={this.handleDialogClose}
> >
<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle> <DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
@ -531,6 +532,7 @@ class Comments extends Component {
<Dialog <Dialog
open={goldRewardDialogOpen} open={goldRewardDialogOpen}
disableEscapeKeyDown={true}
onClose={this.handleGoldRewardDialogClose} onClose={this.handleGoldRewardDialogClose}
> >
<DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle> <DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle>

1
public/react/src/modules/common/RewardDialog.js
Unescape View File

@ -58,6 +58,7 @@ class RewardDialog extends Component {
return ( return (
<Dialog <Dialog
open={goldRewardDialogOpen} open={goldRewardDialogOpen}
disableEscapeKeyDown={true}
onClose={this.handleGoldRewardDialogClose} onClose={this.handleGoldRewardDialogClose}
> >
<DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle> <DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle>

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

@ -5,7 +5,8 @@ import locale from 'antd/lib/date-picker/locale/zh_CN';
import { WordsBtn,getUrl ,handleDateString} from 'educoder'; import { WordsBtn,getUrl ,handleDateString} from 'educoder';
import axios from 'axios'; import axios from 'axios';
import Modals from '../../../modals/Modals'; import Modals from '../../../modals/Modals';
import DownloadMessage from '../../../modals/DownloadMessage'; import DownloadMessageysl from "../../../modals/DownloadMessageysl";
import CoursesListType from '../../coursesPublic/CoursesListType'; import CoursesListType from '../../coursesPublic/CoursesListType';
import HomeworkModal from "../../coursesPublic/HomeworkModal"; import HomeworkModal from "../../coursesPublic/HomeworkModal";
import moment from 'moment'; import moment from 'moment';
@ -70,7 +71,9 @@ class GraduationTaskssettingapp extends Component{
endtimetype:false, endtimetype:false,
flagPageEdit:false, flagPageEdit:false,
visible:false, visible:false,
starttime:undefined starttime:undefined,
DownloadType:false,
DownloadMessageval:undefined,
} }
} }
@ -891,34 +894,41 @@ class GraduationTaskssettingapp extends Component{
} }
/// 确认是否下载 /// 确认是否下载
confirmysl(url){ confirmysl(url){
axios.get(url).then((response) => {
if(response === undefined){
return
}
if(response.data.status&&response.data.status===-1){
this.refs.DownloadMessage.confirmysl(url); }else if(response.data.status&&response.data.status===-2){
if(response.data.messages === "100"){
// axios.get(url).then((response) => { // 已超出文件导出的上限数量（100 ），建议：
// if(response.data.status&&response.data.status===-1){
// }else if(response.data.status&&response.data.status===-2){ this.setState({
// if(response.data.messages === "100"){ DownloadType:true,
// // 已超出文件导出的上限数量（100 ），建议： DownloadMessageval:100
})
}else {
//因附件资料超过500M
this.setState({
DownloadType:true,
DownloadMessageval:500
})
}
}else {
this.props.showNotification(`正在下载中`);
window.open("/api"+url, '_blank');
}
}).catch((error) => {
console.log(error)
});
}
// this.setState({ Downloadcal=()=> {
// DownloadType:true, this.setState({
// DownloadMessageval:100 DownloadType: false,
// }) DownloadMessageval: undefined
// }else { })
// //因附件资料超过500M
// this.setState({
// DownloadType:true,
// DownloadMessageval:500
// })
// }
// }else {
// this.props.showNotification(`正在下载中`);
// window.open("/api"+url, '_blank');
// }
// }).catch((error) => {
// console.log(error)
// });
} }
render(){ render(){
const { getFieldDecorator } = this.props.form; const { getFieldDecorator } = this.props.form;
@ -994,10 +1004,14 @@ class GraduationTaskssettingapp extends Component{
{/*course_groups={course_groups}*/} {/*course_groups={course_groups}*/}
{/*skipTop={this.skipTop}*/} {/*skipTop={this.skipTop}*/}
{/*/>*/} {/*/>*/}
<DownloadMessage <DownloadMessageysl
{...this.props} {...this.props}
ref="DownloadMessage" value={this.state.DownloadMessageval}
modalCancel={this.Downloadcal}
modalsType={this.state.DownloadType}
/> />
<HomeworkModal <HomeworkModal
starttimes={this.state.starttimes} starttimes={this.state.starttimes}
typs={this.state.typs} typs={this.state.typs}

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

@ -6,9 +6,8 @@ import axios from 'axios';
import moment from 'moment'; import moment from 'moment';
import HomeworkModal from "../../coursesPublic/HomeworkModal"; import HomeworkModal from "../../coursesPublic/HomeworkModal";
import Modals from '../../../modals/Modals'; import Modals from '../../../modals/Modals';
import DownloadMessage from '../../../modals/DownloadMessage';
import CoursesListType from '../../coursesPublic/CoursesListType'; import CoursesListType from '../../coursesPublic/CoursesListType';
import DownloadMessageysl from "../../../modals/DownloadMessageysl";
import ModulationModal from "../../coursesPublic/ModulationModal"; import ModulationModal from "../../coursesPublic/ModulationModal";
import AllocationModal from "../../coursesPublic/AllocationModal"; import AllocationModal from "../../coursesPublic/AllocationModal";
import Associationmodel from '../../coursesPublic/Associationmodel'; import Associationmodel from '../../coursesPublic/Associationmodel';
@ -48,7 +47,9 @@ class GraduationTaskssettinglist extends Component{
Allocationtype:false, Allocationtype:false,
task_Id:"", task_Id:"",
user_id:"", user_id:"",
visibles:false visibles:false,
DownloadType:false,
DownloadMessageval:undefined,
} }
} }
@ -626,9 +627,9 @@ class GraduationTaskssettinglist extends Component{
this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pageNumber); this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pageNumber);
} }
/// 确认是否下载 /// 确认是否下载
confirmysl(url){ confirmysl(url){
let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,page} =this.state; let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,page} =this.state;
let params ={ let params ={
@ -640,7 +641,43 @@ class GraduationTaskssettinglist extends Component{
b_order:b_order, b_order:b_order,
search:search, search:search,
} }
this.refs.DownloadMessage.confirmysl(url,params); axios.get(url,{
params
}).then((response) => {
if(response === undefined){
return
}
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 {
this.props.showNotification(`正在下载中`);
window.open("/api"+url, '_blank');
}
}).catch((error) => {
console.log(error)
});
}
Downloadcal=()=> {
this.setState({
DownloadType: false,
DownloadMessageval: undefined
})
} }
render(){ render(){
@ -1007,7 +1044,13 @@ class GraduationTaskssettinglist extends Component{
setupdate={this.setupdate} setupdate={this.setupdate}
/>:""} />:""}
<DownloadMessage ref="DownloadMessage" {...this.props} /> <DownloadMessageysl
{...this.props}
value={this.state.DownloadMessageval}
modalCancel={this.Downloadcal}
modalsType={this.state.DownloadType}
/>
{taskslistdata&&taskslistdata? {taskslistdata&&taskslistdata?
// 教师列表 // 教师列表

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

@ -4,7 +4,7 @@ import {Link} from 'react-router-dom';
import { WordsBtn,markdownToHTML} from 'educoder'; import { WordsBtn,markdownToHTML} from 'educoder';
import axios from 'axios'; import axios from 'axios';
import Modals from '../../../modals/Modals'; import Modals from '../../../modals/Modals';
import DownloadMessage from '../../../modals/DownloadMessage'; import DownloadMessageysl from "../../../modals/DownloadMessageysl";
import HomeworkModal from "../../coursesPublic/HomeworkModal"; import HomeworkModal from "../../coursesPublic/HomeworkModal";
import CoursesListType from '../../coursesPublic/CoursesListType'; import CoursesListType from '../../coursesPublic/CoursesListType';
import moment from 'moment'; import moment from 'moment';
@ -25,7 +25,9 @@ class GraduationTasksquestions extends Component{
fileList: [], fileList: [],
contents: [{val:"",id:1}], contents: [{val:"",id:1}],
type:true, type:true,
questionslist:undefined questionslist:undefined,
DownloadType:false,
DownloadMessageval:undefined,
} }
} }
@ -192,37 +194,40 @@ class GraduationTasksquestions extends Component{
/// 确认是否下载 /// 确认是否下载
confirmysl(url){ confirmysl(url){
this.refs.DownloadMessage.confirmysl(url); axios.get(url).then((response) => {
// axios.get(url).then((response) => { if(response === undefined){
// if(response.data.status&&response.data.status===-1){ return
// }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 {
// this.props.showNotification(`正在下载中`);
// window.open("/api"+url, '_blank');
// }
// }).catch((error) => {
// console.log(error)
// });
} }
Downloadcal=()=>{ 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({ this.setState({
DownloadType:false, DownloadType:true,
DownloadMessageval:undefined DownloadMessageval:100
})
}else {
//因附件资料超过500M
this.setState({
DownloadType:true,
DownloadMessageval:500
})
}
}else {
this.props.showNotification(`正在下载中`);
window.open("/api"+url, '_blank');
}
}).catch((error) => {
console.log(error)
});
}
Downloadcal=()=> {
this.setState({
DownloadType: false,
DownloadMessageval: undefined
}) })
} }
render(){ render(){
@ -256,9 +261,12 @@ class GraduationTasksquestions extends Component{
{/*modalSave={ModalSave}*/} {/*modalSave={ModalSave}*/}
{/*loadtype={Loadtype}*/} {/*loadtype={Loadtype}*/}
{/*/>*/} {/*/>*/}
<DownloadMessage <DownloadMessageysl
{...this.props} {...this.props}
ref="DownloadMessage" value={this.state.DownloadMessageval}
modalCancel={this.Downloadcal}
modalsType={this.state.DownloadType}
/> />
<HomeworkModal <HomeworkModal
starttimes={this.state.starttimes} starttimes={this.state.starttimes}

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

@ -911,8 +911,8 @@ class Listofworksstudentone extends Component {
} }
} }
student=()=>{ student=()=>{
console.log("914"); // console.log("914");
debugger // debugger
this.props.triggerRef(this); this.props.triggerRef(this);
var homeworkid = this.props.match.params.homeworkid; var homeworkid = this.props.match.params.homeworkid;
this.Getalistofworks(homeworkid); this.Getalistofworks(homeworkid);
@ -932,8 +932,8 @@ class Listofworksstudentone extends Component {
// 获取作品列表 // 获取作品列表
Getalistofworks = (homeworkid) => { Getalistofworks = (homeworkid) => {
// console.log("获取作品列表"); // console.log("获取作品列表");
console.log("935"); // console.log("935");
debugger // debugger
let urll = `/homework_commons/${homeworkid}/works_list.json`; let urll = `/homework_commons/${homeworkid}/works_list.json`;
var data = { var data = {
search: "", search: "",
@ -948,9 +948,9 @@ class Listofworksstudentone extends Component {
if(result === undefined){ if(result === undefined){
return return
} }
console.log("951"); // console.log("951");
console.log(result); // console.log(result);
debugger // debugger
if (result.status === 200) { if (result.status === 200) {
this.setState({ this.setState({
teacherdata: result.data, teacherdata: result.data,
@ -1109,11 +1109,11 @@ class Listofworksstudentone extends Component {
}) })
// } // }
var teacherlist = { //分页 // var teacherlist = { //分页
total: teacherdata.student_works.length, //数据总数量 // total: teacherdata.student_works.length, //数据总数量
pageSize: teacherdata.student_works.length, //一页显示几条 // pageSize: teacherdata.student_works.length, //一页显示几条
current: this.state.page, // current: this.state.page,
} // }
styletable = {"display": "block",} styletable = {"display": "block",}
} else { } else {
// console.log("seacthdata设置数据2") // console.log("seacthdata设置数据2")
@ -1231,11 +1231,11 @@ class Listofworksstudentone extends Component {
}) })
// } // }
var teacherlist = { //分页 // var teacherlist = { //分页
total: teacherdata.student_works.length, //数据总数量 // total: teacherdata.student_works.length, //数据总数量
pageSize: teacherdata.student_works.length, //一页显示几条 // pageSize: teacherdata.student_works.length, //一页显示几条
current: this.state.page, // current: this.state.page,
} // }
} else { } else {
// console.log("seacthdata设置数据2") // console.log("seacthdata设置数据2")
var teacherlist = undefined; var teacherlist = undefined;
@ -1404,11 +1404,11 @@ class Listofworksstudentone extends Component {
TablePagination = (e) => { TablePagination = (e) => {
// console.log(e.current); // console.log(e.current);
var teacherlists = { //分页 // var teacherlists = { //分页
total: this.state.student_works.length, //数据总数量 // total: this.state.student_works.length, //数据总数量
pageSize: 10, //一页显示几条 // pageSize: 10, //一页显示几条
current: e.current, // current: e.current,
} // }
this.setState({ this.setState({
page: e.current, page: e.current,
teacherlists: teacherlists teacherlists: teacherlists
@ -1468,7 +1468,7 @@ class Listofworksstudentone extends Component {
// 获取作品列表 // 获取作品列表
Getalistofworkst = (homeworkid) => { Getalistofworkst = (homeworkid) => {
// console.log("获取作品列表");7009 // console.log("获取作品列表");7009
debugger // debugger
let urll = `/homework_commons/${homeworkid}/works_list.json`; let urll = `/homework_commons/${homeworkid}/works_list.json`;
// console.log(homeworkid); // console.log(homeworkid);
@ -1488,7 +1488,7 @@ class Listofworksstudentone extends Component {
limit:20, limit:20,
} }
axios.post(urll, data).then((result) => { axios.post(urll, data).then((result) => {
debugger // debugger
if (result !== undefined) { if (result !== undefined) {
// console.log(url) // console.log(url)
// console.log("作品列表6789077") // console.log("作品列表6789077")
@ -1583,7 +1583,7 @@ class Listofworksstudentone extends Component {
// 设置数据 // 设置数据
seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => { seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => {
debugger // debugger
let {page, limit} = this.state; let {page, limit} = this.state;
let datalist = []; let datalist = [];
let columns = this.state.columns; let columns = this.state.columns;
@ -1615,11 +1615,11 @@ class Listofworksstudentone extends Component {
} }
var teacherlist = { //分页 // var teacherlist = { //分页
total: student_works.length, //数据总数量 // total: student_works.length, //数据总数量
pageSize: 20, //一页显示几条 // pageSize: 20, //一页显示几条
current: page, // current: page,
} // }
if (work_efficiency === false) { if (work_efficiency === false) {
if(JSON.stringify(course_group_info) === "[]"|| course_group_info === undefined||course_group_info === null){ if(JSON.stringify(course_group_info) === "[]"|| course_group_info === undefined||course_group_info === null){
//这里没有分班 没有 关卡得分 没有效率分 //这里没有分班 没有 关卡得分 没有效率分
@ -2198,9 +2198,12 @@ class Listofworksstudentone extends Component {
// console.log(this.state.data); // console.log(this.state.data);
// console.log("841"); // console.log("841");
// console.log(this.state.columns); // console.log(this.state.columns);
// console.log(data);
// console.log("2202");
// 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}
@ -2488,7 +2491,7 @@ class Listofworksstudentone extends Component {
</div> </div>
{ {
teacherdata && teacherdata.work_count && teacherdata.work_count > limit ? teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
<div className="edu-txt-center edu-back-white mt30 mb20"> <div className="edu-txt-center mt30 ">
<Pagination showQuickJumper current={page} <Pagination showQuickJumper current={page}
onChange={this.paginationonChanges} pageSize={limit} onChange={this.paginationonChanges} pageSize={limit}
total={teacherdata.work_count}></Pagination> total={teacherdata.work_count}></Pagination>
@ -2498,8 +2501,9 @@ class Listofworksstudentone extends Component {
</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) === "[]" ?
// 学生不能查看别人的 // 学生不能查看别人的
<div className=" clearfix " style={{margin: "auto" , minWidth:"1200px"}}> <div className=" clearfix " style={{margin: "auto" , minWidth:"1200px"}}>
@ -2837,7 +2841,7 @@ class Listofworksstudentone extends Component {
</div> </div>
{ {
teacherdata && teacherdata.work_count && teacherdata.work_count > limit ? teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
<div className="edu-txt-center edu-back-white mt30 mb20"> <div className="edu-txt-center mt30">
<Pagination showQuickJumper current={page} <Pagination showQuickJumper current={page}
onChange={this.paginationonChanges} pageSize={limit} onChange={this.paginationonChanges} pageSize={limit}
total={teacherdata.work_count}></Pagination> total={teacherdata.work_count}></Pagination>
@ -2868,7 +2872,8 @@ class Listofworksstudentone extends Component {
</div> </div>
</div> </div>
) }
</div>
) )
} }

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

@ -276,6 +276,7 @@ class ShixunHomeworkPage extends Component {
value={this.state.DownloadMessageval} value={this.state.DownloadMessageval}
modalCancel={this.Downloadcal} modalCancel={this.Downloadcal}
modalsType={this.state.DownloadType} modalsType={this.state.DownloadType}
/> />
{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>}

1
public/react/src/modules/login/LoginDialog.js
Unescape View File

@ -381,6 +381,7 @@ class LoginDialog extends Component {
return ( return (
<Dialog open={true} id="DialogID" <Dialog open={true} id="DialogID"
style={{ display: isRender==false? 'none' : ''}} style={{ display: isRender==false? 'none' : ''}}
disableEscapeKeyDown={true}
onClose={() => this.handleDialogClose()} onClose={() => this.handleDialogClose()}
> >
<div className={dialogBox}> <div className={dialogBox}>

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

@ -538,6 +538,7 @@ class Trialapplication extends Component {
style={{height: '0', width: '0', border: 'none', display: "none"}}/> style={{height: '0', width: '0', border: 'none', display: "none"}}/>
<Dialog open={true} id="DialogIDysl" <Dialog open={true} id="DialogIDysl"
disableEscapeKeyDown={true}
style={{display: isRenders == false ? 'none' : '', "border-radius": "10px"}} style={{display: isRenders == false ? 'none' : '', "border-radius": "10px"}}
> >
<div id="closeIcon" onClick={() => { <div id="closeIcon" onClick={() => {
@ -604,7 +605,7 @@ class Trialapplication extends Component {
{ {
Phonenumberisnotco && Phonenumberisnotco != "" ? Phonenumberisnotco && Phonenumberisnotco != "" ?
<p className="color-red mt5 mb5" style={{width: " 100%", height: "20px"}}> <p className="color-red mt5 mb5" style={{width: " 100%", height: "20px"}}>
<span>{Phonenumberisnotco}</span> <span style={{textAlign:"left"}}>{Phonenumberisnotco}</span>
</p> </p>
: <div style={{height: "20px"}}></div> : <div style={{height: "20px"}}></div>
} }
@ -661,7 +662,7 @@ class Trialapplication extends Component {
{ {
Phonenumberisnotcocodes && Phonenumberisnotcocodes != "" ? Phonenumberisnotcocodes && Phonenumberisnotcocodes != "" ?
<p className="color-red " style={{width: " 100%", height: "20px"}}> <p className="color-red " style={{width: " 100%", height: "20px"}}>
<span>{Phonenumberisnotcocodes}</span> <span style={{textAlign:"left"}}>{Phonenumberisnotcocodes}</span>
</p> </p>
: <div style={{height: "20px"}}></div> : <div style={{height: "20px"}}></div>
} }
@ -676,7 +677,7 @@ class Trialapplication extends Component {
{ {
Phonenumberisnotcoreason && Phonenumberisnotcoreason != "" ? Phonenumberisnotcoreason && Phonenumberisnotcoreason != "" ?
<p className="color-red" style={{width: " 100%", height: "20px"}}> <p className="color-red" style={{width: " 100%", height: "20px"}}>
<span>{Phonenumberisnotcoreason}</span> <span style={{textAlign:"left"}}>{Phonenumberisnotcoreason}</span>
</p> </p>
: <div style={{height: "20px"}}></div> : <div style={{height: "20px"}}></div>
} }

3
public/react/src/modules/page/MainContentContainer.js
Unescape View File

@ -876,6 +876,7 @@ class MainContentContainer extends Component {
<React.Fragment> <React.Fragment>
<Dialog <Dialog
open={this.state.open} open={this.state.open}
disableEscapeKeyDown={true}
onClose={this.handleClose} onClose={this.handleClose}
> >
<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle> <DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
@ -893,6 +894,7 @@ class MainContentContainer extends Component {
<Dialog <Dialog
open={this.state.resetCodeDialogOpen} open={this.state.resetCodeDialogOpen}
disableEscapeKeyDown={true}
onClose={() => this.handleResetCodeDialogClose()} onClose={() => this.handleResetCodeDialogClose()}
> >
<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle> <DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>
@ -912,6 +914,7 @@ class MainContentContainer extends Component {
</Dialog> </Dialog>
<Dialog <Dialog
disableEscapeKeyDown={true}
open={this.state.resetPassedCodeDialogOpen} open={this.state.resetPassedCodeDialogOpen}
onClose={() => this.handleResetPassedCodeDialogClose()} onClose={() => this.handleResetPassedCodeDialogClose()}
> >

1
public/react/src/modules/page/main/LeftView.js
Unescape View File

@ -147,6 +147,7 @@ class LeftView extends Component {
<React.Fragment> <React.Fragment>
<Dialog <Dialog
open={dialogOpen} open={dialogOpen}
disableEscapeKeyDown={true}
onClose={handleDialogClose} onClose={handleDialogClose}
> >
<DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle> <DialogTitle id="alert-dialog-title">{"提示"}</DialogTitle>

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

@ -547,13 +547,13 @@ submittojoinclass=(value)=>{
} }
} }
// trialapplications =()=>{ trialapplications =()=>{
// console.log("点击了") console.log("点击了")
// this.setState({ this.setState({
// isRenders: true, isRenders: true,
// showTrial:true, showTrial:true,
// }) })
// } }
// 关闭 // 关闭
cancelModulationModels = () => { cancelModulationModels = () => {
@ -618,14 +618,13 @@ submittojoinclass=(value)=>{
{/* :""*/} {/* :""*/}
{/*}*/} {/*}*/}
{/*{*/} isRenders&&isRenders===true?
{/* isRenders&&isRenders===true?*/} <Trialapplication
{/* <Trialapplication*/} {...this.state}
{/* {...this.state}*/} Cancel={() => this.cancelModulationModels()}
{/* Cancel={() => this.cancelModulationModels()}*/} />
{/* />*/} :""
{/* :""*/} }
{/*}*/}
<Trialapplication {...this.state} Cancel={() => this.cancelModulationModels()} ></Trialapplication> <Trialapplication {...this.state} Cancel={() => this.cancelModulationModels()} ></Trialapplication>
<div className="educontent clearfix"> <div className="educontent clearfix">
{/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/} {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
@ -757,7 +756,7 @@ submittojoinclass=(value)=>{
<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的项目</Link></li> <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的项目</Link></li>
<li><a href={`/account/profile`}>账号管理</a></li> <li><a href={`/account/profile`}>账号管理</a></li>
{/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/} {/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
{/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/} <li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>
{/*<li><Link to={`/interest`}>兴趣页</Link></li>*/} {/*<li><Link to={`/interest`}>兴趣页</Link></li>*/}
<li className="bor-top-greyE"> <li className="bor-top-greyE">

51
public/react/src/modules/user/MyEduCoderModal.js
Unescape View File

@ -0,0 +1,51 @@
import React, { Component } from 'react';
import {getImageUrl} from 'educoder';
import { Modal} from 'antd';
import axios from 'axios';
import 'common.css'
//立即申请试用
class MyEduCoderModal extends Component {
constructor(props) {
super(props);
this.state={
}
}
modalCancel=()=>{
//取消
}
setDownload=()=>{
//立即联系
}
render() {
return(
<Modal
keyboard={false}
closable={false}
footer={null}
destroyOnClose={true}
title="提示"
centered={true}
visible={this.props.modalsType===undefined?false:this.props.modalsType}
width="530px"
>
<div className="educouddiv">
<div><p>欢迎使用EduCoder，您可以试用1天</p></div>
<div><p>超过期限，需要经过管理员的授权审核</p></div>
<div className="clearfix mt30 edu-txt-center">
<a className="task-btn mr30" onClick={this.modalCancel()}>先试试看</a>
<a className="task-btn task-btn-orange" onClick={this.setDownload()}>立即申请授权</a>
</div>
</div>
</Modal>
)
}
}
export default MyEduCoderModal;

49
public/react/src/modules/user/Notcompleted.js
Unescape View File

@ -0,0 +1,49 @@
import React, { Component } from 'react';
import {getImageUrl} from 'educoder';
import { Modal} from 'antd';
import axios from 'axios';
import 'common.css'
//完善个人资料
class Notcompleted extends Component {
constructor(props) {
super(props);
}
modalCancel=()=>{
//取消
}
setDownload=()=>{
//立即联系
}
render() {
return(
<Modal
keyboard={false}
closable={false}
footer={null}
destroyOnClose={true}
title="提示"
centered={true}
visible={this.props.modalsType===undefined?false:this.props.modalsType}
width="530px"
>
<div className="educouddiv">
<div><p>您尚未完善个人资料</p></div>
<div><p>请在完成资料后，提交试用申请</p></div>
<div className="clearfix mt30 edu-txt-center">
<a className="task-btn mr30" onClick={this.modalCancel()}>取消</a>
<a className="task-btn task-btn-orange" onClick={this.setDownload()}>立即完善资料</a>
</div>
</div>
</Modal>
)
}
}
export default Notcompleted;

42
public/react/src/modules/user/ReadPassword.js
Unescape View File

@ -0,0 +1,42 @@
import React, { Component } from 'react';
import {getImageUrl} from 'educoder';
import { Modal} from 'antd';
import axios from 'axios';
import 'common.css'
//密码已重置，请重新登录
class ReadPassword extends Component {
constructor(props) {
super(props);
}
setDownload=()=>{
//立即联系
}
render() {
return(
<Modal
keyboard={false}
closable={false}
footer={null}
destroyOnClose={true}
title="提示"
centered={true}
visible={this.props.modalsType===undefined?false:this.props.modalsType}
width="530px"
>
<div className="educouddiv">
<div><p>密码已重置，请重新登录</p></div>
<a className="task-btn task-btn-orange" onClick={this.setDownload()}>知道啦</a>
</div>
</Modal>
)
}
}
export default ReadPassword;

4
public/react/src/modules/user/common.css
Unescape View File

@ -32,6 +32,10 @@
height: 45px; height: 45px;
} }
.educouddiv {
display: flex;
justify-content: center;
}
.left_right { .left_right {

Write Preview
Loading…
Cancel
Save