diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js index ef38a18f8..e96f22663 100644 --- a/public/react/config/webpack.config.dev.js +++ b/public/react/config/webpack.config.dev.js @@ -32,7 +32,7 @@ module.exports = { // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s // devtool: "cheap-module-eval-source-map", // 开启调试 - //devtool: "source-map", // 开启调试 + devtool: "source-map", // 开启调试 // These are the "entry points" to our application. // This means they will be the "root" imports that are included in JS bundle. // The first two entry points enable "hot" CSS and auto-refreshes for JS. diff --git a/public/react/src/App.js b/public/react/src/App.js index e89746f41..8377ca410 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -279,12 +279,16 @@ const Ecs = Loadable({ loading: Loading, }); -//个人竞赛报名 +//团队竞赛报名 const Registration = Loadable({ loader: () => import('./modules/competition/Registration'), loading: Loading, }); - +//个人竞赛报名 +const PersonalCompetit = Loadable({ + loader: () => import('./modules/competition/personal/PersonalCompetit.js'), + loading: Loading, +}); class App extends Component { constructor(props) { super(props) @@ -529,7 +533,12 @@ class App extends Component { return () } }> - + () + } + /> + () + } + /> + () @@ -599,12 +615,7 @@ class App extends Component { render={ (props)=>() }/> - () - } - /> + { - type === 1 ? + type === 1 || type === 2 ?

Educoder竞赛平台

Educoder是一个面向计算机类的互联网IT教育和实战平台,

@@ -33,7 +29,7 @@ class CompetitionMaxImg extends React.Component {
: - type === 2 ? + type === 3 ?

Educoder竞赛平台

高校智能课堂与综合实训平台

@@ -48,7 +44,7 @@ class CompetitionMaxImg extends React.Component {
: - type === 3 ? + type === 4 || type === 5 ?

Educoder竞赛平台

高校智能课堂与综合实训平台

@@ -62,6 +58,29 @@ class CompetitionMaxImg extends React.Component {
+ : type === 6 ? +
+

Educoder竞赛平台

+

Educoder是一个面向计算机类的互联网IT教育和实战平台,

+

提供企业级工程实训,以实现工程化专业教学的自动化和智能化。

+
+ { + pint === 1 ? +
+

立即报名

+
+ : pint === 2 ? +
+

已报名

+
+ : +
+

报名已截止

+
+ } + +
+
: "" } diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js index 85f532f89..945552ef3 100644 --- a/public/react/src/modules/competition/Registration.js +++ b/public/react/src/modules/competition/Registration.js @@ -16,16 +16,17 @@ import CompetitionMaxImg from './CompetitionMaxImg'; import RegistrationSearch from './RegistrationSearch'; import RegisListview from './RegisListview'; import RegisListviewdata from './RegisListviewdata'; + // 团队竞赛报名无报名 class Registration extends React.Component { constructor(props) { super(props) this.state = { - persons: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20], + test: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20], loadingstate: false, page: 1, limit: 20, - type: 1, + type: 5, } } @@ -36,9 +37,10 @@ class Registration extends React.Component { loadingstate: true, }) } + render() { - const {persons, page, limit, type} = this.state; - const listItems = persons.map((item, index) => + const {test, page, limit, type} = this.state; + const listItems = test.map((item, index) => ); return ( @@ -66,7 +68,7 @@ class Registration extends React.Component { } { type === 2 || type === 3 || type === 5 ? - + : "" } @@ -90,7 +92,7 @@ class Registration extends React.Component { } { - type === 5 ? + type === 4 || type === 5 ?
-
-
+
+
+
-

小猫头像

-
-

重庆邮电大学

-
-
-
- -
-
- -
-
- -
-
- -
-
+ }}>小猫头像

-
-
- -
-
- -
+

已报名

-

邀请码:yngh5

+ textAlign: "center", + }}>2019-09-07 08:33

