From 93eb6b470773bc49ea6e1a9d4cbd914eb95d525b Mon Sep 17 00:00:00 2001
From: lrj <owen.stl@gmail.com>
Date: 星期二, 30 九月 2025 17:38:04 +0800
Subject: [PATCH] feat: 完善比赛晋级功能并清理测试文件
---
web/src/views/player/index.vue | 179 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 102 insertions(+), 77 deletions(-)
diff --git a/web/src/views/player/index.vue b/web/src/views/player/index.vue
index 543137f..3531e92 100644
--- a/web/src/views/player/index.vue
+++ b/web/src/views/player/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="player-page">
<div class="page-card">
- <h3 class="card-title">姣旇禌鎶ュ悕</h3>
+ <h3 class="card-title">鎶ュ悕瀹℃牳</h3>
<!-- 鎼滅储鍜屾搷浣滄爮 -->
<div class="toolbar">
@@ -17,15 +17,30 @@
</template>
</el-input>
<el-select
- v-model="searchForm.status"
+ v-model="searchForm.activityId"
+ placeholder="閫夋嫨姣旇禌"
+ style="width: 300px"
+ clearable
+ filterable
+ >
+ <el-option
+ v-for="activity in activityOptions"
+ :key="activity.id"
+ :label="activity.name"
+ :value="activity.id"
+ >
+ {{ activity.name }}
+ </el-option>
+ </el-select>
+ <el-select
+ v-model="searchForm.state"
placeholder="閫夋嫨鐘舵��"
style="width: 150px"
clearable
>
- <el-option label="鏈鏍�" value="0" />
- <el-option label="杩涜涓�" value="1" />
- <el-option label="宸查┏鍥�" value="2" />
- <el-option label="宸茬粨鏉�" value="3" />
+ <el-option label="寰呭鏍�" value="0" />
+ <el-option label="閫氳繃" value="1" />
+ <el-option label="椹冲洖" value="2" />
</el-select>
<el-button type="primary" @click="handleSearch">
<el-icon><Search /></el-icon>
@@ -46,32 +61,17 @@
<el-table-column prop="activityName" label="鎶ュ悕椤圭洰" min-width="200" />
<el-table-column prop="phone" label="鑱旂郴鐢佃瘽" width="140" />
<el-table-column prop="applyTime" label="鐢宠鏃堕棿" width="180" />
- <el-table-column prop="status" label="鐘舵��" width="100" align="center">
+ <el-table-column prop="state" label="鐘舵��" width="100" align="center">
<template #default="{ row }">
- <el-tag :type="getStatusType(row.status)">{{ getStatusText(row.status) }}</el-tag>
+ <el-tag :type="getStateType(row.state)">{{ getStateText(row.state) }}</el-tag>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="200" fixed="right">
+ <el-table-column label="鎿嶄綔" width="120" fixed="right">
<template #default="{ row }">
<div class="table-actions">
- <el-button
- v-if="row.status === 1"
- type="success"
- size="small"
- @click="handleApprove(row)"
- >
- 瀹℃牳閫氳繃
- </el-button>
- <el-button
- v-if="row.status === 1"
- type="danger"
- size="small"
- @click="handleReject(row)"
- >
- 瀹℃牳鎷掔粷
- </el-button>
- <el-button type="primary" size="small" @click="handleView(row)">
- 璇勫垎璇︽儏
+ <!-- 鍙繚鐣欒鎯呮寜閽� -->
+ <el-button type="primary" size="small" @click="handleViewDetail(row)">
+ 璇︽儏
</el-button>
</div>
</template>
@@ -99,14 +99,19 @@
import { useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
import { PlayerApi } from '@/api/player'
+import { getAllActivities } from '@/api/activity'
const loading = ref(false)
const router = useRouter()
+// 娲诲姩閫夐」
+const activityOptions = ref([])
+
// 鎼滅储琛ㄥ崟
const searchForm = reactive({
name: '',
- status: ''
+ activityId: '',
+ state: ''
})
// 鍒嗛〉淇℃伅
@@ -125,48 +130,57 @@
activityName: '2024骞村垱鏂板垱涓氬ぇ璧�',
phone: '13800138001',
applyTime: '2024-01-05 14:30:00',
- status: 1 // 1-寰呭鏍�, 2-杩涜涓�, 3-宸茬粨鏉�
+ state: 0 // 0-鏈鏍�
},
{
id: 2,
name: '鏉庡洓',
avatar: '',
- activityName: '鎶�鑳界珵璧涘垵璧�',
- phone: '13800138002',
- applyTime: '2024-01-06 09:15:00',
- status: 2
+ activityName: '涔︽硶姣旇禌',
+ phone: '13900139002',
+ applyTime: '2024-01-16 10:30:00',
+ state: 1 // 1-瀹℃牳閫氳繃
},
{
id: 3,
name: '鐜嬩簲',
avatar: '',
- activityName: '璁捐澶ц禌鍐宠禌',
- phone: '13800138003',
- applyTime: '2024-01-07 16:45:00',
- status: 1
+ activityName: '缁樼敾姣旇禌',
+ phone: '13900139003',
+ applyTime: '2024-01-17 14:20:00',
+ state: 2 // 2-瀹℃牳椹冲洖
+ },
+ {
+ id: 4,
+ name: '璧靛叚',
+ avatar: '',
+ activityName: '闊充箰姣旇禌',
+ phone: '13900139004',
+ applyTime: '2024-01-18 09:15:00',
+ state: 0 // 0-鏈鏍�
}
])
// 鑾峰彇鐘舵�佹爣绛剧被鍨�
-const getStatusType = (status: number | null | undefined) => {
+const getStateType = (state: number | null | undefined) => {
const typeMap: Record<number, string> = {
- 0: 'warning', // 寰呭鏍�
- 1: 'success', // 杩涜涓�
- 2: 'danger', // 鏈�氳繃
+ 0: 'warning', // 鏈鏍�
+ 1: 'success', // 瀹℃牳閫氳繃
+ 2: 'danger', // 瀹℃牳椹冲洖
3: 'info' // 宸茬粨鏉�
}
- return status != null ? (typeMap[status] || 'info') : 'info'
+ return state != null ? (typeMap[state] || 'info') : 'info'
}
// 鑾峰彇鐘舵�佹枃鏈�
-const getStatusText = (status: number | null | undefined) => {
+const getStateText = (state: number | null | undefined) => {
const textMap: Record<number, string> = {
- 0: '寰呭鏍�',
- 1: '杩涜涓�',
- 2: '鏈�氳繃',
+ 0: '鏈鏍�',
+ 1: '瀹℃牳閫氳繃',
+ 2: '瀹℃牳椹冲洖',
3: '宸茬粨鏉�'
}
- return status != null ? (textMap[status] || '鏈煡') : '鏈煡'
+ return state != null ? (textMap[state] || '鏈煡') : '鏈煡'
}
// 鎼滅储
@@ -175,36 +189,16 @@
loadData()
}
-// 瀹℃牳閫氳繃
-const handleApprove = async (row: any) => {
- try {
- await ElMessageBox.confirm(`纭畾瀹℃牳閫氳繃瀛﹀憳"${row.name}"鐨勬姤鍚嶇敵璇峰悧锛焋, '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'success'
- })
-
- ElMessage.success('瀹℃牳閫氳繃鎴愬姛')
- row.status = 2
- } catch {
- // 鐢ㄦ埛鍙栨秷
- }
-}
-// 瀹℃牳鎷掔粷
-const handleReject = async (row: any) => {
- try {
- await ElMessageBox.confirm(`纭畾鎷掔粷瀛﹀憳"${row.name}"鐨勬姤鍚嶇敵璇峰悧锛焋, '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- })
-
- ElMessage.success('瀹℃牳鎷掔粷鎴愬姛')
- // 杩欓噷鍙互璁剧疆涓哄垹闄ょ姸鎬佹垨鍏朵粬鐘舵��
- } catch {
- // 鐢ㄦ埛鍙栨秷
+
+// 鏌ョ湅璇︽儏锛堣烦杞埌璇︽儏椤甸潰锛屽彧璇绘ā寮忥級
+const handleViewDetail = (row: any) => {
+ if (!row.id) {
+ ElMessage.error('鏃犳硶鑾峰彇鎶ュ悕璁板綍ID')
+ return
}
+ // 璺宠浆鍒拌鎯呴〉闈紙鍙妯″紡锛�
+ router.push(`/player/${row.id}/detail`)
}
// 鏌ョ湅璇︽儏锛堣烦杞埌璇勫垎椤甸潰锛�
@@ -228,11 +222,38 @@
loadData()
}
+// 鑾峰彇姣旇禌鍚嶇О锛堝鏋滄槸闃舵锛岃繑鍥炵埗姣旇禌鍚嶇О锛涘鏋滄槸姣旇禌锛岃繑鍥炶嚜宸辩殑鍚嶇О锛�
+const getActivityName = (activity: any) => {
+ if (activity.pid > 0 && activity.parent) {
+ return activity.parent.name
+ }
+ return activity.name
+}
+
+
+
+// 鍔犺浇娲诲姩閫夐」
+const loadActivityOptions = async () => {
+ try {
+ const activities = await getAllActivities()
+ // 鍙樉绀虹姸鎬佷负1锛堣繘琛屼腑锛夌殑姣旇禌鍙婂叾闃舵
+ activityOptions.value = (activities || []).filter(activity => activity.state === 1)
+ } catch (e: any) {
+ console.error('鍔犺浇娲诲姩閫夐」澶辫触:', e)
+ }
+}
+
// 鍔犺浇鏁版嵁
const loadData = async () => {
loading.value = true
try {
- const list = await PlayerApi.getApplications(searchForm.name || '', pagination.page, pagination.size)
+ const list = await PlayerApi.getApplications(
+ searchForm.name || '',
+ searchForm.activityId || null,
+ searchForm.state !== '' ? parseInt(searchForm.state) : null,
+ pagination.page,
+ pagination.size
+ )
tableData.value = (list || []).map((item: any) => ({
id: item.id,
name: item.playerName,
@@ -240,7 +261,7 @@
activityName: item.activityName,
phone: item.phone,
applyTime: item.applyTime,
- status: item.state
+ state: item.state
}))
pagination.total = tableData.value.length
} catch (e: any) {
@@ -251,6 +272,7 @@
}
onMounted(() => {
+ loadActivityOptions()
loadData()
})
</script>
@@ -275,8 +297,11 @@
display: flex;
gap: 8px;
flex-wrap: wrap;
+ align-items: center;
}
+
+
.pagination {
margin-top: 20px;
display: flex;
--
Gitblit v1.8.0