|
|
|
@ -69,23 +69,36 @@ |
|
|
|
<th width="100">分数</th> |
|
|
|
<th width="100">分数</th> |
|
|
|
<th width="100">得分详情</th> |
|
|
|
<th width="100">得分详情</th> |
|
|
|
</tr> |
|
|
|
</tr> |
|
|
|
<tr v-for="(item, i) in teams" :key="i"> |
|
|
|
<template v-if="teams.length"> |
|
|
|
<template v-if="!active && item.rowspan"> |
|
|
|
<tr v-for="(item, i) in teams" :key="i"> |
|
|
|
<td :rowspan="item.rowspan">{{ item.stageName }}</td> |
|
|
|
<template v-if="!active && item.rowspan"> |
|
|
|
<td :rowspan="item.rowspan">{{ item.teamScore }}</td> |
|
|
|
<td :rowspan="item.rowspan">{{ item.stageName }}</td> |
|
|
|
</template> |
|
|
|
<td class="scores" :rowspan="item.rowspan"> |
|
|
|
<td>{{ i + 1 }}</td> |
|
|
|
<p class="score">{{ item.teamScore }}</p> |
|
|
|
<td>{{ item.userName }}</td> |
|
|
|
<p>{{ item.teamCalculationMethodName }}</p> |
|
|
|
<td>{{ item.schoolName }}</td> |
|
|
|
<p>权重：</p> |
|
|
|
<td>{{ item.timeSum }}min</td> |
|
|
|
<p>{{ item.pointWeight }}%</p> |
|
|
|
<td>{{ item.score }}</td> |
|
|
|
</td> |
|
|
|
<td> |
|
|
|
</template> |
|
|
|
<el-button type="text" @click="toReport(item)">查看</el-button> |
|
|
|
<template v-if="item.accountId"> |
|
|
|
</td> |
|
|
|
<td>{{ i + 1 }}</td> |
|
|
|
|
|
|
|
<td>{{ item.userName }}</td> |
|
|
|
|
|
|
|
<td>{{ item.schoolName }}</td> |
|
|
|
|
|
|
|
<td>{{ item.timeSum }}min</td> |
|
|
|
|
|
|
|
<td>{{ item.score }}</td> |
|
|
|
|
|
|
|
<td> |
|
|
|
|
|
|
|
<el-button v-if="item.reportId" type="text" @click="toReport(item)">查看</el-button> |
|
|
|
|
|
|
|
</td> |
|
|
|
|
|
|
|
</template> |
|
|
|
|
|
|
|
<td v-else colspan="6"></td> |
|
|
|
|
|
|
|
</tr> |
|
|
|
|
|
|
|
</template> |
|
|
|
|
|
|
|
<tr v-else> |
|
|
|
|
|
|
|
<td colspan="99">暂无数据</td> |
|
|
|
</tr> |
|
|
|
</tr> |
|
|
|
<tr v-if="!active"> |
|
|
|
<tr v-if="!active && teams.length"> |
|
|
|
<td>综合得分</td> |
|
|
|
<td>综合得分</td> |
|
|
|
<td>{{ totalScore }}</td> |
|
|
|
<td>{{ curRow.score }}</td> |
|
|
|
<td colspan="6">总排名：第{{ curRow.index }}名</td> |
|
|
|
<td colspan="6">总排名：第{{ curRow.index }}名</td> |
|
|
|
</tr> |
|
|
|
</tr> |
|
|
|
</table> |
|
|
|
</table> |
|
|
|
@ -144,6 +157,20 @@ export default { |
|
|
|
method: this.$route.query.method, |
|
|
|
method: this.$route.query.method, |
|
|
|
competitionType: +this.$route.query.competitionType, |
|
|
|
competitionType: +this.$route.query.competitionType, |
|
|
|
rule: +this.$route.query.rule, |
|
|
|
rule: +this.$route.query.rule, |
|
|
|
|
|
|
|
teamCalculationMethods: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
id: 0, |
|
|
|
|
|
|
|
name: '最高分' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
id: 1, |
|
|
|
|
|
|
|
name: '平均分' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
id: 2, |
|
|
|
|
|
|
|
name: '求和' |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
], |
|
|
|
headers: { |
|
|
|
headers: { |
|
|
|
token: util.local.get(Setting.tokenKey) |
|
|
|
token: util.local.get(Setting.tokenKey) |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -177,9 +204,11 @@ export default { |
|
|
|
// 获排名 |
|
|
|
// 获排名 |
|
|
|
getData() { |
|
|
|
getData() { |
|
|
|
// 查询是否已经发布排名 |
|
|
|
// 查询是否已经发布排名 |
|
|
|
this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || ''}&isOverallRanking=${this.active ? 0 : 1}`).then(({ whetherToPublish }) => { |
|
|
|
this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}`).then(({ whetherToPublish }) => { |
|
|
|
|
|
|
|
const ids = this.grades.map(e => e.stageId) |
|
|
|
|
|
|
|
ids.pop() |
|
|
|
// 如果已发布，查询发布上一次排名的来源——>默认顺序或者手动发布(返回数据:是否手动发布(1为是,0不是)) |
|
|
|
// 如果已发布，查询发布上一次排名的来源——>默认顺序或者手动发布(返回数据:是否手动发布(1为是,0不是)) |
|
|
|
whetherToPublish && this.$post(`${this.api.queryPublicationSource}?competitionId=${this.id}&stageId=${this.active || ''}&isOverallRanking=${this.active ? 0 : 1}`).then(({ source }) => { |
|
|
|
whetherToPublish && this.$post(`${this.api.queryPublicationSource}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}`).then(({ source }) => { |
|
|
|
this.sourceType = source |
|
|
|
this.sourceType = source |
|
|
|
this.type = source == 1 ? 1 : 0 |
|
|
|
this.type = source == 1 ? 1 : 0 |
|
|
|
}).catch(res => {}) |
|
|
|
}).catch(res => {}) |
|
|
|
@ -191,7 +220,6 @@ export default { |
|
|
|
getRank(whetherToPublish) { |
|
|
|
getRank(whetherToPublish) { |
|
|
|
// 已发布，则调已发布的排名接口 |
|
|
|
// 已发布，则调已发布的排名接口 |
|
|
|
if (whetherToPublish) { |
|
|
|
if (whetherToPublish) { |
|
|
|
console.log(44, this.active) |
|
|
|
|
|
|
|
this.$post(this.api.manuallyRankTheUploadList, { |
|
|
|
this.$post(this.api.manuallyRankTheUploadList, { |
|
|
|
pageNum: this.page, |
|
|
|
pageNum: this.page, |
|
|
|
pageSize: this.pageSize, |
|
|
|
pageSize: this.pageSize, |
|
|
|
@ -250,11 +278,13 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
// tab回调 |
|
|
|
// tab回调 |
|
|
|
tabChange(i) { |
|
|
|
tabChange(i) { |
|
|
|
|
|
|
|
this.type = 0 |
|
|
|
this.active = i |
|
|
|
this.active = i |
|
|
|
this.initData() |
|
|
|
this.initData() |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 查看详情 |
|
|
|
// 查看详情 |
|
|
|
show(row, i) { |
|
|
|
show(row, i) { |
|
|
|
|
|
|
|
this.teams = [] |
|
|
|
// 个人：跳转实验报告，团队：弹框显示成员列表 |
|
|
|
// 个人：跳转实验报告，团队：弹框显示成员列表 |
|
|
|
if (this.competitionType == 1) { |
|
|
|
if (this.competitionType == 1) { |
|
|
|
row.index = i + 1 |
|
|
|
row.index = i + 1 |
|
|
|
@ -275,46 +305,57 @@ export default { |
|
|
|
}).catch(res => {}) |
|
|
|
}).catch(res => {}) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
const ids = this.grades.map(e => e.stageId) |
|
|
|
const ids = this.grades.map(e => e.stageId) |
|
|
|
data.stageIds = ids.splice(0, ids.length - 1) |
|
|
|
ids.pop() |
|
|
|
this.$post(this.api.detailsOfTotalTeamScores, data).then(({ data, resultCalculationMethod }) => { |
|
|
|
data.stageIds = ids.splice(0, this.index + 1) |
|
|
|
const result = [] |
|
|
|
// 发布跟没发布调不同的接口 |
|
|
|
let totalScore = 0 |
|
|
|
// if (this.published) { |
|
|
|
// 合并数据 |
|
|
|
this.$post(this.api.totalRankingScoreDetails, data).then(({ data }) => { |
|
|
|
data.map(e => { |
|
|
|
if (data.length) { |
|
|
|
const team = e.stageTeamInformation |
|
|
|
const result = [] |
|
|
|
if (team.length) { |
|
|
|
// 合并数据 |
|
|
|
// 第一条才赋值团队得分和合并行数 |
|
|
|
data.map(e => { |
|
|
|
const method = e.teamCalculationMethod |
|
|
|
const team = e.stageTeamInformation |
|
|
|
const scores = team.map(n => +n.score) |
|
|
|
if (team.length) { |
|
|
|
let score |
|
|
|
const teamCItem = this.teamCalculationMethods.find(n => n.id == e.teamCalculationMethod) |
|
|
|
// 根据团队规则计算方式计算团队得分 |
|
|
|
if (teamCItem) team[0].teamCalculationMethodName = teamCItem.name |
|
|
|
if (method == 0) { // 最高分 |
|
|
|
team[0].rowspan = team.length |
|
|
|
score = Math.max(scores) |
|
|
|
team.map(n => { |
|
|
|
} else if (method == 1) { // 平均分 |
|
|
|
n = Object.assign(n, e) |
|
|
|
score = scores.reduce((prev, next) => prev + next) / scores.length |
|
|
|
}) |
|
|
|
} else { // 求和 |
|
|
|
result.push(...team) |
|
|
|
score = scores.reduce((prev, next) => prev + next) |
|
|
|
} else { |
|
|
|
} |
|
|
|
e.rowspan = 1 |
|
|
|
team[0].teamScore = score |
|
|
|
result.push(e) |
|
|
|
team[0].rowspan = team.length |
|
|
|
} |
|
|
|
team.map(n => { |
|
|
|
|
|
|
|
n = Object.assign(n, e) |
|
|
|
|
|
|
|
}) |
|
|
|
}) |
|
|
|
// 计算权重（权重为0则不计入总成绩） 团队得分*权重/100 总成绩计算方式选的是加权求和才需要计算 |
|
|
|
this.teams = result |
|
|
|
if (e.pointWeight && !resultCalculationMethod) totalScore += score * e.pointWeight / 100 |
|
|
|
|
|
|
|
result.push(...team) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}).catch(res => {}) |
|
|
|
// 根据总成绩计算方式计算总分 |
|
|
|
// } else { // 没发布 |
|
|
|
const teamScores = data.map(e => e.teamScore) |
|
|
|
// this.$post(this.api.totalRankingScoreDetails, data).then(({ page }) => { |
|
|
|
if (resultCalculationMethod === 1) { // 求和 |
|
|
|
// const list = page.records |
|
|
|
totalScore = teamScores.reduce((prev, next) => prev + next) |
|
|
|
// page.records.map((e, i) => { |
|
|
|
} else if (resultCalculationMethod === 2) { // 平均分 |
|
|
|
// if (!list.find(n => n.stageId == e.stageId && n.rowspan)) { |
|
|
|
totalScore = teamScores.reduce((prev, next) => prev + next) / teamScores.length |
|
|
|
// e.rowspan = list.filter(n => n.stageId == e.stageId).length |
|
|
|
} |
|
|
|
// this.$post(this.api.stageTeamScoreDetails, { |
|
|
|
this.totalScore = totalScore |
|
|
|
// pageNum: 1, |
|
|
|
this.teams = result |
|
|
|
// pageSize: 100, |
|
|
|
}).catch(res => {}) |
|
|
|
// competitionId: this.id, |
|
|
|
|
|
|
|
// teamId: row.teamId, |
|
|
|
|
|
|
|
// stageId: e.stageId |
|
|
|
|
|
|
|
// }).then(({ page }) => { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// }).catch(res => {}) |
|
|
|
|
|
|
|
// } |
|
|
|
|
|
|
|
// }) |
|
|
|
|
|
|
|
// let totalScore = 0 |
|
|
|
|
|
|
|
// this.totalScore = totalScore |
|
|
|
|
|
|
|
// this.teams = list |
|
|
|
|
|
|
|
// console.log("🚀 ~ file: matchRank.vue:346 ~ this.$post ~ list", list) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// }).catch(res => {}) |
|
|
|
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
this.toReport(row) |
|
|
|
this.toReport(row) |
|
|
|
@ -340,14 +381,16 @@ export default { |
|
|
|
list.map(e => { |
|
|
|
list.map(e => { |
|
|
|
e.competitionId = id |
|
|
|
e.competitionId = id |
|
|
|
e.isOverallRanking = isOverall |
|
|
|
e.isOverallRanking = isOverall |
|
|
|
if (isOverall) delete e.stageId |
|
|
|
// if (isOverall) delete e.stageId |
|
|
|
if (isPerson) e.teamId = null // 个人赛则teamId传null |
|
|
|
if (isPerson) e.teamId = null // 个人赛则teamId传null |
|
|
|
}) |
|
|
|
}) |
|
|
|
data = list |
|
|
|
data = list |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
const ids = this.grades.map(e => e.stageId) |
|
|
|
|
|
|
|
ids.pop() |
|
|
|
// 发布前校验 |
|
|
|
// 发布前校验 |
|
|
|
this.$post(`${this.api.releaseVerification}?competitionId=${this.id}&stageId=${this.active || ''}&isOverallRanking=${this.active ? 0 : 1}&whetherToManuallyPublish=${this.type}`).then(res => { |
|
|
|
this.$post(`${this.api.releaseVerification}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&whetherToManuallyPublish=${this.type}`).then(res => { |
|
|
|
this.$post(this.api.publishRanking, data).then(res => { |
|
|
|
this.$post(this.api.publishRanking, data).then(res => { |
|
|
|
this.uploadData = [] |
|
|
|
this.uploadData = [] |
|
|
|
this.getData() |
|
|
|
this.getData() |
|
|
|
@ -391,6 +434,7 @@ export default { |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
this.$post(`${this.api.cancelRanking}?competitionId=${this.id}&isOverallRanking=${this.active ? 0 : 1}&${this.active ? 'stageIds=' + this.active : query.join('&')}`).then(res => { |
|
|
|
this.$post(`${this.api.cancelRanking}?competitionId=${this.id}&isOverallRanking=${this.active ? 0 : 1}&${this.active ? 'stageIds=' + this.active : query.join('&')}`).then(res => { |
|
|
|
this.sourceType = '' |
|
|
|
this.sourceType = '' |
|
|
|
|
|
|
|
this.type = 0 |
|
|
|
this.getData() |
|
|
|
this.getData() |
|
|
|
util.successMsg('取消发布成功！') |
|
|
|
util.successMsg('取消发布成功！') |
|
|
|
}).catch(res => {}) |
|
|
|
}).catch(res => {}) |
|
|
|
@ -473,5 +517,13 @@ export default { |
|
|
|
text-align: center; |
|
|
|
text-align: center; |
|
|
|
background-color: #f8faff; |
|
|
|
background-color: #f8faff; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
.scores { |
|
|
|
|
|
|
|
line-height: 1.6; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
.score { |
|
|
|
|
|
|
|
font-size: 16px; |
|
|
|
|
|
|
|
font-weight: 600; |
|
|
|
|
|
|
|
color: #9076FF; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
</style> |
|
|
|
</style> |
