From 137c305cf82cbe804dc690ee782a2286bfbce225 Mon Sep 17 00:00:00 2001 From: SunWuyuan Date: Sat, 15 Mar 2025 16:52:49 +0800 Subject: [PATCH] 1 --- src/App.vue | 8 +- src/components/GlobalMessage.vue | 7 +- src/pages/index.vue | 126 ++++++++++++++++++++++--------- 3 files changed, 97 insertions(+), 44 deletions(-) diff --git a/src/App.vue b/src/App.vue index f4bc2ff..891a941 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,7 +1,11 @@ diff --git a/src/components/GlobalMessage.vue b/src/components/GlobalMessage.vue index 9171515..80f7bab 100644 --- a/src/components/GlobalMessage.vue +++ b/src/components/GlobalMessage.vue @@ -4,8 +4,8 @@ :color="colors[message?.type] || colors.info" :timeout="2000" location="bottom" - class="global-snackbar" multi-line + variant="tonal" >
@@ -62,8 +62,5 @@ export default defineComponent({ diff --git a/src/pages/index.vue b/src/pages/index.vue index f8f7c65..93f7241 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -133,7 +133,12 @@ @click="setAttendanceArea()" >

出勤

-

应到: {{ state.studentList.length - state.boardData.attendance.exclude.length }}人

+

+ 应到: + {{ + state.studentList.length - state.boardData.attendance.exclude.length + }}人 +

实到: {{ @@ -144,15 +149,24 @@ }}人

请假: {{ state.boardData.attendance.absent.length }}人

-

+

{{ `${index + 1}. ${name}` }}

迟到: {{ state.boardData.attendance.late.length }}人

-

+

{{ `${index + 1}. ${name}` }}

不参与: {{ state.boardData.attendance.exclude.length }}人

-

+

{{ `${index + 1}. ${name}` }}

@@ -208,7 +222,11 @@ {{ state.snackbarText }} - + 编辑出勤状态 @@ -295,9 +313,7 @@ - - 确认保存 - + 确认保存 您正在修改 {{ state.dateString }} 的数据，确定要保存吗？ @@ -306,9 +322,7 @@ 取消 - - 确认保存 - + 确认保存 @@ -320,7 +334,7 @@ import dataProvider from "@/utils/dataProvider"; import { getSetting, watchSettings, setSetting } from "@/utils/settings"; import { useDisplay } from "vuetify"; import "../styles/index.scss"; -import "../styles/transitions.scss"; // 添加新的样式导入 +import "../styles/transitions.scss"; // 添加新的样式导入 import { debounce, throttle } from "@/utils/debounce"; export default { @@ -340,8 +354,8 @@ export default { attendance: { absent: [], late: [], - exclude: [] - } + exclude: [], + }, }, dialogVisible: false, dialogTitle: "", @@ -615,7 +629,7 @@ export default { this.state.noDataMessage = response.error.message; this.state.boardData = { homework: {}, - attendance: { absent: [], late: [], exclude: [] } + attendance: { absent: [], late: [], exclude: [] }, }; } else { throw new Error(response.error.message); @@ -637,7 +651,11 @@ export default { // 如果是自动保存但不满足自动保存条件 if (isAutoSave && !this.canAutoSave) { if (this.shouldShowBlockedMessage) { - this.showMessage('需要手动保存', '已禁止自动保存非当天数据', 'warning'); + this.showMessage( + "需要手动保存", + "已禁止自动保存非当天数据", + "warning" + ); } return false; } @@ -656,7 +674,7 @@ export default { await this.uploadData(); return true; } catch (error) { - this.$message.error('保存失败', error.message || '请重试'); + this.$message.error("保存失败", error.message || "请重试"); return false; } }, @@ -668,7 +686,9 @@ export default { if (content) { // 更新内容 this.state.boardData.homework[this.currentEditSubject] = { - name: this.state.availableSubjects.find(s => s.key === this.currentEditSubject)?.name, + name: this.state.availableSubjects.find( + (s) => s.key === this.currentEditSubject + )?.name, content, }; this.state.synced = false; @@ -770,13 +790,22 @@ export default { toggleStudentStatus(index) { const student = this.state.studentList[index]; if (this.state.boardData.attendance.absent.includes(student)) { - this.state.boardData.attendance.absent = this.state.boardData.attendance.absent.filter(name => name !== student); + this.state.boardData.attendance.absent = + this.state.boardData.attendance.absent.filter( + (name) => name !== student + ); this.state.boardData.attendance.late.push(student); } else if (this.state.boardData.attendance.late.includes(student)) { - this.state.boardData.attendance.late = this.state.boardData.attendance.late.filter(name => name !== student); + this.state.boardData.attendance.late = + this.state.boardData.attendance.late.filter( + (name) => name !== student + ); this.state.boardData.attendance.exclude.push(student); } else if (this.state.boardData.attendance.exclude.includes(student)) { - this.state.boardData.attendance.exclude = this.state.boardData.attendance.exclude.filter(name => name !== student); + this.state.boardData.attendance.exclude = + this.state.boardData.attendance.exclude.filter( + (name) => name !== student + ); } else { this.state.boardData.attendance.absent.push(student); } @@ -933,7 +962,7 @@ export default { this.state.boardData.attendance = { absent: [], late: [], - exclude: [] + exclude: [], }; this.state.synced = false; }, @@ -955,27 +984,43 @@ export default { isPresent(index) { const student = this.state.studentList[index]; const { absent, late, exclude } = this.state.boardData.attendance; - return !absent.includes(student) && !late.includes(student) && !exclude.includes(student); + return ( + !absent.includes(student) && + !late.includes(student) && + !exclude.includes(student) + ); }, isAbsent(index) { - return this.state.boardData.attendance.absent.includes(this.state.studentList[index]); + return this.state.boardData.attendance.absent.includes( + this.state.studentList[index] + ); }, isLate(index) { - return this.state.boardData.attendance.late.includes(this.state.studentList[index]); + return this.state.boardData.attendance.late.includes( + this.state.studentList[index] + ); }, isExclude(index) { - return this.state.boardData.attendance.exclude.includes(this.state.studentList[index]); + return this.state.boardData.attendance.exclude.includes( + this.state.studentList[index] + ); }, setPresent(index) { const student = this.state.studentList[index]; const { absent, late, exclude } = this.state.boardData.attendance; - this.state.boardData.attendance.absent = absent.filter(name => name !== student); - this.state.boardData.attendance.late = late.filter(name => name !== student); - this.state.boardData.attendance.exclude = exclude.filter(name => name !== student); + this.state.boardData.attendance.absent = absent.filter( + (name) => name !== student + ); + this.state.boardData.attendance.late = late.filter( + (name) => name !== student + ); + this.state.boardData.attendance.exclude = exclude.filter( + (name) => name !== student + ); this.state.synced = false; }, @@ -1008,7 +1053,7 @@ export default { async saveAttendance() { try { - await this.uploadData(); // 现在会自动使用当前选中的日期 + await this.trySave(true); this.state.attendanceDialog = false; } catch (error) { console.error("保存出勤状态失败:", error); @@ -1032,8 +1077,8 @@ export default { const rect = card.getBoundingClientRect(); const x = ((e.clientX - rect.left) / rect.width) * 100; const y = ((e.clientY - rect.top) / rect.height) * 100; - card.style.setProperty('--x', `${x}%`); - card.style.setProperty('--y', `${y}%`); + card.style.setProperty("--x", `${x}%`); + card.style.setProperty("--y", `${y}%`); }, handleTouchMove(e) { @@ -1043,8 +1088,8 @@ export default { const rect = card.getBoundingClientRect(); const x = ((touch.clientX - rect.left) / rect.width) * 100; const y = ((touch.clientY - rect.top) / rect.height) * 100; - card.style.setProperty('--x', `${x}%`); - card.style.setProperty('--y', `${y}%`); + card.style.setProperty("--x", `${x}%`); + card.style.setProperty("--y", `${y}%`); } }, @@ -1058,8 +1103,8 @@ export default { }, reject: () => { this.confirmDialog.show = false; - reject(new Error('用户取消保存')); - } + reject(new Error("用户取消保存")); + }, }; }); }, @@ -1074,7 +1119,7 @@ export default { cancelSave() { this.confirmDialog.show = false; if (this.confirmDialog.reject) { - this.confirmDialog.reject(new Error('用户取消保存')); + this.confirmDialog.reject(new Error("用户取消保存")); } }, @@ -1082,6 +1127,13 @@ export default { async manualUpload() { return this.trySave(false); }, + + async handleAttendanceDialogClose(newValue) { + if (!newValue && !this.state.synced) { + // 对话框关闭且数据未同步时尝试保存 + await this.trySave(true); + } + }, }, };