From 28678c67254caaa930635ca4f753d2513dd5ead8 Mon Sep 17 00:00:00 2001
From: MKStoler <MKStoler1024@proton.me>
Date: Wed, 20 Nov 2024 13:50:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20[=E6=9C=AA=E5=AE=8C=E5=B7=A5]?=
 =?UTF-8?q?=E9=9B=86=E6=8E=A7=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/pages/mainWindow.vue | 62 ++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/pages/mainWindow.vue b/src/renderer/src/pages/mainWindow.vue
index eb4d545..cf8dae3 100644
--- a/src/renderer/src/pages/mainWindow.vue
+++ b/src/renderer/src/pages/mainWindow.vue
@@ -1,28 +1,81 @@
 <template>
   <v-container class="main-container" fill-height>
     <v-row justify="center" align="center">
+      <v-col cols="12" md="4">
+        <v-card class="pa-4 fade-in slide-in" outlined>
+          <v-text-field v-model="remoteUrl" label="请求地址" clearable></v-text-field>
+          <v-btn block color="deep-purple accent-4" dark @click="saveUrl">保存地址</v-btn>
+          <p class="mt-2 text-center">输入并保存请求地址</p>
+        </v-card>
+      </v-col>
+      <v-col cols="12" md="4">
+        <v-card class="pa-4 fade-in slide-in" outlined>
+          <v-btn block color="teal accent-4" dark @click="fetchConfig">请求配置</v-btn>
+          <p class="mt-2 text-center">请求并加载配置</p>
+        </v-card>
+      </v-col>
+    </v-row>
+    <v-row justify="center" align="center" class="mt-4">
       <v-col cols="12" md="4">
         <v-card class="pa-4 fade-in slide-in" outlined>
           <v-btn block color="deep-purple accent-4" dark @click="openDialog">打开配置</v-btn>
           <p class="mt-2 text-center">打开 JSON 配置文件</p>
         </v-card>
       </v-col>
-      <v-col cols="12" md="4" class="mt-4 mt-md-0">
+      <v-col cols="12" md="4">
         <v-card class="pa-4 fade-in slide-in" outlined>
           <v-btn block color="teal accent-4" dark @click="gotoInfoPage">直接进入看板</v-btn>
           <p class="mt-2 text-center">直接进入看板，将继续使用上次加载的配置</p>
         </v-card>
       </v-col>
     </v-row>
+    <v-dialog v-model="errorDialog" max-width="500">
+      <v-card>
+        <v-card-title class="headline">错误</v-card-title>
+        <v-card-text>{{ errorMessage }}</v-card-text>
+        <v-card-actions>
+          <v-btn color="red darken-1" text @click="errorDialog = false">关闭</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
   </v-container>
 </template>
 
 <script setup>
