From 82e3d1db1aba58b5e7fb131cb0ff7af81448e808 Mon Sep 17 00:00:00 2001 From: fangxiang Date: Thu, 17 Mar 2022 16:45:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=88=86?= =?UTF-8?q?=E8=BE=A8=E7=8E=87=E5=8D=8F=E8=AE=AE=EF=BC=8C=E5=92=8C=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- src/components/SystemSettingDialog.vue | 4 +- src/entities/WSProtocol.ts | 2 +- src/i18n/zh-CN/index.ts | 2 + src/pages/Login.vue | 322 ++++++++++++------- src/pages/TopToolBar.vue | 1 + yarn.lock | 409 +++++++++++++------------ 7 files changed, 438 insertions(+), 305 deletions(-) diff --git a/package.json b/package.json index 560724f..41d95da 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "test": "echo \"No test specified\" && exit 0" }, "dependencies": { - "@quasar/cli": "^1.3.0", + "@quasar/cli": "^1.3.1", "@quasar/extras": "^1.12.5", "@types/element-resize-detector": "^1.1.3", "autoprefixer": "^10.4.2", @@ -19,6 +19,7 @@ "qrcode.vue": "^3.3.3", "quasar": "^2.5.5", "reconnecting-websocket": "^4.4.0", + "ts-md5": "^1.2.11", "v-viewer": "^3.0.9", "vue": "^3.0.0", "vue-i18n": "^9.1.9", diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue index c727ea2..e79c478 100644 --- a/src/components/SystemSettingDialog.vue +++ b/src/components/SystemSettingDialog.vue @@ -973,9 +973,7 @@ export default defineComponent({ ?.getSupportResolutions(); if (support_resolutions) { device_resolution_options.value = []; - for (const item of Object.keys( - support_resolutions.device_support_resolutions - )) { + for (const item of support_resolutions.device_edid_support_resolutions) { device_resolution_options.value.push(item); } device_resolution_type.value = diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts index 3f3040e..e754b7d 100644 --- a/src/entities/WSProtocol.ts +++ b/src/entities/WSProtocol.ts @@ -1657,7 +1657,7 @@ export namespace Protocol { timing: string = ""; } export class GetSupportResolutionsResponseEntity extends Protocol.PacketEntity { - device_support_resolutions: Object = {}; + device_edid_support_resolutions: string[] = []; current_device_resolution: string = ""; screen_width = 0; screen_height = 0; diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index e7f8589..09432e5 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -417,4 +417,6 @@ export default { "last days": "剩余天数", "register date": "注册日期", "open file": "打开文件", + "remember password": "记住密码", + "auto login": "自动登录", }; diff --git a/src/pages/Login.vue b/src/pages/Login.vue index ef179b3..3040ac7 100644 --- a/src/pages/Login.vue +++ b/src/pages/Login.vue @@ -2,116 +2,145 @@ - + {{ $t("login") }} - - - - + + + + + + + + + - - - + + + + + + + - - - + + + + + + + + + + + + + + + + @@ -131,16 +160,17 @@