From d16e6c90757393f0bc6e49c86d9bd1ac962d0706 Mon Sep 17 00:00:00 2001
From: lyt-Top <1105290566@qq.com>
Date: Tue, 12 Jan 2021 22:48:55 +0800
Subject: [PATCH] =?UTF-8?q?'admin-21.01.12:=E6=96=B0=E5=A2=9E=E5=B8=83?=
=?UTF-8?q?=E5=B1=80=E9=85=8D=E7=BD=AE=E8=87=AA=E5=8A=A8=E9=94=81=E5=B1=8F?=
=?UTF-8?q?=E7=95=8C=E9=9D=A2'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vue-admin-wonderful-next/package.json | 2 +-
vue-admin-wonderful-next/src/App.vue | 12 +-
vue-admin-wonderful-next/src/store/index.ts | 3 +-
.../src/utils/themeConfig.ts | 3 +-
.../src/views/layout/lockScreen/index.vue | 212 ++++++++++++------
.../layout/navBars/breadcrumb/setings.vue | 14 +-
6 files changed, 169 insertions(+), 77 deletions(-)
diff --git a/vue-admin-wonderful-next/package.json b/vue-admin-wonderful-next/package.json
index 4fb1842..d41813a 100644
--- a/vue-admin-wonderful-next/package.json
+++ b/vue-admin-wonderful-next/package.json
@@ -6,7 +6,7 @@
"build": "vite build"
},
"dependencies": {
- "element-plus": "^v1.0.1-beta.23",
+ "element-plus": "^v1.0.1-beta.24",
"mitt": "^2.1.0",
"sortablejs": "^1.10.2",
"vue": "^3.0.5",
diff --git a/vue-admin-wonderful-next/src/App.vue b/vue-admin-wonderful-next/src/App.vue
index d56e3d1..26001aa 100644
--- a/vue-admin-wonderful-next/src/App.vue
+++ b/vue-admin-wonderful-next/src/App.vue
@@ -1,10 +1,10 @@
-
+
\ No newline at end of file
diff --git a/vue-admin-wonderful-next/src/store/index.ts b/vue-admin-wonderful-next/src/store/index.ts
index f980d1a..3aba339 100644
--- a/vue-admin-wonderful-next/src/store/index.ts
+++ b/vue-admin-wonderful-next/src/store/index.ts
@@ -23,7 +23,8 @@ export interface RootStateTypes {
isFixedHeader: boolean,
isFixedHeaderChange: boolean,
isCollapse1: boolean,
- menuWidth1: number,
+ isLockScreen: boolean,
+ lockScreenTime: number,
isShowLogo: boolean,
isShowLogoChange: boolean,
isBreadcrumb: boolean,
diff --git a/vue-admin-wonderful-next/src/utils/themeConfig.ts b/vue-admin-wonderful-next/src/utils/themeConfig.ts
index bdfa254..7d62a57 100644
--- a/vue-admin-wonderful-next/src/utils/themeConfig.ts
+++ b/vue-admin-wonderful-next/src/utils/themeConfig.ts
@@ -20,7 +20,8 @@ export default {
isFixedHeader: false,
isFixedHeaderChange: false,
isCollapse1: false,
- menuWidth1: 200,
+ isLockScreen: false,
+ lockScreenTime: 30,
isShowLogo: false,
isShowLogoChange: false,
isBreadcrumb: true,
diff --git a/vue-admin-wonderful-next/src/views/layout/lockScreen/index.vue b/vue-admin-wonderful-next/src/views/layout/lockScreen/index.vue
index 9dd731b..871c89d 100644
--- a/vue-admin-wonderful-next/src/views/layout/lockScreen/index.vue
+++ b/vue-admin-wonderful-next/src/views/layout/lockScreen/index.vue
@@ -1,92 +1,164 @@
-
-
-
-
-
-
22:14
-
1月11日,星期一
+
+
+
+
+
+
+
{{time.hm}}{{time.s}}
+
{{time.mdq}}
+
+
+
+
+
+

+
+
Administrator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-

-
-
Administrator
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-