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

Merge remote-tracking branch 'origin/master'

Browse Source
dev_forum
杨树明 6 years ago
parent aea230c45a 7bb031e0a3
commit b116ec06fa
13 changed files with 35 additions and 52 deletions
Show Stats Download Patch File Download Diff File

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

@ -114,7 +114,6 @@ class Testpapersettinghomepage extends Component{
axios.get(url).then((response) => {
console.log(response);
debugger
if(response.data.status&&response.data.status===-1){
}else if(response.data.status&&response.data.status===-2){
@ -170,12 +169,17 @@ class Testpapersettinghomepage extends Component{
Loadtype:false
})
}
DownloadType=()=>{
this.setState({
DownloadType:false,
DownloadMessageval:undefined
})
}
Downloadcal=()=>{
this.setState({
DownloadType:false,
DownloadMessageval:undefined
})
this.setState({
DownloadType:false,
DownloadMessageval:undefined
})
}
render(){
let {tab,visible,Commonheadofthetestpaper}=this.state;
@ -188,7 +192,7 @@ class Testpapersettinghomepage extends Component{
{...this.props}
value={this.state.DownloadMessageval}
modalCancel={this.Downloadcal}
modalsType={this.state.DownloadType}
modalsType={this.DownloadType}
/>
<div className={"educontent mb20"} style={{width:"1200px"}}>
{/* 公用的提示弹框 */}

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

@ -1360,13 +1360,6 @@ class Listofworks extends Component {
// });
}
Downloadcal=()=>{
this.setState({
DownloadType:false,
DownloadMessageval:undefined
})
}
ChangeTab=(e)=>{
this.props.ChangeTab(e);
}

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

@ -350,6 +350,9 @@ class Listofworksstudentone extends Component {
if(result === undefined){
return
}
try {
if (result.status === 200) {
if(this.props.isNotMember()===false) {
this.setState({
@ -374,10 +377,12 @@ class Listofworksstudentone extends Component {
}
}
}
}
}catch (e) {
console.log(e);
}
}).catch((error) => {
console.log(error)
console.log(error);
})
}

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

@ -371,14 +371,14 @@ class ShixunHomeworkPage extends Component {
<a className="fr color-blue font-16" onClick={this.workshowmodel}>代码查重</a>
: "" : ""}
{this.state.view_report === true ? <Link className="fr color-blue font-16" target={"_blank"}
to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/shixun_work_report`}>
to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/shixun_work_report`}>
查看实训报告
</Link> : ""}
{
teacherdata === undefined ? ""
: teacherdata.commit_des === null || teacherdata.commit_des === undefined ? "" :
<a className="fr color-blue font-16"
href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata === undefined ? "" : teacherdata.id}/commitsummary/${this.state.props.match.params.homeworkid}`}>{teacherdata.commit_des}</a>
href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdata === undefined ? "" : teacherdata.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdata.commit_des}</a>
}
{teacherdata === undefined ? "" : <Startshixuntask
{...this.props}

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

@ -501,13 +501,6 @@ class ShixunStudentWork extends Component {
// console.log(error)
// });
}
Downloadcal=()=>{
this.setState({
DownloadType:false,
DownloadMessageval:undefined
})
}
ChangeTab=(e)=>{
this.props.ChangeTab(e);
}
@ -572,7 +565,7 @@ class ShixunStudentWork extends Component {
key: 'operating',
render: (text, record) => (
<span>
<a onClick={()=>this.Viewstudenttraininginformation("/courses/"+this.state.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+this.props.match.params.homeworkid+"/review_detail/"+record.operating)} >查看</a>
<a onClick={()=>this.Viewstudenttraininginformation("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+this.props.match.params.homeworkid+"/review_detail/"+record.operating)} >查看</a>
</span>
)
},

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

@ -94,12 +94,6 @@ class ShixunWorkReport extends Component {
}
}
}
Downloadcal=()=>{
this.setState({
DownloadType:false,
DownloadMessageval:undefined
})
}
render() {
let{data} =this.state;
let category_id=data===undefined?"":data.category.category_id;

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

@ -1714,12 +1714,7 @@ class Trainingjobsetting extends Component {
// });
}
Downloadcal=()=>{
this.setState({
DownloadType:false,
DownloadMessageval:undefined
})
}
testscripttip =(e)=>{
if(e === 0){
this.setState({

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

@ -344,12 +344,6 @@ class Workquestionandanswer extends Component {
// console.log(error)
// });
}
Downloadcal=()=>{
this.setState({
DownloadType:false,
DownloadMessageval:undefined
})
}
ChangeTab=(e)=>{
this.props.ChangeTab(e);
}

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

@ -59,7 +59,6 @@ class EducoderInteresse extends Component {
display: "flex",
justifyContent: "center",
width: "100%",
height: "600px",
marginTop: "20px",
}}>
<InterestpageComponent {...this.props} {...this.state}>

8
public/react/src/modules/modals/DownloadMessage.js
Unescape View File

@ -19,7 +19,13 @@ class DownloadMessage extends Component {
this.modalCancel();
window.open(`/users/${this.props.user.login}/private_messages`)
}
DownloadType=()=>{
this.setState({
DownloadType:false,
DownloadMessageval:undefined
})
}
Downloadcal=()=>{
this.setState({
DownloadType:false,

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

@ -671,11 +671,11 @@ class MainContentContainer extends Component {
// 之前的task_commit方法
gameBuild(fileUpdateResponse, first) {
const { st, challenge, output_sets, onRunCodeTestFinish, resetTestSetsExpandedArray, showSnackbar, time_limit, game } = this.props
const { resubmit, content_modified } = fileUpdateResponse.data;
const { resubmit, content_modified, sec_key } = fileUpdateResponse.data;
const timeOut = time_limit;
// http://localhost:3000/myshixuns/so5w6iap97/stages/zl6kx8f7vfpo/game_build?first=1&resubmit=GDBEX741_1993
// const game_build_url = `${locationPath}/game_build?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}`
const game_build_url = `/tasks/${game.identifier}/game_build.json?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}`
const game_build_url = `/tasks/${game.identifier}/game_build.json?first=${first}&resubmit=${resubmit}&content_modified=${content_modified}&sec_key=${sec_key}`
// var timeOut = parseInt(<%= @myshixun.main_mirror.try(:time_limit) %>); // 超时参数
@ -702,7 +702,7 @@ class MainContentContainer extends Component {
var gameStatusIntervalId = setInterval(()=>{
// let game_status_url = `${locationPath}/game_status?port=${port}&resubmit=${resubmit||""}&time_out=${timeOutFlag}`
let game_status_url = `/tasks/${game.identifier}/game_status.json?port=${port}&resubmit=${resubmit||""}&time_out=${timeOutFlag}`
let game_status_url = `/tasks/${game.identifier}/game_status.json?port=${port}&resubmit=${resubmit||""}&time_out=${timeOutFlag}&sec_key=${sec_key}`
axios.get(game_status_url, {
// withCredentials: true,

2
public/react/src/modules/user/account/AccountNav.js
Unescape View File

@ -16,7 +16,7 @@ class AccountNav extends Component {
let { basicInfo } = this.props
console.log(this.props);
const path = window.location.pathname
const isBasic = path.indexOf('basic') != -1 || path == "/account"
const isBasic = path.indexOf('profile') != -1 || path == "/account"
const isCertification = path.indexOf('certification') != -1
const isSecure = path.indexOf('secure') != -1
return (

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

@ -73,7 +73,7 @@
display: flex;
flex-direction:column;
margin-left: 73px;
margin-top: 15px;
margin-top: 8px;
}
.ysldivhomediv2{
width: 110px;

Write Preview
Loading…
Cancel
Save