+
+
+
+
+
+
+
diff --git a/src/views/martial/schedule/index.vue b/src/views/martial/schedule/index.vue
index 1accdb9..814bbd9 100644
--- a/src/views/martial/schedule/index.vue
+++ b/src/views/martial/schedule/index.vue
@@ -71,71 +71,176 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+ {{ scope.row.gender === 1 ? '男' : '女' }}
+
+
+
+
+
+
+
+ 查看
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加选手
+
+
+
+ 参赛选手管理
+
+
+
+
+
+
+
+
+
+ 返回列表
+
+
+
+ {{ pageTitle }}
+
+ 取消
+
+ {{ currentView === 'create' ? '创建' : '保存' }}
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+ 男
+ 女
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 赛事信息
+
+
+
+
+
+
+
+
+
+
+ 其他信息
+
+
+
-
-
- {{ group.title }}
-
-
-
+
+
+
+
+
-
-
-
- {{ scope.row.status || '未签到' }}
-
-
-
-
-
-
+
+
+
+ {{ groupIndex + 1 }}、
+ {{ group.title }}
+
+
+
+
-
-
- 移动
-
+
-
+
+
+
+ 移动
+
+
+
+
+
+ 移动
+
+ 移动到
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ teamIndex + 1 }}、
+ {{ team.schoolUnit }}
+
+
+
+
+
+ {{ player.playerName }}
+
+
+
+
+
+
+ 
+
+
+ 
+
+
+
+
+
+
+
-
-
-
-
-
-
- 异常
-
-
-
-
+ {{ playerIndex + 1 }}
+ {{ player.playerName }}
+
+
+ {{ player.status || '未签到' }}
+
+
+
+
+ 标记异常
+
+
+ 取消异常
+
+
+
+
-
-
-
+
+
+
+
diff --git a/src/views/martial/score/index.vue b/src/views/martial/score/index.vue
index 253721c..b49a9e2 100644
--- a/src/views/martial/score/index.vue
+++ b/src/views/martial/score/index.vue
@@ -154,6 +154,11 @@
@@ -182,96 +187,6 @@ export default {
projectOptions: [],
venueOptions: [],
scoreList: [],
- allTableData: [
- {
- id: 1,
- projectName: '男子组陈氏太极拳',
- venueName: '第一场地',
- playerName: '张三',
- teamName: '少林寺武术大学院',
- idCard: '123456789000000000',
- playerNo: '123-4567898275',
- judgeScores: [8.906, 8.905, 8.908, 8.907, 8.906],
- totalScore: 8.907
- },
- {
- id: 2,
- projectName: '女子组长拳',
- venueName: '第一场地',
- playerName: '李四',
- teamName: '武当武术学院',
- idCard: '123456789000000001',
- playerNo: '123-4567898276',
- judgeScores: [9.125, 9.130, 9.128, 9.126, 9.129],
- totalScore: 9.128
- },
- {
- id: 3,
- projectName: '男子组陈氏太极拳',
- venueName: '第二场地',
- playerName: '王五',
- teamName: '峨眉武术协会',
- idCard: '123456789000000002',
- playerNo: '123-4567898277',
- judgeScores: [8.550, 8.548, 8.552, 8.551, 8.549],
- totalScore: 8.550
- },
- {
- id: 4,
- projectName: '女子组双剑（含长穗双剑）',
- venueName: '第一场地',
- playerName: '赵六',
- teamName: '昆仑武术馆',
- idCard: '123456789000000003',
- playerNo: '123-4567898278',
- judgeScores: [9.245, 9.248, 9.246, 9.247, 9.249],
- totalScore: 9.247
- },
- {
- id: 5,
- projectName: '男子组杨氏太极拳',
- venueName: '第三场地',
- playerName: '孙七',
- teamName: '华山武术学校',
- idCard: '123456789000000004',
- playerNo: '123-4567898279',
- judgeScores: [8.785, 8.788, 8.786, 8.787, 8.785],
- totalScore: 8.786
- },
- {
- id: 6,
- projectName: '女子组刀术',
- venueName: '第二场地',
- playerName: '周八',
- teamName: '少林寺武术大学院',
- idCard: '123456789000000005',
- playerNo: '123-4567898280',
- judgeScores: [8.925, 8.928, 8.926, 8.927, 8.925],
- totalScore: 8.926
- },
- {
- id: 7,
- projectName: '男子组棍术',
- venueName: '第四场地',
- playerName: '吴九',
- teamName: '武当武术学院',
- idCard: '123456789000000006',
- playerNo: '123-4567898281',
- judgeScores: [9.015, 9.018, 9.016, 9.017, 9.015],
- totalScore: 9.016
- },
- {
- id: 8,
- projectName: '女子组枪术',
- venueName: '第三场地',
- playerName: '郑十',
- teamName: '峨眉武术协会',
- idCard: '123456789000000007',
- playerNo: '123-4567898282',
- judgeScores: [8.665, 8.668, 8.666, 8.667, 8.665],
- totalScore: 8.666
- }
- ],
tableData: [],
pagination: {
current: 1,
@@ -345,25 +260,22 @@ export default {
try {
const res = await getScoreList(this.pagination.current, this.pagination.size, params)
console.log('评分列表返回数据:', res)
- console.log('===== 调试：后端返回的数据结构 =====')
+
const responseData = res.data?.data
- if (responseData && responseData.records && responseData.records.length > 0) {
- console.log('第一条评分记录:', responseData.records[0])
- console.log('记录字段:', Object.keys(responseData.records[0]))
- console.log('是否包含 projectName:', 'projectName' in responseData.records[0])
- console.log('是否包含 venueName:', 'venueName' in responseData.records[0])
- console.log('是否包含 playerName:', 'playerName' in responseData.records[0])
- console.log('projectId 值:', responseData.records[0].projectId)
- console.log('venueId 值:', responseData.records[0].venueId)
- console.log('athleteId 值:', responseData.records[0].athleteId)
- }
- console.log('======================================')
-
if (responseData && responseData.records) {
- this.scoreList = responseData.records
+ // 过滤掉 projectId 为 null 的无效记录
+ const validScores = responseData.records.filter(score => {
+ if (!score.projectId) {
+ console.warn('发现无效评分记录（projectId为空）:', score)
+ return false
+ }
+ return true
+ })
+
+ this.scoreList = validScores
// 补充关联数据（项目名称、场地名称、选手名称）
- await this.enrichScoreData(responseData.records)
+ await this.enrichScoreData(validScores)
// 按选手分组评分数据
this.processScoreData(this.scoreList)
@@ -466,6 +378,12 @@ export default {
const athleteMap = new Map()
scores.forEach(score => {
+ // 确保 projectId 存在
+ if (!score.projectId) {
+ console.warn('跳过无效评分记录:', score)
+ return
+ }
+
const key = `${score.athleteId}-${score.projectId}`
if (!athleteMap.has(key)) {
athleteMap.set(key, {
@@ -495,11 +413,10 @@ export default {
})
})
- // 计算总分（平均分）
+ // 计算总分（去掉最高最低分后的平均分）
this.tableData = Array.from(athleteMap.values()).map(athlete => {
if (athlete.judgeScores.length > 0) {
- const sum = athlete.judgeScores.reduce((a, b) => a + b, 0)
- athlete.totalScore = sum / athlete.judgeScores.length
+ athlete.totalScore = this.calculateFinalScore(athlete.judgeScores)
}
return athlete
})
@@ -516,6 +433,34 @@ export default {
this.judgeColumns = Array(maxJudges).fill(null)
},
+ /**
+ * 计算最终得分
+ * 规则：
+ * - 如果裁判数 <= 2，直接取平均值
+ * - 如果裁判数 > 2，去掉最高分和最低分后取平均值
+ */
+ calculateFinalScore(scores) {
+ if (!scores || scores.length === 0) {
+ return 0
+ }
+
+ // 如果只有1-2个裁判，直接取平均值
+ if (scores.length <= 2) {
+ const sum = scores.reduce((a, b) => a + b, 0)
+ return sum / scores.length
+ }
+
+ // 3个及以上裁判，去掉最高分和最低分
+ const sortedScores = [...scores].sort((a, b) => a - b)
+
+ // 去掉第一个（最低分）和最后一个（最高分）
+ const validScores = sortedScores.slice(1, -1)
+
+ // 计算平均值
+ const sum = validScores.reduce((a, b) => a + b, 0)
+ return sum / validScores.length
+ },
+
// 查询
handleSearch() {
this.pagination.current = 1
@@ -663,6 +608,12 @@ export default {
font-weight: 700;
color: #1b7c5e;
}
+
+ .calculation-note {
+ margin-top: 8px;
+ font-size: 12px;
+ color: #999;
+ }
}
}
}
+
+
+
总分：
{{ formatScore(currentDetail.totalScore) }}
+
+
+ (去掉最高分和最低分后的平均分)
+
+