mirror of
https://github.com/ZeroCatDev/Classworks.git
synced 2026-02-04 07:53:11 +00:00
Merge pull request #32 from user111192/feat-late-students-are-present
feat(settings): 添加迟到学生是否计入出勤人数的显示设置
This commit is contained in:
commit
24524c91ec
@ -28,7 +28,7 @@
|
|||||||
{{
|
{{
|
||||||
studentList.length -
|
studentList.length -
|
||||||
attendance.absent.length -
|
attendance.absent.length -
|
||||||
attendance.late.length -
|
(!getSetting("display.lateStudentsArePresent")) * attendance.late.length -
|
||||||
attendance.exclude.length
|
attendance.exclude.length
|
||||||
}}人
|
}}人
|
||||||
</span>
|
</span>
|
||||||
@ -83,6 +83,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { useDisplay } from "vuetify";
|
import { useDisplay } from "vuetify";
|
||||||
|
import {getSetting} from "@/utils/settings.js";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "AttendanceSidebar",
|
name: "AttendanceSidebar",
|
||||||
@ -106,6 +107,7 @@ export default {
|
|||||||
return { display };
|
return { display };
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
getSetting,
|
||||||
handleClick() {
|
handleClick() {
|
||||||
if (this.isEditingDisabled) {
|
if (this.isEditingDisabled) {
|
||||||
this.$emit('disabled-click');
|
this.$emit('disabled-click');
|
||||||
|
|||||||
@ -47,7 +47,7 @@
|
|||||||
{{ item.data.total - item.data.exclude.length }}/{{
|
{{ item.data.total - item.data.exclude.length }}/{{
|
||||||
item.data.total -
|
item.data.total -
|
||||||
item.data.absent.length -
|
item.data.absent.length -
|
||||||
item.data.late.length -
|
(!getSetting("display.lateStudentsArePresent")) * item.data.late.length -
|
||||||
item.data.exclude.length
|
item.data.exclude.length
|
||||||
}}
|
}}
|
||||||
</span>
|
</span>
|
||||||
@ -205,9 +205,15 @@
|
|||||||
<script>
|
<script>
|
||||||
import HitokotoCard from "@/components/HitokotoCard.vue";
|
import HitokotoCard from "@/components/HitokotoCard.vue";
|
||||||
import ConciseExamCard from "@/components/home/ConciseExamCard.vue";
|
import ConciseExamCard from "@/components/home/ConciseExamCard.vue";
|
||||||
|
import {getSetting} from "@/utils/settings.js";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "HomeworkGrid",
|
name: "HomeworkGrid",
|
||||||
|
computed: {
|
||||||
|
settings() {
|
||||||
|
return settings
|
||||||
|
}
|
||||||
|
},
|
||||||
components: {
|
components: {
|
||||||
HitokotoCard,
|
HitokotoCard,
|
||||||
ConciseExamCard,
|
ConciseExamCard,
|
||||||
@ -296,6 +302,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
getSetting,
|
||||||
async checkReadOnlyStatus() {
|
async checkReadOnlyStatus() {
|
||||||
// 尝试获取父组件中的StudentNameManager引用
|
// 尝试获取父组件中的StudentNameManager引用
|
||||||
try {
|
try {
|
||||||
|
|||||||
@ -31,6 +31,9 @@
|
|||||||
<v-divider class="my-2"/>
|
<v-divider class="my-2"/>
|
||||||
<setting-item :setting-key="'display.forceDesktopMode'"/>
|
<setting-item :setting-key="'display.forceDesktopMode'"/>
|
||||||
|
|
||||||
|
<v-divider class="my-2"/>
|
||||||
|
<setting-item :setting-key="'display.lateStudentsArePresent'"/>
|
||||||
|
|
||||||
</v-list>
|
</v-list>
|
||||||
</settings-card>
|
</settings-card>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@ -179,6 +179,13 @@ const settingsDefinitions = {
|
|||||||
icon: "mdi-monitor",
|
icon: "mdi-monitor",
|
||||||
// 启用后将不判断屏幕大小,强制使用一体机(桌面端)UI布局
|
// 启用后将不判断屏幕大小,强制使用一体机(桌面端)UI布局
|
||||||
},
|
},
|
||||||
|
"display.lateStudentsArePresent": {
|
||||||
|
type: "boolean",
|
||||||
|
default: false,
|
||||||
|
description: "将迟到人数算入出勤人数",
|
||||||
|
icon: "mdi-clock-fast",
|
||||||
|
// 启用后,迟到的人数也会计入出勤人数
|
||||||
|
},
|
||||||
// 服务器设置(合并了数据提供者设置)
|
// 服务器设置(合并了数据提供者设置)
|
||||||
"server.domain": {
|
"server.domain": {
|
||||||
type: "string",
|
type: "string",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user