From f9eaa8acd5dad33b3aa29f6b146bf49aff38dd30 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 13 Sep 2024 10:13:13 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=99=BB=E5=BD=95=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E5=88=B0=E6=9C=9F=E6=8F=90=E7=A4=BA=E6=98=8E=E7=A1=AE=E5=88=B0?=
 =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4=202=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5=E9=87=8D=E7=BD=AE=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/LoginForm.vue | 18 ++++++++++--------
 src/views/system/passwordRule/index.vue  | 16 +++++++++-------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 6fcefd3cd..ed783f5c6 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -260,14 +260,7 @@
       console.log('登陆res',res)
       const differenceDays = await PassWordApi.validateResetTime(res.userId)
       switch (differenceDays){
-        case -1:
-          await ElMessageBox.alert(
-            '<strong>密码即将到期，请尽快修改。</strong>',
-            '重要提示',
-            {
-              dangerouslyUseHTMLString: true,
-            }
-          )
+        case null:
           break
         case 0:
           await ElMessageBox.alert(
@@ -288,6 +281,15 @@
             }
           )
           return
+        default:
+          await ElMessageBox.alert(
+            '密码'+differenceDays+'到期，请尽快修改。',
+            '重要提示',
+            {
+              dangerouslyUseHTMLString: true,
+            }
+          )
+          break
       }
       if (!res) {
         console.log('登录-195')
diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue
index 8582612fb..054beb7fa 100644
--- a/src/views/system/passwordRule/index.vue
+++ b/src/views/system/passwordRule/index.vue
@@ -29,7 +29,7 @@
           <el-form-item label="试错次数" prop="tryCount">
             <el-input-number
               v-model="passwordConfig.tryCount"
-              :min="0"
+              :min="3"
               :precision="0"
               style="margin-right: 10px"
             />每分钟
@@ -39,7 +39,7 @@
           <el-form-item label="锁定时长" prop="lockMinutes">
             <el-input-number
               v-model="passwordConfig.lockMinutes"
-              :min="0"
+              :min="1"
               :precision="0"
               style="margin-right: 10px"
             />小时
@@ -49,7 +49,7 @@
           <el-form-item label="试错次数" prop="tryCount">
             <el-input-number
               v-model="passwordConfig.dayTryCount"
-              :min="0"
+              :min="3"
               :precision="0"
               style="margin-right: 10px"
             />每天
@@ -59,7 +59,7 @@
           <el-form-item label="更新周期" prop="updatePeriod">
             <el-input-number
               v-model="passwordConfig.updatePeriod"
-              :min="0"
+              :min="3"
               :precision="0"
               style="margin-right: 10px"
             />天
@@ -69,7 +69,7 @@
           <el-form-item label="更新预警期" prop="updateRemind">
             <el-input-number
               v-model="passwordConfig.updateRemind"
-              :min="0"
+              :min="1"
               :precision="0"
               style="margin-right: 10px"
             />天
@@ -109,8 +109,9 @@ const reset = () => {
     ruleDesc: "",
     tryCount: 3,
     lockMinutes: 1,
-    updatePeriod: 1,
+    updatePeriod: 30,
     dayTryCount: 3,
+    updateRemind: 7,
   }
 }
 const passwordConfig = ref({
@@ -119,8 +120,9 @@ const passwordConfig = ref({
   ruleDesc: "",
   tryCount: 3,
   lockMinutes: 1,
-  updatePeriod: 1,
+  updatePeriod: 30,
   dayTryCount: 3,
+  updateRemind: 7,
 })
 /** 查询配置 */
 const getConfig = async () => {