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

jingsai.

Browse Source
dev_sync_trustie
杨树林 5 years ago
parent 6d713fb10a
commit 6f927424d3
10 changed files with 464 additions and 253 deletions
Show Stats Download Patch File Download Diff File

6
public/react/src/modules/competition/CompetitionMaxImg.js
Unescape View File

@ -16,9 +16,9 @@ class CompetitionMaxImg extends React.Component {
componentDidUpdate = (prevProps) => { componentDidUpdate = (prevProps) => {
if (prevProps.GetenrollmentAPI != this.props.GetenrollmentAPI) { if (prevProps.GetenrollmentAPI != this.props.GetenrollmentAPI) {
// console.log("团队竞赛报名大图componentDidUpdate"); // //console.log("团队竞赛报名大图componentDidUpdate");
// console.log(this.props); // //console.log(this.props);
// console.log(this.props.GetenrollmentAPI); // //console.log(this.props.GetenrollmentAPI);
this.setState({ this.setState({
GetenrollmentAPI: this.props.GetenrollmentAPI, GetenrollmentAPI: this.props.GetenrollmentAPI,
}) })

10
public/react/src/modules/competition/RegisListview.js
Unescape View File

@ -30,15 +30,15 @@ class RegisListview extends React.Component {
backgroundPosition: "center", backgroundPosition: "center",
backgroundSize: "110% 100%", backgroundSize: "110% 100%",
}}> }}>
<p className="borders" <p className=" "
style={{fontSize: "16px", color: "#05101A", width: "79px", textAlign: "center"}}>创建者</p> style={{fontSize: "16px", color: "#05101A", width: "79px", textAlign: "center"}}>创建者</p>
<p className="borders" <p className=" "
style={{fontSize: "16px", color: "#05101A", width: "160px", textAlign: "center"}}>战队名称</p> style={{fontSize: "16px", color: "#05101A", width: "160px", textAlign: "center"}}>战队名称</p>
<p className="borders" <p className=" "
style={{fontSize: "16px", color: "#05101A", width: "487px", textAlign: "center"}}>战队成员</p> style={{fontSize: "16px", color: "#05101A", width: "487px", textAlign: "center"}}>战队成员</p>
<p className="borders" <p className=" "
style={{fontSize: "16px", color: "#05101A", width: "134px", textAlign: "center"}}>学校</p> style={{fontSize: "16px", color: "#05101A", width: "134px", textAlign: "center"}}>学校</p>
<p className="borders" <p className=" "
style={{fontSize: "16px", color: "#05101A", width: "151px", textAlign: "center"}}>时间</p> style={{fontSize: "16px", color: "#05101A", width: "151px", textAlign: "center"}}>时间</p>
</div> </div>
</div> </div>

97
public/react/src/modules/competition/RegisListviewdata.js
Unescape View File

@ -6,72 +6,103 @@ import {
} from 'react-router-dom'; } from 'react-router-dom';
import axios from 'axios'; import axios from 'axios';
import moment from 'moment'; import moment from 'moment';
import {SnackbarHOC, WordsBtn} from 'educoder'; import {SnackbarHOC, WordsBtn, getImageUrl} from 'educoder';
import {TPMIndexHOC} from '../tpm/TPMIndexHOC'; import {TPMIndexHOC} from '../tpm/TPMIndexHOC';
import competition from './comcss/competition.css'; import competition from './comcss/competition.css';
import pexjiazai from './pexjiazai.png'
import {Button} from 'antd'; import {Button} from 'antd';
// 团队竞赛报名无报名子组件团队 竞赛报名-已创建战队 // 团队竞赛报名无报名子组件团队 竞赛报名-已创建战队
class RegisListviewdata extends React.Component { class RegisListviewdata extends React.Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state = {
item: undefined
}
} }
componentDidMount() {
console.log("RegisListviewdata");
console.log(this.props.item)
this.setState({
item: this.props.item
})
}
render() { render() {
const {item} = this.state;
return ( return (
<div className="regitem"> <div>
<div className="regitemimg1 borders"> {
<div className="regitemimg2"> item !== undefined ?
<div className={"yslborderbottom"}>
<div className="regitem22">
<div className="regitemimg1 ">
<img className="regitemimg2" src={getImageUrl("images/" + item.creator.image_url)}>
</img>
<p>{item.creator.name}</p>
</div> </div>
<p>小猫头像</p> <div style={{
</div>
<div className="borders" style={{
marginTop: "29px", marginTop: "29px",
marginLeft: "37px" marginLeft: "37px"
}}> }}>
<p style={{ <p style={{
border: "1px solid",
color: "#05101A", color: "#05101A",
fontSize: "16px", fontSize: "16px",
width: "160px", width: "160px",
textAlign: "center" textAlign: "center"
}}>重庆邮电大学</p> }}>{item.name}</p>
</div> </div>
<div className="borders" style={{ <div style={{
marginLeft: "37px", marginLeft: "37px",
display: "flex", display: "flex",
flexDirection: "initial", flexDirection: "initial",
width: "487px" width: "487px"
}}> }}>
<div className="regitemimgs">
</div> {
<div className="regitemimgs2"> item && item.team_members.map((item, index) => {
return (
</div> index === 0 ?
<div className="regitemimgs2"> <img className="regitemimgs" src={getImageUrl("images/" + item.image_url)}>
</div> </img>
<div className="regitemimgs2"> : index === 1 ?
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div> </img>
<div className="regitemimgs2"> : index === 2 ?
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div> </img>
<div className="regitemimgs2"> : index === 3 ?
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div> </img>
<div className="regitemimgs22"> : index === 4 ?
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</img>
: index === 5 ?
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</img>
:
<img className="regitemimgs22" src={pexjiazai}>
</img>
)
})
}
</div> </div>
</div> <div style={{
<div className="borders" style={{ marginLeft: "41px",
marginLeft: "37px",
width: "134px", width: "134px",
marginTop: "29px", marginTop: "29px",
}}> }}>
@ -79,9 +110,9 @@ class RegisListviewdata extends React.Component {
color: "#05101A", color: "#05101A",
fontSize: "16px", fontSize: "16px",
textAlign: "center" textAlign: "center"
}}>重庆邮电大学</p> }}>{item.school_name}</p>
</div> </div>
<div className="borders" style={{ <div style={{
marginLeft: "37px", marginLeft: "37px",
width: "151px", width: "151px",
marginTop: "29px", marginTop: "29px",
@ -91,10 +122,12 @@ class RegisListviewdata extends React.Component {
color: "#999999", color: "#999999",
fontSize: "16px", fontSize: "16px",
textAlign: "center" textAlign: "center"
}}>2019-09-07 08:33</p> }}>{item.created_at}</p>
</div> </div>
</div>
</div>
: ""
}
</div> </div>

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

@ -19,7 +19,8 @@ import RegisListviewdata from './RegisListviewdata';
import PersonModal from './competmodal/PersonModal'; import PersonModal from './competmodal/PersonModal';
import MessagePersonModal from './competmodal/MessagePersonModal'; import MessagePersonModal from './competmodal/MessagePersonModal';
import PersonalModalteam from './competmodal/PersonalModalteam'; 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 { class Registration extends React.Component {
/*** /***
@ -44,6 +45,7 @@ class Registration extends React.Component {
page: 1, page: 1,
per_page: 20, per_page: 20,
data: [], data: [],
competition_teams: [],
count: 0, count: 0,
GetenrollmentAPI: undefined, GetenrollmentAPI: undefined,
personal: false, personal: false,
@ -53,19 +55,35 @@ class Registration extends React.Component {
member_staff: null, member_staff: null,
messagePer: "提示", messagePer: "提示",
messagePerbool: false, messagePerbool: false,
intpermessages: "确认" intpermessages: "确认",
messageexit: "提示",
messageexitol: false,
exitintpermessages: "是否退出战队",
itemid: undefined,
} }
} }
componentDidMount() { componentDidMount() {
//console.log("componentDidMount Registration"); // //console.log("componentDidMount Registration");
// ////console.log("调用子组件 "); // //// //console.log("调用子组件 ");
//console.log(this.props.isAdmin()); // //console.log(this.props.isAdmin());
// ////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; const {keyword, page, per_page} = this.state;
this.Getdata(keyword, page, per_page); this.Getdata(keyword, page, per_page, this.props.user.admin);
this.GetenrollmentAPI(); this.GetenrollmentAPI();
}
} }
//获取报名配置API //获取报名配置API
@ -74,8 +92,8 @@ class Registration extends React.Component {
axios.get((url)).then((result) => { axios.get((url)).then((result) => {
if (result) { if (result) {
if (result.data) { if (result.data) {
////console.log("获取报名配置API"); //// //console.log("获取报名配置API");
////console.log(result); //// //console.log(result);
this.setState({ this.setState({
GetenrollmentAPI: result.data, GetenrollmentAPI: result.data,
personal: result.data.personal, personal: result.data.personal,
@ -87,11 +105,11 @@ class Registration extends React.Component {
} }
} }
}).catch((error) => { }).catch((error) => {
////console.log(error); //// //console.log(error);
}) })
} }
Getdata = (keyword, page, per_page) => { Getdata = (keyword, page, per_page, admin) => {
//搜索关键字 keyword //搜索关键字 keyword
//页数 page //页数 page
//分页 per_page //分页 per_page
@ -104,17 +122,17 @@ class Registration extends React.Component {
axios.get((url), {params: datas}).then((result) => { axios.get((url), {params: datas}).then((result) => {
if (result) { if (result) {
if (result.data) { if (result.data) {
////console.log(result); //// //console.log(result);
if (result.data.count === 0) { if (result.data.count === 0) {
// 没有创建数据的 // 没有创建数据的
if (this.props.isAdmin() === true) { if (admin === true) {
//管理员 //管理员
this.setState({ this.setState({
type: 4, type: 4,
count: result.data.count, count: result.data.count,
}) })
} else { } else {
//普通人 //普通账号
this.setState({ this.setState({
type: 1, type: 1,
count: result.data.count, count: result.data.count,
@ -122,25 +140,36 @@ class Registration extends React.Component {
} }
} else { } else {
//有数据的 //有数据的
if (this.props.isAdmin() === true) { if (admin === true) {
if (result.data.my_teams[0].manage_permission === true) {
this.setState({ this.setState({
type: 5, 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, count: result.data.count,
competition_teams: result.data.competition_teams
}) })
}
} else { } else {
if (result.data.competition_teams[0].manage_permission === true) { if (result.data.my_teams[0].manage_permission === true) {
//学生true 为创建了竞赛 //普通账号true 为创建了竞赛
this.setState({ this.setState({
type: 2, type: 2,
data: result.data.competition_teams, data: result.data.my_teams,
count: result.data.count, count: result.data.count,
}) })
} else { } else {
//学生true 加入了竞赛 //普通账号true 加入了竞赛
this.setState({ this.setState({
type: 3, type: 3,
data: result.data.competition_teams, data: result.data.my_teams,
count: result.data.count, count: result.data.count,
}) })
} }
@ -152,7 +181,19 @@ class Registration extends React.Component {
} }
}).catch((error) => { }).catch((error) => {
////console.log(error); if (admin === true) {
//管理员
this.setState({
type: 4,
count: 0,
})
} else {
//普通账号
this.setState({
type: 1,
count: 0,
})
}
}) })
} }
paginationonChangestwo = (pageNumber) => { paginationonChangestwo = (pageNumber) => {
@ -219,53 +260,53 @@ class Registration extends React.Component {
**/ **/
Createateam = () => { Createateam = () => {
// //
if (this.state.enrolled === true) { // if (this.state.enrolled === true) {
//已经报名 // //已经报名
this.setState({ // this.setState({
messagePerbool: true, // messagePerbool: true,
intpermessages: "您已报名，无需重复报" // intpermessages: "您已报名，无需重复报"
}) // })
return; // return;
} // }
if (this.state.enroll_ended === true) { // if (this.state.enroll_ended === true) {
//报名截止 // //报名截止
this.setState({ // this.setState({
messagePerbool: true, // messagePerbool: true,
intpermessages: "报名已截止，无需报名" // intpermessages: "报名已截止，无需报名"
}) // })
return // return
} // }
if (this.props.isAdmin() === true) { // if (this.props.isAdmin() === true) {
//老师 // //老师
if (this.state.teacher_staff === null) { // if (this.state.teacher_staff === null) {
//禁止老师 // //禁止老师
this.setState({ // this.setState({
messagePerbool: true, // messagePerbool: true,
intpermessages: "已禁止老师报名" // intpermessages: "已禁止老师报名"
}) // })
return; // return;
} // }
this.setState({ // this.setState({
tmodalsType: true // tmodalsType: true
}) // })
} else { // } else {
//学生 // //学生
if (this.state.member_staff === null) { // if (this.state.member_staff === null) {
//禁止学生 // //禁止学生
this.setState({ // this.setState({
messagePerbool: true, // messagePerbool: true,
intpermessages: "已禁止学生报名" // intpermessages: "已禁止学生报名"
}) // })
return; // return;
} // }
this.setState({
tmodalsType: true
})
}
// this.setState({ // this.setState({
// tmodalsType: true // tmodalsType: true
// }) // })
// }
this.setState({
tmodalsType: true
})
} }
@ -285,7 +326,7 @@ class Registration extends React.Component {
} }
} }
//创建战队确认
Tmoconfirm1 = (bool) => { Tmoconfirm1 = (bool) => {
//boolfalse 取消 true 确认 //boolfalse 取消 true 确认
this.setState({ this.setState({
@ -293,8 +334,7 @@ class Registration extends React.Component {
}) })
if (bool) { if (bool) {
//确认 //确认
this.Refreshteam();
} else { } else {
//取消 //取消
@ -308,12 +348,62 @@ class Registration extends React.Component {
messagePerbool: false 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() { render() {
const {test, page, pages, limit, type, tmodalsType, tmodalsTypes, data} = this.state; const {test, page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams} = this.state;
const listItems = test.map((item, index) => var listItems = "";
<RegisListviewdata></RegisListviewdata> if (competition_teams) {
listItems = competition_teams.map((item, index) =>
<RegisListviewdata key={index} item={item}></RegisListviewdata>
); );
}
return ( return (
<div className="newMain clearfix "> <div className="newMain clearfix ">
@ -335,6 +425,8 @@ class Registration extends React.Component {
Tmoconfirm1={(bool) => this.Tmoconfirm1(bool)}></PersonModal> Tmoconfirm1={(bool) => this.Tmoconfirm1(bool)}></PersonModal>
<PersonalModalteam tmodalsTypes={tmodalsTypes} {...this.props} {...this.state} <PersonalModalteam tmodalsTypes={tmodalsTypes} {...this.props} {...this.state}
Tmoconfirm={(bool) => this.Tmoconfirm(bool)}></PersonalModalteam> Tmoconfirm={(bool) => this.Tmoconfirm(bool)}></PersonalModalteam>
<ExittheteamModel {...this.props} {...this.state}
Exittheteam={(bool) => this.Exittheteam(bool)}></ExittheteamModel>
<div className="educontent mb20 "> <div className="educontent mb20 ">
<p className="clearfix mb20 mt10"> <p className="clearfix mb20 mt10">
<a className="btn colorgrey fl hovercolorblue ">在线竞赛</a> <a className="btn colorgrey fl hovercolorblue ">在线竞赛</a>
@ -357,15 +449,17 @@ class Registration extends React.Component {
: :
"" ""
} }
{/*普通账号出现单人 战队弹框*/}
{ {
type === 2 || type === 3 || type === 5 ? type === 2 || type === 3 || type === 5 ?
<PersonalCompetititem type={type} data={data}></PersonalCompetititem> <PersonalCompetititem type={type} data={data}
Exittheteamshow={(itemid) => this.Exittheteamshow(itemid)}></PersonalCompetititem>
: "" : ""
} }
{ {
type === 4 || type === 5 ? type === 4 || type === 5 ?
<RegistrationSearch></RegistrationSearch> <RegistrationSearch count={count}></RegistrationSearch>
: "" : ""
} }
{/*<Registrationitem></Registrationitem>*/} {/*<Registrationitem></Registrationitem>*/}
@ -385,12 +479,22 @@ class Registration extends React.Component {
{ {
type === 4 || type === 5 ? type === 4 || type === 5 ?
(
count < 20 ? <div style={{
height: "20px",
minHeight: "20px"
}}></div> :
<div className="edu-txt-center ysyslxh mt56 " style={{marginBottom: "192px",}}> <div className="edu-txt-center ysyslxh mt56 " style={{marginBottom: "192px",}}>
<Pagination showQuickJumper current={pages} <Pagination showQuickJumper current={pages}
onChange={this.paginationonChangestwo} pageSize={limit} onChange={this.paginationonChangestwo} pageSize={limit}
total={30}></Pagination> total={count}></Pagination>
</div> </div>
: "" )
: <div style={{
height: "20px",
minHeight: "20px"
}}></div>
} }
</div> </div>

4
public/react/src/modules/competition/RegistrationSearch.js
Unescape View File

@ -26,7 +26,7 @@ class RegistrationSearch extends React.Component {
}) })
}; };
setdatafuns = (value) => { setdatafuns = (value) => {
console.log("点击了搜索"); //console.log("点击了搜索");
this.setState({ this.setState({
keywords: value keywords: value
}) })
@ -45,7 +45,7 @@ class RegistrationSearch extends React.Component {
onSearch={(value) => this.setdatafuns(value)}/> onSearch={(value) => this.setdatafuns(value)}/>
<p style={{color: "#07140E", fontSize: "16px", marginTop: "7px", marginLeft: "760px"}}>战队总数：<span <p style={{color: "#07140E", fontSize: "16px", marginTop: "7px", marginLeft: "760px"}}>战队总数：<span
style={{color: "#459BE5", fontSize: "16px"}}>271</span>个</p> style={{color: "#459BE5", fontSize: "16px"}}>{this.props.count}</span>个</p>
</div> </div>
) )
} }

19
public/react/src/modules/competition/comcss/competition.css
Unescape View File

@ -301,10 +301,21 @@
.regitem { .regitem {
display: flex; display: flex;
flex-direction: initial; flex-direction: initial;
border-bottom: 1px solid #EDEDED;
margin-top: 44px; margin-top: 44px;
} }
.regitem22 {
display: flex;
flex-direction: initial;
margin-top: 27px;
margin-bottom: 19px;
}
.yslborderbottom {
border-bottom: 1px solid #EDEDED;
}
.regitem2 { .regitem2 {
display: flex; display: flex;
flex-direction: initial; flex-direction: initial;
@ -334,6 +345,8 @@
.regitemimg2 { .regitemimg2 {
height: 78px; height: 78px;
width: 78px; width: 78px;
background-color: transparent;
margin-bottom: 9px;
} }
.personregitemimg { .personregitemimg {
@ -353,7 +366,7 @@
width: 69px; width: 69px;
height: 69px; height: 69px;
margin-top: 3px; margin-top: 3px;
background-color: transparent;
} }
.regitemimgs2 { .regitemimgs2 {
@ -375,7 +388,7 @@
height: 22px; height: 22px;
width: 22px; width: 22px;
font-size: 21px !important; font-size: 21px !important;
margin-top: 22px; margin-top: 21px;
color: #1C91E8; color: #1C91E8;
} }

59
public/react/src/modules/competition/competmodal/ExittheteamModel.js
Unescape View File

@ -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 (
<Modal
keyboard={false}
closable={false}
footer={null}
destroyOnClose={true}
title={this.props.messageexit}
centered={true}
visible={this.props.messageexitol === undefined ? false : this.props.messageexitol}
width="480px"
>
<div className="task-popup-content">
<div className="task-popup-text-center font-14">{this.props.exitintpermessages}</div>
</div>
<div className="task-popup-submit clearfix">
<a className="pop_close task-btn mb10 mr40 colorFFF"
onClick={() => this.props.Exittheteam(false)}>取消</a>
<a className="task-btn task-btn-orange fr" onClick={() => this.props.Exittheteam(true)}>确定</a>
</div>
</Modal>
)
}
}
export default ExittheteamModel;

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

@ -61,9 +61,9 @@ class PersonModal extends Component {
componentDidUpdate = (prevProps) => { componentDidUpdate = (prevProps) => {
if (prevProps.user != this.props.user) { if (prevProps.user != this.props.user) {
console.log("Registration.js componentDidUpdate"); //console.log("Registration.js componentDidUpdate");
console.log(this.props); //console.log(this.props);
//console.log(prevProps); // //console.log(prevProps);
//identity职场称 //identity职场称
//user_school学校 //user_school学校
//real_name姓名 //real_name姓名
@ -86,8 +86,8 @@ class PersonModal extends Component {
} }
if (prevProps.GetenrollmentAPI != this.props.GetenrollmentAPI) { if (prevProps.GetenrollmentAPI != this.props.GetenrollmentAPI) {
console.log("Registration.js GetenrollmentAPIcomponentDidUpdate"); //console.log("Registration.js GetenrollmentAPIcomponentDidUpdate");
console.log(this.props); //console.log(this.props);
this.setState({ this.setState({
GetenrollmentAPI: this.props.GetenrollmentAPI, GetenrollmentAPI: this.props.GetenrollmentAPI,
}) })
@ -151,15 +151,15 @@ class PersonModal extends Component {
teacher_ids: myteaherdata, teacher_ids: myteaherdata,
member_ids: myshtudentdata, member_ids: myshtudentdata,
}).then((result) => { }).then((result) => {
//console.log("获取到创建战队的数据"); // //console.log("获取到创建战队的数据");
//console.log(result); // //console.log(result);
if (result) { if (result) {
if (result.data) { if (result.data) {
this.props.Tmoconfirm1(true); this.props.Tmoconfirm1(true);
} }
} }
}).catch((error) => { }).catch((error) => {
//console.log(error) // //console.log(error)
}); });
} }
@ -177,7 +177,7 @@ class PersonModal extends Component {
} }
} }
}).catch((error) => { }).catch((error) => {
//console.log(error) // //console.log(error)
}); });
} }
@ -189,7 +189,7 @@ class PersonModal extends Component {
//老师姓名 keyword //老师姓名 keyword
//当前战队ID team_id //当前战队ID team_id
//当前老师ID数组 teacher_ids //当前老师ID数组 teacher_ids
//console.log("搜索的老师"); // //console.log("搜索的老师");
const datas = { const datas = {
keyword: keywordteachers, keyword: keywordteachers,
team_id: team_idteachers, team_id: team_idteachers,
@ -199,14 +199,14 @@ class PersonModal extends Component {
axios.get((url), {params: datas}).then((result) => { axios.get((url), {params: datas}).then((result) => {
if (result) { if (result) {
if (result.data) { if (result.data) {
//console.log(result); // //console.log(result);
this.setState({ this.setState({
teacher_ids: result.data.teachers teacher_ids: result.data.teachers
}) })
} }
} }
}).catch((error) => { }).catch((error) => {
//console.log(error); // //console.log(error);
}) })
}; };
Getstudentsdata = (keywordstudents, team_idstudents, student_ids) => { Getstudentsdata = (keywordstudents, team_idstudents, student_ids) => {
@ -217,7 +217,7 @@ class PersonModal extends Component {
//学生姓名 keyword //学生姓名 keyword
//当前战队ID team_id //当前战队ID team_id
//当前队员ID数组 student_ids //当前队员ID数组 student_ids
//console.log("搜索的学生"); // //console.log("搜索的学生");
const datas = { const datas = {
keyword: keywordstudents, keyword: keywordstudents,
team_id: team_idstudents, team_id: team_idstudents,
@ -227,7 +227,7 @@ class PersonModal extends Component {
axios.get((url), {params: datas}).then((result) => { axios.get((url), {params: datas}).then((result) => {
if (result) { if (result) {
if (result.data) { if (result.data) {
//console.log(result); // //console.log(result);
this.setState({ this.setState({
member_ids: result.data.teachers member_ids: result.data.teachers
}) })
@ -235,14 +235,14 @@ class PersonModal extends Component {
} }
} }
}).catch((error) => { }).catch((error) => {
//console.log(error); // //console.log(error);
}) })
}; };
//老师输入框事件 //老师输入框事件
teacheronChange = (e) => { teacheronChange = (e) => {
//console.log(e.target.value); // //console.log(e.target.value);
//console.log("老师输入框事件|||||||||||123123123"); // //console.log("老师输入框事件|||||||||||123123123");
this.setState({ this.setState({
keywordteachers: e.target.value, keywordteachers: e.target.value,
booltech: false, booltech: false,
@ -280,8 +280,8 @@ class PersonModal extends Component {
//学生输入框事件 //学生输入框事件
studentsonChange = (e) => { studentsonChange = (e) => {
//console.log("学生输入框事件"); // //console.log("学生输入框事件");
//console.log(e); // //console.log(e);
this.setState({ this.setState({
keywordstudents: e.target.value, keywordstudents: e.target.value,
boolstud: false, boolstud: false,
@ -331,9 +331,9 @@ class PersonModal extends Component {
}; };
var fordabool = false; var fordabool = false;
var forda = this.state.mydatas; var forda = this.state.mydatas;
//console.log("点击获取老师数据"); // //console.log("点击获取老师数据");
//console.log(object); // //console.log(object);
//console.log(forda); // //console.log(forda);
for (var i = 0; i < forda.length; i++) { for (var i = 0; i < forda.length; i++) {
if (forda[i].id) { if (forda[i].id) {
if (forda[i].id === object.id) { if (forda[i].id === object.id) {
@ -372,14 +372,14 @@ class PersonModal extends Component {
}; };
var fordabool = false; var fordabool = false;
var forda = this.state.mydatas; var forda = this.state.mydatas;
//console.log("点击获取学生数据2"); // //console.log("点击获取学生数据2");
//console.log(object); // //console.log(object);
//console.log(forda); // //console.log(forda);
for (var i = 0; i < forda.length; i++) { for (var i = 0; i < forda.length; i++) {
if (forda[i].id) { if (forda[i].id) {
// //console.log(true); // // //console.log(true);
// //console.log(forda[i].id); // // //console.log(forda[i].id);
// //console.log(object.id); // // //console.log(object.id);
if (forda[i].id === object.id) { if (forda[i].id === object.id) {
fordabool = true; fordabool = true;
break break
@ -407,7 +407,7 @@ class PersonModal extends Component {
} }
//输入框事件 //输入框事件
changeTopicName = (e) => { changeTopicName = (e) => {
// //console.log("调用了changeTopicName"); // // //console.log("调用了changeTopicName");
let num = parseInt(e.target.value.length); let num = parseInt(e.target.value.length);
if (num > 60) { if (num > 60) {
return; return;
@ -422,7 +422,7 @@ class PersonModal extends Component {
//onSearchsou //onSearchsou
onSearch = (value) => { onSearch = (value) => {
//console.log("搜索的数据" + value); // //console.log("搜索的数据" + value);
}; };
handleInfiniteOnLoad = () => { handleInfiniteOnLoad = () => {
// this.setState({ // this.setState({
@ -442,12 +442,12 @@ class PersonModal extends Component {
} }
handleInfiniteOnLoad1 = () => { handleInfiniteOnLoad1 = () => {
// //console.log("调用了方法1111"); // // //console.log("调用了方法1111");
// this.setState({ // this.setState({
// loading1: true, // loading1: true,
// }) // })
// setTimeout(() => { // setTimeout(() => {
// //console.log("调用了方法11112"); // // //console.log("调用了方法11112");
// this.setState({ // this.setState({
// loading1: false, // loading1: false,
// hasMore: true, // hasMore: true,
@ -456,13 +456,13 @@ class PersonModal extends Component {
} }
handleInfiniteOnLoad2 = () => { handleInfiniteOnLoad2 = () => {
// //console.log("调用了方法1111"); // // //console.log("调用了方法1111");
// this.setState({ // this.setState({
// loading2: true, // loading2: true,
// //
// }) // })
// setTimeout(() => { // setTimeout(() => {
// //console.log("调用了方法11113"); // // //console.log("调用了方法11113");
// this.setState({ // this.setState({
// hasMore: true, // hasMore: true,
// loading2: false, // loading2: false,
@ -471,23 +471,23 @@ class PersonModal extends Component {
} }
inputOnBlur = (e) => { inputOnBlur = (e) => {
//console.log("inputOnBlur"); // //console.log("inputOnBlur");
//console.log(e); // //console.log(e);
this.setState({ this.setState({
person1: false person1: false
}) })
} }
inputOnBlur2 = (e) => { inputOnBlur2 = (e) => {
//console.log("inputOnBlur"); // //console.log("inputOnBlur");
//console.log(e); // //console.log(e);
this.setState({ this.setState({
person2: false person2: false
}) })
} }
startSearch = (e) => { startSearch = (e) => {
//console.log("startSearch"); // //console.log("startSearch");
//console.log(e); // //console.log(e);
this.setState({ this.setState({
person1: true, person1: true,
person2: false, person2: false,
@ -497,8 +497,8 @@ class PersonModal extends Component {
} }
startSearch2 = (e) => { startSearch2 = (e) => {
//console.log("startSearch2"); // //console.log("startSearch2");
//console.log(e); // //console.log(e);
this.setState({ this.setState({
person1: false, person1: false,
person2: true, person2: true,
@ -508,8 +508,8 @@ class PersonModal extends Component {
} }
inputOnFocus = (e) => { inputOnFocus = (e) => {
//console.log("inputOnFocus"); // //console.log("inputOnFocus");
//console.log(e); // //console.log(e);
try { try {
if (this.state.keywordteachers && this.state.keywordteachers.length > 0) { if (this.state.keywordteachers && this.state.keywordteachers.length > 0) {
this.setState({ this.setState({
@ -533,8 +533,8 @@ class PersonModal extends Component {
} }
inputOnFocus2 = (e) => { inputOnFocus2 = (e) => {
//console.log("inputOnFocus2"); // //console.log("inputOnFocus2");
//console.log(e); // //console.log(e);
try { try {
if (this.state.keywordstudents && this.state.keywordstudents.length > 0) { if (this.state.keywordstudents && this.state.keywordstudents.length > 0) {
this.setState({ this.setState({
@ -559,8 +559,8 @@ class PersonModal extends Component {
} }
inputOnFocus3 = (e) => { inputOnFocus3 = (e) => {
//console.log("inputOnFocus3"); // //console.log("inputOnFocus3");
//console.log(e); // //console.log(e);
this.setState({ this.setState({
person2: false, person2: false,
person1: false, person1: false,
@ -570,13 +570,13 @@ class PersonModal extends Component {
var {mydatas} = this.state; var {mydatas} = this.state;
if (item) { if (item) {
var pos = mydatas.indexOf(item); var pos = mydatas.indexOf(item);
// console.log("deletedata"); // //console.log("deletedata");
// console.log(pos); // //console.log(pos);
var removedItem = mydatas.splice(pos, 1); var removedItem = mydatas.splice(pos, 1);
// console.log("deletedata22222"); // //console.log("deletedata22222");
// console.log(removedItem) // //console.log(removedItem)
//removedItem 是被删除的元素 //removedItem 是被删除的元素
// console.log(mydatas) // //console.log(mydatas)
this.setState({ this.setState({
mydatas: mydatas, mydatas: mydatas,
}) })
@ -780,7 +780,7 @@ class PersonModal extends Component {
<style> <style>
{ {
` `
.reglistviewdivss2 a:hover a:hover
{ {
background-color:#F6F4F4; background-color:#F6F4F4;
} }

56
public/react/src/modules/competition/personal/PersonalCompetititem.js
Unescape View File

@ -10,7 +10,7 @@ import {SnackbarHOC, WordsBtn, getImageUrl} from 'educoder';
import {TPMIndexHOC} from '../../tpm/TPMIndexHOC'; import {TPMIndexHOC} from '../../tpm/TPMIndexHOC';
import competition from '../comcss/competition.css'; import competition from '../comcss/competition.css';
import {Button} from 'antd'; import {Button} from 'antd';
import pexjiazai from '../pexjiazai.png'
// 团队竞赛报名无报名子组件团队 竞赛报名-已创建战队 // 团队竞赛报名无报名子组件团队 竞赛报名-已创建战队
class PersonalCompetititem extends React.Component { class PersonalCompetititem extends React.Component {
constructor(props) { constructor(props) {
@ -22,7 +22,7 @@ class PersonalCompetititem extends React.Component {
} }
componentDidMount() { componentDidMount() {
// //console.log(this.props.data) // // //console.log(this.props.data)
this.setState({ this.setState({
data: this.props.data, data: this.props.data,
}) })
@ -38,20 +38,21 @@ class PersonalCompetititem extends React.Component {
render() { render() {
const {data} = this.state; const {data} = this.state;
//console.log("PersonalCompetititem"); // //console.log("PersonalCompetititem");
//console.log(data); // //console.log(data);
//console.log(data[0]); // //console.log(data[0]);
//console.log(data&&data[0].creator.image_url); // //console.log(data&&data[0].creator.image_url);
// const listItems = mydatas.map((item, index) => // const listItems = mydatas.map((item, index) =>
// //
// ); // );
return ( return (
<div> <div>
{ {
data && data[0] ? <div className="regitem"> data && data[0] ? <div className={"yslborderbottom"}>
<div className="regitemimg1 " style={{ <div className="regitem" style={{
marginBottom: "16px", marginBottom: "19px",
}}> }}>
<div className="regitemimg1 ">
<img className="regitemimg2" src={getImageUrl("images/" + data[0].creator.image_url)}> <img className="regitemimg2" src={getImageUrl("images/" + data[0].creator.image_url)}>
</img> </img>
@ -61,7 +62,7 @@ class PersonalCompetititem extends React.Component {
width: "78px", width: "78px",
textAlign: "center" textAlign: "center"
}}>{data && data[0].name}</p> }}>{data[0].creator.name}</p>
</div> </div>
<div className=" " style={{ <div className=" " style={{
marginTop: "29px", marginTop: "29px",
@ -73,7 +74,7 @@ class PersonalCompetititem extends React.Component {
fontSize: "16px", fontSize: "16px",
width: "160px", width: "160px",
textAlign: "center" textAlign: "center"
}}>{data && data[0].school_name}</p> }}>{data[0].school_name}</p>
</div> </div>
<div className=" " style={{ <div className=" " style={{
marginLeft: "37px", marginLeft: "37px",
@ -90,30 +91,30 @@ class PersonalCompetititem extends React.Component {
</img> </img>
: index === 1 ? : index === 1 ?
<div className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}> <img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div> </img>
: index === 2 ? : index === 2 ?
<div className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}> <img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div> </img>
: index === 3 ? : index === 3 ?
<div className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}> <img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div> </img>
: index === 4 ? : index === 4 ?
<div className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}> <img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div> </img>
: index === 5 ? : index === 5 ?
<div className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}> <img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div> </img>
: :
<div className="regitemimgs22" src={getImageUrl("images/" + item.image_url)}> <img className="regitemimgs22" src={pexjiazai}>
</div> </img>
) )
}) })
} }
@ -159,8 +160,8 @@ class PersonalCompetititem extends React.Component {
<div className="regitemimgs5"> <div className="regitemimgs5">
<p>战队详情</p> <p>战队详情</p>
</div> </div>
<div className="regitemimgs6"> <div className="regitemimgs6" onClick={() => this.props.Exittheteamshow(data[0].id)}>
<p>退出战队</p> <p onClick={() => this.props.Exittheteamshow(data[0].id)}>退出战队</p>
</div> </div>
</div> </div>
@ -172,8 +173,8 @@ class PersonalCompetititem extends React.Component {
}} }}
> >
<div className="regitemimgs6"> <div className="regitemimgs6" onClick={() => this.props.Exittheteamshow(data[0].id)}>
<p>退出战队</p> <p onClick={() => this.props.Exittheteamshow(data[0].id)}>退出战队</p>
</div> </div>
</div> </div>
@ -182,6 +183,7 @@ class PersonalCompetititem extends React.Component {
} }
</div> </div>
</div>
: "" : ""
} }
</div> </div>

BIN
public/react/src/modules/competition/pexjiazai.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

Write Preview
Loading…
Cancel
Save