|
|
|
@ -51,7 +51,7 @@ |
|
|
|
<p style="font-size: 16px;color: #333;">{{ rule.stageName }}</p> |
|
|
|
<p style="font-size: 16px;color: #333;">{{ rule.stageName }}</p> |
|
|
|
<p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p> |
|
|
|
<p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p> |
|
|
|
<p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p> |
|
|
|
<p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p> |
|
|
|
<p v-if="!rule.method">课程系统：{{ rule.systemName }}</p> |
|
|
|
<p v-if="rule.method != 2">课程系统：{{ rule.systemName }}</p> |
|
|
|
<p v-if="rule.onlineButton">线上地点：{{ rule.onlineAddress }}</p> |
|
|
|
<p v-if="rule.onlineButton">线上地点：{{ rule.onlineAddress }}</p> |
|
|
|
<p v-if="rule.offlineButton">线下地点：{{ rule.offlineAddress }}</p> |
|
|
|
<p v-if="rule.offlineButton">线下地点：{{ rule.offlineAddress }}</p> |
|
|
|
<template v-if="rule.method === 2"> |
|
|
|
<template v-if="rule.method === 2"> |
|
|
|
@ -122,8 +122,11 @@ |
|
|
|
</el-tabs> |
|
|
|
</el-tabs> |
|
|
|
<el-table ref="table" :data="ranks" stripe header-align="center"> |
|
|
|
<el-table ref="table" :data="ranks" stripe header-align="center"> |
|
|
|
<el-table-column type="index" width="60" label="排名" align="center"></el-table-column> |
|
|
|
<el-table-column type="index" width="60" label="排名" align="center"></el-table-column> |
|
|
|
<el-table-column prop="teamName" label="团队名称"></el-table-column> |
|
|
|
<template v-if="form.completeCompetitionSetup.competitionType"> |
|
|
|
<el-table-column prop="leaderName" label="队长"></el-table-column> |
|
|
|
<el-table-column prop="teamName" label="团队名称"></el-table-column> |
|
|
|
|
|
|
|
<el-table-column prop="leaderName" label="队长"></el-table-column> |
|
|
|
|
|
|
|
</template> |
|
|
|
|
|
|
|
<el-table-column v-else prop="schoolName" label="学校"></el-table-column> |
|
|
|
<el-table-column prop="schoolName" label="学校"></el-table-column> |
|
|
|
<el-table-column prop="schoolName" label="学校"></el-table-column> |
|
|
|
<el-table-column prop="school" label="用时"> |
|
|
|
<el-table-column prop="school" label="用时"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
@ -246,7 +249,7 @@ |
|
|
|
<template v-if="info.stages.length"> |
|
|
|
<template v-if="info.stages.length"> |
|
|
|
<tr v-for="(item, i) in info.stages" :key="i"> |
|
|
|
<tr v-for="(item, i) in info.stages" :key="i"> |
|
|
|
<td>{{ i + 1 }}</td> |
|
|
|
<td>{{ i + 1 }}</td> |
|
|
|
<td>{{ item.stageName }}</td> |
|
|
|
<td>{{ item.stageName || form.name }}</td> |
|
|
|
<template v-if="form.completeCompetitionSetup.competitionType"> |
|
|
|
<template v-if="form.completeCompetitionSetup.competitionType"> |
|
|
|
<td>{{ item.teamNumLimit || '不限制' }}</td> |
|
|
|
<td>{{ item.teamNumLimit || '不限制' }}</td> |
|
|
|
<td> |
|
|
|
<td> |
|
|
|
@ -315,6 +318,17 @@ |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog title="报名" :visible.sync="peopleSignupVisible" :close-on-click-modal="false" width="300px"> |
|
|
|
|
|
|
|
<el-form class="dia-form"> |
|
|
|
|
|
|
|
<el-form-item> |
|
|
|
|
|
|
|
<el-input placeholder="请输入4位数大赛邀请码" maxlength="4" v-model="peopleSignupForm.registrationInvitationCode"></el-input> |
|
|
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
</el-form> |
|
|
|
|
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
|
|
|
|
<el-button size="small" type="primary" @click="peopleSignupSubmit">报名</el-button> |
|
|
|
|
|
|
|
<el-button size="small" @click="peopleSignupVisible = false">取消</el-button> |
|
|
|
|
|
|
|
</span> |
|
|
|
|
|
|
|
</el-dialog> |
|
|
|
<el-dialog title="报名" :visible.sync="enterVisible" :close-on-click-modal="false" width="300px" @close="enterClose"> |
|
|
|
<el-dialog title="报名" :visible.sync="enterVisible" :close-on-click-modal="false" width="300px" @close="enterClose"> |
|
|
|
<el-form class="dia-form"> |
|
|
|
<el-form class="dia-form"> |
|
|
|
<p style="margin-bottom: 5px">请选择要加入的团队</p> |
|
|
|
<p style="margin-bottom: 5px">请选择要加入的团队</p> |
|
|
|
@ -517,7 +531,11 @@ export default { |
|
|
|
checkedMembers: [], |
|
|
|
checkedMembers: [], |
|
|
|
chooses: [], |
|
|
|
chooses: [], |
|
|
|
lastType: 1, |
|
|
|
lastType: 1, |
|
|
|
playingStages: [] |
|
|
|
playingStages: [], |
|
|
|
|
|
|
|
peopleSignupVisible: false, |
|
|
|
|
|
|
|
peopleSignupForm: { |
|
|
|
|
|
|
|
registrationInvitationCode: '' |
|
|
|
|
|
|
|
}, |
|
|
|
}; |
|
|
|
}; |
|
|
|
}, |
|
|
|
}, |
|
|
|
computed: { |
|
|
|
computed: { |
|
|
|
@ -623,7 +641,7 @@ export default { |
|
|
|
const stages = form.competitionStage |
|
|
|
const stages = form.competitionStage |
|
|
|
if (stages) { |
|
|
|
if (stages) { |
|
|
|
this.playingStages = [] |
|
|
|
this.playingStages = [] |
|
|
|
stages.forEach(e => { |
|
|
|
form.competitionRegistration && stages.forEach(e => { |
|
|
|
if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && e.method !== 2) this.playingStages.push(e) |
|
|
|
if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && e.method !== 2) this.playingStages.push(e) |
|
|
|
}) |
|
|
|
}) |
|
|
|
let endText = '' |
|
|
|
let endText = '' |
|
|
|
@ -689,7 +707,7 @@ export default { |
|
|
|
this.$post(`${this.api.entryInformation}?competitionId=${this.id}`).then(res => { |
|
|
|
this.$post(`${this.api.entryInformation}?competitionId=${this.id}`).then(res => { |
|
|
|
const info = res.entryInformation |
|
|
|
const info = res.entryInformation |
|
|
|
// 如果是队长，并且没有指导老师，默认添加一个空的 |
|
|
|
// 如果是队长，并且没有指导老师，默认添加一个空的 |
|
|
|
if (!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(JSON.parse(JSON.stringify(this.originIns))) |
|
|
|
if (info.personalDetail) { |
|
|
|
if (info.personalDetail) { |
|
|
|
info.team = {} |
|
|
|
info.team = {} |
|
|
|
info.teamDetail = [] |
|
|
|
info.teamDetail = [] |
|
|
|
@ -717,18 +735,22 @@ export default { |
|
|
|
}) |
|
|
|
}) |
|
|
|
// 设置定时器，阶段比赛结束后公布成绩，到时间后调本接口 |
|
|
|
// 设置定时器，阶段比赛结束后公布成绩，到时间后调本接口 |
|
|
|
const now = Date.now() |
|
|
|
const now = Date.now() |
|
|
|
this.form.competitionStage.map(e => { |
|
|
|
this.form.competitionStage && this.form.competitionStage.map(e => { |
|
|
|
// 如果公布成绩详情勾选的是 |
|
|
|
// 如果公布成绩详情勾选的是 |
|
|
|
if (!e.resultsDetails) { |
|
|
|
if (!e.resultsDetails) { |
|
|
|
|
|
|
|
console.log(44, endTime - now < 86400000) |
|
|
|
|
|
|
|
|
|
|
|
const endTime = new Date(e.endTime).getTime() + e.resultAnnouncementTime * 3600000 // 阶段结束时间+成绩公布时间（成绩公布时间单位是小时，所以要转化为毫秒） |
|
|
|
const endTime = new Date(e.endTime).getTime() + e.resultAnnouncementTime * 3600000 // 阶段结束时间+成绩公布时间（成绩公布时间单位是小时，所以要转化为毫秒） |
|
|
|
if (now > endTime) { // 如果到了公布时间 |
|
|
|
if (now > endTime) { // 如果到了公布时间 |
|
|
|
info.stages.find(n => n.stageId == e.stageId).showDetail = 1 |
|
|
|
info.stages.find(n => n.stageId == e.stageId).showDetail = 1 |
|
|
|
} else { // 没有到公布时间，则加定时器，到点后调用 |
|
|
|
} else if (endTime - now < 86400000) { // 没有到公布时间，则加定时器，到点后调用 |
|
|
|
this.timerList.push(setTimeout(this.getInfo, endTime - now)) |
|
|
|
this.timerList.push(setTimeout(this.getInfo, endTime - now)) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
this.info = info |
|
|
|
this.info = info |
|
|
|
|
|
|
|
console.log("🚀 ~ file: index.vue:752 ~ this.$post ~ info", info) |
|
|
|
|
|
|
|
|
|
|
|
}).catch(err => {}); |
|
|
|
}).catch(err => {}); |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 编辑保存 |
|
|
|
// 编辑保存 |
|
|
|
@ -1037,7 +1059,18 @@ export default { |
|
|
|
this.$router.push(`/record/show?reportId=${row.reportId}`) |
|
|
|
this.$router.push(`/record/show?reportId=${row.reportId}`) |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 报名提交 |
|
|
|
// 个人报名提交 |
|
|
|
|
|
|
|
peopleSignupSubmit() { |
|
|
|
|
|
|
|
this.$post(this.api.addCompetitionRegistration, { |
|
|
|
|
|
|
|
competitionId: this.id, |
|
|
|
|
|
|
|
registrationInvitationCode: this.peopleSignupForm.registrationInvitationCode |
|
|
|
|
|
|
|
}).then(res => { |
|
|
|
|
|
|
|
this.peopleSignupVisible = false |
|
|
|
|
|
|
|
this.getData() |
|
|
|
|
|
|
|
this.$message.success('报名成功') |
|
|
|
|
|
|
|
}).catch(res => {}) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
// 团队报名提交 |
|
|
|
enterSubmit() { |
|
|
|
enterSubmit() { |
|
|
|
const form = this.enterForm |
|
|
|
const form = this.enterForm |
|
|
|
if (!form.teamId) return util.errorMsg('请选择团队') |
|
|
|
if (!form.teamId) return util.errorMsg('请选择团队') |
|
|
|
@ -1127,7 +1160,8 @@ export default { |
|
|
|
if (util.local.get(Setting.tokenKey)) { |
|
|
|
if (util.local.get(Setting.tokenKey)) { |
|
|
|
const { competitionType } = form.completeCompetitionSetup |
|
|
|
const { competitionType } = form.completeCompetitionSetup |
|
|
|
if (status == 4) { // 进入比赛 |
|
|
|
if (status == 4) { // 进入比赛 |
|
|
|
if (this.curStage && this.curStage.count) return // 参加过比赛不让参加 |
|
|
|
// 参加过比赛不让参加 |
|
|
|
|
|
|
|
if (this.curStage && this.curStage.count) return util.errorMsg('您已经参加过该阶段竞赛！') |
|
|
|
if (form.competitionRegistration.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛 |
|
|
|
if (form.competitionRegistration.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛 |
|
|
|
// 团队赛，则判断是否为参赛人员 |
|
|
|
// 团队赛，则判断是否为参赛人员 |
|
|
|
if (competitionType) { |
|
|
|
if (competitionType) { |
|
|
|
@ -1146,12 +1180,17 @@ export default { |
|
|
|
if (competitionType) { |
|
|
|
if (competitionType) { |
|
|
|
this.enterVisible = true |
|
|
|
this.enterVisible = true |
|
|
|
} else { // 个人赛报名 |
|
|
|
} else { // 个人赛报名 |
|
|
|
this.$post(this.api.addCompetitionRegistration, { |
|
|
|
if (form.completeCompetitionSetup.isNeedCode) { |
|
|
|
competitionId: this.id |
|
|
|
this.peopleSignupForm.registrationInvitationCode = '' |
|
|
|
}).then(res => { |
|
|
|
this.peopleSignupVisible = true |
|
|
|
this.getData() |
|
|
|
} else { |
|
|
|
this.$message.success('报名成功') |
|
|
|
this.$post(this.api.addCompetitionRegistration, { |
|
|
|
}).catch(res => {}) |
|
|
|
competitionId: this.id |
|
|
|
|
|
|
|
}).then(res => { |
|
|
|
|
|
|
|
this.getData() |
|
|
|
|
|
|
|
this.$message.success('报名成功') |
|
|
|
|
|
|
|
}).catch(res => {}) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} else if (status == 1) { |
|
|
|
} else if (status == 1) { |
|
|
|
// 已报名，点击取消报名 |
|
|
|
// 已报名，点击取消报名 |
|
|
|
|
