diff --git a/public/images/educoder/competition/Noentry.jpg b/public/images/educoder/competition/Noentry.jpg new file mode 100644 index 000000000..5ffc34e17 Binary files /dev/null and b/public/images/educoder/competition/Noentry.jpg differ diff --git a/public/images/educoder/competition/Rectanglex.png b/public/images/educoder/competition/Rectanglex.png new file mode 100755 index 000000000..0aa2a31b1 Binary files /dev/null and b/public/images/educoder/competition/Rectanglex.png differ diff --git a/public/images/educoder/competition/pexjiazai.png b/public/images/educoder/competition/pexjiazai.png new file mode 100644 index 000000000..78f56b82a Binary files /dev/null and b/public/images/educoder/competition/pexjiazai.png differ diff --git a/public/react/src/modules/competition/comcss/tipregistit.jpg b/public/images/educoder/competition/tipregistit.jpg similarity index 100% rename from public/react/src/modules/competition/comcss/tipregistit.jpg rename to public/images/educoder/competition/tipregistit.jpg diff --git a/public/react/src/modules/competition/CompetitionMaxImg.js b/public/react/src/modules/competition/CompetitionMaxImg.js index 7a81b952a..c5d99a88b 100644 --- a/public/react/src/modules/competition/CompetitionMaxImg.js +++ b/public/react/src/modules/competition/CompetitionMaxImg.js @@ -1,6 +1,6 @@ import React, {Component} from 'react'; import competition from './comcss/competition.css'; - +import {getImageUrl} from 'educoder'; // 团队竞赛报名大图 class CompetitionMaxImg extends React.Component { constructor(props) { @@ -38,7 +38,9 @@ class CompetitionMaxImg extends React.Component { { type === 1 || type === 2 ? -
+

Educoder竞赛平台

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

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

