-
-
-
-
- 小猫头像
-
-
- 重庆邮电大学
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 重庆邮电大学
-
-
-
-
+ 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}
+