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

jingsai.

Browse Source
dev_sync_trustie
杨树林 5 years ago
parent 677791ad36
commit 91fa828359
23 changed files with 660 additions and 176 deletions
Show Stats Download Patch File Download Diff File

115
public/react/public/css/demo_index.html
Unescape View File

@ -1080,6 +1080,12 @@
<div class="code-name">&amp;#xe669;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe800;</span>
<div class="name">复制</div>
<div class="code-name">&amp;#xe800;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe7f9;</span>
<div class="name">更多</div>
@ -1338,6 +1344,30 @@
<div class="code-name">&amp;#xe6be;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6c1;</span>
<div class="name">detection@1x</div>
<div class="code-name">&amp;#xe6c1;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6c2;</span>
<div class="name">community@1x</div>
<div class="code-name">&amp;#xe6c2;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6c3;</span>
<div class="name">hosting@1x</div>
<div class="code-name">&amp;#xe6c3;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6c4;</span>
<div class="name">project@1x</div>
<div class="code-name">&amp;#xe6c4;</div>
</li>
</ul>
<div class="article markdown">
<h2 id="unicode-">Unicode 引用</h2>
@ -2963,6 +2993,15 @@
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-fuzhi1"></span>
<div class="name">
复制
</div>
<div class="code-name">.icon-fuzhi1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-gengduo1"></span>
<div class="name">
@ -3350,6 +3389,42 @@
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-detectionx"></span>
<div class="name">
detection@1x
</div>
<div class="code-name">.icon-detectionx
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-communityx"></span>
<div class="name">
community@1x
</div>
<div class="code-name">.icon-communityx
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-hostingx2"></span>
<div class="name">
hosting@1x
</div>
<div class="code-name">.icon-hostingx2
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-projectx"></span>
<div class="name">
project@1x
</div>
<div class="code-name">.icon-projectx
</div>
</li>
</ul>
<div class="article markdown">
<h2 id="font-class-">font-class 引用</h2>
@ -4779,6 +4854,14 @@
<div class="code-name">#icon-xiajiang</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-fuzhi1"></use>
</svg>
<div class="name">复制</div>
<div class="code-name">#icon-fuzhi1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-gengduo1"></use>
@ -5123,6 +5206,38 @@
<div class="code-name">#icon-nenghaofenxix</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-detectionx"></use>
</svg>
<div class="name">detection@1x</div>
<div class="code-name">#icon-detectionx</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-communityx"></use>
</svg>
<div class="name">community@1x</div>
<div class="code-name">#icon-communityx</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-hostingx2"></use>
</svg>
<div class="name">hosting@1x</div>
<div class="code-name">#icon-hostingx2</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-projectx"></use>
</svg>
<div class="name">project@1x</div>
<div class="code-name">#icon-projectx</div>
</li>
</ul>
<div class="article markdown">
<h2 id="symbol-">Symbol 引用</h2>

30
public/react/public/css/iconfont.css
View File

File diff suppressed because one or more lines are too long

BIN
public/react/public/css/iconfont.eot
View File

Binary file not shown.

2
public/react/public/css/iconfont.js
View File

File diff suppressed because one or more lines are too long

35
public/react/public/css/iconfont.json
Unescape View File

@ -1230,6 +1230,13 @@
"unicode": "e669",
"unicode_decimal": 58985
},
{
"icon_id": "5255211",
"name": "复制",
"font_class": "fuzhi1",
"unicode": "e800",
"unicode_decimal": 59392
},
{
"icon_id": "5291605",
"name": "更多",
@ -1530,6 +1537,34 @@
"font_class": "nenghaofenxix",
"unicode": "e6be",
"unicode_decimal": 59070
},
{
"icon_id": "11408531",
"name": "detection@1x",
"font_class": "detectionx",
"unicode": "e6c1",
"unicode_decimal": 59073
},
{
"icon_id": "11409495",
"name": "community@1x",
"font_class": "communityx",
"unicode": "e6c2",
"unicode_decimal": 59074
},
{
"icon_id": "11409771",
"name": "hosting@1x",
"font_class": "hostingx2",
"unicode": "e6c3",
"unicode_decimal": 59075
},
{
"icon_id": "11410432",
"name": "project@1x",
"font_class": "projectx",
"unicode": "e6c4",
"unicode_decimal": 59076
}
]
}

