Compare commits
3 Commits
5349b80cf8
...
devops
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
88a931976d | ||
|
|
96bc2d92a2 | ||
|
|
a9c5c4a904 |
@@ -23,7 +23,10 @@ export function getMyAthletes(params) {
|
|||||||
return request({
|
return request({
|
||||||
url: '/mini/score/athletes',
|
url: '/mini/score/athletes',
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
params: params, // GET 请求使用 params
|
params: {
|
||||||
|
...params,
|
||||||
|
size: 200 // 确保获取所有选手
|
||||||
|
},
|
||||||
showLoading: true
|
showLoading: true
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -36,14 +39,24 @@ export function getMyAthletes(params) {
|
|||||||
* @param {String} params.projectId - 项目ID
|
* @param {String} params.projectId - 项目ID
|
||||||
* @returns {Promise}
|
* @returns {Promise}
|
||||||
*
|
*
|
||||||
* 注意:此接口需要后端实现
|
* 实际调用 /mini/score/athletes 接口,传递 refereeType=1
|
||||||
* 建议路径: GET /api/mini/athletes/admin
|
|
||||||
*/
|
*/
|
||||||
export function getAthletesForAdmin(params) {
|
export function getAthletesForAdmin(params) {
|
||||||
|
// 从 globalData 获取 judgeId
|
||||||
|
const app = getApp()
|
||||||
|
const globalData = app.globalData || {}
|
||||||
|
const judgeId = globalData.judgeId
|
||||||
|
|
||||||
return request({
|
return request({
|
||||||
url: '/mini/athletes/admin',
|
url: '/mini/score/athletes',
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
params: params, // GET 请求使用 params
|
params: {
|
||||||
|
judgeId: judgeId,
|
||||||
|
refereeType: 1, // 裁判长
|
||||||
|
venueId: params.venueId,
|
||||||
|
projectId: params.projectId,
|
||||||
|
size: 200 // 确保获取所有选手
|
||||||
|
},
|
||||||
showLoading: true
|
showLoading: true
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -90,55 +103,3 @@ export default {
|
|||||||
getVenues,
|
getVenues,
|
||||||
getProjects
|
getProjects
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 后端接口规范:
|
|
||||||
*
|
|
||||||
* GET /api/mini/score/athletes
|
|
||||||
*
|
|
||||||
* 请求参数:
|
|
||||||
* {
|
|
||||||
* "judgeId": "456",
|
|
||||||
* "refereeType": 2, // 1-裁判长, 2-普通裁判
|
|
||||||
* "venueId": "1", // 可选
|
|
||||||
* "projectId": "5" // 可选
|
|
||||||
* }
|
|
||||||
*
|
|
||||||
* 响应(普通裁判 - 待评分选手):
|
|
||||||
* {
|
|
||||||
* "code": 200,
|
|
||||||
* "success": true,
|
|
||||||
* "msg": "操作成功",
|
|
||||||
* "data": [
|
|
||||||
* {
|
|
||||||
* "athleteId": 1,
|
|
||||||
* "name": "张三",
|
|
||||||
* "number": "123-4567898275",
|
|
||||||
* "team": "少林寺武术大学院",
|
|
||||||
* "projectName": "女子组长拳",
|
|
||||||
* "orderNum": 1,
|
|
||||||
* "competitionStatus": 0
|
|
||||||
* }
|
|
||||||
* ]
|
|
||||||
* }
|
|
||||||
*
|
|
||||||
* 响应(裁判长 - 已有评分选手):
|
|
||||||
* {
|
|
||||||
* "code": 200,
|
|
||||||
* "success": true,
|
|
||||||
* "msg": "操作成功",
|
|
||||||
* "data": [
|
|
||||||
* {
|
|
||||||
* "athleteId": 1,
|
|
||||||
* "name": "张三",
|
|
||||||
* "number": "123-4567898275",
|
|
||||||
* "team": "少林寺武术大学院",
|
|
||||||
* "projectName": "女子组长拳",
|
|
||||||
* "orderNum": 1,
|
|
||||||
* "totalScore": 8.907,
|
|
||||||
* "scoredJudgeCount": 3,
|
|
||||||
* "competitionStatus": 2
|
|
||||||
* }
|
|
||||||
* ]
|
|
||||||
* }
|
|
||||||
*/
|
|
||||||
|
|||||||
@@ -405,11 +405,16 @@ export default {
|
|||||||
mask: true
|
mask: true
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// 获取场地ID
|
||||||
|
const app = getApp()
|
||||||
|
const venueId = app.globalData?.currentVenueId
|
||||||
|
|
||||||
const response = await dataAdapter.getData('modifyScore', {
|
const response = await dataAdapter.getData('modifyScore', {
|
||||||
athleteId: this.athleteInfo.athleteId,
|
athleteId: this.athleteInfo.athleteId,
|
||||||
modifierId: this.modifierId,
|
modifierId: this.modifierId,
|
||||||
modifiedScore: this.currentScore,
|
modifiedScore: this.currentScore,
|
||||||
note: this.note
|
note: this.note,
|
||||||
|
venueId: venueId // 添加场地ID
|
||||||
})
|
})
|
||||||
|
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
|
|||||||
@@ -68,13 +68,20 @@
|
|||||||
<view class="player-header">
|
<view class="player-header">
|
||||||
<view class="player-name">{{ player.name }}</view>
|
<view class="player-name">{{ player.name }}</view>
|
||||||
|
|
||||||
<!-- 已评分:显示总分和修改按钮 -->
|
<!-- 动作区域:始终显示 -->
|
||||||
<view class="action-area" v-if="player.totalScore">
|
<view class="action-area">
|
||||||
<text class="total-score">总分:{{ player.totalScore }}</text>
|
<!-- 已评分:显示总分和修改按钮 -->
|
||||||
<view class="chief-actions">
|
<template v-if="player.scoringComplete && player.totalScore > 0">
|
||||||
<!-- <text class="chief-hint">裁判长功能:修改评分、修改按钮需等总分出来才出现</text> -->
|
<text class="total-score">总分:{{ player.totalScore }}</text>
|
||||||
<button class="modify-btn" @click="goToModify(player)">修改</button>
|
<view class="chief-actions">
|
||||||
</view>
|
<button class="modify-btn" @click="goToModify(player)">修改</button>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<!-- 未评分:显示评分中提示 -->
|
||||||
|
<template v-else>
|
||||||
|
<text class="scoring-status">评分中...</text>
|
||||||
|
</template>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
@@ -217,11 +224,11 @@ export default {
|
|||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
|
|
||||||
// 保存选手列表
|
// 保存选手列表
|
||||||
this.players = response.data || []
|
this.players = (response.data.records || response.data) || []
|
||||||
|
|
||||||
// 计算评分统计(裁判长视图:统计有总分的选手)
|
// 计算评分统计(裁判长视图:统计有总分的选手)
|
||||||
this.totalCount = this.players.length
|
this.totalCount = this.players.length
|
||||||
this.scoredCount = this.players.filter(p => p.totalScore).length
|
this.scoredCount = this.players.filter(p => p.scoringComplete).length
|
||||||
|
|
||||||
// 调试信息
|
// 调试信息
|
||||||
if (config.debug) {
|
if (config.debug) {
|
||||||
@@ -509,6 +516,15 @@ export default {
|
|||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.scoring-status {
|
||||||
|
font-size: 26rpx;
|
||||||
|
color: #FF9800;
|
||||||
|
font-weight: 500;
|
||||||
|
padding: 8rpx 20rpx;
|
||||||
|
background-color: #FFF3E0;
|
||||||
|
border-radius: 8rpx;
|
||||||
|
}
|
||||||
|
|
||||||
.chief-actions {
|
.chief-actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|||||||
@@ -62,18 +62,35 @@
|
|||||||
|
|
||||||
<!-- 裁判长:显示总分和已评分裁判数 -->
|
<!-- 裁判长:显示总分和已评分裁判数 -->
|
||||||
<view class="player-scores" v-if="refereeType === 1">
|
<view class="player-scores" v-if="refereeType === 1">
|
||||||
<text class="total-score">总分:{{ player.totalScore || '未评分' }}</text>
|
<text class="total-score">
|
||||||
<text class="judge-count">已评分:{{ player.scoredJudgeCount || 0 }}人</text>
|
总分:{{ player.scoringComplete ? player.totalScore : '评分中' }}
|
||||||
|
</text>
|
||||||
|
<text class="judge-count">
|
||||||
|
已评分:{{ player.scoredJudgeCount || 0 }}/{{ player.requiredJudgeCount || 0 }}人
|
||||||
|
</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 普通裁判:显示评分按钮 -->
|
<!-- 普通裁判:根据评分状态显示不同内容 -->
|
||||||
<button
|
<view class="judge-action" v-else>
|
||||||
class="score-btn"
|
<!-- 已评分:显示分数和修改按钮 -->
|
||||||
v-else
|
<view class="scored-info" v-if="player.scored">
|
||||||
@click.stop="goToScoreDetail(player)"
|
<text class="my-score-text">我的评分:{{ player.myScore }}</text>
|
||||||
>
|
<button
|
||||||
评分
|
class="score-btn modify-btn"
|
||||||
</button>
|
@click.stop="goToScoreDetail(player)"
|
||||||
|
>
|
||||||
|
修改
|
||||||
|
</button>
|
||||||
|
</view>
|
||||||
|
<!-- 未评分:显示评分按钮 -->
|
||||||
|
<button
|
||||||
|
class="score-btn"
|
||||||
|
v-else
|
||||||
|
@click.stop="goToScoreDetail(player)"
|
||||||
|
>
|
||||||
|
评分
|
||||||
|
</button>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="player-info">
|
<view class="player-info">
|
||||||
@@ -634,6 +651,29 @@ export default {
|
|||||||
opacity: 0.9;
|
opacity: 0.9;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.judge-action {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.scored-info {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 20rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.my-score-text {
|
||||||
|
font-size: 28rpx;
|
||||||
|
color: #1B7C5E;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modify-btn {
|
||||||
|
background: linear-gradient(135deg, #FF9500 0%, #FFB340 100%);
|
||||||
|
padding: 10rpx 30rpx;
|
||||||
|
font-size: 26rpx;
|
||||||
|
}
|
||||||
|
|
||||||
.player-info {
|
.player-info {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|||||||
Reference in New Issue
Block a user