+import { ref, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { useProfileStore } from '@renderer/stores/app';
 
 const globalStore = useProfileStore();
 const router = useRouter();
+const remoteUrl = ref(localStorage.getItem('remoteUrl') || '');
+const errorDialog = ref(false);
+const errorMessage = ref('');
+
+function saveUrl() {
+  localStorage.setItem('remoteUrl', remoteUrl.value);
+  alert('地址已保存');
+}
+
+async function fetchConfig() {
+  if (remoteUrl.value) {
+    try {
+      const configResponse = await fetch(remoteUrl.value);
+      if (!configResponse.ok) {
+        throw new Error('无法获取配置文件');
+      }
+      const config = await configResponse.json();
+      globalStore.$patch(config);
+      router.push('/infoPage');
+    } catch (error) {
+      errorMessage.value = error.message;
+      errorDialog.value = true;
+    }
+  } else {
+    errorMessage.value = '请输入有效的请求地址';
+    errorDialog.value = true;
+  }
+}
 
 function openDialog() {
   window.electron.ipcRenderer.send('prog:loadjson');
@@ -38,6 +91,13 @@ window.electron.ipcRenderer.on('common:openFile', (event, message) => {
   globalStore.$patch(examData);
   router.push('/infoPage');
 });
+
+onMounted(() => {
+  const savedUrl = localStorage.getItem('remoteUrl');
+  if (savedUrl) {
+    remoteUrl.value = savedUrl;
+  }
+});
 </script>
 
 <style scoped>

From 4b2108e7a4fdd88ee29586522ed2fed17e44bccd Mon Sep 17 00:00:00 2001
From: MKStoler <MKStoler1024@proton.me>
Date: Sat, 30 Nov 2024 06:50:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E9=9B=86=E6=8E=A7=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                             | 54 +++++++++++++--------------
 src/renderer/src/pages/mainWindow.vue | 26 +++++--------
 2 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/README.md b/README.md
index cf09fe8..430f3e2 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 <image src="resources/icon.png" height="64"/>
 
 # dsz-exam-showboard-next
+
 # DSZ考试看板 next（原DSZ考试看板）
 
 ![WelcomePage](/.Screenshots/WelcomePage.jpg)
@@ -18,26 +19,26 @@
 [![Github Last Commit](https://img.shields.io/github/last-commit/MKStoler4096/dsz-exam-showboard-next)](https://github.com/MKStoler4096/dsz-exam-showboard-next/commits/master)
 [![GitHub Language Count](https://img.shields.io/github/languages/count/MKStoler4096/dsz-exam-showboard-next)](https://github.com/MKStoler4096/dsz-exam-showboard-next)
 [![GitHub Top Language](https://img.shields.io/github/languages/top/MKStoler4096/dsz-exam-showboard-next)](https://github.com/MKStoler4096/dsz-exam-showboard-next)
-[![LICENSE](https://img.shields.io/badge/License-GPL--3.0-red.svg "LICENSE")](LICENSE)
+[![LICENSE](https://img.shields.io/badge/License-GPL--3.0-red.svg 'LICENSE')](LICENSE)
 [![QQ群](https://img.shields.io/badge/-QQ%E7%BE%A4%EF%BD%9C901670561-blue?style=flat&logo=TencentQQ&logoColor=white)](https://qm.qq.com/q/zDiEipHsaI)
 
 一款显示当前时间与考试详细信息的看板类软件
 
 | 下载 | [Releases](https://github.com/MKStoler4096/dsz-exam-showboard-next/releases) | [Actions](https://github.com/MKStoler4096/dsz-exam-showboard-next/actions) |
-| - | - | - |
+| ---- | ---------------------------------------------------------------------------- | -------------------------------------------------------------------------- |
 
 </div>
 
-> [!tip]
-> **本软件使用`Vue` + `TypeScript` + `JavaScript`制作，使用`Node.js` + `Electron`完善系统级功能并打包。**
+> [!tip] > **本软件使用`Vue` + `TypeScript` + `JavaScript`制作，使用`Node.js` + `Electron`完善系统级功能并打包。**
 
 ## 功能
+
 - 起始页展示`打开配置`、`直接进入看板`按钮
 - 看板页面
-	- 上方展示`考试标题`、`信息`
-	- 左侧展示`当前时间`、`当前科目`、`考试时间`、`考试状态`
-	- 右侧展示考试科目列表，包括`科目`、`开始`、`结束`、`状态`
-	- 考试结束前15分钟黄字提醒
+  - 上方展示`考试标题`、`信息`
+  - 左侧展示`当前时间`、`当前科目`、`考试时间`、`考试状态`
+  - 右侧展示考试科目列表，包括`科目`、`开始`、`结束`、`状态`
+  - 考试结束前15分钟黄字提醒
 
 ## 开始使用
 
@@ -48,26 +49,27 @@
 - 编写`json`配置文件
 
 新建文件`exam_config.json`，模板如下
+
 ```json
 {
-    "examName": "考试名称",
-    "message": "信息",
-    "examInfos": [
-        {
-            "name": "科目",
-            "start": "2024-10-01T07:00:00",
-            "end": "2024-10-01T08:00:00"
-        },
-        {
-            "name": "科目",
-            "start": "2024-10-01T09:00:00",
-            "end": "2024-10-01T10:00:00"
-        }
-    ]
+  "examName": "考试名称",
+  "message": "信息",
+  "examInfos": [
+    {
+      "name": "科目",
+      "start": "2024-10-01T07:00:00",
+      "end": "2024-10-01T08:00:00"
+    },
+    {
+      "name": "科目",
+      "start": "2024-10-01T09:00:00",
+      "end": "2024-10-01T10:00:00"
+    }
+  ]
 }
 ```
 
--  打开软件，进入起始页面，点击`打开配置`按钮，选择配置文件，下次可点击`直接进入看板`按钮，将继续使用上次加载的配置。 
+- 打开软件，进入起始页面，点击`打开配置`按钮，选择配置文件，下次可点击`直接进入看板`按钮，将继续使用上次加载的配置。
 
 ## 遇到问题
 
@@ -82,8 +84,7 @@
 ### Recommended IDE Setup
 
 - [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar)
-> [!Caution]
-> **必须使用Yarn包管理。Node版本要求为20。**
+  > [!Caution] > **必须使用Yarn包管理。Node版本要求为20。**
 
 ### Project Setup
 
@@ -118,8 +119,7 @@ $ yarn build:linux
 
 - 正在[`dev`](https://github.com/MKStoler4096/dsz-exam-showboard-next/commits/dev)分支上开发`1.3-Zob`版本。
 
-> [!note]
-> **如果dev模式页面不显示或按钮点击无效等问题，请连续刷新至少3次后再进行操作。build后没有此问题。**
+> [!note] > **如果dev模式页面不显示或按钮点击无效等问题，请连续刷新至少3次后再进行操作。build后没有此问题。**
 
 ## Stars 历史
 
diff --git a/src/renderer/src/pages/mainWindow.vue b/src/renderer/src/pages/mainWindow.vue
index cf8dae3..db309df 100644
--- a/src/renderer/src/pages/mainWindow.vue
+++ b/src/renderer/src/pages/mainWindow.vue
@@ -1,30 +1,24 @@
 <template>
   <v-container class="main-container" fill-height>
     <v-row justify="center" align="center">
-      <v-col cols="12" md="4">
+      <v-col cols="12" md="4" class="d-flex flex-column">
         <v-card class="pa-4 fade-in slide-in" outlined>
           <v-text-field v-model="remoteUrl" label="请求地址" clearable></v-text-field>
           <v-btn block color="deep-purple accent-4" dark @click="saveUrl">保存地址</v-btn>
           <p class="mt-2 text-center">输入并保存请求地址</p>
-        </v-card>
-      </v-col>
-      <v-col cols="12" md="4">
-        <v-card class="pa-4 fade-in slide-in" outlined>
-          <v-btn block color="teal accent-4" dark @click="fetchConfig">请求配置</v-btn>
-          <p class="mt-2 text-center">请求并加载配置</p>
-        </v-card>
-      </v-col>
-    </v-row>
-    <v-row justify="center" align="center" class="mt-4">
-      <v-col cols="12" md="4">
-        <v-card class="pa-4 fade-in slide-in" outlined>
-          <v-btn block color="deep-purple accent-4" dark @click="openDialog">打开配置</v-btn>
+          <v-btn block color="deep-purple accent-4" dark class="mt-2" @click="openDialog"
+            >打开配置</v-btn
+          >
           <p class="mt-2 text-center">打开 JSON 配置文件</p>
         </v-card>
       </v-col>
-      <v-col cols="12" md="4">
+      <v-col cols="12" md="4" class="d-flex flex-column">
         <v-card class="pa-4 fade-in slide-in" outlined>
-          <v-btn block color="teal accent-4" dark @click="gotoInfoPage">直接进入看板</v-btn>
+          <v-btn block color="teal accent-4" dark @click="fetchConfig">请求配置</v-btn>
+          <p class="mt-2 text-center">请求并加载配置</p>
+          <v-btn block color="teal accent-4" dark class="mt-2" @click="gotoInfoPage"
+            >直接进入看板</v-btn
+          >
           <p class="mt-2 text-center">直接进入看板，将继续使用上次加载的配置</p>
         </v-card>
       </v-col>

From acba4956b0e917debcbdd409b540f546a5c5969f Mon Sep 17 00:00:00 2001
From: MKStoler <MKStoler1024@proton.me>
Date: Sat, 30 Nov 2024 12:00:25 +0800
Subject: [PATCH 3/3] 1.2.0

---
 README.md    | 27 ++++++++++++++++++---------
 package.json |  2 +-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 430f3e2..ed6426a 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@
   - 左侧展示`当前时间`、`当前科目`、`考试时间`、`考试状态`
   - 右侧展示考试科目列表，包括`科目`、`开始`、`结束`、`状态`
   - 考试结束前15分钟黄字提醒
+  - 集控功能（早期测试）
 
 ## 开始使用
 
@@ -71,6 +72,10 @@
 
 - 打开软件，进入起始页面，点击`打开配置`按钮，选择配置文件，下次可点击`直接进入看板`按钮，将继续使用上次加载的配置。
 
+- 集控
+
+仿照 `ClassIsland` 的集控方法，把上面提到的 `exam_config.json` 传上去，获得 `raw` 直链粘贴回文本框并保存即可。
+
 ## 遇到问题
 
 💡 如果您遇到`Bug`，或需要提出`优化`建议或新的`功能`，请提交[`Issues`](https://github.com/MKStoler4096/dsz-exam-showboard-next/issues)或在[`Discussions`](https://github.com/MKStoler4096/dsz-exam-showboard-next/discussions)中讨论。
@@ -81,26 +86,32 @@
 
 ## 开发
 
-### Recommended IDE Setup
+### 推荐开发环境
 
 - [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar)
   > [!Caution] > **必须使用Yarn包管理。Node版本要求为20。**
 
-### Project Setup
+### 工程构建
 
-#### Install
+#### 配置
 
 ```bash
 $ yarn
 ```
 
-#### Development
+#### 开发
 
 ```bash
 $ yarn dev
+# 如果无法显示，可以尝试使用下面的命令（不支持热重载）：
+$ yarn start
 ```
 
-#### Build
+> [!note]
+>
+> **如果dev模式页面不显示或按钮点击无效等问题，请连续刷新至少3次后再进行操作。build后没有此问题。**
+
+#### 生成
 
 ```bash
 # For windows
@@ -113,13 +124,11 @@ $ yarn build:mac
 $ yarn build:linux
 ```
 
-### Progress
+### 开发进度
 
 - 正在[`master`](https://github.com/MKStoler4096/dsz-exam-showboard-next/commits/master)分支上维护`1.2-Yesod`版本。
 
-- 正在[`dev`](https://github.com/MKStoler4096/dsz-exam-showboard-next/commits/dev)分支上开发`1.3-Zob`版本。
-
-> [!note] > **如果dev模式页面不显示或按钮点击无效等问题，请连续刷新至少3次后再进行操作。build后没有此问题。**
+- 正在[`dev`](https://github.com/MKStoler4096/dsz-exam-showboard-next/commits/dev)分支上开发`1.3-HOD`版本。
 
 ## Stars 历史
 
diff --git a/package.json b/package.json
index 01b6b4b..ebf92e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "examshowboard",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "电子考试展示板",
   "main": "./out/main/index.js",
   "author": "Hello8693&MKStoler <hello8693@hello8693.xyz>",