|
|
@@ -492,7 +492,7 @@ const printScores = async () => {
|
|
|
|
|
|
// 按积分排序，取前n名（使用用户输入的数量）
|
|
|
const sortedScores = scores
|
|
|
- .filter(score => score.scorePoint && score.scorePoint > 0) // 只显示有积分的成绩
|
|
|
+ // .filter(score => score.scorePoint && score.scorePoint > 0) // 只显示有积分的成绩
|
|
|
.sort((a: any, b: any) => (b.scorePoint || 0) - (a.scorePoint || 0)) // 按积分降序排列
|
|
|
.slice(0, topCount); // 使用用户输入的数量
|
|
|
|
|
|
@@ -606,107 +606,123 @@ const printScores = async () => {
|
|
|
/**
|
|
|
* 构建打印HTML内容
|
|
|
*/
|
|
|
-const buildPrintHtml = (projects: any[], topCount: number = 3) => {
|
|
|
- const printTime = new Date().toLocaleString('zh-CN');
|
|
|
-
|
|
|
- let html = `
|
|
|
- <!DOCTYPE html>
|
|
|
+const buildPrintHtml = (projects: any[], topCount: number) => {
|
|
|
+ return `
|
|
|
<html>
|
|
|
<head>
|
|
|
<meta charset="UTF-8">
|
|
|
- <title>赛事成绩打印 - 前${topCount}名</title>
|
|
|
+ <title>成绩打印（前${topCount}名）</title>
|
|
|
<style>
|
|
|
- body { font-family: Arial, sans-serif; margin: 20px; }
|
|
|
- .print-header { text-align: center; margin-bottom: 30px; border-bottom: 2px solid #333; padding-bottom: 20px; }
|
|
|
- .print-header h1 { margin: 0 0 10px 0; font-size: 24px; color: #333; }
|
|
|
- .print-header p { margin: 0; color: #666; font-size: 14px; }
|
|
|
- .project-section { margin-bottom: 40px; page-break-inside: avoid; }
|
|
|
- .project-title { font-size: 18px; font-weight: bold; margin-bottom: 15px; padding: 10px; background: #f5f5f5; border-left: 4px solid #409eff; }
|
|
|
- .title-label { color: #f56c6c; font-weight: bold; }
|
|
|
- .score-table { width: 100%; border-collapse: collapse; margin-bottom: 20px; }
|
|
|
- .score-table th, .score-table td { border: 1px solid #ddd; padding: 8px 12px; text-align: center; }
|
|
|
- .score-table th { background: #f8f9fa; font-weight: bold; color: #333; }
|
|
|
- .score-table td { color: #333; }
|
|
|
+ body {
|
|
|
+ font-family: SimSun, 'Times New Roman', serif;
|
|
|
+ padding: 20px;
|
|
|
+ margin: 0;
|
|
|
+ color: #333;
|
|
|
+ }
|
|
|
+ .print-header {
|
|
|
+ text-align: center;
|
|
|
+ margin-bottom: 30px;
|
|
|
+ border-bottom: 2px solid #333;
|
|
|
+ padding-bottom: 20px;
|
|
|
+ }
|
|
|
+ .print-header h1 {
|
|
|
+ margin: 0 0 10px 0;
|
|
|
+ font-size: 24px;
|
|
|
+ }
|
|
|
+ .print-header p {
|
|
|
+ margin: 0;
|
|
|
+ color: #666;
|
|
|
+ font-size: 14px;
|
|
|
+ }
|
|
|
+ .project-section {
|
|
|
+ margin-bottom: 40px;
|
|
|
+ page-break-inside: avoid;
|
|
|
+ }
|
|
|
+ .project-title {
|
|
|
+ font-size: 18px;
|
|
|
+ font-weight: bold;
|
|
|
+ margin-bottom: 15px;
|
|
|
+ padding: 10px;
|
|
|
+ background: #f5f5f5;
|
|
|
+ border-left: 4px solid #409eff;
|
|
|
+ }
|
|
|
+ .title-label {
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
+ .score-table {
|
|
|
+ width: 100%;
|
|
|
+ border-collapse: collapse;
|
|
|
+ margin-bottom: 20px;
|
|
|
+ }
|
|
|
+ .score-table th,
|
|
|
+ .score-table td {
|
|
|
+ border: 1px solid #ddd;
|
|
|
+ padding: 8px 12px;
|
|
|
+ text-align: center;
|
|
|
+ }
|
|
|
+ .score-table th {
|
|
|
+ background: #f8f9fa;
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
.rank-1 { background-color: #fff7e6; font-weight: bold; }
|
|
|
.rank-2 { background-color: #f6ffed; }
|
|
|
.rank-3 { background-color: #f0f9ff; }
|
|
|
- @media print { .project-section { page-break-inside: avoid; } }
|
|
|
+ @media print {
|
|
|
+ @page {
|
|
|
+ margin: 20px;
|
|
|
+ }
|
|
|
+ body {
|
|
|
+ padding: 0;
|
|
|
+ }
|
|
|
+ .project-section {
|
|
|
+ page-break-inside: avoid;
|
|
|
+ }
|
|
|
+ }
|
|
|
</style>
|
|
|
</head>
|
|
|
<body>
|
|
|
<div class="print-header">
|
|
|
<h1>赛事管理系统 - 成绩打印（前${topCount}名）</h1>
|
|
|
- <p>打印时间: ${printTime}</p>
|
|
|
+ <p>打印时间: ${new Date().toLocaleString('zh-CN')}</p>
|
|
|
</div>
|
|
|
- `;
|
|
|
-
|
|
|
- // 为每个项目添加成绩表格
|
|
|
- projects.forEach(project => {
|
|
|
- const scores = project.scores || [];
|
|
|
-
|
|
|
- html += `
|
|
|
- <div class="project-section">
|
|
|
- <div class="project-title">
|
|
|
- <span class="title-label">${project.projectId}</span>
|
|
|
- <span class="title-label">${getProjectTypeName(project.projectType)} ${project.projectName}</span>
|
|
|
+
|
|
|
+ ${projects.map(project => `
|
|
|
+ <div class="project-section">
|
|
|
+ <div class="project-title">
|
|
|
+ <span class="title-label">${project.projectId} </span>
|
|
|
+ <span class="title-label">${getProjectTypeName(project.projectType)}-${project.projectName}</span>
|
|
|
+ </div>
|
|
|
+ <table class="score-table">
|
|
|
+ <thead>
|
|
|
+ <tr>
|
|
|
+ <th class="title-label">类别</th>
|
|
|
+ <th class="title-label">名次</th>
|
|
|
+ <th class="title-label">队伍</th>
|
|
|
+ <th class="title-label">运动员编号</th>
|
|
|
+ <th class="title-label">姓名</th>
|
|
|
+ <th class="title-label">成绩</th>
|
|
|
+ <th class="title-label">积分</th>
|
|
|
+ </tr>
|
|
|
+ </thead>
|
|
|
+ <tbody>
|
|
|
+ ${project.scores.slice(0, topCount).map((score: any, index: number) => `
|
|
|
+ <tr class="${index === 0 ? 'rank-1' : index === 1 ? 'rank-2' : 'rank-3'}">
|
|
|
+ <td>${score.classification === '0' ? '个人项目' : '团体项目'}</td>
|
|
|
+ <td>第${Number(index) + 1}名</td>
|
|
|
+ <td>${score.teamName || '-'}</td>
|
|
|
+ <td>${score.athleteCode || '-'}</td>
|
|
|
+ <td>${score.athleteName || '-'}</td>
|
|
|
+ <td >${score.classification === '0' ? formatScore(score.individualPerformance) : formatScore(score.teamPerformance)}</td>
|
|
|
+ <td>${score.scorePoint || 0}</td>
|
|
|
+ </tr>
|
|
|
+ `).join('')}
|
|
|
+ </tbody>
|
|
|
+ </table>
|
|
|
</div>
|
|
|
-
|
|
|
- <table class="score-table">
|
|
|
- <thead>
|
|
|
- <tr>
|
|
|
- <th class="title-label">类别</th>
|
|
|
- <th>名次</th>
|
|
|
- <th class="title-label">队伍</th>
|
|
|
- <th class="title-label">运动员编号</th>
|
|
|
- <th class="title-label">姓名</th>
|
|
|
- <th class="title-label">成绩</th>
|
|
|
- <th class="title-label">积分</th>
|
|
|
- </tr>
|
|
|
- </thead>
|
|
|
- <tbody>
|
|
|
- `;
|
|
|
-
|
|
|
- if (scores.length > 0) {
|
|
|
- scores.forEach((score: any, index: number) => {
|
|
|
- // 动态设置排名样式，只对前3名应用特殊样式
|
|
|
- let rankClass = '';
|
|
|
- if (index === 0) rankClass = 'rank-1';
|
|
|
- else if (index === 1) rankClass = 'rank-2';
|
|
|
- else if (index === 2) rankClass = 'rank-3';
|
|
|
-
|
|
|
- html += `
|
|
|
- <tr class="${rankClass}">
|
|
|
- <td>${score.classification === '0' ? '个人项目' : '团体项目'}</td>
|
|
|
- <td>第${index + 1}名</td>
|
|
|
- <td>${score.teamName || '-'}</td>
|
|
|
- <td>${score.athleteCode || '-'}</td>
|
|
|
- <td>${score.athleteName || '-'}</td>
|
|
|
- <td>${formatScore(score.individualPerformance || score.teamPerformance)}</td>
|
|
|
- <td>${score.scorePoint || 0}</td>
|
|
|
- </tr>
|
|
|
- `;
|
|
|
- });
|
|
|
- } else {
|
|
|
- html += `
|
|
|
- <tr>
|
|
|
- <td colspan="7" style="text-align: center; color: #999;">暂无成绩数据</td>
|
|
|
- </tr>
|
|
|
- `;
|
|
|
- }
|
|
|
-
|
|
|
- html += `
|
|
|
- </tbody>
|
|
|
- </table>
|
|
|
- </div>
|
|
|
- `;
|
|
|
- });
|
|
|
-
|
|
|
- html += `
|
|
|
+ `).join('')}
|
|
|
</body>
|
|
|
</html>
|
|
|
`;
|
|
|
-
|
|
|
- return html;
|
|
|
};
|
|
|
|
|
|
/**
|
|
|
@@ -847,12 +863,16 @@ const calculateParticipantCounts = async () => {
|
|
|
|
|
|
// 计算完赛人数（有成绩记录的）
|
|
|
const completedScores = scores.filter(score => {
|
|
|
- const individualScore = parseFloat(score.individualPerformance);
|
|
|
- const teamScore = parseFloat(score.teamPerformance);
|
|
|
-
|
|
|
// 成绩必须存在且大于0
|
|
|
- return (!isNaN(individualScore) && individualScore > 0) ||
|
|
|
- (!isNaN(teamScore) && teamScore > 0);
|
|
|
+ const sc = score.classification === '0' ? score.individualPerformance : score.teamPerformance;
|
|
|
+ if (sc === null || sc === undefined || sc === '') {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (typeof sc === 'number') {
|
|
|
+ return !isNaN(sc) && sc > 0;
|
|
|
+ }else if(typeof sc === 'string'){
|
|
|
+ return sc !== '0';
|
|
|
+ }
|
|
|
});
|
|
|
console.log('completedScores: ', completedScores);
|
|
|
(project as any).completedParticipants = completedScores.length;
|
|
|
@@ -907,3 +927,5 @@ onMounted(() => {
|
|
|
loadProjects();
|
|
|
});
|
|
|
</script>
|
|
|
+
|
|
|
+
|
