From 2fe453955e0c8a8ce1f659b991aec8ea392a049d Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Fri, 14 Nov 2025 14:47:54 +0800 Subject: [PATCH 01/27] =?UTF-8?q?chore:=20=E5=8F=98=E6=9B=B4package.json?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c4d9da..1551644 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "dev": "vite", "build": "vite build", "preview": "vite preview", - "start": "npm run build && node server.js" + "server": "npm run build && node server.js", + "start": "node server.js" }, "dependencies": { "cors": "^2.8.5", -- 2.49.1 From 91e8af324dfc5e2b8df68d0b9b4fb57e32047108 Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Fri, 21 Nov 2025 14:43:43 +0800 Subject: [PATCH 02/27] =?UTF-8?q?chore:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E6=88=98=E5=8C=BA=E6=8E=92=E5=90=8D=E5=85=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/AdminPanel.vue | 500 ++++++++++++++------------------- src/views/BattleRanking.vue | 540 ++++++++++++++++++++---------------- 2 files changed, 501 insertions(+), 539 deletions(-) diff --git a/src/views/AdminPanel.vue b/src/views/AdminPanel.vue index cc8d5a7..561c485 100644 --- a/src/views/AdminPanel.vue +++ b/src/views/AdminPanel.vue @@ -6,23 +6,11 @@

🔐 管理员登录

- +
- +
@@ -32,50 +20,40 @@
-
+ +

📊 百日大战管理系统

- 欢迎您，{{ currentUser.username }}！ - - -
+ 欢迎您，{{ currentUser.username }}！ + + +
- +
-
-
+ +
+ +

⏰ 百日大战结束时间设置

@@ -83,37 +61,44 @@
- -
+ + +

⚙️ 显示配置管理

- +

👤 个人排名显示选项

+
+ +
+
+ +
@@ -125,16 +110,18 @@
- +

列宽设置（单位：像素）

- +
- +
@@ -148,11 +135,13 @@
- +
- +
@@ -163,41 +152,41 @@
+
+ + +
- +
- +

👥 战区排名显示选项

@@ -209,12 +198,13 @@
- +

列宽设置（单位：像素）

- +
@@ -228,11 +218,13 @@
- +
- +
@@ -245,14 +237,16 @@
- +
- -
+ + +

👤 个人排名管理

@@ -268,20 +262,18 @@ 奖金 操作
-
+
{{ index + 1 }} 头像 {{ item.avatar || '👤' }} {{ item.name }} - {{ localDisplayConfig.individual.scoreColumn.displayStyle === 'amount' ? '¥' + item.score : item.score }} - {{ item.level }} + {{ localDisplayConfig.individual.scoreColumn.displayStyle === 'amount' ? '¥' + + item.score : item.score }} + {{ + item.level }} {{ item.department }} ¥{{ item.bonus }} @@ -292,7 +284,8 @@
-
+ +

👥 战区排名管理

@@ -307,37 +300,30 @@ 奖金 操作
-
+
{{ index + 1 }} {{ item.name }} - {{ localDisplayConfig.team.totalScoreColumn.displayStyle === 'amount' ? '¥' + item.totalScore : item.totalScore }} + {{ localDisplayConfig.team.totalScoreColumn.displayStyle === 'amount' ? '¥' + + item.totalScore : item.totalScore }} {{ item.memberCount }}人 {{ item.leader }} ¥{{ item.bonus }} - +
- +

🎯 奖金设置

🏆 奖金规则配置

-
+
@@ -349,11 +335,13 @@
- +
- +
@@ -364,132 +352,102 @@
- +

🏆 冠军Logo配置

- +

🎯 战区冠军Logo

- 战区冠军Logo -
+ 战区冠军Logo +
未上传Logo
- +
- + px

支持JPG、PNG、GIF格式，建议尺寸200x200像素，文件大小不超过5MB

- +

👤 英雄冠军Logo

- 英雄冠军Logo -
+ 英雄冠军Logo +
未上传Logo
- -
- + px

支持JPG、PNG、GIF格式，建议尺寸200x200像素，文件大小不超过5MB

- +

🥁 战鼓配置管理

- +

🔊 音效配置

🎵 第一个音调

@@ -507,13 +465,8 @@

🎵 第二个音调

@@ -531,95 +484,61 @@
- +

🎬 动画配置

- +

🎵 节拍模式配置

@@ -627,62 +546,36 @@
@@ -690,13 +583,15 @@
-
+ +
-
+ +

{{ editingIndividual ? '编辑人员' : '添加人员' }}

@@ -722,14 +617,16 @@
- 头像预览 + 头像预览
{{ individualForm.avatar }}
- @@ -767,7 +664,8 @@
-
+ +

{{ editingTeam ? '编辑战区' : '添加战区' }}

@@ -865,18 +763,18 @@ onMounted(async () => { localIndividualRankings.value = [...individualRankings]; localTeamRankings.value = [...teamRankings]; localBonusRules.value = [...bonusRules]; - localDisplayConfig.value = {...displayConfig}; - localBattleEndTime.value = {...battleEndTime}; - localDrumConfig.value = {...drumConfig}; - + localDisplayConfig.value = { ...displayConfig }; + localBattleEndTime.value = { ...battleEndTime }; + localDrumConfig.value = { ...drumConfig }; + // 初始化冠军Logo配置 if (displayConfig.championLogos) { - championLogos.value = {...displayConfig.championLogos}; + championLogos.value = { ...displayConfig.championLogos }; } - + // 重新处理强拍位置 if (localDrumConfig.value.pattern && localDrumConfig.value.pattern.strongBeats) { - localDrumConfig.value.pattern.strongBeatsStr = + localDrumConfig.value.pattern.strongBeatsStr = localDrumConfig.value.pattern.strongBeats.join(',') || '1,4'; } } catch (error) { @@ -888,16 +786,16 @@ onMounted(async () => { const handleChampionLogoUpload = async (event, type) => { const file = event.target.files[0]; if (!file) return; - + const formData = new FormData(); formData.append('image', file); - + try { const response = await fetch('/api/upload', { method: 'POST', body: formData }); - + const result = await response.json(); if (result.success) { // 删除旧的图片 @@ -909,7 +807,7 @@ const handleChampionLogoUpload = async (event, type) => { console.error('删除旧文件失败:', error); }); } - + championLogos.value[type] = result.filePath; } else { alert('上传失败: ' + result.error); @@ -918,7 +816,7 @@ const handleChampionLogoUpload = async (event, type) => { console.error('上传失败:', error); alert('上传失败，请重试'); } - + // 清空文件输入 event.target.value = ''; }; @@ -944,16 +842,16 @@ const handleRefreshData = () => { localIndividualRankings.value = [...individualRankings]; localTeamRankings.value = [...teamRankings]; localBonusRules.value = [...bonusRules]; - localDisplayConfig.value = {...displayConfig}; - localBattleEndTime.value = {...battleEndTime}; - localDrumConfig.value = {...drumConfig}; - + localDisplayConfig.value = { ...displayConfig }; + localBattleEndTime.value = { ...battleEndTime }; + localDrumConfig.value = { ...drumConfig }; + // 重新处理强拍位置 if (localDrumConfig.value.pattern && localDrumConfig.value.pattern.strongBeats) { - localDrumConfig.value.pattern.strongBeatsStr = + localDrumConfig.value.pattern.strongBeatsStr = localDrumConfig.value.pattern.strongBeats.join(',') || '1,4'; } - + if (success) { alert('数据刷新成功！'); } else { @@ -970,10 +868,10 @@ const currentTab = ref('individual'); const localIndividualRankings = ref([...individualRankings]); const localTeamRankings = ref([...teamRankings]); const localBonusRules = ref([...bonusRules]); -const localDisplayConfig = ref({...displayConfig}); -const localBattleEndTime = ref({...battleEndTime}); +const localDisplayConfig = ref({ ...displayConfig }); +const localBattleEndTime = ref({ ...battleEndTime }); // 初始化本地战鼓配置副本 -const localDrumConfig = ref({...drumConfig}); +const localDrumConfig = ref({ ...drumConfig }); // 添加强拍位置的字符串表示，用于输入框 if (localDrumConfig.value.pattern && localDrumConfig.value.pattern.strongBeats) { localDrumConfig.value.pattern.strongBeatsStr = localDrumConfig.value.pattern.strongBeats.join(',') || '1,4'; @@ -991,13 +889,13 @@ onMounted(async () => { localIndividualRankings.value = [...individualRankings]; localTeamRankings.value = [...teamRankings]; localBonusRules.value = [...bonusRules]; - localDisplayConfig.value = {...displayConfig}; - localBattleEndTime.value = {...battleEndTime}; - localDrumConfig.value = {...drumConfig}; - + localDisplayConfig.value = { ...displayConfig }; + localBattleEndTime.value = { ...battleEndTime }; + localDrumConfig.value = { ...drumConfig }; + // 重新处理强拍位置 if (localDrumConfig.value.pattern && localDrumConfig.value.pattern.strongBeats) { - localDrumConfig.value.pattern.strongBeatsStr = + localDrumConfig.value.pattern.strongBeatsStr = localDrumConfig.value.pattern.strongBeats.join(',') || '1,4'; } } catch (error) { @@ -1049,16 +947,16 @@ const individualForm = reactive({ const handleAvatarUpload = async (event) => { const file = event.target.files[0]; if (!file) return; - + const formData = new FormData(); formData.append('image', file); - + try { const response = await fetch('/api/upload', { method: 'POST', body: formData }); - + const result = await response.json(); if (result.success) { individualForm.avatar = result.filePath; @@ -1069,7 +967,7 @@ const handleAvatarUpload = async (event) => { console.error('上传失败:', error); alert('上传失败，请重试'); } - + // 清空文件输入，允许重新选择相同文件 event.target.value = ''; }; @@ -1104,7 +1002,7 @@ const login = () => { const user = systemUsers.find( u => u.username === loginForm.username && u.password === loginForm.password ); - + if (user) { isLoggedIn.value = true; currentUser.value = user; @@ -1133,19 +1031,19 @@ const saveData = async () => { // 按分数重新排序 localIndividualRankings.value.sort((a, b) => b.score - a.score); localTeamRankings.value.sort((a, b) => b.totalScore - a.totalScore); - + // 保存战鼓配置前，确保强拍位置数组是最新的 updateStrongBeats(); // 移除临时的字符串表示，避免保存到配置中 - const configToSave = {...localDrumConfig.value}; + const configToSave = { ...localDrumConfig.value }; delete configToSave.pattern.strongBeatsStr; - + // 导入必要的配置服务函数 const { readConfig, writeConfig } = await import('../services/configService'); - + // 一次性读取、修改并保存所有配置，避免竞态条件 const currentConfig = await readConfig(); - + // 更新所有配置项 currentConfig.individualRankings = localIndividualRankings.value; currentConfig.teamRankings = localTeamRankings.value; @@ -1155,10 +1053,10 @@ const saveData = async () => { currentConfig.displayConfig.championLogos = championLogos.value; currentConfig.battleEndTime = localBattleEndTime.value; currentConfig.drumConfig = configToSave; - + // 一次性保存所有配置 const result = await writeConfig(currentConfig); - + // 检查保存是否成功 if (result) { alert('数据保存成功！'); @@ -1293,8 +1191,8 @@ const deleteBonusRule = (index) => { \ No newline at end of file -- 2.49.1 From 59c09546a98f3dc9f51a4f5b6f9adfc8868b9aed Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Fri, 21 Nov 2025 16:27:03 +0800 Subject: [PATCH 03/27] =?UTF-8?q?chore:=20=E6=94=AF=E6=8C=81=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=88=97=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/config.json | 23 +- src/views/AdminPanel.vue | 146 ++++++++++++- src/views/BattleRanking.vue | 412 ++++++++++++++++++++++++++++-------- 3 files changed, 485 insertions(+), 96 deletions(-) diff --git a/data/config.json b/data/config.json index 846e4d5..3562cca 100644 --- a/data/config.json +++ b/data/config.json @@ -367,7 +367,17 @@ "level": 80, "department": 1, "bonus": 80 - } + }, + "columnAlignments": { + "rank": "center", + "avatar": "left", + "name": "left", + "score": "left", + "level": "left", + "department": "left", + "bonus": "left" + }, + "defaultDisplayRows": 7 }, "team": { "showMemberCount": false, @@ -383,7 +393,16 @@ "memberCount": 60, "leader": 1, "bonus": 80 - } + }, + "columnAlignments": { + "rank": "center", + "name": "center", + "score": "left", + "memberCount": "left", + "leader": "left", + "bonus": "left" + }, + "defaultDisplayRows": 0 }, "championLogos": { "teamChampion": "", diff --git a/src/views/AdminPanel.vue b/src/views/AdminPanel.vue index 561c485..761889d 100644 --- a/src/views/AdminPanel.vue +++ b/src/views/AdminPanel.vue @@ -90,8 +90,8 @@
@@ -111,6 +111,118 @@
+
+

列对齐设置

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+

列对齐设置

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+

列宽设置（单位：像素）

@@ -182,6 +294,12 @@ 显示队长列
+
+ +