23
public/react/public/css/iconfont.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 294 KiB

After

Width:  |  Height:  |  Size: 303 KiB

BIN
public/react/public/css/iconfont.ttf
View File

Binary file not shown.

BIN
public/react/public/css/iconfont.woff
View File

Binary file not shown.

BIN
public/react/public/css/iconfont.woff2
View File

Binary file not shown.

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

@ -19,6 +19,7 @@ import RegisListviewdata from './RegisListviewdata';
import PersonModal from './competmodal/PersonModal';
import MessagePersonModal from './competmodal/MessagePersonModal';
import PersonalModalteam from './competmodal/PersonalModalteam';
import PersonalCompetititem from './personal/PersonalCompetititem'
// 团队竞赛报名无报名
class Registration extends React.Component {
/***
@ -53,14 +54,15 @@ class Registration extends React.Component {
messagePer: "提示",
messagePerbool: false,
intpermessages: "确认"
}
}
componentDidMount() {
// //console.log("componentDidMount ");
// //console.log("调用子组件 ");
// //console.log(this.props);
// //console.log(this.props.isAdmin())
//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();
@ -72,8 +74,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,
@ -85,7 +87,7 @@ class Registration extends React.Component {
}
}
}).catch((error) => {
//console.log(error);
////console.log(error);
})
}
@ -102,24 +104,55 @@ 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) {
//管理员
this.setState({
type: 4,
count: result.data.count,
})
} else {
//普通人
this.setState({
type: 1,
count: result.data.count,
})
}
} else {
//有数据的
if (this.props.isAdmin() === true) {
this.setState({
type: 5,
data: result.data.competition_teams,
count: result.data.count,
})
} else {
if (result.data.competition_teams[0].manage_permission === true) {
//学生true 为创建了竞赛
this.setState({
type: 2,
data: result.data.competition_teams,
count: result.data.count,
})
} else {
//学生true 加入了竞赛
this.setState({
type: 3,
data: result.data.competition_teams,
count: result.data.count,
})
}
}
}
}
}
}).catch((error) => {
//console.log(error);
////console.log(error);
})
}
paginationonChangestwo = (pageNumber) => {
@ -277,7 +310,7 @@ class Registration extends React.Component {
}
render() {
const {test, page, pages, limit, type, tmodalsType, tmodalsTypes} = this.state;
const {test, page, pages, limit, type, tmodalsType, tmodalsTypes, data} = this.state;
const listItems = test.map((item, index) =>
<RegisListviewdata></RegisListviewdata>
);
@ -326,7 +359,7 @@ class Registration extends React.Component {
}
{
type === 2 || type === 3 || type === 5 ?
<Registrationitem type={type}></Registrationitem>
<PersonalCompetititem type={type} data={data}></PersonalCompetititem>
: ""
}
@ -335,6 +368,7 @@ class Registration extends React.Component {
<RegistrationSearch></RegistrationSearch>
: ""
}
{/*<Registrationitem></Registrationitem>*/}
{
type === 4 || type === 5 ?
<RegisListview></RegisListview>

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

@ -301,7 +301,7 @@
.regitem {
display: flex;
flex-direction: initial;
border: 0.5px solid;
border-bottom: 1px solid #EDEDED;
margin-top: 44px;
}
@ -310,6 +310,7 @@
flex-direction: initial;
border-bottom: 1px solid #EDEDED;
margin-top: 19px;
}
/*垂直*/
@ -331,7 +332,6 @@
}
.regitemimg2 {
border: 0.5px solid;
height: 78px;
width: 78px;
}
@ -350,7 +350,6 @@
}
.regitemimgs {
border: 0.5px solid;
width: 69px;
height: 69px;
margin-top: 3px;
@ -359,7 +358,6 @@
.regitemimgs2 {
margin-top: 16px;
border: 0.5px solid;
width: 49px;
height: 51px;
margin-left: 25px
@ -367,17 +365,18 @@
.regitemimgs22 {
margin-top: 27px;
border: 0.5px solid;
width: 28px;
height: 28px;
margin-left: 20px;
}
.regitemimgs3 {
border: 0.5px solid;
/* border: 0.5px solid; */
height: 22px;
width: 22px;
margin-top: 30px;
font-size: 21px !important;
margin-top: 22px;
color: #1C91E8;
}
.regitemimgs4 {

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

@ -780,7 +780,7 @@ class PersonModal extends Component {
<style>
{
`
a:hover
.reglistviewdivss2 a:hover
{
background-color:#F6F4F4;
}

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

@ -6,85 +6,135 @@ import {
} from 'react-router-dom';
import axios from 'axios';
import moment from 'moment';
import {SnackbarHOC, WordsBtn} from 'educoder';
import {TPMIndexHOC} from '../tpm/TPMIndexHOC';
import competition from './comcss/competition.css';
import {SnackbarHOC, WordsBtn, getImageUrl} from 'educoder';
import {TPMIndexHOC} from '../../tpm/TPMIndexHOC';
import competition from '../comcss/competition.css';
import {Button} from 'antd';
// 团队竞赛报名无报名子组件团队 竞赛报名-已创建战队
class Registrationitem extends React.Component {
class PersonalCompetititem extends React.Component {
constructor(props) {
super(props)
this.state = {
data: ""
}
}
componentDidMount() {
// //console.log(this.props.data)
this.setState({
data: this.props.data,
})
}
componentDidUpdate = (prevProps) => {
//
// if (prevProps.data != this.props.data) {
//
// }
}
render() {
const {data} = this.state;
//console.log("PersonalCompetititem");
//console.log(data);
//console.log(data[0]);
//console.log(data&&data[0].creator.image_url);
// const listItems = mydatas.map((item, index) =>
//
// );
return (
<div>
{
data && data[0] ? <div className="regitem">
<div className="regitemimg1 " style={{
marginBottom: "16px",
}}>
<img className="regitemimg2" src={getImageUrl("images/" + data[0].creator.image_url)}>
<div className="regitem">
<div className="regitemimg1 borders">
<div className="regitemimg2">
</img>
<p className="" style={{
color: "#999999",
fontSize: "14px",
width: "78px",
textAlign: "center"
}}>{data && data[0].name}</p>
</div>
</div>
<div className="borders" style={{
<div className=" " style={{
marginTop: "29px",
marginLeft: "37px"
}}>
<p style={{
border: "1px solid",
color: "#05101A",
fontSize: "16px",
width: "160px",
textAlign: "center"
}}>重庆邮电大学</p>
}}>{data && data[0].school_name}</p>
</div>
<div className="borders" style={{
<div className=" " style={{
marginLeft: "37px",
display: "flex",
flexDirection: "initial",
width: "487px"
}}>
<div className="regitemimgs">
{
data && data[0].team_members.map((item, index) => {
return (
</div>
<div className="regitemimgs2">
index === 0 ?
<img className="regitemimgs" src={getImageUrl("images/" + item.image_url)}>
</img>
: index === 1 ?
<div className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div>
<div className="regitemimgs2">
: index === 2 ?
<div className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div>
<div className="regitemimgs2">
: index === 3 ?
<div className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div>
<div className="regitemimgs2">
: index === 4 ?
<div className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div>
<div className="regitemimgs2">
: index === 5 ?
<div className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</div>
<div className="regitemimgs22">
:
<div className="regitemimgs22" src={getImageUrl("images/" + item.image_url)}>
</div>
)
})
}
</div>
<div className="borders" style={{
<div className=" " style={{
marginLeft: "37px",
}}>
<p style={{
border: "1px solid",
marginTop: "30px",
color: "#05101A",
fontSize: "16px",
}}>邀请码：yngh5</p>
</div>
<div className="regitemimgs3 "
<i className="regitemimgs3 iconfont icon-fuzhi1 font-14 font-n"
style={{
marginLeft: "18px",
}}
>
</div>
</i>
{
this.props.type === 5 ?
<div className="regitemimgs4"
@ -131,8 +181,9 @@ class Registrationitem extends React.Component {
""
}
</div>
: ""
}
</div>
@ -141,4 +192,4 @@ class Registrationitem extends React.Component {
}
export default Registrationitem;
export default PersonalCompetititem;

30
public/stylesheets/css/iconfont.css
View File

File diff suppressed because one or more lines are too long

115
public/stylesheets/educoder/iconfont/demo_index.html
Unescape View File

@ -1080,6 +1080,12 @@
<div class="code-name">&amp;#xe669;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe800;</span>
<div class="name">复制</div>
<div class="code-name">&amp;#xe800;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe7f9;</span>
<div class="name">更多</div>
@ -1338,6 +1344,30 @@
<div class="code-name">&amp;#xe6be;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6c1;</span>
<div class="name">detection@1x</div>
<div class="code-name">&amp;#xe6c1;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6c2;</span>
<div class="name">community@1x</div>
<div class="code-name">&amp;#xe6c2;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6c3;</span>
<div class="name">hosting@1x</div>
<div class="code-name">&amp;#xe6c3;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6c4;</span>
<div class="name">project@1x</div>
<div class="code-name">&amp;#xe6c4;</div>
</li>
</ul>
<div class="article markdown">
<h2 id="unicode-">Unicode 引用</h2>
@ -2963,6 +2993,15 @@
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-fuzhi1"></span>
<div class="name">
复制
</div>
<div class="code-name">.icon-fuzhi1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-gengduo1"></span>
<div class="name">
@ -3350,6 +3389,42 @@
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-detectionx"></span>
<div class="name">
detection@1x
</div>
<div class="code-name">.icon-detectionx
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-communityx"></span>
<div class="name">
community@1x
</div>
<div class="code-name">.icon-communityx
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-hostingx2"></span>
<div class="name">
hosting@1x
</div>
<div class="code-name">.icon-hostingx2
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-projectx"></span>
<div class="name">
project@1x
</div>
<div class="code-name">.icon-projectx
</div>
</li>
</ul>
<div class="article markdown">
<h2 id="font-class-">font-class 引用</h2>
@ -4779,6 +4854,14 @@
<div class="code-name">#icon-xiajiang</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-fuzhi1"></use>
</svg>
<div class="name">复制</div>
<div class="code-name">#icon-fuzhi1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-gengduo1"></use>
@ -5123,6 +5206,38 @@
<div class="code-name">#icon-nenghaofenxix</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-detectionx"></use>
</svg>
<div class="name">detection@1x</div>
<div class="code-name">#icon-detectionx</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-communityx"></use>
</svg>
<div class="name">community@1x</div>
<div class="code-name">#icon-communityx</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-hostingx2"></use>
</svg>
<div class="name">hosting@1x</div>
<div class="code-name">#icon-hostingx2</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-projectx"></use>
</svg>
<div class="name">project@1x</div>
<div class="code-name">#icon-projectx</div>
</li>
</ul>
<div class="article markdown">
<h2 id="symbol-">Symbol 引用</h2>

30
public/stylesheets/educoder/iconfont/iconfont.css
View File

File diff suppressed because one or more lines are too long

BIN
public/stylesheets/educoder/iconfont/iconfont.eot
View File

Binary file not shown.

2
public/stylesheets/educoder/iconfont/iconfont.js
View File

File diff suppressed because one or more lines are too long

35
public/stylesheets/educoder/iconfont/iconfont.json
Unescape View File

@ -1230,6 +1230,13 @@
"unicode": "e669",
"unicode_decimal": 58985
},
{
"icon_id": "5255211",
"name": "复制",
"font_class": "fuzhi1",
"unicode": "e800",
"unicode_decimal": 59392
},
{
"icon_id": "5291605",
"name": "更多",
@ -1530,6 +1537,34 @@
"font_class": "nenghaofenxix",
"unicode": "e6be",
"unicode_decimal": 59070
},
{
"icon_id": "11408531",
"name": "detection@1x",
"font_class": "detectionx",
"unicode": "e6c1",
"unicode_decimal": 59073
},
{
"icon_id": "11409495",
"name": "community@1x",
"font_class": "communityx",
"unicode": "e6c2",
"unicode_decimal": 59074
},
{
"icon_id": "11409771",
"name": "hosting@1x",
"font_class": "hostingx2",
"unicode": "e6c3",
"unicode_decimal": 59075
},
{
"icon_id": "11410432",
"name": "project@1x",
"font_class": "projectx",
"unicode": "e6c4",
"unicode_decimal": 59076
}
]
}

23
public/stylesheets/educoder/iconfont/iconfont.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 294 KiB

After

Width:  |  Height:  |  Size: 303 KiB

BIN
public/stylesheets/educoder/iconfont/iconfont.ttf
View File

Binary file not shown.

BIN
public/stylesheets/educoder/iconfont/iconfont.woff
View File

Binary file not shown.

BIN
public/stylesheets/educoder/iconfont/iconfont.woff2
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save