From 9fd20fde9e44b0876ea5682f17bddc55e6e0d358 Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Tue, 24 Sep 2024 22:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/7250=E3=80=91=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=94=81=E5=B1=8F=E6=97=A0=E6=B3=95=E8=A7=A3=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layouts/default/setting/components/InputNumberItem.vue  | 2 +-
 jeecgboot-vue3/src/utils/cache/persistent.ts                | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jeecgboot-vue3/src/layouts/default/setting/components/InputNumberItem.vue b/jeecgboot-vue3/src/layouts/default/setting/components/InputNumberItem.vue
index 2a90caff..237f7d67 100644
--- a/jeecgboot-vue3/src/layouts/default/setting/components/InputNumberItem.vue
+++ b/jeecgboot-vue3/src/layouts/default/setting/components/InputNumberItem.vue
@@ -1,7 +1,7 @@
 <template>
   <div :class="prefixCls">
     <span> {{ title }}</span>
-    <InputNumber v-bind="$attrs" size="small" :class="`${prefixCls}-input-number`" @change="handleChange" />
+    <InputNumber :max="7200" v-bind="$attrs" size="small" :class="`${prefixCls}-input-number`" @change="handleChange" />
   </div>
 </template>
 <script lang="ts">
diff --git a/jeecgboot-vue3/src/utils/cache/persistent.ts b/jeecgboot-vue3/src/utils/cache/persistent.ts
index 7d67f5c8..7ebb0d96 100644
--- a/jeecgboot-vue3/src/utils/cache/persistent.ts
+++ b/jeecgboot-vue3/src/utils/cache/persistent.ts
@@ -21,6 +21,8 @@ import {
 import { DEFAULT_CACHE_TIME } from '/@/settings/encryptionSetting';
 import { toRaw } from 'vue';
 import { pick, omit } from 'lodash-es';
+import { PageEnum } from '/@/enums/pageEnum';
+import { router } from '/@/router';
 
 interface BasicStore {
   [TOKEN_KEY]: string | number | null | undefined;
@@ -60,9 +62,11 @@ export class Persistent {
   static getLocal<T>(key: LocalKeys) {
     //update-begin---author:scott ---date:2022-10-27  for：token过期退出重新登录，online菜单还是提示token过期----------
     const globalCache = ls.get(APP_LOCAL_CACHE_KEY);
-    if(globalCache){
+    // update-begin--author:liaozhiyang---date:20240920---for：【issues/7250】自动锁屏无法解锁
+    if (globalCache && router?.currentRoute?.value.path !== PageEnum.BASE_LOGIN) {
       localMemory.setCache(globalCache);
     }
+    // update-end--author:liaozhiyang---date:20240920---for：【issues/7250】自动锁屏无法解锁
     //update-end---author:scott ---date::2022-10-27  for：token过期退出重新登录，online菜单还是提示token过期----------
     return localMemory.get(key)?.value as Nullable<T>;
   }