From 2c161f902a4cff07146a47c670ef3701e03eab67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Wed, 13 Nov 2024 14:41:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/myUser/index.js                       |  6 ++---
 .../NavBar/components/NavbarRight.vue         | 27 ++++++++++++++++++-
 .../NavBar/components/NavbarRight2.vue        | 26 +++++++++++++++++-
 src/views/system/user/index.vue               |  5 ++++
 4 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/src/api/myUser/index.js b/src/api/myUser/index.js
index faef55c..64a08c7 100644
--- a/src/api/myUser/index.js
+++ b/src/api/myUser/index.js
@@ -23,15 +23,15 @@ const deleteUser = (id) => {
         method: "delete"
     });
 }
-//更新用户信息
+//更新用户密码
 const updatePassword = (id, data) => {
     return request({
-        url: `/users/${id}/auth`,
+        url: `/users/${id}/password`,
         method: "put",
         data: data
     });
 }
-//更新用户密码
+//更新用户信息
 const updateAuth = (id, data) => {
     return request({
         url: `/users/${id}/auth`,
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index d706634..4d75c6c 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -30,7 +30,7 @@
       </div>
       <template #dropdown>
         <el-dropdown-menu>          
-          <el-dropdown-item >
+          <el-dropdown-item @click="resetPassword">
             修改密码
           </el-dropdown-item>
           <el-dropdown-item  @click="logout">
@@ -50,7 +50,9 @@ import {
   useUserStore,
   useSettingsStore,
 } from "@/store";
+import md5 from 'js-md5';
 import defaultSettings from "@/settings";
+import UserAPI from "@/api/myUser";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 
 const appStore = useAppStore();
@@ -85,6 +87,29 @@ function logout() {
       });
   });
 }
+
+/** 重置密码 */
+function resetPassword() {
+  ElMessageBox.prompt("请输入用户「" + userStore.user.username + "」的新密码", "重置密码", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+  }).then(({ value }) => {
+    if (!value || value.length < 6) {
+      // 检查密码是否为空或少于6位
+      ElMessage.warning("密码至少需要6位字符，请重新输入");
+      return false;
+    }
+    debugger
+    UserAPI.updatePassword(userStore.user.userId, { password: md5(value) }).then((res) => {
+      if (res.data.code == 0) {
+        ElMessage.success("密码重置成功，新密码是：" + value);
+      } else {
+        ElMessage.error("密码重置失败！" + res.data.message);
+      }
+    });
+  });
+}
+
 </script>
 <style lang="scss" scoped>
 .setting-item {
diff --git a/src/layout/components/NavBar/components/NavbarRight2.vue b/src/layout/components/NavBar/components/NavbarRight2.vue
index f4b92ef..c49f191 100644
--- a/src/layout/components/NavBar/components/NavbarRight2.vue
+++ b/src/layout/components/NavBar/components/NavbarRight2.vue
@@ -25,7 +25,7 @@
       </div>
       <template #dropdown>
         <el-dropdown-menu>          
-          <el-dropdown-item >
+          <el-dropdown-item @click="resetPassword">
             修改密码
           </el-dropdown-item>
           <el-dropdown-item  @click="logout">
@@ -45,7 +45,9 @@ import {
   useUserStore,
   useSettingsStore,
 } from "@/store";
+import md5 from 'js-md5';
 import defaultSettings from "@/settings";
+import UserAPI from "@/api/myUser";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 
 const appStore = useAppStore();
@@ -80,6 +82,28 @@ function logout() {
       });
   });
 }
+
+/** 重置密码 */
+function resetPassword() {
+  ElMessageBox.prompt("请输入用户「" + userStore.user.username + "」的新密码", "重置密码", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+  }).then(({ value }) => {
+    if (!value || value.length < 6) {
+      // 检查密码是否为空或少于6位
+      ElMessage.warning("密码至少需要6位字符，请重新输入");
+      return false;
+    }
+    debugger
+    UserAPI.updatePassword(userStore.user.userId, { password: md5(value) }).then((res) => {
+      if (res.data.code == 0) {
+        ElMessage.success("密码重置成功，新密码是：" + value);
+      } else {
+        ElMessage.error("密码重置失败！" + res.data.message);
+      }
+    });
+  });
+}
 </script>
 <style lang="scss" scoped>
 .setting-item {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 9a2816d..8d56cfc 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -235,6 +235,11 @@ const handleSubmit = useThrottleFn(() => {
             formLoading.value = false;
           });
       } else {
+        if (form.password.length < 6) {
+          // 检查密码是否为空或少于6位
+          ElMessage.warning("密码至少需要6位字符，请重新输入");
+          return false;
+        }
         //新增用户时判断密码是否一致
         if (form.user_password != form.password) {
           ElMessage.error("两次密码不一致");