@@ -54,7 +56,8 @@ class CompetitionMaxImg extends React.Component {
: type === 3 ? -
+

Educoder竞赛平台

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

@@ -69,7 +72,8 @@ class CompetitionMaxImg extends React.Component {
: type === 4 || type === 5 ? -
+

Educoder竞赛平台

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

@@ -83,7 +87,8 @@ class CompetitionMaxImg extends React.Component {
: type === 6 ? -
+

Educoder竞赛平台

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

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

@@ -106,7 +111,8 @@ class CompetitionMaxImg extends React.Component {
: -
+
} diff --git a/public/react/src/modules/competition/RegisListview.js b/public/react/src/modules/competition/RegisListview.js index 73f94592c..a1c283220 100644 --- a/public/react/src/modules/competition/RegisListview.js +++ b/public/react/src/modules/competition/RegisListview.js @@ -8,8 +8,8 @@ import axios from 'axios'; import moment from 'moment'; import competition from './comcss/competition.css'; import {Checkbox, Table, Pagination, Menu, Icon} from "antd"; +import {getImageUrl} from 'educoder'; // 团队竞赛报名无报名子组件团队 在线竞赛 > 全国高校计算机大赛-项目挑战> -import Rectanglex from "../../modules/competition/Rectanglex.png"; class RegisListview extends React.Component { constructor(props) { super(props) @@ -25,7 +25,7 @@ class RegisListview extends React.Component { display: "flex", justifyContent: " space-around", alignItems: "center", - background: `url(${Rectanglex})`, + background: `url(${getImageUrl(`images/educoder/competitions/Rectanglex.png`)})`, height: "50px", backgroundPosition: "center", backgroundSize: "110% 100%", diff --git a/public/react/src/modules/competition/RegisListviewdata.js b/public/react/src/modules/competition/RegisListviewdata.js index 3bd8fe0b2..397064662 100644 --- a/public/react/src/modules/competition/RegisListviewdata.js +++ b/public/react/src/modules/competition/RegisListviewdata.js @@ -9,7 +9,6 @@ import moment from 'moment'; import {SnackbarHOC, WordsBtn, getImageUrl} from 'educoder'; import {TPMIndexHOC} from '../tpm/TPMIndexHOC'; import competition from './comcss/competition.css'; -import pexjiazai from './pexjiazai.png' import {Button} from 'antd'; // 团队竞赛报名无报名子组件团队 竞赛报名-已创建战队 @@ -97,7 +96,8 @@ class RegisListviewdata extends React.Component { - +
diff --git a/public/react/src/modules/competition/RegisNodata.js b/public/react/src/modules/competition/RegisNodata.js index 3f8835634..a8441f420 100644 --- a/public/react/src/modules/competition/RegisNodata.js +++ b/public/react/src/modules/competition/RegisNodata.js @@ -1,6 +1,6 @@ import React, {Component} from 'react'; import competition from './comcss/competition.css'; -import Noentry from './Noentry.jpg'; +import {getImageUrl} from 'educoder'; // 团队竞赛报名无报名子组件 class RegisNodata extends React.Component { constructor(props) { @@ -17,7 +17,7 @@ class RegisNodata extends React.Component { height: "80px", width: "125px", marginTop: "107px", - background: `url(${Noentry})`, + background: `url(${getImageUrl(`images/educoder/competitions/Noentry.jpg`)})`, backgroundPosition: "center", backgroundSize: "110% 100%", }}> diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js index d89060173..9bffc492c 100644 --- a/public/react/src/modules/competition/Registration.js +++ b/public/react/src/modules/competition/Registration.js @@ -21,8 +21,6 @@ import MessagePersonModal from './competmodal/MessagePersonModal'; import PersonalModalteam from './competmodal/PersonalModalteam'; import PersonalCompetititem from './personal/PersonalCompetititem'; import ExittheteamModel from './competmodal/ExittheteamModel'; -import pexjiazai from "./pexjiazai.png"; - // 团队竞赛报名无报名 class Registration extends React.Component { /*** diff --git a/public/react/src/modules/competition/comcss/competition.css b/public/react/src/modules/competition/comcss/competition.css index 102f2492d..14e0d788e 100644 --- a/public/react/src/modules/competition/comcss/competition.css +++ b/public/react/src/modules/competition/comcss/competition.css @@ -323,7 +323,6 @@ display: -webkit-flex; flex-direction: column; align-items: center; - background-image: url(./tipregistit.jpg); } .registrationback1 { @@ -331,7 +330,6 @@ width: 1200px; display: flex; flex-direction: column; - background-image: url(./tipregistit.jpg); } .regitem2 { diff --git a/public/react/src/modules/competition/competmodal/PersonModal.js b/public/react/src/modules/competition/competmodal/PersonModal.js index ffa924900..53091d5e5 100644 --- a/public/react/src/modules/competition/competmodal/PersonModal.js +++ b/public/react/src/modules/competition/competmodal/PersonModal.js @@ -65,13 +65,13 @@ class PersonModal extends Component { school_name: this.props.user.user_school, student_id: null, identity: this.props.user.user_identity, - type: "创建者", + type: "导师", }; data.push(datas); - console.log("itemiddata"); - console.log("编辑战队") - console.log(this.props.itemiddata); + // console.log("itemiddata"); + // console.log("编辑战队") + // console.log(this.props.itemiddata); try { if (this.props.Newtit === false) { for (var i = 0; i < this.props.itemiddata.team_members.length; i++) { @@ -126,7 +126,7 @@ class PersonModal extends Component { school_name: this.props.user.user_school, student_id: null, identity: this.props.user.user_identity, - type: "创建者", + type: "导师", }; data.push(datas); this.setState({ @@ -670,11 +670,21 @@ class PersonModal extends Component { textAlign: "center", }} >{item.name === undefined || item.name === null || item.name === "" ? "--" : item.name}

-

{item.type === undefined || item.type === null || item.type === "" ? "--" : item.type}

+ { + index === 0 ? +

创建者

+ : +

{item.type === undefined || item.type === null || item.type === "" ? "--" : item.type}

+ } +

{item.identity === undefined || item.identity === null || item.identity === "" ? "--" : item.identity}

-

{item.type && item.type === "创建者" ? "" : - this.deletedata(item)}/>}

+ { + index === 0 ? +

+ : +

this.deletedata(item)}/>

+ }
); var cpersondiv1Items = []; diff --git a/public/react/src/modules/competition/competmodal/PersonModaltion.js b/public/react/src/modules/competition/competmodal/PersonModaltion.js index e8e4148ee..680566297 100644 --- a/public/react/src/modules/competition/competmodal/PersonModaltion.js +++ b/public/react/src/modules/competition/competmodal/PersonModaltion.js @@ -9,7 +9,6 @@ import moment from 'moment'; import competition from './comcss/competition.css'; import {Checkbox, Table, Pagination, Menu, Icon} from "antd"; // 团队竞赛报名无报名子组件团队 在线竞赛 > 全国高校计算机大赛-项目挑战> -import Rectanglex from "../../modules/competition/Rectanglex.png"; class PersonModaltion extends React.Component { constructor(props) { diff --git a/public/react/src/modules/competition/personal/PersonalCompetititem.js b/public/react/src/modules/competition/personal/PersonalCompetititem.js index e3863b3a7..bd6a092eb 100644 --- a/public/react/src/modules/competition/personal/PersonalCompetititem.js +++ b/public/react/src/modules/competition/personal/PersonalCompetititem.js @@ -10,8 +10,6 @@ import {SnackbarHOC, WordsBtn, getImageUrl} from 'educoder'; import {TPMIndexHOC} from '../../tpm/TPMIndexHOC'; import competition from '../comcss/competition.css'; import {Button, message} from 'antd'; -import pexjiazai from '../pexjiazai.png' - // 点击按钮复制功能 function jsCopy() { var e = document.getElementById("copy_invite_code"); @@ -126,7 +124,8 @@ class PersonalCompetititem extends React.Component { - +