diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js index a32b36147..d599fdf3d 100644 --- a/public/react/src/modules/competition/Registration.js +++ b/public/react/src/modules/competition/Registration.js @@ -64,6 +64,7 @@ class Registration extends React.Component { pint: 0, competition_name: undefined, mutiple_limited: false, + teamutiple_limited: false, } } @@ -117,6 +118,7 @@ class Registration extends React.Component { teacher_staff: result.data.teacher_staff, member_staff: result.data.member_staff, mutiple_limited: result.data.member_staff.mutiple_limited, + teamutiple_limited: result.data.teacher_staff.mutiple_limited }) if (result.data.enroll_ended === true) { this.setState({ @@ -631,7 +633,7 @@ class Registration extends React.Component { render() { - const {page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint, competition_name, mutiple_limited} = this.state; + const {page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint, competition_name, mutiple_limited, teamutiple_limited} = this.state; return (
@@ -659,6 +661,7 @@ class Registration extends React.Component { tmodalsType === true ? this.Tmoconfirm1(bool)} GetenrollmentAPIopens={() => this.GetenrollmentAPI()} diff --git a/public/react/src/modules/competition/comcss/competition.css b/public/react/src/modules/competition/comcss/competition.css index e9fd84944..0f34dbf0d 100644 --- a/public/react/src/modules/competition/comcss/competition.css +++ b/public/react/src/modules/competition/comcss/competition.css @@ -774,6 +774,31 @@ reglistviewdivs2 { cursor: default; } +.maxnamewidth85 { + max-width: 85px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + cursor: default; +} + +.maxnamewidth90 { + max-width: 90px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + cursor: default; +} + +.maxnamewidth110 { + max-width: 110px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + cursor: default; +} + + .maxnamewidth160 { max-width: 160px; overflow: hidden; diff --git a/public/react/src/modules/competition/competmodal/PersonModal.js b/public/react/src/modules/competition/competmodal/PersonModal.js index 7f7637dce..a27ba9b00 100644 --- a/public/react/src/modules/competition/competmodal/PersonModal.js +++ b/public/react/src/modules/competition/competmodal/PersonModal.js @@ -878,37 +878,107 @@ class PersonModal extends Component { var cpersondiv1Items = []; if (teacher_ids) { cpersondiv1Items = teacher_ids.map((item, index) => - this.getdatacpersondiv1Items(item)} + onClick={() => this.getdatacpersondiv1Items(item)} + > -

{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.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} + } + + { + this.props.teamutiple_limited === undefined || this.props.teamutiple_limited === null ? +

{""}

+ : + ( + this.props.teamutiple_limited === true ? +

{item.enrollable === false ? "已加入其他战队" : ""}

+ : +

{""}

+ ) + + } + + + + ); } @@ -953,24 +1023,62 @@ class PersonModal extends Component { }} onClick={() => this.getdatacpersondiv1Items2(item)} > -

{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.name === undefined || item.name === null || item.name === "" ? + -- + : + {item.name} + } + {item.student_id === undefined || item.student_id === null || item.student_id === "" ? +

--

+ : + {"学号:" + 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.onSearch(value)}*/} - {/*/>*/} trigger.parentNode} visible={this.state.person2}>