-
-
- { - this.props.type === 5 ? -
-
-

删除战队

-
-
-

编辑战队

-
- -
- : this.props.type === 2 ? -
-
-

战队详情

-
-
-

退出战队

-
- -
- : - this.props.type === 2 ? -
- -
-

退出战队

-
- -
- : - "" - - } -
diff --git a/public/react/src/modules/competition/comcss/competition.css b/public/react/src/modules/competition/comcss/competition.css index e50561e75..aa8e2b725 100644 --- a/public/react/src/modules/competition/comcss/competition.css +++ b/public/react/src/modules/competition/comcss/competition.css @@ -1,6 +1,6 @@ /*All*/ .borders { - border: 1px solid; + border: 0.5px solid; } /*All*/ @@ -8,7 +8,7 @@ .registrationback { height: 368px; width: 1200px; - border: 1px solid; + border: 0.5px solid; display: flex; display: -webkit-flex; flex-direction: column; @@ -19,7 +19,7 @@ .registrationback1 { height: 368px; width: 1200px; - border: 1px solid; + border: 0.5px solid; display: flex; flex-direction: column; background: #0dcecb; @@ -63,6 +63,7 @@ color: #ffffff; font-size: 18px; line-height: 20px; + margin-top: 7px; } .registrationbackp4 { @@ -112,6 +113,19 @@ } +.personreg1 { + margin-right: 46px; + text-align: center; + background: #C3C1C1; + height: 54px; + width: 156px; + border-radius: 4px; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer +} + .registbut11 { margin-right: 46px; text-align: center; @@ -163,6 +177,12 @@ } +.personreg1 p { + color: #ffffff; + font-size: 20px; + cursor: not-allowed; +} + .registbut2 { text-align: center; color: #05101A; @@ -217,7 +237,7 @@ } .bootomimg { - border: 1px solid; + border: 0.5px solid; height: 80px; width: 125px; margin-top: 107px; @@ -239,10 +259,16 @@ .regitem { display: flex; flex-direction: initial; - border: 1px solid; + border: 0.5px solid; margin-top: 44px; } +.regitem2 { + display: flex; + flex-direction: initial; + border-bottom: 1px solid #EDEDED; + margin-top: 19px; +} /*垂直*/ .regitemimg1 { display: flex; @@ -252,20 +278,35 @@ margin-left: 17px; } +.perregitemimg1 { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + margin-left: 26px; + padding-bottom: 18px; +} .regitemimg2 { - border: 1px solid; + border: 0.5px solid; height: 78px; width: 78px; } +.personregitemimg { + border: 0.5px solid; + height: 64px; + width: 64px; +} + + .regitemimg2 p { - border: 1px solid; + border: 0.5px solid; color: #999999; font-size: 14px; } .regitemimgs { - border: 1px solid; + border: 0.5px solid; width: 69px; height: 69px; margin-top: 3px; @@ -274,7 +315,7 @@ .regitemimgs2 { margin-top: 16px; - border: 1px solid; + border: 0.5px solid; width: 49px; height: 51px; margin-left: 25px @@ -282,14 +323,14 @@ .regitemimgs22 { margin-top: 27px; - border: 1px solid; + border: 0.5px solid; width: 28px; height: 28px; margin-left: 20px; } .regitemimgs3 { - border: 1px solid; + border: 0.5px solid; height: 22px; width: 22px; margin-top: 30px; @@ -402,7 +443,7 @@ reglistviewdivs2 { } .reglistimg2 { - border: 1px solid; + border: 0.5px solid; height: 78px; width: 78px; } diff --git a/public/react/src/modules/competition/competmodal/PersonModal.js b/public/react/src/modules/competition/competmodal/PersonModal.js new file mode 100644 index 000000000..e69de29bb diff --git a/public/react/src/modules/competition/personal/PersonalCompetit.js b/public/react/src/modules/competition/personal/PersonalCompetit.js new file mode 100644 index 000000000..b14ad4d36 --- /dev/null +++ b/public/react/src/modules/competition/personal/PersonalCompetit.js @@ -0,0 +1,97 @@ +import React, {Component} from 'react'; +import {SnackbarHOC, WordsBtn} from 'educoder'; +import {TPMIndexHOC} from '../../tpm/TPMIndexHOC'; +import competition from '../comcss/competition.css'; +import {Button, Pagination,} from 'antd'; +import CompetitionMaxImg from '../CompetitionMaxImg'; +import Registrationitem from '../Registrationitem'; + +// 团队竞赛报名无报名 +class PersonalCompetit extends React.Component { + constructor(props) { + super(props) + this.state = { + loadingstate: false, + page: 1, + limit: 20, + type: 6, + pint: 1, + test: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20], + } + } + + + paginationonChangestwo = (pageNumber) => { + this.setState({ + page: pageNumber, + loadingstate: true, + }) + } + + render() { + const {test, page, limit, type, pint} = this.state; + const listItems = test.map((item, index) => + + ); + return ( +
+
+ + {/*大图*/} + { + type === 6 ? + + : + "" + } + { + pint === 1 || pint === 3 ? +
+

参赛总人数:132

+
+ : ""} + + {/*列表*/} + { + pint === 1 || pint === 3 ? +
+ { + listItems + } + +
+ : ""} + { + pint === 1 || pint === 3 ? +
+ +
+ : "" + } + +
+ +
+ ) + } + +} + +export default SnackbarHOC()(TPMIndexHOC(PersonalCompetit)); diff --git a/public/react/src/modules/competition/personal/PersonalCompetititem.js b/public/react/src/modules/competition/personal/PersonalCompetititem.js new file mode 100644 index 000000000..8a0730736 --- /dev/null +++ b/public/react/src/modules/competition/personal/PersonalCompetititem.js @@ -0,0 +1,144 @@ +import React, {Component} from 'react'; +import { + BrowserRouter as Router, + Route, + Switch +} 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 {Button} from 'antd'; + +// 团队竞赛报名无报名子组件团队 竞赛报名-已创建战队 +class Registrationitem extends React.Component { + constructor(props) { + super(props) + + + } + + + render() { + return ( + +
+
+
+ +
+
+
+

重庆邮电大学

+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+

邀请码:yngh5

+
+
+
+ { + this.props.type === 5 ? +
+
+

删除战队

+
+
+

编辑战队

+
+ +
+ : this.props.type === 2 ? +
+
+

战队详情

+
+
+

退出战队

+
+ +
+ : + this.props.type === 3 ? +
+ +
+

退出战队

+
+ +
+ : + "" + + } + + +
+ + + ) + } + +} + +export default Registrationitem;