Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/attendance/AttendanceSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{{
studentList.length -
attendance.absent.length -
attendance.late.length -
(!getSetting("display.lateStudentsArePresent")) * attendance.late.length -
attendance.exclude.length
}}人
</span>
Expand Down Expand Up @@ -83,6 +83,7 @@

<script>
import { useDisplay } from "vuetify";
import {getSetting} from "@/utils/settings.js";

export default {
name: "AttendanceSidebar",
Expand All @@ -106,6 +107,7 @@ export default {
return { display };
},
methods: {
getSetting,
handleClick() {
if (this.isEditingDisabled) {
this.$emit('disabled-click');
Expand Down
9 changes: 8 additions & 1 deletion src/components/home/HomeworkGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
{{ item.data.total - item.data.exclude.length }}/{{
item.data.total -
item.data.absent.length -
item.data.late.length -
(!getSetting("display.lateStudentsArePresent")) * item.data.late.length -
item.data.exclude.length
}}
</span>
Expand Down Expand Up @@ -205,9 +205,15 @@
<script>
import HitokotoCard from "@/components/HitokotoCard.vue";
import ConciseExamCard from "@/components/home/ConciseExamCard.vue";
import {getSetting} from "@/utils/settings.js";

export default {
name: "HomeworkGrid",
computed: {
settings() {
return settings
}
},
components: {
HitokotoCard,
ConciseExamCard,
Expand Down Expand Up @@ -296,6 +302,7 @@ export default {
}
},
methods: {
getSetting,
async checkReadOnlyStatus() {
// 尝试获取父组件中的StudentNameManager引用
try {
Expand Down
3 changes: 3 additions & 0 deletions src/components/settings/cards/DisplaySettingsCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
<v-divider class="my-2"/>
<setting-item :setting-key="'display.forceDesktopMode'"/>

<v-divider class="my-2"/>
<setting-item :setting-key="'display.lateStudentsArePresent'"/>

</v-list>
</settings-card>
</template>
Expand Down
7 changes: 7 additions & 0 deletions src/utils/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,13 @@ const settingsDefinitions = {
icon: "mdi-monitor",
// 启用后将不判断屏幕大小,强制使用一体机(桌面端)UI布局
},
"display.lateStudentsArePresent": {
type: "boolean",
default: false,
description: "将迟到人数算入出勤人数",
icon: "mdi-clock-fast",
// 启用后,迟到的人数也会计入出勤人数
},
// 服务器设置(合并了数据提供者设置)
"server.domain": {
type: "string",
Expand Down
Loading