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

竞赛

Browse Source
dev_sync_trustie
杨树林 5 years ago
parent fd187c696a
commit f39566075d
2 changed files with 176 additions and 152 deletions
Show Stats Download Patch File Download Diff File

260
public/react/src/modules/competition/Registration.js
Unescape View File

@ -66,6 +66,7 @@ class Registration extends React.Component {
competition_name: undefined,
mutiple_limited: false,
teamutiple_limited: false,
members_count: 0,
}
}
@ -145,6 +146,7 @@ class Registration extends React.Component {
}
if (result.data.personal === true) {
if (result.data.enroll_ended === true) {
this.setState({
pint: 0
@ -159,6 +161,8 @@ class Registration extends React.Component {
})
}
}
}
}
}).catch((error) => {
console.log("GetenrollmentAPI");
@ -192,7 +196,8 @@ class Registration extends React.Component {
data: result.data.my_teams,
competition_teams: result.data.competition_teams,
personal: result.data.personal,
competition_name: result.data.competition_name
competition_name: result.data.competition_name,
members_count: result.data.members_count
})
} else {
//普通账号
@ -202,7 +207,8 @@ class Registration extends React.Component {
data: result.data.my_teams,
competition_teams: result.data.competition_teams,
personal: result.data.personal,
competition_name: result.data.competition_name
competition_name: result.data.competition_name,
members_count: result.data.members_count
})
}
} else {
@ -216,7 +222,9 @@ class Registration extends React.Component {
count: result.data.count,
competition_teams: result.data.competition_teams,
personal: result.data.personal,
competition_name: result.data.competition_name
competition_name: result.data.competition_name,
members_count: result.data.members_count
})
} else {
@ -226,7 +234,9 @@ class Registration extends React.Component {
count: result.data.count,
competition_teams: result.data.competition_teams,
personal: result.data.personal,
competition_name: result.data.competition_name
competition_name: result.data.competition_name,
members_count: result.data.members_count
})
}
@ -238,7 +248,9 @@ class Registration extends React.Component {
data: result.data.my_teams,
count: result.data.count,
personal: result.data.personal,
competition_name: result.data.competition_name
competition_name: result.data.competition_name,
members_count: result.data.members_count
})
} else {
@ -248,7 +260,9 @@ class Registration extends React.Component {
data: result.data.my_teams,
count: result.data.count,
personal: result.data.personal,
competition_name: result.data.competition_name
competition_name: result.data.competition_name,
members_count: result.data.members_count
})
}
@ -262,7 +276,9 @@ class Registration extends React.Component {
count: result.data.count,
competition_teams: result.data.competition_teams,
personal: result.data.personal,
competition_name: result.data.competition_name
competition_name: result.data.competition_name,
members_count: result.data.members_count
})
@ -296,112 +312,120 @@ class Registration extends React.Component {
}
Getdatatype5 = (keyword, page, per_page, admin) => {
//搜索关键字 keyword
//页数 page
//分页 per_page
const datas = {
keyword: keyword,
page: page,
per_page: per_page,
};
let url = `/competitions/${this.props.match.params.identifier}/competition_teams.json`;
axios.get((url), {params: datas}).then((result) => {
this.setState({
loadingstate: false,
})
if (result) {
if (result.data) {
//// //////console.log(result);
if (result.data.personal === false) {
//不是个人赛
////console.log("Getdatatype5");
////console.log(result.data.my_teams.length);
if (result.data.my_teams.length === 0) {
// 没有创建数据的
//管理员
////console.log("a");
////console.log(this.state.competition_teams);
////console.log(result.data.competition_teams);
this.setState({
type: 4,
count: result.data.count,
competition_teams: result.data.competition_teams,
data: result.data.my_teams,
personal: result.data.personal,
competition_name: result.data.competition_name
})
} else {
//有数据的
////console.log("b");
if (result.data.my_teams[0].manage_permission === true) {
this.setState({
type: 5,
data: result.data.my_teams,
count: result.data.count,
competition_teams: result.data.competition_teams,
personal: result.data.personal,
competition_name: result.data.competition_name
})
} else {
////console.log("c");
this.setState({
type: 4,
data: result.data.my_teams,
count: result.data.count,
competition_teams: result.data.competition_teams,
personal: result.data.personal,
competition_name: result.data.competition_name
})
}
}
} else {
//团队赛
//////console.log("d");
this.setState({
type: 6,
data: result.data.my_teams,
count: result.data.count,
competition_teams: result.data.competition_teams,
personal: result.data.personal,
competition_name: result.data.competition_name
})
}
}
}
}).catch((error) => {
////console.log("k");
////console.log(error);
////console.log("报错了");
if (admin === true) {
//管理员
this.setState({
count: 0,
competition_teams: [],
data: [],
loadingstate: false,
})
} else {
//普通账号
this.setState({
count: 0,
competition_teams: [],
data: [],
loadingstate: false,
})
}
})
}
// Getdatatype5 = (keyword, page, per_page, admin) => {
// //搜索关键字 keyword
// //页数 page
// //分页 per_page
// const datas = {
// keyword: keyword,
// page: page,
// per_page: per_page,
// };
// let url = `/competitions/${this.props.match.params.identifier}/competition_teams.json`;
// axios.get((url), {params: datas}).then((result) => {
// this.setState({
// loadingstate: false,
// })
// if (result) {
// if (result.data) {
// //// //////console.log(result);
// if (result.data.personal === false) {
// //不是个人赛
// ////console.log("Getdatatype5");
// ////console.log(result.data.my_teams.length);
// if (result.data.my_teams.length === 0) {
// // 没有创建数据的
// //管理员
// ////console.log("a");
// ////console.log(this.state.competition_teams);
// ////console.log(result.data.competition_teams);
// this.setState({
// type: 4,
// count: result.data.count,
// competition_teams: result.data.competition_teams,
// data: result.data.my_teams,
// personal: result.data.personal,
// competition_name: result.data.competition_name,
// members_count:result.data.members_count
//
//
// })
// } else {
// //有数据的
// ////console.log("b");
//
// if (result.data.my_teams[0].manage_permission === true) {
// this.setState({
// type: 5,
// data: result.data.my_teams,
// count: result.data.count,
// competition_teams: result.data.competition_teams,
// personal: result.data.personal,
// competition_name: result.data.competition_name,
// members_count:result.data.members_count
//
//
// })
// } else {
// ////console.log("c");
//
// this.setState({
// type: 4,
// data: result.data.my_teams,
// count: result.data.count,
// competition_teams: result.data.competition_teams,
// personal: result.data.personal,
// competition_name: result.data.competition_name,
// members_count:result.data.members_count
//
//
// })
// }
// }
// } else {
// //团队赛
// //////console.log("d");
//
// this.setState({
// type: 6,
// data: result.data.my_teams,
// count: result.data.count,
// competition_teams: result.data.competition_teams,
// personal: result.data.personal,
// competition_name: result.data.competition_name,
// members_count:result.data.members_count
//
//
// })
// }
//
// }
// }
//
// }).catch((error) => {
// ////console.log("k");
//
// ////console.log(error);
// ////console.log("报错了");
// if (admin === true) {
// //管理员
// this.setState({
// count: 0,
// competition_teams: [],
// data: [],
// loadingstate: false,
// })
// } else {
// //普通账号
// this.setState({
// count: 0,
// competition_teams: [],
// data: [],
// loadingstate: false,
// })
// }
// })
// }
//团队竞赛翻页
@ -411,7 +435,7 @@ class Registration extends React.Component {
loadingstate: true,
})
const {keyword, per_page} = this.state;
this.Getdatatype5(keyword, pageNumber, per_page, this.props.user.admin);
this.Getdata(keyword, pageNumber, per_page, this.props.user.admin);
};
/**
@ -628,7 +652,7 @@ class Registration extends React.Component {
pages: 1,
limit: 20,
})
this.Getdatatype5(value, 1, 20, this.props.user.admin);
this.Getdata(value, 1, 20, this.props.user.admin);
}
//个人竞赛
@ -659,7 +683,7 @@ class Registration extends React.Component {
render() {
const {page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint, competition_name, mutiple_limited, teamutiple_limited} = this.state;
const {page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint, competition_name, mutiple_limited, teamutiple_limited, members_count} = this.state;
return (
<div className="newMain clearfix newMainybot">
@ -734,7 +758,7 @@ class Registration extends React.Component {
<div style={{
marginTop: "22px"
}}>
<p>参赛总人数：<span style={{color: "#459BE5"}}>{data === null || data === undefined ? 0 : data.length}</span><span
<p>参赛总人数：<span style={{color: "#459BE5"}}>{members_count}</span><span
style={{marginLeft: "5px"}}>人</span>
</p>
</div>
@ -806,7 +830,7 @@ class Registration extends React.Component {
}
{
type === 4 || type === 5 ?
type === 2 || type === 4 || type === 5 ?
(
count < 20 ? <div style={{
height: "20px",

44
public/react/src/modules/competition/competmodal/PersonModal.js
Unescape View File

@ -68,7 +68,7 @@ class PersonModal extends Component {
school_name: this.props.user.user_school,
student_id: null,
identity: this.props.user.user_identity,
type: "导师",
type: this.props.user.is_teacher === true ? "导师" : "队员",
};
data.push(datas);
@ -189,23 +189,23 @@ class PersonModal extends Component {
}
}
try {
if (i === 0) {
this.props.showNotification(`请添加导师`);
return;
}
} catch (e) {
}
try {
if (s === 0) {
this.props.showNotification(`请添加队员`);
return;
}
} catch (e) {
}
// try {
// if (i === 0) {
// this.props.showNotification(`请添加导师`);
// return;
// }
// } catch (e) {
//
// }
//
// try {
// if (s === 0) {
// this.props.showNotification(`请添加队员`);
// return;
// }
// } catch (e) {
//
// }
//确认的时候 去确认老师人数是否符合
@ -325,8 +325,8 @@ class PersonModal extends Component {
// ////console.log("搜索的老师");
const datas = {
keyword: keywordteachers,
team_id: team_idteachers,
teacher_ids: teacher_ids,
team_id: null,
teacher_ids: null,
};
let url = `/competitions/${this.props.match.params.identifier}/teachers.json`;
axios.get((url), {params: datas}).then((result) => {
@ -353,8 +353,8 @@ class PersonModal extends Component {
// ////console.log("搜索的学生");
const datas = {
keyword: keywordstudents,
team_id: team_idstudents,
student_ids: student_ids,
team_id: null,
student_ids: null,
};
let url = `/competitions/${this.props.match.params.identifier}/students.json`;
axios.get((url), {params: datas}).then((result) => {

Write Preview
Loading…
Cancel
Save