From 32398333ec48f17bca2a86aa7f9d8857b94ea994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Wed, 23 Oct 2019 22:06:24 +0800 Subject: [PATCH] jingsai.4 --- .../modules/competition/CompetitionMaxImg.js | 6 +- .../modules/competition/RegisListviewdata.js | 4 +- .../src/modules/competition/Registration.js | 119 ++++++++--------- .../modules/competition/RegistrationSearch.js | 8 +- .../competition/competmodal/PersonModal.js | 120 +++++++++--------- .../competmodal/PersonalModalteam.js | 2 +- .../personal/PersonalCompetititem.js | 10 +- 7 files changed, 129 insertions(+), 140 deletions(-) diff --git a/public/react/src/modules/competition/CompetitionMaxImg.js b/public/react/src/modules/competition/CompetitionMaxImg.js index 154183f2f..ca400f90a 100644 --- a/public/react/src/modules/competition/CompetitionMaxImg.js +++ b/public/react/src/modules/competition/CompetitionMaxImg.js @@ -16,9 +16,9 @@ class CompetitionMaxImg extends React.Component { componentDidUpdate = (prevProps) => { if (prevProps.GetenrollmentAPI != this.props.GetenrollmentAPI) { - // //console.log("团队竞赛报名大图componentDidUpdate"); - // //console.log(this.props); - // //console.log(this.props.GetenrollmentAPI); + // ////console.log("团队竞赛报名大图componentDidUpdate"); + // ////console.log(this.props); + // ////console.log(this.props.GetenrollmentAPI); this.setState({ GetenrollmentAPI: this.props.GetenrollmentAPI, }) diff --git a/public/react/src/modules/competition/RegisListviewdata.js b/public/react/src/modules/competition/RegisListviewdata.js index 31ea816b5..accba353f 100644 --- a/public/react/src/modules/competition/RegisListviewdata.js +++ b/public/react/src/modules/competition/RegisListviewdata.js @@ -23,8 +23,8 @@ class RegisListviewdata extends React.Component { } componentDidMount() { - //console.log("RegisListviewdata"); - //console.log(this.props.item) + ////console.log("RegisListviewdata"); + ////console.log(this.props.item) this.setState({ item: this.props.item }) diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js index 02396466f..5591d68c5 100644 --- a/public/react/src/modules/competition/Registration.js +++ b/public/react/src/modules/competition/Registration.js @@ -9,7 +9,7 @@ import moment from 'moment'; import {SnackbarHOC, WordsBtn} from 'educoder'; import {TPMIndexHOC} from '../tpm/TPMIndexHOC'; import competition from './comcss/competition.css'; -import {Button, Pagination, message, Spin} from 'antd'; +import {Button, Pagination, message, Spin, Breadcrumb} from 'antd'; import Registrationitem from './Registrationitem'; import RegisNodata from './RegisNodata'; import CompetitionMaxImg from './CompetitionMaxImg'; @@ -36,7 +36,6 @@ class Registration extends React.Component { constructor(props) { super(props) this.state = { - test: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20], loadingstate: false, pages: 1, limit: 20, @@ -71,52 +70,38 @@ class Registration extends React.Component { } componentDidMount() { - // ////console.log("componentDidMount Registration"); - // //// ////console.log("调用子组件 "); - // ////console.log(this.props.isAdmin()); - // //// ////console.log(this.props.isAdmin()) - this.GetenrollmentAPI(); - this.Getthenavigationbar(); - + console.log(this.props); + // //////console.log("componentDidMount Registration"); + // //// //////console.log("调用子组件 "); + // //////console.log(this.props.isAdmin()); + // //// //////console.log(this.props.isAdmin()) } componentDidUpdate = (prevProps) => { if (prevProps.user != this.props.user) { - //console.log("Registration"); - //console.log("componentDidUpdate"); - //console.log(this.props.user.admin); + console.log("componentDidUpdate"); + console.log(this.props); + ////console.log("Registration"); + ////console.log("componentDidUpdate"); + ////console.log(this.props.user.admin); const {keyword, page, per_page} = this.state; this.Getdata(keyword, page, per_page, this.props.user.admin); + this.GetenrollmentAPI(); } } - // 获取导航栏 - Getthenavigationbar = () => { - const url = `/competitions/${"gcc-task-2020"}/competition_modules.json`; - axios.get((url)).then((result) => { - if (result) { - if (result.data) { - //// ////console.log("获取报名配置API"); - //// ////console.log(result); - console.log("Getthenavigationbar"); - console.log(result); - } - } - }).catch((error) => { - //// ////console.log(error); - }) - } + //获取报名配置API GetenrollmentAPI = () => { - const url = `/competitions/${"gcc-task-2020"}/competition_staff.json`; + const url = `/competitions/${this.props.match.params.identifier}/competition_staff.json`; axios.get((url)).then((result) => { if (result) { if (result.data) { - //// ////console.log("获取报名配置API"); - //// ////console.log(result); + //// //////console.log("获取报名配置API"); + //// //////console.log(result); this.setState({ GetenrollmentAPI: result.data, personal: result.data.personal, @@ -141,7 +126,7 @@ class Registration extends React.Component { } } }).catch((error) => { - //// ////console.log(error); + //// //////console.log(error); }) } @@ -154,11 +139,11 @@ class Registration extends React.Component { page: page, per_page: per_page, }; - let url = `/competitions/${"gcc-task-2020"}/competition_teams.json`; + let url = `/competitions/${this.props.match.params.identifier}/competition_teams.json`; axios.get((url), {params: datas}).then((result) => { if (result) { if (result.data) { - //// ////console.log(result);\ + //// //////console.log(result);\ if (result.data.personal === false) { //不是个人赛 if (result.data.my_teams.length === 0) { @@ -277,24 +262,24 @@ class Registration extends React.Component { page: page, per_page: per_page, }; - let url = `/competitions/${"gcc-task-2020"}/competition_teams.json`; + 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); + //// //////console.log(result); if (result.data.personal === false) { //不是个人赛 - //console.log("Getdatatype5"); - //console.log(result.data.my_teams.length); + ////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); + ////console.log("a"); + ////console.log(this.state.competition_teams); + ////console.log(result.data.competition_teams); this.setState({ type: 4, count: result.data.count, @@ -305,7 +290,7 @@ class Registration extends React.Component { }) } else { //有数据的 - //console.log("b"); + ////console.log("b"); if (result.data.my_teams[0].manage_permission === true) { this.setState({ @@ -318,7 +303,7 @@ class Registration extends React.Component { }) } else { - //console.log("c"); + ////console.log("c"); this.setState({ type: 4, @@ -332,7 +317,7 @@ class Registration extends React.Component { } } else { //团队赛 - //console.log("d"); + ////console.log("d"); this.setState({ type: 6, @@ -348,10 +333,10 @@ class Registration extends React.Component { } }).catch((error) => { - //console.log("k"); + ////console.log("k"); - //console.log(error); - //console.log("报错了"); + ////console.log(error); + ////console.log("报错了"); if (admin === true) { //管理员 this.setState({ @@ -561,7 +546,7 @@ class Registration extends React.Component { } //退出战队 Exittheteam = (bool) => { - // ////console.log(this.state.itemid); + // //////console.log(this.state.itemid); if (bool) { this.setState({ messageexitol: true @@ -571,8 +556,8 @@ class Registration extends React.Component { axios.post(url).then((response) => { if (response) { if (response.data) { - ////console.log("退出战队"); - ////console.log(response); + //////console.log("退出战队"); + //////console.log(response); this.Refreshteam(); this.setState({ messageexitol: false @@ -581,7 +566,7 @@ class Registration extends React.Component { } } }).catch((error) => { - ////console.log(error) + //////console.log(error) }); } else { @@ -592,8 +577,8 @@ class Registration extends React.Component { } //搜索战队 RegistrationSearchvalue = (value) => { - //console.log("RegistrationSearchvalue"); - //console.log(this.props.user.admin); + ////console.log("RegistrationSearchvalue"); + ////console.log(this.props.user.admin); this.setState({ pages: 1, limit: 20, @@ -638,7 +623,7 @@ class Registration extends React.Component { } } } - const url = `/competitions/${"gcc-task-2020"}/competition_teams.json`; + const url = `/competitions/${this.props.match.params.identifier}/competition_teams.json`; axios.post(url).then((response) => { if (response) { if (response.data) { @@ -653,7 +638,7 @@ class Registration extends React.Component { }); } render() { - const {test, page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint} = this.state; + const {page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint} = this.state; // var listItems = ""; // if (competition_teams) { @@ -709,16 +694,20 @@ class Registration extends React.Component { : "" } -
-

- 在线竞赛 - > - 全国高校计算机大赛-项目挑战 - > - 报名 -

-
+ {/*
*/} + {/*

*/} + {/* 在线竞赛*/} + {/* >*/} + {/* 全国高校计算机大赛-项目挑战*/} + {/* >*/} + {/* 报名*/} + {/*

*/} + {/*
*/} + + 在线竞赛 + 全国高校计算机大赛 + {/*大图*/} this.Jointheteam()} pint={pint} diff --git a/public/react/src/modules/competition/RegistrationSearch.js b/public/react/src/modules/competition/RegistrationSearch.js index 5a08cd84d..3d3019e95 100644 --- a/public/react/src/modules/competition/RegistrationSearch.js +++ b/public/react/src/modules/competition/RegistrationSearch.js @@ -27,8 +27,8 @@ class RegistrationSearch extends React.Component { }; setdatafuns = (value) => { - console.log("setdatafuns点击了搜索"); - console.log(value); + //console.log("setdatafuns点击了搜索"); + //console.log(value); this.setState({ keywords: value }) @@ -36,8 +36,8 @@ class RegistrationSearch extends React.Component { }; myonPressEnter = (e) => { - console.log("点击了回车setdatafunsval点击了搜索"); - console.log(e.target.value); + //console.log("点击了回车setdatafunsval点击了搜索"); + //console.log(e.target.value); this.props.RegistrationSearchvalue(e.target.value); } render() { diff --git a/public/react/src/modules/competition/competmodal/PersonModal.js b/public/react/src/modules/competition/competmodal/PersonModal.js index 9b48307e3..7ee726f53 100644 --- a/public/react/src/modules/competition/competmodal/PersonModal.js +++ b/public/react/src/modules/competition/competmodal/PersonModal.js @@ -61,9 +61,9 @@ class PersonModal extends Component { componentDidUpdate = (prevProps) => { if (prevProps.user != this.props.user) { - //console.log("Registration.js componentDidUpdate"); - //console.log(this.props); - // //console.log(prevProps); + ////console.log("Registration.js componentDidUpdate"); + ////console.log(this.props); + // ////console.log(prevProps); //identity职场称 //user_school学校 //real_name姓名 @@ -86,8 +86,8 @@ class PersonModal extends Component { } if (prevProps.GetenrollmentAPI != this.props.GetenrollmentAPI) { - //console.log("Registration.js GetenrollmentAPIcomponentDidUpdate"); - //console.log(this.props); + ////console.log("Registration.js GetenrollmentAPIcomponentDidUpdate"); + ////console.log(this.props); this.setState({ GetenrollmentAPI: this.props.GetenrollmentAPI, }) @@ -151,21 +151,21 @@ class PersonModal extends Component { // Thecurrentnumber if (this.props.Newtit === true) { //创建新的战队 - let url = `/competitions/${"gcc-course-2019"}/competition_teams.json`; + let url = `/competitions/${this.props.match.params.identifier}/competition_teams.json`; axios.post(url, { name: polls_nametest, teacher_ids: myteaherdata, member_ids: myshtudentdata, }).then((result) => { - // //console.log("获取到创建战队的数据"); - // //console.log(result); + // ////console.log("获取到创建战队的数据"); + // ////console.log(result); if (result) { if (result.data) { this.props.Tmoconfirm1(true); } } }).catch((error) => { - // //console.log(error) + // ////console.log(error) }); } else { //编辑战队 @@ -175,15 +175,15 @@ class PersonModal extends Component { teacher_ids: myteaherdata, member_ids: myshtudentdata, }).then((result) => { - // //console.log("获取到编辑战队的数据"); - // //console.log(result); + // ////console.log("获取到编辑战队的数据"); + // ////console.log(result); if (result) { if (result.data) { this.props.Tmoconfirm1(true); } } }).catch((error) => { - // //console.log(error) + // ////console.log(error) }); } } @@ -195,24 +195,24 @@ class PersonModal extends Component { //老师姓名 keyword //当前战队ID team_id //当前老师ID数组 teacher_ids - // //console.log("搜索的老师"); + // ////console.log("搜索的老师"); const datas = { keyword: keywordteachers, team_id: team_idteachers, teacher_ids: teacher_ids, }; - let url = `/competitions/${"gcc-course-2019"}/teachers.json`; + let url = `/competitions/${this.props.match.params.identifier}/teachers.json`; axios.get((url), {params: datas}).then((result) => { if (result) { if (result.data) { - // //console.log(result); + // ////console.log(result); this.setState({ teacher_ids: result.data.teachers }) } } }).catch((error) => { - // //console.log(error); + // ////console.log(error); }) }; Getstudentsdata = (keywordstudents, team_idstudents, student_ids) => { @@ -223,17 +223,17 @@ class PersonModal extends Component { //学生姓名 keyword //当前战队ID team_id //当前队员ID数组 student_ids - // //console.log("搜索的学生"); + // ////console.log("搜索的学生"); const datas = { keyword: keywordstudents, team_id: team_idstudents, student_ids: student_ids, }; - let url = `/competitions/${"gcc-course-2019"}/students.json`; + let url = `/competitions/${this.props.match.params.identifier}/students.json`; axios.get((url), {params: datas}).then((result) => { if (result) { if (result.data) { - // //console.log(result); + // ////console.log(result); this.setState({ member_ids: result.data.teachers }) @@ -241,14 +241,14 @@ class PersonModal extends Component { } } }).catch((error) => { - // //console.log(error); + // ////console.log(error); }) }; //老师输入框事件 teacheronChange = (e) => { - // //console.log(e.target.value); - // //console.log("老师输入框事件|||||||||||123123123"); + // ////console.log(e.target.value); + // ////console.log("老师输入框事件|||||||||||123123123"); this.setState({ keywordteachers: e.target.value, booltech: false, @@ -286,8 +286,8 @@ class PersonModal extends Component { //学生输入框事件 studentsonChange = (e) => { - // //console.log("学生输入框事件"); - // //console.log(e); + // ////console.log("学生输入框事件"); + // ////console.log(e); this.setState({ keywordstudents: e.target.value, boolstud: false, @@ -337,9 +337,9 @@ class PersonModal extends Component { }; var fordabool = false; var forda = this.state.mydatas; - // //console.log("点击获取老师数据"); - // //console.log(object); - // //console.log(forda); + // ////console.log("点击获取老师数据"); + // ////console.log(object); + // ////console.log(forda); for (var i = 0; i < forda.length; i++) { if (forda[i].id) { if (forda[i].id === object.id) { @@ -378,14 +378,14 @@ class PersonModal extends Component { }; var fordabool = false; var forda = this.state.mydatas; - // //console.log("点击获取学生数据2"); - // //console.log(object); - // //console.log(forda); + // ////console.log("点击获取学生数据2"); + // ////console.log(object); + // ////console.log(forda); for (var i = 0; i < forda.length; i++) { if (forda[i].id) { - // // //console.log(true); - // // //console.log(forda[i].id); - // // //console.log(object.id); + // // ////console.log(true); + // // ////console.log(forda[i].id); + // // ////console.log(object.id); if (forda[i].id === object.id) { fordabool = true; break @@ -413,7 +413,7 @@ class PersonModal extends Component { } //输入框事件 changeTopicName = (e) => { - // // //console.log("调用了changeTopicName"); + // // ////console.log("调用了changeTopicName"); let num = parseInt(e.target.value.length); if (num > 60) { return; @@ -428,7 +428,7 @@ class PersonModal extends Component { //onSearchsou onSearch = (value) => { - // //console.log("搜索的数据" + value); + // ////console.log("搜索的数据" + value); }; handleInfiniteOnLoad = () => { // this.setState({ @@ -448,12 +448,12 @@ class PersonModal extends Component { } handleInfiniteOnLoad1 = () => { - // // //console.log("调用了方法1111"); + // // ////console.log("调用了方法1111"); // this.setState({ // loading1: true, // }) // setTimeout(() => { - // // //console.log("调用了方法11112"); + // // ////console.log("调用了方法11112"); // this.setState({ // loading1: false, // hasMore: true, @@ -462,13 +462,13 @@ class PersonModal extends Component { } handleInfiniteOnLoad2 = () => { - // // //console.log("调用了方法1111"); + // // ////console.log("调用了方法1111"); // this.setState({ // loading2: true, // // }) // setTimeout(() => { - // // //console.log("调用了方法11113"); + // // ////console.log("调用了方法11113"); // this.setState({ // hasMore: true, // loading2: false, @@ -477,23 +477,23 @@ class PersonModal extends Component { } inputOnBlur = (e) => { - // //console.log("inputOnBlur"); - // //console.log(e); + // ////console.log("inputOnBlur"); + // ////console.log(e); this.setState({ person1: false }) } inputOnBlur2 = (e) => { - // //console.log("inputOnBlur"); - // //console.log(e); + // ////console.log("inputOnBlur"); + // ////console.log(e); this.setState({ person2: false }) } startSearch = (e) => { - // //console.log("startSearch"); - // //console.log(e); + // ////console.log("startSearch"); + // ////console.log(e); this.setState({ person1: true, person2: false, @@ -503,8 +503,8 @@ class PersonModal extends Component { } startSearch2 = (e) => { - // //console.log("startSearch2"); - // //console.log(e); + // ////console.log("startSearch2"); + // ////console.log(e); this.setState({ person1: false, person2: true, @@ -514,8 +514,8 @@ class PersonModal extends Component { } inputOnFocus = (e) => { - // //console.log("inputOnFocus"); - // //console.log(e); + // ////console.log("inputOnFocus"); + // ////console.log(e); try { if (this.state.keywordteachers && this.state.keywordteachers.length > 0) { this.setState({ @@ -539,8 +539,8 @@ class PersonModal extends Component { } inputOnFocus2 = (e) => { - // //console.log("inputOnFocus2"); - // //console.log(e); + // ////console.log("inputOnFocus2"); + // ////console.log(e); try { if (this.state.keywordstudents && this.state.keywordstudents.length > 0) { this.setState({ @@ -565,8 +565,8 @@ class PersonModal extends Component { } inputOnFocus3 = (e) => { - // //console.log("inputOnFocus3"); - // //console.log(e); + // ////console.log("inputOnFocus3"); + // ////console.log(e); this.setState({ person2: false, person1: false, @@ -576,13 +576,13 @@ class PersonModal extends Component { var {mydatas} = this.state; if (item) { var pos = mydatas.indexOf(item); - // //console.log("deletedata"); - // //console.log(pos); + // ////console.log("deletedata"); + // ////console.log(pos); var removedItem = mydatas.splice(pos, 1); - // //console.log("deletedata22222"); - // //console.log(removedItem) + // ////console.log("deletedata22222"); + // ////console.log(removedItem) //removedItem 是被删除的元素 - // //console.log(mydatas) + // ////console.log(mydatas) this.setState({ mydatas: mydatas, }) @@ -770,8 +770,8 @@ class PersonModal extends Component { ); - console.log("PersonModal"); - console.log(this.props); + //console.log("PersonModal"); + //console.log(this.props); return ( { - let url = `/competitions/${"gcc-course-2019"}/competition_teams/join.json`; + let url = `/competitions/${this.props.match.params.identifier}/competition_teams/join.json`; axios.post(url, { invite_code: this.state.yslzxueshiskmcdm1 }).then((result) => { diff --git a/public/react/src/modules/competition/personal/PersonalCompetititem.js b/public/react/src/modules/competition/personal/PersonalCompetititem.js index 7f157cead..d7830b969 100644 --- a/public/react/src/modules/competition/personal/PersonalCompetititem.js +++ b/public/react/src/modules/competition/personal/PersonalCompetititem.js @@ -34,7 +34,7 @@ class PersonalCompetititem extends React.Component { } componentDidMount() { - // // //console.log(this.props.data) + // // ////console.log(this.props.data) this.setState({ data: this.props.data, }) @@ -50,10 +50,10 @@ class PersonalCompetititem extends React.Component { render() { const {data} = this.props; - // //console.log("PersonalCompetititem"); - // //console.log(data); - // //console.log(data[0]); - // //console.log(data&&data[0].creator.image_url); + // ////console.log("PersonalCompetititem"); + // ////console.log(data); + // ////console.log(data[0]); + // ////console.log(data&&data[0].creator.image_url); // const listItems = mydatas.map((item, index) => // // );