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 @@