|
|
|
|
@ -374,59 +374,24 @@ |
|
|
|
|
<el-button size="small" @click="peopleSignupVisible = false">取消</el-button> |
|
|
|
|
</span> |
|
|
|
|
</el-dialog> |
|
|
|
|
<el-dialog title="报名" :visible.sync="enterVisible" :close-on-click-modal="false" width="850px" |
|
|
|
|
custom-class="enter-dia" @close="enterClose"> |
|
|
|
|
<div class="flex"> |
|
|
|
|
<el-form class="dia-form" label-width="90px"> |
|
|
|
|
<el-form-item label="姓名"> |
|
|
|
|
<el-input disabled v-model="userName"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="来自学校"> |
|
|
|
|
<el-select v-model="enterForm.studentAffiliatedInstitutionId" filterable style="width: 100%"> |
|
|
|
|
<el-option v-for="(item, i) in schools" :key="i" :label="item.schoolName" |
|
|
|
|
:value="item.schoolId"></el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
<p class="m-t-20 m-b-5">请选择要加入的团队</p> |
|
|
|
|
<el-form-item label="团队"> |
|
|
|
|
<el-select class="w-100" v-model="enterForm.teamId" filterable> |
|
|
|
|
<el-option v-for="(item, i) in teams" :key="i" :label="item.teamName" :value="item.teamId"></el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="团队邀请码"> |
|
|
|
|
<el-input placeholder="请输入团队邀请码" maxlength="6" v-model="enterForm.invitationCode"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="大赛邀请码" v-if="form.completeCompetitionSetup.isNeedCode"> |
|
|
|
|
<el-input placeholder="请输入大赛邀请码" maxlength="6" v-model="enterForm.registrationInvitationCode"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<p class="tips"> |
|
|
|
|
查找不到团队？点击 <el-link :underline="false" type="primary" @click="toTeam">创建团队</el-link> |
|
|
|
|
</p> |
|
|
|
|
</el-form> |
|
|
|
|
<div class="agree"> |
|
|
|
|
<div class="agreement"> |
|
|
|
|
<h6>参赛选手承诺书</h6> |
|
|
|
|
<div class="text"> |
|
|
|
|
<p class="line">本人自愿参加2024年安徽省大学生金融投资创新大赛，为进一步提高廉洁自律意识，客观公正的履行职责，我以大赛参赛学生的身份和荣誉郑重作出如下承诺：</p> |
|
|
|
|
<p class="line">1．尊重大赛组委会及秘书处，尊重专家和仲裁，尊重参赛单位和其他选手，客观、公正地参加比赛。</p> |
|
|
|
|
<p class="line"> |
|
|
|
|
2．遵守道德，遵守大赛纪律，不私下接触其他参赛单位和团队成员、专家、裁判员、仲裁员。 |
|
|
|
|
</p> |
|
|
|
|
<p class="line"> |
|
|
|
|
3．保证提交的所有信息、数据和材料均真实、准确、合法及有效，不侵犯任何第三方的知识产权和其他权益。参赛选手均无条件配合大赛组委会对参赛选手提供的数据、信息、材料及有关情况等进行核实。 |
|
|
|
|
</p> |
|
|
|
|
<p class="line">4．遵守公正、公平原则，不干扰裁判员、仲裁员等工作及其他参赛单位和团队成员等比赛，影响比赛成绩。认可大赛组委会提供的基础数据。</p> |
|
|
|
|
<p class="line">5．不发表、不传播没有根据并对大赛产生不利影响的言论。</p> |
|
|
|
|
<p class="line">6．不隐瞒按规定应该回避的事项。</p> |
|
|
|
|
<p class="line">7．对于涉嫌泄密事宜，愿接受、协助、配合相关部门的监督检查，并履行举证义务。</p> |
|
|
|
|
<p class="line">8．如若发生上述问题，自愿承担相关责任。</p> |
|
|
|
|
<p class="line">特此承诺！</p> |
|
|
|
|
<p class="line">勾选后才可登录和注册！</p> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<el-checkbox class="m-t-15 m-l-20" v-model="agreeCheck">同意，我已阅读</el-checkbox> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<el-dialog title="报名" :visible.sync="enterVisible" :close-on-click-modal="false" width="300px" @close="enterClose"> |
|
|
|
|
<el-form class="dia-form"> |
|
|
|
|
<p style="margin-bottom: 5px">请选择要加入的团队</p> |
|
|
|
|
<el-form-item> |
|
|
|
|
<el-select class="w-100" v-model="enterForm.teamId" filterable> |
|
|
|
|
<el-option v-for="(item, i) in teams" :key="i" :label="item.teamName" :value="item.teamId"></el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item> |
|
|
|
|
<el-input placeholder="请输入团队邀请码" maxlength="6" v-model="enterForm.invitationCode"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item v-if="form.completeCompetitionSetup.isNeedCode"> |
|
|
|
|
<el-input placeholder="请输入大赛邀请码" maxlength="6" v-model="enterForm.registrationInvitationCode"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<p class="tips"> |
|
|
|
|
查找不到团队？点击 <el-link :underline="false" type="primary" @click="toTeam">创建团队</el-link> |
|
|
|
|
</p> |
|
|
|
|
</el-form> |
|
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
|
<el-button size="small" type="primary" @click="enterSubmit">报名</el-button> |
|
|
|
|
<el-button size="small" @click="enterVisible = false">取消</el-button> |
|
|
|
|
@ -560,6 +525,7 @@ import Const from '@/const/match' |
|
|
|
|
import OSS from 'ali-oss' |
|
|
|
|
import OssConfig from '@/components/upload/config.js' |
|
|
|
|
import Oss from '@/components/upload/upload.js' |
|
|
|
|
import _ from 'lodash' |
|
|
|
|
export default { |
|
|
|
|
name: 'matchdetail', |
|
|
|
|
data () { |
|
|
|
|
@ -625,8 +591,6 @@ export default { |
|
|
|
|
registrationInvitationCode: '', |
|
|
|
|
whetherSignUp: 1 |
|
|
|
|
}, |
|
|
|
|
schools: [], |
|
|
|
|
agreeCheck: false, |
|
|
|
|
|
|
|
|
|
teamVisible: false, |
|
|
|
|
teams: [], |
|
|
|
|
@ -698,7 +662,7 @@ export default { |
|
|
|
|
}, |
|
|
|
|
computed: { |
|
|
|
|
...mapState("user", [ |
|
|
|
|
"userId", 'account', 'logView', 'userName' |
|
|
|
|
"userId", 'account', 'logView' |
|
|
|
|
]), |
|
|
|
|
}, |
|
|
|
|
components: { |
|
|
|
|
@ -716,9 +680,6 @@ export default { |
|
|
|
|
this.getProgress() |
|
|
|
|
this.getNotice() |
|
|
|
|
this.getTeam() |
|
|
|
|
this.getAutomaticAllocation() |
|
|
|
|
|
|
|
|
|
this.initOss() |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
...mapMutations('match', [ |
|
|
|
|
@ -759,6 +720,8 @@ export default { |
|
|
|
|
name: '参赛信息' |
|
|
|
|
}) |
|
|
|
|
this.getInfo() |
|
|
|
|
this.getAutomaticAllocation() |
|
|
|
|
this.initOss() |
|
|
|
|
} |
|
|
|
|
this.token && this.intervalRank() |
|
|
|
|
} else { |
|
|
|
|
@ -894,7 +857,7 @@ export default { |
|
|
|
|
this.$post(`${this.api.entryInformation}?competitionId=${this.id}`).then(async res => { |
|
|
|
|
const info = res.entryInformation |
|
|
|
|
// 如果是队长，并且没有指导老师，默认添加一个空的 |
|
|
|
|
if (info.team && !info.team.captain && !info.teamInstructors.length) info.teamInstructors.push(JSON.parse(JSON.stringify(this.originIns))) |
|
|
|
|
if (info.team && !info.team.captain && !info.teamInstructors.length) info.teamInstructors.push(_.cloneDeep(this.originIns)) |
|
|
|
|
if (info.personalDetail) { |
|
|
|
|
info.team = {} |
|
|
|
|
info.teamDetail = [] |
|
|
|
|
@ -904,7 +867,7 @@ export default { |
|
|
|
|
const caption = info.teamDetail.find(e => !e.caption) |
|
|
|
|
info.caption = caption ? caption : {} |
|
|
|
|
info.person = info.personalDetail || info.teamDetail.find(e => e.accountId == info.team.accountId) |
|
|
|
|
this.originInfo = JSON.parse(JSON.stringify(info)) |
|
|
|
|
this.originInfo = _.cloneDeep(info) |
|
|
|
|
// 把参赛人员的名字和accountId处理成一个数组 |
|
|
|
|
info.stages && info.stages.map(e => { |
|
|
|
|
if (e.participantAccountIds && e.teamParticipantIds) { |
|
|
|
|
@ -1013,6 +976,7 @@ export default { |
|
|
|
|
} else if (JSON.stringify(teamInstructors) !== JSON.stringify(originInfo.teamInstructors)) { |
|
|
|
|
notSave = 2 |
|
|
|
|
} |
|
|
|
|
// debugger |
|
|
|
|
if (notSave) { |
|
|
|
|
this.$confirm('所填写内容暂未保存，是否保存？', "提示", { |
|
|
|
|
type: "warning", |
|
|
|
|
@ -1076,16 +1040,18 @@ export default { |
|
|
|
|
this.$post(`${this.api.deleteAnAdvisor}?id=${row.id}`).then(res => { |
|
|
|
|
Util.successMsg('删除成功') |
|
|
|
|
this.info.teamInstructors.splice(i, 1) |
|
|
|
|
this.originInfo.teamInstructors = _.cloneDeep(this.info.teamInstructors) |
|
|
|
|
}).catch(res => { }) |
|
|
|
|
}).catch(() => { }) |
|
|
|
|
} else { |
|
|
|
|
this.info.teamInstructors.splice(i, 1) |
|
|
|
|
this.originInfo.teamInstructors = _.cloneDeep(this.info.teamInstructors) |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
// 添加指导老师 |
|
|
|
|
addAdvisor () { |
|
|
|
|
if (this.info.teamInstructors.length > 4) return Util.errorMsg('指导老师仅限添加5个！') |
|
|
|
|
const line = JSON.parse(JSON.stringify(this.originIns)) |
|
|
|
|
const line = _.cloneDeep(this.originIns) |
|
|
|
|
line.edit = 1 |
|
|
|
|
this.info.teamInstructors.push(line) |
|
|
|
|
}, |
|
|
|
|
@ -1111,6 +1077,7 @@ export default { |
|
|
|
|
this.info.teamInstructors[i].id = id |
|
|
|
|
} |
|
|
|
|
this.info.teamInstructors[i].edit = 0 |
|
|
|
|
this.originInfo.teamInstructors = _.cloneDeep(this.info.teamInstructors) |
|
|
|
|
}).catch(res => { }) |
|
|
|
|
}, |
|
|
|
|
// 显示转让队长 |
|
|
|
|
@ -1311,7 +1278,6 @@ export default { |
|
|
|
|
}, |
|
|
|
|
// 团队报名提交 |
|
|
|
|
enterSubmit () { |
|
|
|
|
if (!this.agreeCheck) return Util.errorMsg('请勾选同意，才可继续报名！') |
|
|
|
|
const form = this.enterForm |
|
|
|
|
if (!form.teamId) return Util.errorMsg('请选择团队') |
|
|
|
|
if (!form.invitationCode) return Util.errorMsg('请输入团队邀请码') |
|
|
|
|
@ -1433,8 +1399,9 @@ export default { |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
initOss () { |
|
|
|
|
this.client = new OSS(OssConfig.config) |
|
|
|
|
async initOss () { |
|
|
|
|
const o = await OssConfig() |
|
|
|
|
this.client = new OSS(o.config) |
|
|
|
|
}, |
|
|
|
|
// 附件上传前 |
|
|
|
|
beforeUpload (file) { |
|
|
|
|
@ -2204,32 +2171,4 @@ export default { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/deep/.enter-dia { |
|
|
|
|
.agree { |
|
|
|
|
width: 500px; |
|
|
|
|
margin-left: 20px; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.agreement { |
|
|
|
|
max-height: 300px; |
|
|
|
|
padding: 10px 20px; |
|
|
|
|
box-shadow: 0 0 7px rgba(235, 235, 235, .8); |
|
|
|
|
overflow: auto; |
|
|
|
|
|
|
|
|
|
h6 { |
|
|
|
|
font-size: 20px; |
|
|
|
|
font-weight: 600; |
|
|
|
|
text-align: center; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.text { |
|
|
|
|
line-height: 1.6; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.line { |
|
|
|
|
margin-top: 7px; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
</style> |
