-
-
-
-
- 小猫头像
-
-
- 重庆邮电大学
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 重庆邮电大学
-
-
-
-
+ 2019-09-07 08:33
-
+ {
+ item !== undefined ?
+
diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js
index 60512a893..a4c557573 100644
--- a/public/react/src/modules/competition/Registration.js
+++ b/public/react/src/modules/competition/Registration.js
@@ -19,7 +19,8 @@ import RegisListviewdata from './RegisListviewdata';
import PersonModal from './competmodal/PersonModal';
import MessagePersonModal from './competmodal/MessagePersonModal';
import PersonalModalteam from './competmodal/PersonalModalteam';
-import PersonalCompetititem from './personal/PersonalCompetititem'
+import PersonalCompetititem from './personal/PersonalCompetititem';
+import ExittheteamModel from './competmodal/ExittheteamModel';
// 团队竞赛报名无报名
class Registration extends React.Component {
/***
@@ -44,6 +45,7 @@ class Registration extends React.Component {
page: 1,
per_page: 20,
data: [],
+ competition_teams: [],
count: 0,
GetenrollmentAPI: undefined,
personal: false,
@@ -53,19 +55,35 @@ class Registration extends React.Component {
member_staff: null,
messagePer: "提示",
messagePerbool: false,
- intpermessages: "确认"
+ intpermessages: "确认",
+ messageexit: "提示",
+ messageexitol: false,
+ exitintpermessages: "是否退出战队",
+ itemid: undefined,
}
}
componentDidMount() {
- //console.log("componentDidMount Registration");
- // ////console.log("调用子组件 ");
- //console.log(this.props.isAdmin());
- // ////console.log(this.props.isAdmin())
- const {keyword, page, per_page} = this.state;
- this.Getdata(keyword, page, per_page);
- this.GetenrollmentAPI();
+ // //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);
+ const {keyword, page, per_page} = this.state;
+ this.Getdata(keyword, page, per_page, this.props.user.admin);
+ this.GetenrollmentAPI();
+
+ }
+
}
//获取报名配置API
@@ -74,8 +92,8 @@ class Registration extends React.Component {
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,
@@ -87,11 +105,11 @@ class Registration extends React.Component {
}
}
}).catch((error) => {
- ////console.log(error);
+ //// //console.log(error);
})
}
- Getdata = (keyword, page, per_page) => {
+ Getdata = (keyword, page, per_page, admin) => {
//搜索关键字 keyword
//页数 page
//分页 per_page
@@ -104,17 +122,17 @@ class Registration extends React.Component {
axios.get((url), {params: datas}).then((result) => {
if (result) {
if (result.data) {
- ////console.log(result);
+ //// //console.log(result);
if (result.data.count === 0) {
// 没有创建数据的
- if (this.props.isAdmin() === true) {
+ if (admin === true) {
//管理员
this.setState({
type: 4,
count: result.data.count,
})
} else {
- //普通人
+ //普通账号
this.setState({
type: 1,
count: result.data.count,
@@ -122,25 +140,36 @@ class Registration extends React.Component {
}
} else {
//有数据的
- if (this.props.isAdmin() === true) {
+ if (admin === true) {
+ if (result.data.my_teams[0].manage_permission === true) {
this.setState({
type: 5,
- data: result.data.competition_teams,
+ data: result.data.my_teams,
count: result.data.count,
+ competition_teams: result.data.competition_teams
+
})
+ } else {
+ this.setState({
+ type: 4,
+ data: result.data.my_teams,
+ count: result.data.count,
+ competition_teams: result.data.competition_teams
+ })
+ }
} else {
- if (result.data.competition_teams[0].manage_permission === true) {
- //学生true 为创建了竞赛
+ if (result.data.my_teams[0].manage_permission === true) {
+ //普通账号true 为创建了竞赛
this.setState({
type: 2,
- data: result.data.competition_teams,
+ data: result.data.my_teams,
count: result.data.count,
})
} else {
- //学生true 加入了竞赛
+ //普通账号true 加入了竞赛
this.setState({
type: 3,
- data: result.data.competition_teams,
+ data: result.data.my_teams,
count: result.data.count,
})
}
@@ -152,7 +181,19 @@ class Registration extends React.Component {
}
}).catch((error) => {
- ////console.log(error);
+ if (admin === true) {
+ //管理员
+ this.setState({
+ type: 4,
+ count: 0,
+ })
+ } else {
+ //普通账号
+ this.setState({
+ type: 1,
+ count: 0,
+ })
+ }
})
}
paginationonChangestwo = (pageNumber) => {
@@ -219,53 +260,53 @@ class Registration extends React.Component {
**/
Createateam = () => {
//
- if (this.state.enrolled === true) {
- //已经报名
- this.setState({
- messagePerbool: true,
- intpermessages: "您已报名，无需重复报"
- })
- return;
- }
- if (this.state.enroll_ended === true) {
- //报名截止
- this.setState({
- messagePerbool: true,
- intpermessages: "报名已截止，无需报名"
- })
- return
- }
- if (this.props.isAdmin() === true) {
- //老师
- if (this.state.teacher_staff === null) {
- //禁止老师
- this.setState({
- messagePerbool: true,
- intpermessages: "已禁止老师报名"
- })
- return;
- }
- this.setState({
- tmodalsType: true
- })
- } else {
- //学生
- if (this.state.member_staff === null) {
- //禁止学生
- this.setState({
- messagePerbool: true,
- intpermessages: "已禁止学生报名"
- })
- return;
- }
- this.setState({
- tmodalsType: true
- })
- }
-
- // this.setState({
- // tmodalsType: true
+ // if (this.state.enrolled === true) {
+ // //已经报名
+ // this.setState({
+ // messagePerbool: true,
+ // intpermessages: "您已报名，无需重复报"
+ // })
+ // return;
+ // }
+ // if (this.state.enroll_ended === true) {
+ // //报名截止
+ // this.setState({
+ // messagePerbool: true,
+ // intpermessages: "报名已截止，无需报名"
+ // })
+ // return
+ // }
+ // if (this.props.isAdmin() === true) {
+ // //老师
+ // if (this.state.teacher_staff === null) {
+ // //禁止老师
+ // this.setState({
+ // messagePerbool: true,
+ // intpermessages: "已禁止老师报名"
+ // })
+ // return;
+ // }
+ // this.setState({
+ // tmodalsType: true
+ // })
+ // } else {
+ // //学生
+ // if (this.state.member_staff === null) {
+ // //禁止学生
+ // this.setState({
+ // messagePerbool: true,
+ // intpermessages: "已禁止学生报名"
// })
+ // return;
+ // }
+ // this.setState({
+ // tmodalsType: true
+ // })
+ // }
+
+ this.setState({
+ tmodalsType: true
+ })
}
@@ -285,7 +326,7 @@ class Registration extends React.Component {
}
}
-
+ //创建战队确认
Tmoconfirm1 = (bool) => {
//boolfalse 取消 true 确认
this.setState({
@@ -293,8 +334,7 @@ class Registration extends React.Component {
})
if (bool) {
//确认
-
-
+ this.Refreshteam();
} else {
//取消
@@ -308,12 +348,62 @@ class Registration extends React.Component {
messagePerbool: false
})
}
+ //显示退出战队弹框
+ Exittheteamshow = (itemid) => {
+ this.setState({
+ messageexitol: true,
+ itemid: itemid
+ })
+
+ };
+ //刷新战队
+ Refreshteam = () => {
+
+ const {keyword, page, per_page} = this.state;
+ this.Getdata(keyword, page, per_page, this.props.user.admin);
+ this.GetenrollmentAPI();
+ }
+ //退出战队
+ Exittheteam = (bool) => {
+ // //console.log(this.state.itemid);
+ if (bool) {
+ this.setState({
+ messageexitol: true
+ })
+
+ let url = `/competitions/${"gcc-course-2019"}/competition_teams/${this.state.itemid}/leave.json`;
+ axios.post(url).then((response) => {
+ if (response) {
+ if (response.data) {
+ //console.log("退出战队");
+ //console.log(response);
+ this.Refreshteam();
+ this.setState({
+ messageexitol: false
+ })
+
+ }
+ }
+ }).catch((error) => {
+ //console.log(error)
+ });
+
+ } else {
+ this.setState({
+ messageexitol: false
+ })
+ }
+ }
render() {
- const {test, page, pages, limit, type, tmodalsType, tmodalsTypes, data} = this.state;
- const listItems = test.map((item, index) =>
-
+
+ : ""
+ }
+
+
+
+ ![]({getImageUrl("images/")
+
+
+
+ {item.creator.name}
+
+
+ {item.name}
+
+
+ {
+ item && item.team_members.map((item, index) => {
+ return (
+
+ index === 0 ?
+
+
+
+ : index === 1 ?
+
+
+
+ : index === 2 ?
+
+
+
+ : index === 3 ?
+
+
+
+ : index === 4 ?
+
+
+
+ : index === 5 ?
+
+
+
+
+ :
+ 
+
+
+ )
+ })
+ }
+
+
+
+ {item.school_name}
+
+
+ {item.created_at}
+
@@ -335,6 +425,8 @@ class Registration extends React.Component {
Tmoconfirm1={(bool) => this.Tmoconfirm1(bool)}>
this.Tmoconfirm(bool)}>
+ this.Exittheteam(bool)}>
diff --git a/public/react/src/modules/competition/RegistrationSearch.js b/public/react/src/modules/competition/RegistrationSearch.js
index ed7e326ba..79f820f9d 100644
--- a/public/react/src/modules/competition/RegistrationSearch.js
+++ b/public/react/src/modules/competition/RegistrationSearch.js
@@ -26,7 +26,7 @@ class RegistrationSearch extends React.Component {
})
};
setdatafuns = (value) => {
- console.log("点击了搜索");
+ //console.log("点击了搜索");
this.setState({
keywords: value
})
@@ -45,7 +45,7 @@ class RegistrationSearch extends React.Component {
onSearch={(value) => this.setdatafuns(value)}/>
)
}
diff --git a/public/react/src/modules/competition/comcss/competition.css b/public/react/src/modules/competition/comcss/competition.css
index 40e732139..ba2921020 100644
--- a/public/react/src/modules/competition/comcss/competition.css
+++ b/public/react/src/modules/competition/comcss/competition.css
@@ -301,10 +301,21 @@
.regitem {
display: flex;
flex-direction: initial;
- border-bottom: 1px solid #EDEDED;
margin-top: 44px;
}
+.regitem22 {
+ display: flex;
+ flex-direction: initial;
+ margin-top: 27px;
+ margin-bottom: 19px;
+}
+
+.yslborderbottom {
+ border-bottom: 1px solid #EDEDED;
+}
+
+
.regitem2 {
display: flex;
flex-direction: initial;
@@ -334,6 +345,8 @@
.regitemimg2 {
height: 78px;
width: 78px;
+ background-color: transparent;
+ margin-bottom: 9px;
}
.personregitemimg {
@@ -353,7 +366,7 @@
width: 69px;
height: 69px;
margin-top: 3px;
-
+ background-color: transparent;
}
.regitemimgs2 {
@@ -375,7 +388,7 @@
height: 22px;
width: 22px;
font-size: 21px !important;
- margin-top: 22px;
+ margin-top: 21px;
color: #1C91E8;
}
diff --git a/public/react/src/modules/competition/competmodal/ExittheteamModel.js b/public/react/src/modules/competition/competmodal/ExittheteamModel.js
new file mode 100644
index 000000000..29eab7b50
--- /dev/null
+++ b/public/react/src/modules/competition/competmodal/ExittheteamModel.js
@@ -0,0 +1,59 @@
+import React, {Component} from 'react';
+import {getImageUrl} from 'educoder';
+import {Modal, Input, Spin, Tooltip, Icon, Dropdown, Button} from 'antd';
+import axios from 'axios';
+import competition from '../comcss/competition.css';
+import Registrationitem from "../Registrationitem";
+import InfiniteScroll from 'react-infinite-scroller';
+// import PersonModaltion from "./PersonModaltion";
+const {Search} = Input;
+
+//退出战队
+class ExittheteamModel extends React.Component {
+
+ constructor(props) {
+ super(props);
+ this.state = {}
+ }
+
+
+ render() {
+ const {
+ addonAfter, test, test3, Numberofteammentors, Thecurrentnumber, person1, person2
+ } = this.state;
+ //Modal
+ //keyboard是否支持键盘 esc 关闭
+ //closable 是否显示右上角的关闭按钮
+ //底部内容，当不需要默认底部按钮时，可以设为 footer={null}
+ //destroyOnClose 关闭时销毁 Modal 里的子元素
+ //centered 垂直居中展示 Modal
+ //visible 弹出框是否显示
+
+ return (
+
+
在线竞赛
@@ -357,15 +449,17 @@ class Registration extends React.Component {
:
""
}
+ {/*普通账号出现单人 战队弹框*/}
{
type === 2 || type === 3 || type === 5 ?
-
-
- : ""
+ (
+ count < 20 ? :
+
+
+ )
+
+ :
}
战队总数：271个
+ style={{color: "#459BE5", fontSize: "16px"}}>{this.props.count}个
+
+
+
+ {this.props.exitintpermessages}
+
在线竞赛
@@ -536,7 +595,8 @@ class Registration extends React.Component {
{
type === 2 || type === 3 || type === 5 ?
-
-
- listItems
+ {
+ listItems
+ }
:
""
diff --git a/public/react/src/modules/competition/personal/PersonalCompetititem.js b/public/react/src/modules/competition/personal/PersonalCompetititem.js
index 2c364e293..31b43bf06 100644
--- a/public/react/src/modules/competition/personal/PersonalCompetititem.js
+++ b/public/react/src/modules/competition/personal/PersonalCompetititem.js
@@ -9,8 +9,20 @@ import moment from 'moment';
import {SnackbarHOC, WordsBtn, getImageUrl} from 'educoder';
import {TPMIndexHOC} from '../../tpm/TPMIndexHOC';
import competition from '../comcss/competition.css';
-import {Button} from 'antd';
+import {Button, message} from 'antd';
import pexjiazai from '../pexjiazai.png'
+
+// 点击按钮复制功能
+function jsCopy() {
+ var e = document.getElementById("copy_invite_code");
+ e.select();
+ document.execCommand("Copy");
+ codesuccess()
+}
+
+function codesuccess() {
+ message.success('复制成功');
+};
// 团队竞赛报名无报名子组件团队 竞赛报名-已创建战队
class PersonalCompetititem extends React.Component {
constructor(props) {
@@ -124,19 +136,37 @@ class PersonalCompetititem extends React.Component {
-
-
+ {data[0].invite_code === null || data[0].invite_code === undefined ?
+
+
+ :
+ {
+ jsCopy()
+ }}
+ >
+
+ }
+
{
this.props.type === 5 ?
删除战队
+ this.props.Exittheteamshow(data[0].id, true)}>
+
- this.props.Exittheteamshow(data[0].id, true)}>删除战队
-
@@ -160,8 +161,8 @@ class PersonalCompetititem extends React.Component {
编辑战队
+ this.props.Createateamedit(data[0])}>
+
this.props.Createateamedit(data[0])}>编辑战队
战队详情
this.props.Exittheteamshow(data[0].id)}>
-
@@ -173,8 +174,8 @@ class PersonalCompetititem extends React.Component {
}}
>
- this.props.Exittheteamshow(data[0].id)}>退出战队
+ this.props.Exittheteamshow(data[0].id, false)}>
+
this.props.Exittheteamshow(data[0].id, false)}>退出战队
this.props.Exittheteamshow(data[0].id)}>
-
From 0010173d193e3ca8039415217895ab815e0ea45b 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 15:34:05 +0800
Subject: [PATCH 05/52] jingsai.
---
.../src/modules/competition/Registration.js | 4 +-
.../personal/PersonalCompetititem.js | 52 +++++++++++++++----
2 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js
index dd567a367..e48cd0fef 100644
--- a/public/react/src/modules/competition/Registration.js
+++ b/public/react/src/modules/competition/Registration.js
@@ -617,7 +617,9 @@ class Registration extends React.Component {
{type === 4 || type === 5 ?
this.props.Exittheteamshow(data[0].id)}>退出战队
+ this.props.Exittheteamshow(data[0].id, false)}>
+
this.props.Exittheteamshow(data[0].id, false)}>退出战队
-
+ 邀请码： + 邀请码：yngh5
+ }}>{data[0].invite_code === null || data[0].invite_code === undefined ? "" : data[0].invite_code} +
Date: Wed, 23 Oct 2019 16:29:59 +0800
Subject: [PATCH 06/52] jingsai.
---
.../modules/competition/RegisListviewdata.js | 7 +-
.../src/modules/competition/Registration.js | 207 ++++++++++++------
.../modules/competition/RegistrationSearch.js | 10 +-
.../personal/PersonalCompetititem.js | 5 +-
4 files changed, 161 insertions(+), 68 deletions(-)
diff --git a/public/react/src/modules/competition/RegisListviewdata.js b/public/react/src/modules/competition/RegisListviewdata.js
index fb8c1c68e..d5dcd9cc0 100644
--- a/public/react/src/modules/competition/RegisListviewdata.js
+++ b/public/react/src/modules/competition/RegisListviewdata.js
@@ -89,15 +89,16 @@ class RegisListviewdata extends React.Component {
: index === 5 ?
-
+
- : index === 6 ?
- : ""
+
+ : ""
+
)
})
}
diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js
index e48cd0fef..a3e330cfe 100644
--- a/public/react/src/modules/competition/Registration.js
+++ b/public/react/src/modules/competition/Registration.js
@@ -21,6 +21,7 @@ import MessagePersonModal from './competmodal/MessagePersonModal';
import PersonalModalteam from './competmodal/PersonalModalteam';
import PersonalCompetititem from './personal/PersonalCompetititem';
import ExittheteamModel from './competmodal/ExittheteamModel';
+import pexjiazai from "./pexjiazai.png";
// 团队竞赛报名无报名
class Registration extends React.Component {
/***
@@ -29,6 +30,7 @@ class Registration extends React.Component {
*"enrolled: false, // 是否已经报名
*"teacher_staff": { // 为空表示不支持老师报名
*"member_staff": { // 为空表示不支持学生报名
+ * personal// 是否是个人赛
* **/
constructor(props) {
super(props)
@@ -61,6 +63,8 @@ class Registration extends React.Component {
exitintpermessages: "是否退出战队",
itemid: undefined,
itemiddata: [],
+ pint: 0,
+
}
}
@@ -119,72 +123,92 @@ class Registration extends React.Component {
page: page,
per_page: per_page,
};
- let url = `/competitions/${"gcc-course-2019"}/competition_teams.json`;
+ let url = `/competitions/${"gcc-task-2019"}/competition_teams.json`;
axios.get((url), {params: datas}).then((result) => {
if (result) {
if (result.data) {
- //// //console.log(result);
- if (result.data.my_teams.length === 0) {
- // 没有创建数据的
- if (admin === true) {
- //管理员
- this.setState({
- type: 4,
- count: result.data.count,
- data: result.data.my_teams,
- competition_teams: result.data.competition_teams
- })
- } else {
- //普通账号
- this.setState({
- type: 1,
- count: result.data.count,
- data: result.data.my_teams,
- competition_teams: result.data.competition_teams
- })
- }
- } else {
- //有数据的
- if (admin === true) {
- 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
-
- })
- } else {
+ //// //console.log(result);\
+ if (result.data.personal === false) {
+ //不是个人赛
+ if (result.data.my_teams.length === 0) {
+ // 没有创建数据的
+ if (admin === true) {
+ //管理员
this.setState({
type: 4,
- data: result.data.my_teams,
count: result.data.count,
- competition_teams: result.data.competition_teams
- })
- }
- } else {
- if (result.data.my_teams[0].manage_permission === true) {
- //普通账号true 为创建了竞赛
- this.setState({
- type: 2,
data: result.data.my_teams,
- count: result.data.count,
+ competition_teams: result.data.competition_teams,
+ personal: result.data.personal,
})
} else {
- //普通账号true 加入了竞赛
+ //普通账号
this.setState({
- type: 3,
- data: result.data.my_teams,
+ type: 1,
count: result.data.count,
+ data: result.data.my_teams,
+ competition_teams: result.data.competition_teams,
+ personal: result.data.personal,
})
}
- }
+ } else {
+ //有数据的
+
+ if (admin === true) {
+ 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,
+
+ })
+ } else {
+ this.setState({
+ type: 4,
+ data: result.data.my_teams,
+ count: result.data.count,
+ competition_teams: result.data.competition_teams,
+ personal: result.data.personal,
+
+ })
+ }
+ } else {
+ if (result.data.my_teams[0].manage_permission === true) {
+ //普通账号true 为创建了竞赛
+ this.setState({
+ type: 2,
+ data: result.data.my_teams,
+ count: result.data.count,
+ personal: result.data.personal,
+
+ })
+ } else {
+ //普通账号true 加入了竞赛
+ this.setState({
+ type: 3,
+ data: result.data.my_teams,
+ count: result.data.count,
+ personal: result.data.personal,
+
+ })
+ }
+ }
- }
+ }
+ } else {
+ this.setState({
+ type: 6,
+ data: result.data.my_teams,
+ count: result.data.count,
+ competition_teams: result.data.competition_teams,
+ personal: result.data.personal,
+ })
+ }
}
-
}
this.setState({
loadingstate: false,
@@ -222,12 +246,14 @@ class Registration extends React.Component {
page: page,
per_page: per_page,
};
- let url = `/competitions/${"gcc-course-2019"}/competition_teams.json`;
+ let url = `/competitions/${"gcc-task-2019"}/competition_teams.json`;
axios.get((url), {params: datas}).then((result) => {
if (result) {
if (result.data) {
//// //console.log(result);
- if (result.data.my_teams.length === 0) {
+ if (result.data.personal === false) {
+ //不是个人赛
+ if (result.data.my_teams.length === 0) {
// 没有创建数据的
//管理员
this.setState({
@@ -235,6 +261,8 @@ class Registration extends React.Component {
count: result.data.count,
competition_teams: result.data.competition_teams,
data: result.data.my_teams,
+ personal: result.data.personal,
+
})
} else {
//有数据的
@@ -243,7 +271,9 @@ class Registration extends React.Component {
type: 5,
data: result.data.my_teams,
count: result.data.count,
- competition_teams: result.data.competition_teams
+ competition_teams: result.data.competition_teams,
+ personal: result.data.personal,
+
})
} else {
@@ -251,10 +281,23 @@ class Registration extends React.Component {
type: 4,
data: result.data.my_teams,
count: result.data.count,
- competition_teams: result.data.competition_teams
+ competition_teams: result.data.competition_teams,
+ personal: result.data.personal,
+
})
}
}
+ } else {
+ //团队赛
+ this.setState({
+ type: 6,
+ data: result.data.my_teams,
+ count: result.data.count,
+ competition_teams: result.data.competition_teams,
+ personal: result.data.personal,
+
+ })
+ }
}
}
@@ -262,6 +305,8 @@ class Registration extends React.Component {
loadingstate: false,
})
}).catch((error) => {
+ console.log(error);
+ console.log("报错了");
if (admin === true) {
//管理员
this.setState({
@@ -290,7 +335,7 @@ class Registration extends React.Component {
loadingstate: true,
})
const {keyword, per_page} = this.state;
- this.Getdata(keyword, pageNumber, per_page, this.props.user.admin);
+ this.Getdatatype5(keyword, pageNumber, per_page, this.props.user.admin);
};
/**
@@ -482,7 +527,7 @@ class Registration extends React.Component {
messageexitol: true
})
- let url = `/competitions/${"gcc-course-2019"}/competition_teams/${this.state.itemid}/leave.json`;
+ let url = `/competitions/${"gcc-task-2019"}/competition_teams/${this.state.itemid}/leave.json`;
axios.post(url).then((response) => {
if (response) {
if (response.data) {
@@ -515,15 +560,21 @@ class Registration extends React.Component {
})
this.Getdatatype5(value, 1, 20, this.props.user.admin);
}
+
+ //个人竞赛
+// /competitions/:identifier/competition_teams.json
render() {
- const {test, page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate} = this.state;
+ const {test, page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint} = this.state;
var listItems = "";
- if (competition_teams) {
- listItems = competition_teams.map((item, index) =>
- this.Jointheteam()}
+ pint={pint}
{...this.props} {...this.state}
Createateam={() => this.Createateam()}>
{/*大图结尾*/}
{/*没数据*/}
+ {
+ pint === 1 || pint === 3 ?
+
+ {/*{*/}
+ {/* listItems*/}
+ {/*}*/}
+
{
- listItems
+ competition_teams && competition_teams.map((item, index) => {
+ return (
+
:
""
diff --git a/public/react/src/modules/competition/RegistrationSearch.js b/public/react/src/modules/competition/RegistrationSearch.js
index 28fdd2b9d..5a08cd84d 100644
--- a/public/react/src/modules/competition/RegistrationSearch.js
+++ b/public/react/src/modules/competition/RegistrationSearch.js
@@ -53,7 +53,15 @@ class RegistrationSearch extends React.Component {
onPressEnter={(e) => this.myonPressEnter(e)}
/>
-
)
diff --git a/public/react/src/modules/competition/personal/PersonalCompetititem.js b/public/react/src/modules/competition/personal/PersonalCompetititem.js
index 31b43bf06..146f7591a 100644
--- a/public/react/src/modules/competition/personal/PersonalCompetititem.js
+++ b/public/react/src/modules/competition/personal/PersonalCompetititem.js
@@ -119,14 +119,15 @@ class PersonalCompetititem extends React.Component {
: index === 5 ?
-
+
@@ -581,10 +632,33 @@ class Registration extends React.Component {
{/*大图*/}
+
+ : ""}
+ {/*列表*/}
+ {
+ pint === 1 || pint === 3 ?
+ 参赛总人数：132人
+
+ {
+ listItemss
+ }
+
+
+ : ""}
{
type === 1 ?
战队总数：战队总数：{this.props.count}个
{
pint === 1 ?
-
-
立即报名
+ this.props.Personalregistration()}>
+
: pint === 2 ?
this.props.Personalregistration()}>立即报名
diff --git a/public/react/src/modules/competition/RegisListviewdata.js b/public/react/src/modules/competition/RegisListviewdata.js
index d5dcd9cc0..31ea816b5 100644
--- a/public/react/src/modules/competition/RegisListviewdata.js
+++ b/public/react/src/modules/competition/RegisListviewdata.js
@@ -23,15 +23,15 @@ 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
})
}
render() {
- const {item} = this.state;
+ const {item} = this.props;
return (
: this.props.type === 2 ?
-
diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js
index a3e330cfe..76a1d70b9 100644
--- a/public/react/src/modules/competition/Registration.js
+++ b/public/react/src/modules/competition/Registration.js
@@ -70,19 +70,19 @@ class Registration extends React.Component {
}
componentDidMount() {
- // //console.log("componentDidMount Registration");
- // //// //console.log("调用子组件 ");
- // //console.log(this.props.isAdmin());
- // //// //console.log(this.props.isAdmin())
+ // ////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("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();
@@ -93,12 +93,12 @@ class Registration extends React.Component {
//获取报名配置API
GetenrollmentAPI = () => {
- const url = `/competitions/${"gcc-course-2019"}/competition_staff.json`;
+ const url = `/competitions/${"gcc-task-2020"}/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,
@@ -107,10 +107,23 @@ class Registration extends React.Component {
teacher_staff: result.data.teacher_staff,
member_staff: result.data.member_staff,
})
+ if (result.data.enroll_ended === true) {
+ this.setState({
+ pint: 0
+ })
+ } else if (result.data.enrolled === true) {
+ this.setState({
+ pint: 2
+ })
+ } else if (result.data.enrolled === false) {
+ this.setState({
+ pint: 1
+ })
+ }
}
}
}).catch((error) => {
- //// //console.log(error);
+ //// ////console.log(error);
})
}
@@ -123,11 +136,11 @@ class Registration extends React.Component {
page: page,
per_page: per_page,
};
- let url = `/competitions/${"gcc-task-2019"}/competition_teams.json`;
+ let url = `/competitions/${"gcc-task-2020"}/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) {
@@ -246,16 +259,24 @@ class Registration extends React.Component {
page: page,
per_page: per_page,
};
- let url = `/competitions/${"gcc-task-2019"}/competition_teams.json`;
+ let url = `/competitions/${"gcc-task-2020"}/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);
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,
@@ -266,7 +287,9 @@ class Registration extends React.Component {
})
} else {
//有数据的
- if (result.data.my_teams[0].manage_permission === true) {
+ //console.log("b");
+
+ if (result.data.my_teams[0].manage_permission === true) {
this.setState({
type: 5,
data: result.data.my_teams,
@@ -277,7 +300,9 @@ class Registration extends React.Component {
})
} else {
- this.setState({
+ //console.log("c");
+
+ this.setState({
type: 4,
data: result.data.my_teams,
count: result.data.count,
@@ -289,6 +314,8 @@ class Registration extends React.Component {
}
} else {
//团队赛
+ //console.log("d");
+
this.setState({
type: 6,
data: result.data.my_teams,
@@ -301,12 +328,12 @@ class Registration extends React.Component {
}
}
- this.setState({
- loadingstate: false,
- })
+
}).catch((error) => {
- console.log(error);
- console.log("报错了");
+ //console.log("k");
+
+ //console.log(error);
+ //console.log("报错了");
if (admin === true) {
//管理员
this.setState({
@@ -521,18 +548,18 @@ class Registration extends React.Component {
}
//退出战队
Exittheteam = (bool) => {
- // //console.log(this.state.itemid);
+ // ////console.log(this.state.itemid);
if (bool) {
this.setState({
messageexitol: true
})
- let url = `/competitions/${"gcc-task-2019"}/competition_teams/${this.state.itemid}/leave.json`;
+ let url = `/competitions/${"gcc-task-2020"}/competition_teams/${this.state.itemid}/leave.json`;
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
@@ -541,7 +568,7 @@ class Registration extends React.Component {
}
}
}).catch((error) => {
- //console.log(error)
+ ////console.log(error)
});
} else {
@@ -552,8 +579,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,
@@ -563,6 +590,45 @@ class Registration extends React.Component {
//个人竞赛
// /competitions/:identifier/competition_teams.json
+ Personalregistration = () => {
+ let {teacher_staff, member_staff, data} = this.state;
+ if (teacher_staff) {
+ if (teacher_staff.mutiple_limited === true) {
+ if (data) {
+ if (data.length > teacher_staff.maximum) {
+ message.success('已限制多次报名！');
+ return
+ }
+ }
+ }
+
+ }
+ if (member_staff) {
+ if (teacher_staff.mutiple_limited === true) {
+ if (data) {
+ if (data.length > teacher_staff.maximum) {
+ message.success('已限制多次报名！');
+
+ return;
+ }
+ }
+ }
+
+ }
+ const url = `/competitions/${"gcc-task-2020"}/competition_teams.json`;
+ axios.post(url).then((response) => {
+ if (response) {
+ if (response.data) {
+
+ this.Refreshteam();
+
+
+ }
+ }
+ }).catch((error) => {
+
+ });
+ }
render() {
const {test, page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint} = this.state;
var listItems = "";
@@ -572,9 +638,9 @@ class Registration extends React.Component {
//
// );
// }
- const listItemss = test.map((item, index) =>
-
- {/*{*/}
- {/* listItems*/}
- {/*}*/}
-
{
competition_teams && competition_teams.map((item, index) => {
return (
diff --git a/public/react/src/modules/competition/Registrationitem.js b/public/react/src/modules/competition/Registrationitem.js
index 6bcd18534..192166691 100644
--- a/public/react/src/modules/competition/Registrationitem.js
+++ b/public/react/src/modules/competition/Registrationitem.js
@@ -6,7 +6,7 @@ import {
} from 'react-router-dom';
import axios from 'axios';
import moment from 'moment';
-import {SnackbarHOC, WordsBtn} from 'educoder';
+import {SnackbarHOC, WordsBtn, getImageUrl} from 'educoder';
import {TPMIndexHOC} from '../tpm/TPMIndexHOC';
import competition from './comcss/competition.css';
import {Button} from 'antd';
@@ -22,14 +22,16 @@ class Registrationitem extends React.Component {
render() {
-
+ let {item} = this.props;
return (
-
+
{data[0].invite_code === null || data[0].invite_code === undefined ?
+
}
{
@@ -184,13 +189,18 @@ class PersonalCompetititem extends React.Component {
@@ -634,7 +700,9 @@ class Registration extends React.Component {
this.Jointheteam()}
pint={pint}
{...this.props} {...this.state}
- Createateam={() => this.Createateam()}>
+ Createateam={() => this.Createateam()}
+ Personalregistration={() => this.Personalregistration()}
+ >
{/*大图结尾*/}
{/*没数据*/}
{
@@ -642,7 +710,8 @@ class Registration extends React.Component {
+ {
+ data && data.map((item, index) => {
+ return (
+
: ""}
@@ -691,10 +767,6 @@ class Registration extends React.Component {
{type === 4 || type === 5 ?
-
: ""}
{/*列表*/}
@@ -653,9 +722,16 @@ class Registration extends React.Component {
marginTop: "31px"
}}
>
- {
- listItemss
- }
+ 参赛总人数：132人
+参赛总人数：{data === null || data === undefined ? 0 : data.length}人 +
+ {
+ item !== undefined ?
-
-
+ : ""
+ }
+
)
}
diff --git a/public/react/src/modules/competition/comcss/competition.css b/public/react/src/modules/competition/comcss/competition.css
index ba2921020..859759a4d 100644
--- a/public/react/src/modules/competition/comcss/competition.css
+++ b/public/react/src/modules/competition/comcss/competition.css
@@ -319,7 +319,7 @@
.regitem2 {
display: flex;
flex-direction: initial;
- border-bottom: 1px solid #EDEDED;
+
margin-top: 19px;
}
@@ -350,7 +350,6 @@
}
.personregitemimg {
- border: 0.5px solid;
height: 64px;
width: 64px;
}
diff --git a/public/react/src/modules/competition/personal/PersonalCompetititem.js b/public/react/src/modules/competition/personal/PersonalCompetititem.js
index 146f7591a..7f157cead 100644
--- a/public/react/src/modules/competition/personal/PersonalCompetititem.js
+++ b/public/react/src/modules/competition/personal/PersonalCompetititem.js
@@ -49,7 +49,7 @@ class PersonalCompetititem extends React.Component {
}
render() {
- const {data} = this.state;
+ const {data} = this.props;
// //console.log("PersonalCompetititem");
// //console.log(data);
// //console.log(data[0]);
@@ -142,12 +142,16 @@ class PersonalCompetititem extends React.Component {
color: "#05101A",
fontSize: "16px",
}}>邀请码：
- {data[0].invite_code === null || data[0].invite_code === undefined ? "" : data[0].invite_code}
+
-
+
-
+
小猫头像
+ }}>{item.creator.name}
+ {
+ item.manage_permission === true ?
+
已报名
+ : + "" + } -已报名
-
战队详情
+ 战队详情 this.props.Exittheteamshow(data[0].id, false)}>
this.props.Exittheteamshow(data[0].id, false)}>退出战队
From 1bf72e9314a7b6f36673c757ed8f9576e2e4a99c 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 20:11:55 +0800 Subject: [PATCH 08/52] jingsai.2 --- public/react/src/modules/competition/comcss/competition.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/competition/comcss/competition.css b/public/react/src/modules/competition/comcss/competition.css index 859759a4d..e6b6b63a5 100644 --- a/public/react/src/modules/competition/comcss/competition.css +++ b/public/react/src/modules/competition/comcss/competition.css @@ -319,7 +319,7 @@ .regitem2 { display: flex; flex-direction: initial; - + padding-bottom: 18px; margin-top: 19px; } @@ -339,7 +339,7 @@ align-items: center; justify-content: center; margin-left: 26px; - padding-bottom: 18px; + } .regitemimg2 { From fa47b00a7ab5e54529c88b4a9b875f60be789b57 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 21:38:24 +0800 Subject: [PATCH 09/52] jingsai.2 --- .../modules/competition/CompetitionMaxImg.js | 7 +++ .../src/modules/competition/Registration.js | 59 +++++++++++++----- .../modules/competition/Registrationitem.js | 2 +- .../competition/comcss/competition.css | 54 ++++++++++------ .../competition/comcss/tipregistit.jpg | Bin 0 -> 140143 bytes 5 files changed, 87 insertions(+), 35 deletions(-) create mode 100644 public/react/src/modules/competition/comcss/tipregistit.jpg diff --git a/public/react/src/modules/competition/CompetitionMaxImg.js b/public/react/src/modules/competition/CompetitionMaxImg.js index b05ca56fc..154183f2f 100644 --- a/public/react/src/modules/competition/CompetitionMaxImg.js +++ b/public/react/src/modules/competition/CompetitionMaxImg.js @@ -29,6 +29,13 @@ class CompetitionMaxImg extends React.Component { let {type, pint} = this.props; return (
+
{
type === 1 || type === 2 ?
^bf!LGA{~2e^50dB7DKJo#I9RFNg9zXy4u?Pp`
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
diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js
index 76a1d70b9..a260e343e 100644
--- a/public/react/src/modules/competition/Registration.js
+++ b/public/react/src/modules/competition/Registration.js
@@ -22,6 +22,7 @@ import PersonalModalteam from './competmodal/PersonalModalteam';
import PersonalCompetititem from './personal/PersonalCompetititem';
import ExittheteamModel from './competmodal/ExittheteamModel';
import pexjiazai from "./pexjiazai.png";
+
// 团队竞赛报名无报名
class Registration extends React.Component {
/***
@@ -74,6 +75,8 @@ class Registration extends React.Component {
// //// ////console.log("调用子组件 ");
// ////console.log(this.props.isAdmin());
// //// ////console.log(this.props.isAdmin())
+ this.GetenrollmentAPI();
+ this.Getthenavigationbar();
}
@@ -85,12 +88,26 @@ class Registration extends React.Component {
//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(result);
+ }
+ }
+ }).catch((error) => {
+ //// ////console.log(error);
+ })
+ }
//获取报名配置API
GetenrollmentAPI = () => {
const url = `/competitions/${"gcc-task-2020"}/competition_staff.json`;
@@ -591,35 +608,45 @@ class Registration extends React.Component {
//个人竞赛
// /competitions/:identifier/competition_teams.json
Personalregistration = () => {
- let {teacher_staff, member_staff, data} = this.state;
+ let {teacher_staff, member_staff, data, enroll_ended} = this.state;
+ if (enroll_ended === true) {
+ //已截止
+ this.props.showNotification(`报名已截止`);
+
+ return;
+ }
if (teacher_staff) {
- if (teacher_staff.mutiple_limited === true) {
- if (data) {
- if (data.length > teacher_staff.maximum) {
- message.success('已限制多次报名！');
- return
+ if (teacher_staff.mutiple_limited) {
+ if (teacher_staff.mutiple_limited === true) {
+ if (data) {
+ if (data.length > teacher_staff.maximum) {
+ this.props.showNotification(`你已经报名,不能重复报名！`);
+ return
+ }
}
}
}
+
}
if (member_staff) {
- if (teacher_staff.mutiple_limited === true) {
+ if (member_staff.mutiple_limited) {
+ if (member_staff.mutiple_limited === true) {
if (data) {
- if (data.length > teacher_staff.maximum) {
- message.success('已限制多次报名！');
+ if (data.length > member_staff.maximum) {
+ this.props.showNotification(`你已经报名,不能重复报名！`);
return;
}
}
}
-
+ }
}
const url = `/competitions/${"gcc-task-2020"}/competition_teams.json`;
axios.post(url).then((response) => {
if (response) {
if (response.data) {
-
+ this.props.showNotification(`报名成功,预祝您夺得桂冠!`);
this.Refreshteam();
@@ -631,7 +658,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;
- var listItems = "";
+ // var listItems = "";
// if (competition_teams) {
// listItems = competition_teams.map((item, index) =>
@@ -716,7 +743,7 @@ class Registration extends React.Component {
: ""}
{/*列表*/}
{
- pint === 1 || pint === 3 ?
+ type === 6 ?
diff --git a/public/react/src/modules/competition/comcss/competition.css b/public/react/src/modules/competition/comcss/competition.css
index e6b6b63a5..2b3070ad4 100644
--- a/public/react/src/modules/competition/comcss/competition.css
+++ b/public/react/src/modules/competition/comcss/competition.css
@@ -8,16 +8,17 @@
}
/*All*/
/*Registration.js*/
-.registrationback {
- height: 368px;
- width: 1200px;
- border: 0.5px solid;
- display: flex;
- display: -webkit-flex;
- flex-direction: column;
- align-items: center;
- background: #0dcecb;
-}
+/*.registrationback {*/
+/* height: 368px;*/
+/* width: 1200px;*/
+/* border: 0.5px solid;*/
+/* display: flex;*/
+/* display: -webkit-flex;*/
+/* flex-direction: column;*/
+/* align-items: center;*/
+/* background:url(../../../../../images/regis/tipregistit.jpg)*/
+
+/*}*/
.registrationbackcenter {
display: flex;
@@ -26,14 +27,14 @@
align-items: center;
}
-.registrationback1 {
- height: 368px;
- width: 1200px;
- border: 0.5px solid;
- display: flex;
- flex-direction: column;
- background: #0dcecb;
-}
+/*.registrationback1 {*/
+/* height: 368px;*/
+/* width: 1200px;*/
+/* border: 0.5px solid;*/
+/* display: flex;*/
+/* flex-direction: column;*/
+/* background:url(../../../../../images/regis/tipregistit.jpg)*/
+/*}*/
.registrationbackp1 {
color: #ffffff;
@@ -315,6 +316,23 @@
border-bottom: 1px solid #EDEDED;
}
+.registrationback {
+ height: 368px;
+ width: 1200px;
+ display: flex;
+ display: -webkit-flex;
+ flex-direction: column;
+ align-items: center;
+ background-image: url(./tipregistit.jpg);
+}
+
+.registrationback1 {
+ height: 368px;
+ width: 1200px;
+ display: flex;
+ flex-direction: column;
+ background-image: url(./tipregistit.jpg);
+}
.regitem2 {
display: flex;
diff --git a/public/react/src/modules/competition/comcss/tipregistit.jpg b/public/react/src/modules/competition/comcss/tipregistit.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8aae5023220d809f80bdd58feb5856fa457b9257
GIT binary patch
literal 140143
zcmeFYcT`hf+btSGfPjF2ARPmQ-g^@aorE4BbR`s}cLV{I-lT>iT?jq&-jOa%r6XNH
zdQk+yf^y^Ud(Zcsd+#`7y#JqfjggVHvv&5g_cJo`%sHRAu0LFFkQzAp`g+QXh`9R*
zqwPIx9fa*X+(ZJ {
return (
-
- ${r!blAT6`(*VmFI=b