+
-
+ {item.name === undefined || item.name === null || item.name === "" ? "--" : item.name}
+ >{item.name === undefined || item.name === null || item.name === "" ? "--" : item.name}
{
index === 0 ?
);
}
const cpersondiv1 = (
创建者
: -{item.type === undefined || item.type === null || item.type === "" ? "--" : item.type}
+ >{item.type === undefined || item.type === null || item.type === "" ? "--" : item.type} } -{item.school_name === undefined || item.school_name === null || item.school_name === "" ? "--" : item.school_name}
-{item.school_name === undefined || item.school_name === null || item.school_name === "" ? "--" : item.school_name} + {item.identity === undefined || item.identity === null || item.identity === "" ? "--" : item.identity}
+ >{item.identity === undefined || item.identity === null || item.identity === "" ? "--" : item.identity} { index === 0 ? - : -
);
var cpersondiv1Items = [];
+ // console.log("this.props.teamutiple_limited ");
+ // console.log(this.props.teamutiple_limited );
if (teacher_ids) {
cpersondiv1Items = teacher_ids.map((item, index) =>
-
+ {item.name === undefined || item.name === null || item.name === "" ? "--" : item.name} {item.identity === undefined || item.identity === null || item.identity === "" ? "--" : item.identity} {item.school_name === undefined || item.school_name === null || item.school_name === "" ? "--" : item.school_name}
--
+ : + {item.identity}} + {item.school_name === undefined || item.school_name === null || item.school_name === "" ? + +--
+ : + {item.school_name} + } + + { + this.props.teamutiple_limited === undefined || this.props.teamutiple_limited === null ? +{""}
+ : + ( + this.props.teamutiple_limited === true ? +{item.enrollable === false ? "已加入其他战队" : ""}
+ : +{""}
+ ) + + } + + + +
+
{
cpersondiv1Items.length === 0 ?
@@ -778,48 +1073,115 @@ class PersonModal extends Component {
var persondiv2Items = [];
if (member_ids) {
persondiv2Items = member_ids.map((item, index) =>
-
+
+
+ this.getdatacpersondiv1Items2(item)}
+ onMouseDown={() => this.getdatacpersondiv1Items2(item)}
>
-
+
+ {item.name === undefined || item.name === null || item.name === "" ?
+ --
+ :
+ {item.name}
+ }
+ {item.student_id === undefined || item.student_id === null || item.student_id === "" ?
+
);
}
const persondiv2 = (
{item.name === undefined || item.name === null || item.name === "" ? "--" : item.name}
-{item.identity === undefined || item.identity === null || item.identity === "" ? "--" : item.identity}
-{item.school_name === undefined || item.school_name === null || item.school_name === "" ? "--" : item.school_name}
-{item.enrollable === false ? "" : "已加入其他战队"}
---
+ : + {"学号:" + item.student_id}} + {item.school_name === undefined || item.school_name === null || item.school_name === "" ? + +--
+ : + {item.school_name} + } + + { + this.props.mutiple_limited === undefined || this.props.mutiple_limited === null ? +{""}
+ : + ( + this.props.mutiple_limited === true ? +{item.enrollable === false ? "已加入其他战队" : ""}
+ : +{""}
+ ) + + } + + + +
{/*this.state.loading2*/}
-
+
{
persondiv2Items.length === 0 ?
@@ -857,16 +1219,16 @@ class PersonModal extends Component {
width="620px"
>
-
+ {/**/}
{/*队名*/}
- {/* this.onSearch(value)}*/}
- {/*/>*/}
trigger.parentNode}
visible={this.state.person2}>
@@ -1021,6 +1379,7 @@ class PersonModal extends Component {
placeholder="请输入想要队员姓名的任意关键字进行搜索"
onPressEnter={this.startSearch2}
onFocus={this.inputOnFocus2}
+ onBlur={this.inputOnBlur2}
onChange={(e) => this.studentsonChange(e)}
value={this.state.keywordstudents}
suffix={
@@ -1114,8 +1473,21 @@ class PersonModal extends Component {
) :
""
}
+ {
+ GetenrollmentAPI && GetenrollmentAPI.member_staff ?
+ (
+ Thecurrentnumberboolstu === true ?
+
战队队员为{GetenrollmentAPI.member_staff.minimum}-{GetenrollmentAPI.member_staff.maximum}人,现在为{Thecurrentnumberstu}人
- + : "" + ) : + "" + } {
+ try {
+ if (this.state.yslzxueshiskmcdm1) {
+ if (this.state.yslzxueshiskmcdm1.length === 0) {
+ this.props.showNotification(`请输入您的邀请码`);
+ return
+ }
+
+ }
+ } catch (e) {
+
+ }
+
+
let url = `/competitions/${this.props.match.params.identifier}/competition_teams/join.json`;
axios.post(url, {
invite_code: this.state.yslzxueshiskmcdm1
diff --git a/public/react/src/modules/competition/personal/PersonalCompetititem.js b/public/react/src/modules/competition/personal/PersonalCompetititem.js
index bd6a092eb..4abbb5348 100644
--- a/public/react/src/modules/competition/personal/PersonalCompetititem.js
+++ b/public/react/src/modules/competition/personal/PersonalCompetititem.js
@@ -9,13 +9,21 @@ import moment from 'moment';
import {SnackbarHOC, WordsBtn, getImageUrl} from 'educoder';
import {TPMIndexHOC} from '../../tpm/TPMIndexHOC';
import competition from '../comcss/competition.css';
-import {Button, message} from 'antd';
+import {Button, message, Tooltip} from 'antd';
// 点击按钮复制功能
function jsCopy() {
var e = document.getElementById("copy_invite_code");
e.select();
document.execCommand("Copy");
codesuccess()
+ // const range=document.createRange();
+ // window.getSelection().removeAllRanges();
+ // range.selectNode(e.target);
+ // window.getSelection().addRange(range);
+ // const successful =document.execCommand('copy');
+ // if(successful){
+ // codesuccess()
+ // }
}
function codesuccess() {
@@ -25,17 +33,13 @@ function codesuccess() {
class PersonalCompetititem extends React.Component {
constructor(props) {
super(props)
- this.state = {
- data: ""
- }
+
}
componentDidMount() {
// // ////console.log(this.props.data)
- this.setState({
- data: this.props.data,
- })
+
}
@@ -47,7 +51,7 @@ class PersonalCompetititem extends React.Component {
}
render() {
- const {data} = this.props;
+ const {key, item} = this.props;
// ////console.log("PersonalCompetititem");
// ////console.log(data);
// ////console.log(data[0]);
@@ -60,12 +64,14 @@ class PersonalCompetititem extends React.Component {
return (
{
- data && data[0] ?
-
+
- ![]({getImageUrl("images/")
+
{data[0].creator.name}
+ }}>{item.creator.name}
-
- {data[0].name}
+ }}>{item.name}
- {
- data && data[0].team_members.map((item, index) => {
- return (
+ {this.props.type === 5 || this.props.type === 2 ?
+
+ {
+ item && item.team_members.map((item, index) => {
+ return (
+
+ index === 0 ?
+
+
+
+ : index === 1 ?
+
- index === 0 ?
-
+
+ : index === 2 ?
+
-
- : index === 1 ?
-
+
+ : index === 3 ?
+
:
+
+
-
- : index === 2 ?
-
+
-
- : index === 3 ?
+ })
+
+
+
+ : ""
+ )
+ })
+ }
+
+
+
+
+
+ {
+ item && item.team_members.map((item, index) => {
+ return (
+
+ index === 0 ?
+
+
+
+ : index === 1 ?
- : index === 4 ?
+ : index === 2 ?
- : index === 5 ?
-
+ }
+
+ : index === 3 ?
+ : index === 4 ?
+
-
+
+ : index === 5 ?
+
-
+
+ : index === 5 ?
+
+
-
-
- : ""
- )
- })
- }
+
-
+
+
+
+ : ""
+ )
+ })
+ }
+
+
-
+ {
+ jsCopy()
+ }}
+ >
+
+
}
{
this.props.type === 5 ?
-
+
- {data[0].invite_code === null || data[0].invite_code === undefined ?
+ {item.invite_code === null || item.invite_code === undefined ?
:
- {
- jsCopy()
- }}
- >
-
-
+
邀请码：
{data[0].invite_code === null || data[0].invite_code === undefined ? "" : data[0].invite_code}
+ }}>{item.invite_code === null || item.invite_code === undefined ? "" : item.invite_code}
+ value={item.invite_code === null || item.invite_code === undefined ? "" : item.invite_code}/>
-
this.props.Exittheteamshow(data[0].id, true)}>
-
this.props.Exittheteamshow(data[0].id, true)}>删除战队
+
+ 战队详情
+
+ this.props.Exittheteamshow(item.id, false)}>
+
- this.props.Exittheteamshow(item.id, false)}>删除战队
this.props.Createateamedit(data[0])}>
-
: this.props.type === 2 ?
- this.props.Createateamedit(data[0])}>编辑战队
+ this.props.Createateamedit(item)}>
+
this.props.Createateamedit(item)}>编辑战队
-
-
this.props.Exittheteamshow(data[0].id, false)}>
-
:
this.props.type === 3 ?
@@ -220,8 +282,8 @@ class PersonalCompetititem extends React.Component {
}}
>
- this.props.Exittheteamshow(data[0].id, false)}>退出战队
+ this.props.Exittheteamshow(item.id, false)}>
+
+ this.props.Exittheteamshow(item.id, false)}>删除战队
+ this.props.Createateamedit(item)}>
+
-
this.props.Createateamedit(item)}>编辑战队
this.props.Exittheteamshow(data[0].id, false)}>
-
diff --git a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
index 61e6419b7..2009588b4 100644
--- a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
+++ b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
@@ -1,20 +1,11 @@
import React, { Component } from 'react';
import { Link } from 'react-router-dom';
-import { Menu, Icon, List, Avatar,Row, Col,Tag,Pagination} from 'antd';
+import { Menu, Icon, List, Avatar,Row, Col,Tag,Pagination,Alert} from 'antd';
import {getImageUrl} from 'educoder';
import axios from 'axios';
import './Competitionsindex.css';
import NoneData from "../../courses/coursesPublic/NoneData";
-const { SubMenu } = Menu;
-
-const IconText = ({ type, text }) => (
-
- this.props.Exittheteamshow(data[0].id, false)}>退出战队
+ this.props.Exittheteamshow(item.id, false)}>
+
this.props.Exittheteamshow(item.id, false)}>退出战队
@@ -133,7 +123,11 @@ class CompetitionsIndex extends Component{
dataSource={datas&&datas}
renderItem={(item,key) => (
+
+ {item.competition_status==="nearly_published"?
+ this.props.current_user&&this.props.current_user.admin===true?"":this.props.current_user&&this.props.current_user.business===true?"":
即将发布 敬请期待
:""}
+ {/*即将发布 敬请期待
*/}
{item.description===null||item.description===undefined||item.description===""?