Compare commits

..
4 Commits
Author SHA1 Message Date
DevOpsandfactory-droid[bot] f986c63cd1 fix: 修复集体项目队员名称显示
- 修改 members 渲染逻辑,支持 name 和 playerName 两种字段

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
2026-01-16 13:46:55 +08:00
DevOps 45d7e9f36f Revert "修复合计时间显示-1的问题:添加前端备用计算逻辑"
This reverts commit 5f5ab37e97.
2026-01-16 11:16:45 +08:00
DevOpsandfactory-droid[bot] 5f5ab37e97 修复合计时间显示-1的问题:添加前端备用计算逻辑
当后端返回的estimatedDuration为null或负数时,前端自动计算参赛人数×2分钟作为默认时长

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
2026-01-16 11:13:45 +08:00
DevOpsandfactory-droid[bot] 066f13f48d fix: 调度页面状态列显示中文状态文本
- 修改状态列数据源从venueName改为status
- 状态显示: 未开始/进行中/已完成

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
2026-01-15 19:11:26 +08:00
+3 -3
View File
@@ -240,7 +240,7 @@
<el-table-column prop="duration" label="合计时间" width="100" align="center"></el-table-column>
<el-table-column prop="status" label="状态" width="100" align="center">
<template #default="scope">
<span v-if="scope.row.status" class="status-active">{{ scope.row.status }}</span>
<span :class="['status-tag', scope.row.status === 2 ? 'status-completed' : scope.row.status === 1 ? 'status-progress' : 'status-pending']">{{ scope.row.status === 2 ? '已完成' : scope.row.status === 1 ? '进行中' : '未开始' }}</span>
</template>
</el-table-column>
</el-table>
@@ -457,7 +457,7 @@ export default {
team: 1, // 队伍数量,可以从分组中计算
number: group.items?.length || 0, // 参赛人数
duration: group.estimatedDuration || 0, // 合计时间
status: group.venueName, // 显示场地名称
status: group.status, // 状态: 0-未开始, 1-进行中, 2-已完成
venueName: group.venueName,
hint: '' // 可以根据需要添加提示信息
}))
@@ -625,7 +625,7 @@ export default {
item.members.forEach(member => {
teamMap.get(key).players.push({
id: member.id,
playerName: member.playerName,
playerName: member.name || member.playerName,
organization: member.organization,
status: member.status
})