huoran
/
FE_occupationlab_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

大赛成绩公布时间、链接跳转

Browse Source
alioss
yujialong 2 years ago
parent dbf89c8a9b
commit 1e2df95021
4 changed files with 70 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/pages/account/login/index.vue
  2. 37
      src/pages/match/details/index.vue
  3. 12
      src/pages/match/list/index.vue
  4. 2
      src/pages/station/preview/index.vue

4
src/pages/account/login/index.vue
Unescape View File

@ -587,11 +587,13 @@ export default {
this.queryClient(data.token) this.queryClient(data.token)
} }
} else { } else {
form.code = ''
util.errorMsg(message) util.errorMsg(message)
} }
}).catch(res => { }).catch(res => {
this.getVerImg()
form.code = '' form.code = ''
console.log("🚀 ~ file: index.vue:594 ~ this.$post ~ form:", form)
this.getVerImg()
}) })
} }
}); });

37
src/pages/match/details/index.vue
Unescape View File

@ -94,7 +94,7 @@
<p>团队参赛人数限制：{{ rule.teamNumLimit || '不限制' }}</p> <p>团队参赛人数限制：{{ rule.teamNumLimit || '不限制' }}</p>
<p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p> <p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p>
</template> </template>
<p>阶段比赛结束后{{ rule.resultAnnouncementTime }}小时，公布阶段比赛成绩。</p> <p v-if="rule.resultAnnouncementTime != 0">阶段比赛结束后{{ rule.resultAnnouncementTime }}小时，公布阶段比赛成绩。</p>
<div v-if="form.rule === 1" <div v-if="form.rule === 1"
class="flex"> class="flex">
<p>晋级规则：</p> <p>晋级规则：</p>
@ -367,13 +367,14 @@
@click="selectPar(item)"></i> @click="selectPar(item)"></i>
</td> </td>
</template> </template>
<!-- 积分赛才需要显示总分这个字段，直接第一行合并表格（填了成绩公布时间才显示分数，不然为空） -->
<td v-if="form.rule === 0 && !i" <td v-if="form.rule === 0 && !i"
:rowspan="info.stages.length">{{ info.totalScore || 0 }}</td> :rowspan="info.stages.length">{{ item.resultAnnouncementTime ? info.totalScore || 0 : '' }}</td>
<td> <td>
<span v-if="item.score >= 0" <span v-if="item.score >= 0 && item.resultAnnouncementTime"
class="m-r-10">分数{{item.score}}</span> class="m-r-10">分数{{item.score}}</span>
<el-button type="text" <el-button v-if="item.showDetail && item.resultAnnouncementTime && item.resultsDetails === 0 && item.reportId"
:disabled="item.showDetail && item.resultsDetails === 1 || (form.completeCompetitionSetup.competitionType && !item.reportId) || (form.completeCompetitionSetup.competitionType === 0 && !item.reportId)" type="text"
@click="show(item)">查看成绩详情</el-button> @click="show(item)">查看成绩详情</el-button>
</td> </td>
</tr> </tr>
@ -839,7 +840,7 @@ export default {
if (stages) { if (stages) {
this.playingStages = [] this.playingStages = []
form.competitionRegistration && 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.isLink(e))) this.playingStages.push(e)
}) })
let endText = '' let endText = ''
for (const i in stages) { for (const i in stages) {
@ -850,7 +851,8 @@ export default {
endText = '阶段开始' endText = '阶段开始'
total = startTime - now total = startTime - now
break break
} else if (now >= startTime && now <= endTime && e.method !== 2) { // 阶段比赛进行中，显示进入比赛按钮 } else if (now >= startTime && now <= endTime && (e.method !== 2 || this.isLink(e))) { // 阶段比赛进行中，显示进入比赛按钮
if (e.method !== 2) {
if (form.competitionRegistration) { // 报名了才能进入比赛 if (form.competitionRegistration) { // 报名了才能进入比赛
this.statusList[4] = e.count ? '已提交' : '进入' + e.stageName this.statusList[4] = e.count ? '已提交' : '进入' + e.stageName
curStage = e curStage = e
@ -858,6 +860,10 @@ export default {
this.statusList[4] = '进入' + e.stageName this.statusList[4] = '进入' + e.stageName
curStage = e curStage = e
} }
} else {
this.statusList[4] = '进入' + e.stageName
curStage = e
}
endText = '阶段结束' endText = '阶段结束'
total = endTime - now total = endTime - now
break break
@ -899,6 +905,10 @@ export default {
} }
}, 1000) }, 1000)
}, },
isLink (stage) {
console.log("🚀 ~ file: index.vue:904 ~ isLink ~ stage:", stage)
return stage.method === 2 && /[a-zA-Z\d]+\.[a-zA-Z]+/.test(stage.offlineAddress)
},
// 获取竞赛信息 // 获取竞赛信息
getInfo () { getInfo () {
this.$post(`${this.api.entryInformation}?competitionId=${this.id}`).then(res => { this.$post(`${this.api.entryInformation}?competitionId=${this.id}`).then(res => {
@ -935,8 +945,6 @@ export default {
this.form.competitionStage && 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
@ -946,8 +954,6 @@ export default {
} }
}) })
this.info = info this.info = info
console.log("🚀 ~ file: index.vue:752 ~ this.$post ~ info", info)
}).catch(err => { }); }).catch(err => { });
}, },
// 编辑保存 // 编辑保存
@ -1370,6 +1376,10 @@ 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.method == 2) {
window.open(this.curStage.offlineAddress)
} else {
// 参加过比赛不让参加 // 参加过比赛不让参加
if (this.curStage && this.curStage.count) return util.errorMsg('您已经参加过该阶段竞赛！') 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('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛
@ -1385,6 +1395,7 @@ export default {
} else { } else {
this.getAllow() this.getAllow()
} }
}
} else if (status == 2) { // 报名 } else if (status == 2) { // 报名
// 团队赛报名 // 团队赛报名
if (competitionType) { if (competitionType) {
@ -1422,6 +1433,10 @@ export default {
}).catch(() => { }) }).catch(() => { })
} }
}, },
// 线下比赛方式点击进入跳转<比赛地点>
toOffline () {
window.open(this.curStage.offlineAddress)
},
// 进入python系统 // 进入python系统
toPython () { toPython () {
const form = this.curStage const form = this.curStage

12
src/pages/match/list/index.vue
Unescape View File

@ -494,7 +494,7 @@ export default {
item.playingStages = [] item.playingStages = []
// 报了名才算作可以进入的阶段 // 报了名才算作可以进入的阶段
item.whetherToSignUp === 0 && stages.forEach(e => { item.whetherToSignUp === 0 && stages.forEach(e => {
if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && e.method !== 2) item.playingStages.push(e) if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && (e.method !== 2 || this.isLink(e))) item.playingStages.push(e)
}) })
for (const i in stages) { for (const i in stages) {
const e = stages[i] const e = stages[i]
@ -506,7 +506,7 @@ export default {
total = startTime - now total = startTime - now
break break
} else if (now >= startTime && now <= endTime) { // 阶段比赛进行中，显示进入比赛按钮 } else if (now >= startTime && now <= endTime) { // 阶段比赛进行中，显示进入比赛按钮
if (item.whetherToSignUp === 0 && e.method !== 2) this.$set(item, 'stageName', e.count ? '已提交' : '进入' + e.stageName) // 报名了并且没参加比赛才能进入比赛 if (item.whetherToSignUp === 0 && (e.method !== 2 || this.isLink(e))) this.$set(item, 'stageName', (!this.isLink(e) && e.count) ? '已提交' : '进入' + e.stageName) // 报名了并且没参加比赛才能进入比赛
this.$set(item, 'endText', '阶段结束') this.$set(item, 'endText', '阶段结束')
curStage = e curStage = e
total = endTime - now total = endTime - now
@ -553,6 +553,9 @@ export default {
} }
}) })
}, },
isLink (stage) {
return stage.method === 2 && /[a-zA-Z\d]+\.[a-zA-Z]+/.test(stage.offlineAddress)
},
// 清除定时器 // 清除定时器
clearTimer () { clearTimer () {
this.timerList.forEach(n => { this.timerList.forEach(n => {
@ -706,6 +709,10 @@ export default {
if (util.local.get(Setting.tokenKey)) { if (util.local.get(Setting.tokenKey)) {
this.curItem = item this.curItem = item
if (status == 4) { // 进入比赛 if (status == 4) { // 进入比赛
// 线下
if (item.curStage.method == 2) {
window.open(item.curStage.offlineAddress)
} else {
// 参加过比赛不让参加 // 参加过比赛不让参加
if (item.curStage.count) return util.errorMsg('您已经参加过该阶段竞赛！') if (item.curStage.count) return util.errorMsg('您已经参加过该阶段竞赛！')
if (item.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛 if (item.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛
@ -721,6 +728,7 @@ export default {
} else { } else {
this.getAllow(item) this.getAllow(item)
} }
}
} else if (status == 2) { // 报名 } else if (status == 2) { // 报名
// 团队赛报名 // 团队赛报名
if (competitionType) { if (competitionType) {

2
src/pages/station/preview/index.vue
Unescape View File

@ -605,7 +605,7 @@ export default {
}, },
// 获取最高分列表 // 获取最高分列表
async getMaximumScore () { async getMaximumScore () {
let { message } = await this.$post(`${this.api.maximumPracticeScoreList}?projectId=${this.archProject}&pageNum=1&pageSize=1000`); let { message } = await this.$post(`${this.api.maximumPracticeScoreList}?projectId=${this.archProject}&pageNum=1&pageSize=1000&mallId=${this.mallId}&cid=${this.courseId}`);
const list = message.records const list = message.records
list.forEach(e => { list.forEach(e => {
if (!e.userAvatars) e.userAvatars = 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png' if (!e.userAvatars) e.userAvatars = 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'

Write Preview
Loading…
Cancel
Save