From 567c3cd7b5037b241997714eb2d28d17ea1e3e44 Mon Sep 17 00:00:00 2001
From: MKStoler
Date: Wed, 9 Oct 2024 12:04:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=E7=AE=80=E5=8D=95=E7=9A=84?=
=?UTF-8?q?=E5=85=B3=E4=BA=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
src/renderer/src/components/AppTopBar.vue | 1 +
src/renderer/src/pages/about.vue | 38 +++++++++++++++++++++++
src/renderer/src/pages/testComponents.vue | 19 ------------
src/renderer/src/stores/app.js | 2 +-
5 files changed, 41 insertions(+), 21 deletions(-)
create mode 100644 src/renderer/src/pages/about.vue
delete mode 100644 src/renderer/src/pages/testComponents.vue
diff --git a/README.md b/README.md
index de133e7..056dc32 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@
### 开发进度
-- 在`main`分支上保留原作者`0.1.0`版本;
+- 正在`main`分支上维护`1.1.0`版本。
- 正在`dev`分支上开发`1.1-Malkuth`版本。
### Project Setup
diff --git a/src/renderer/src/components/AppTopBar.vue b/src/renderer/src/components/AppTopBar.vue
index 71bdcd1..d374b3c 100644
--- a/src/renderer/src/components/AppTopBar.vue
+++ b/src/renderer/src/components/AppTopBar.vue
@@ -5,6 +5,7 @@
回到主页
+ 关于
diff --git a/src/renderer/src/pages/about.vue b/src/renderer/src/pages/about.vue
new file mode 100644
index 0000000..c29615d
--- /dev/null
+++ b/src/renderer/src/pages/about.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+ 关于考试展板
+
+
+ 欢迎来到考试展板应用程序。这是一个用于展示考试信息的工具,帮助考生更好地了解考试安排和状态。
+
+ 本应用程序旨在为考生提供便捷的考试信息查看体验。
+ 版本号: 1.1.0-Malkuth
+
+
+
+
+
+
+
+
diff --git a/src/renderer/src/pages/testComponents.vue b/src/renderer/src/pages/testComponents.vue
deleted file mode 100644
index 2b3c6fc..0000000
--- a/src/renderer/src/pages/testComponents.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
测试页面
-
-
-
-
-
diff --git a/src/renderer/src/stores/app.js b/src/renderer/src/stores/app.js
index cba549d..8fd3214 100644
--- a/src/renderer/src/stores/app.js
+++ b/src/renderer/src/stores/app.js
@@ -4,7 +4,7 @@ import { defineStore } from 'pinia';
export const useProfileStore = defineStore('app', {
state: () => ({
examName: '考试名称',
- appHeader: 'DSZ考试看板',
+ appHeader: '考试看板',
message: '考试提醒信息',
examInfos: []
}),
From c6db4ce0475068286bc8ee0fc537120b27db7548 Mon Sep 17 00:00:00 2001
From: MKStoler
Date: Wed, 9 Oct 2024 12:26:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=E6=97=B6=E9=97=B4=E5=B7=AE1?=
=?UTF-8?q?=E7=A7=92=E7=9A=84=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/src/components/ExamList.vue | 1 +
src/renderer/src/pages/about.vue | 9 +++++++++
src/renderer/src/typed-router.d.ts | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/renderer/src/components/ExamList.vue b/src/renderer/src/components/ExamList.vue
index 9ba01a8..f9fafe3 100644
--- a/src/renderer/src/components/ExamList.vue
+++ b/src/renderer/src/components/ExamList.vue
@@ -73,6 +73,7 @@ const headers = [
const formatTime = (isoString: string) => {
const date = new Date(isoString);
+ date.setSeconds(date.getSeconds() + 1); // 加1秒
return `${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`;
};
diff --git a/src/renderer/src/pages/about.vue b/src/renderer/src/pages/about.vue
index c29615d..9ddbc5f 100644
--- a/src/renderer/src/pages/about.vue
+++ b/src/renderer/src/pages/about.vue
@@ -10,6 +10,15 @@
本应用程序旨在为考生提供便捷的考试信息查看体验。
版本号: 1.1.0-Malkuth
+ 开发者:Hello8963 & Mkstoler4096
+
+ 在 GitHub 上查看源代码
+
diff --git a/src/renderer/src/typed-router.d.ts b/src/renderer/src/typed-router.d.ts
index b49550c..42863d8 100644
--- a/src/renderer/src/typed-router.d.ts
+++ b/src/renderer/src/typed-router.d.ts
@@ -19,8 +19,8 @@ declare module 'vue-router/auto-routes' {
*/
export interface RouteNamedMap {
'/': RouteRecordInfo<'/', '/', Record, Record>,
+ '/about': RouteRecordInfo<'/about', '/about', Record, Record>,
'/infoPage': RouteRecordInfo<'/infoPage', '/infoPage', Record, Record>,
'/mainWindow': RouteRecordInfo<'/mainWindow', '/mainWindow', Record, Record>,
- '/testComponents': RouteRecordInfo<'/testComponents', '/testComponents', Record, Record>,
}
}
From f0a5fcc68a43154f2219d6b07d861f206df8bc67 Mon Sep 17 00:00:00 2001
From: MKStoler
Date: Wed, 9 Oct 2024 19:54:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat=EF=BC=9A=E5=BC=80=E8=80=83=E5=89=8D15?=
=?UTF-8?q?=E5=88=86=E9=92=9F=E5=92=8C=E8=80=83=E8=AF=95=E6=97=B6=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E5=80=92=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/src/components/SubjectInfo.vue | 26 +++++++++++++++++++++
src/renderer/src/pages/about.vue | 2 +-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/src/renderer/src/components/SubjectInfo.vue b/src/renderer/src/components/SubjectInfo.vue
index 4e3cc6e..c2c28bc 100644
--- a/src/renderer/src/components/SubjectInfo.vue
+++ b/src/renderer/src/components/SubjectInfo.vue
@@ -11,6 +11,7 @@
考试状态: {{ statusText }}
考试即将结束
+ 剩余时间: {{ remainingTime }}
@@ -69,6 +70,27 @@ const isWarning = computed(() => {
return now.value >= fifteenMinutesBeforeEnd && now.value < end;
});
+const showRemainingTime = computed(() => {
+ if (!props.exam) return false;
+
+ const start = new Date(props.exam.start);
+ const end = new Date(props.exam.end);
+ const fifteenMinutesBeforeStart = new Date(start.getTime() - 15 * 60 * 1000);
+
+ return now.value >= fifteenMinutesBeforeStart && now.value < end;
+});
+
+const remainingTime = computed(() => {
+ if (!props.exam) return '';
+
+ const end = new Date(props.exam.end);
+ const timeDiff = end.getTime() - now.value.getTime();
+ const minutes = Math.floor(timeDiff / (1000 * 60));
+ const seconds = Math.floor((timeDiff % (1000 * 60)) / 1000);
+
+ return `${minutes}分${seconds}秒`;
+});
+
// Update the current time every second
const updateNow = () => {
now.value = new Date();
@@ -86,6 +108,10 @@ updateNow();
color: #ffc107 !important; /* Vuetify's default warning color */
}
+.text--info {
+ color: #17a2b8 !important; /* Info color */
+}
+
.status-before {
color: orange;
}
diff --git a/src/renderer/src/pages/about.vue b/src/renderer/src/pages/about.vue
index 9ddbc5f..985dfa0 100644
--- a/src/renderer/src/pages/about.vue
+++ b/src/renderer/src/pages/about.vue
@@ -12,7 +12,7 @@
版本号: 1.1.0-Malkuth
开发者:Hello8963 & Mkstoler4096