feat:新增管理员修改密码模块

portal-manager-ui/admin/src/api/user.js

-import http from '../request/http'
+import http from "../request/http";
 
 // 1.2.1. 登录
 export function LoginInterface(params) {
-    return http.post("login/login", params)
+  return http.post("login/login", params);
 }
 // 1.2.2. 首页
 export function loginIndex(params) {
-    return http.post("login/index", params)
+  return http.post("login/index", params);
 }
 // 1.2.3. 登出
 export function LogoutInterface(params) {
-    return http.post("login/logout", params)
+  return http.post("login/logout", params);
 }
-// 1.2.4. 修改密码
+// 1.2.4. 用户修改密码
 export function changePassword(params) {
-    return http.post("user/change/password", params)
+  return http.post("user/change/password", params);
+}
+// 管理员修改密码
+export function editPassword(params) {
+  return http.post("user/reset/password", params);
 }
-
-

portal-manager-ui/admin/src/directive/index.js

-
-// 用户子菜单权限
-export const permission = (el, binding) => {
+import Storage from "@/utils/js/Storage";
+// 修改密码权限
+export const permission = {
+  inserted: function (el, binding) {
     const { value } = binding;
-  const roles = ['admin'];
-  if (value && value instanceof Array && value.length > 0) {
+    const roles = Storage.get(2, "userInfo").id;
+    if (value) {
       const permissionRoles = value;
-    const hasPermission = roles.some(role => permissionRoles.includes(role));
-
+      const hasPermission = permissionRoles.includes(roles);
       if (!hasPermission) {
-      el.parentNode && el.parentNode.removeChild(el);
+        el.remove();
       }
     } else {
       throw new Error(`need roles! Like v-permission="['admin','editor']"`);
     }
-}
+  },
+};

portal-manager-ui/admin/src/views/home/components/changePassword.vue

@@ -14,17 +14,20 @@
       :label-col="{ span: 5 }"
       :wrapper-col="{ span: 19 }"
     >
-      <a-form-model-item label="用户名" prop="loginName">
-        <a-input v-model="form.loginName" />
-      </a-form-model-item>
+      <!-- <a-form-model-item label="用户名" prop="loginName">
+        <a-input v-model="form.loginName" placeholder="请输入用户名" />
+      </a-form-model-item> -->
       <a-form-model-item label="原密码" prop="oldPwd">
-        <a-input-password v-model="form.oldPwd" />
+        <a-input-password v-model="form.oldPwd" placeholder="请输入原密码" />
       </a-form-model-item>
       <a-form-model-item label="新密码" prop="newPwd">
-        <a-input-password v-model="form.newPwd" />
+        <a-input-password v-model="form.newPwd" placeholder="请输入新密码" />
       </a-form-model-item>
       <a-form-model-item label="确认新密码" prop="newPwdAgain">
-        <a-input-password v-model="form.newPwdAgain" />
+        <a-input-password
+          v-model="form.newPwdAgain"
+          placeholder="请再次输入新密码"
+        />
       </a-form-model-item>
     </a-form-model>
 
@@ -64,9 +67,9 @@ export default {
         newPwdAgain: "",
       },
       rules: {
-        loginName: [
-          { required: true, validator: changeAccount, trigger: "blur" },
-        ],
+        // loginName: [
+        //   { required: true, validator: changeAccount, trigger: "blur" },
+        // ],
         oldPwd: [
           { required: true, validator: changePassWord, trigger: "blur" },
         ],

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/EditPwd.vue

@@ -16,21 +16,25 @@
         :wrapper-col="{ span: 19 }"
       >
         <a-form-model-item label="用户名" prop="loginName">
-          <a-input v-model="form.loginName" />
-        </a-form-model-item>
-        <a-form-model-item label="原密码" prop="oldPwd">
-          <a-input-password v-model="form.oldPwd" />
+          <a-input
+            disabled
+            v-model="form.loginName"
+            placeholder="请输入用户名"
+          />
         </a-form-model-item>
         <a-form-model-item label="新密码" prop="newPwd">
-          <a-input-password v-model="form.newPwd" />
+          <a-input-password v-model="form.newPwd" placeholder="请输入新密码" />
         </a-form-model-item>
         <a-form-model-item label="确认新密码" prop="newPwdAgain">
-          <a-input-password v-model="form.newPwdAgain" />
+          <a-input-password
+            v-model="form.newPwdAgain"
+            placeholder="请再次输入新密码"
+          />
         </a-form-model-item>
       </a-form-model>
 
       <div slot="footer">
-        <a-button style="margin-left: 10px" @click="resetForm">重置</a-button>
+        <a-button style="margin-left: 10px" @click="handleClose">取消</a-button>
         <a-button type="primary" @click="handleOk">确定</a-button>
       </div>
     </a-modal>
@@ -39,7 +43,7 @@
 
 <script>
 import { changeAccount, changePassWord } from "@/utils/js/validate";
-import { changePwd } from "@/api/userManagement";
+import { editPassword } from "@/api/user";
 export default {
   props: {
     visibleEditPwd: {
@@ -60,7 +64,6 @@ export default {
     return {
       form: {
         loginName: "",
-        oldPwd: "",
         newPwd: "",
         newPwdAgain: "",
       },
@@ -68,9 +71,6 @@ export default {
         loginName: [
           { required: true, validator: changeAccount, trigger: "blur" },
         ],
-        oldPwd: [
-          { required: true, validator: changePassWord, trigger: "blur" },
-        ],
         newPwd: [
           { required: true, validator: changePassWord, trigger: "blur" },
         ],
@@ -97,13 +97,11 @@ export default {
     handleOk() {
       this.$refs.formData.validate(async (valid) => {
         if (valid) {
-          let obj = {
-            loginName: this.form.loginName,
-            oldPwd: this.form.oldPwd,
-            newPwd: this.form.newPwd,
-          };
-          let res = await changePwd(obj);
-          console.log(res.data);
+          let res = await editPassword(this.form);
+          if (res.data.code === 1) {
+            this.$message.success("密码修改成功");
+            this.handleClose();
+          }
         }
       });
     },
@@ -111,9 +109,6 @@ export default {
       this.$refs.formData.resetFields();
       this.Visible = false;
     },
-    resetForm() {
-      this.$refs.formData.resetFields();
-    },
   },
 };
 </script>

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/userManagement.vue

@@ -55,9 +55,13 @@
           <span v-else>--</span>
         </template>
         <span slot="action" slot-scope="text">
-          <!-- <a-button type="link" @click="editPwd(text.loginName)"
+          <a-button
+            type="link"
+            id="edit"
+            v-permission="[1]"
+            @click="editPwd(text.loginName)"
             >修改密码</a-button
-          > -->
+          >
           <a-button type="link" @click="editUserModal(text)">编辑</a-button>
           <a-button
             style="color: #ff4420"
@@ -84,7 +88,7 @@
       @EditSuccess="addSuccess"
     ></edit-user>
     <!-- 修改密码 -->
-    <!-- <edit-pwd ref="editPwd" :visibleEditPwd.sync="visibleEditPwd"></edit-pwd> -->
+    <edit-pwd ref="editPwd" :visibleEditPwd.sync="visibleEditPwd"></edit-pwd>
   </div>
 </template>
 
@@ -92,13 +96,13 @@
 import { userList, userDelete } from "@/api/userManagement.js";
 import addUser from "./components/addUser.vue";
 import EditUser from "./components/EditUser.vue";
-// import EditPwd from "./components/EditPwd.vue";
+import EditPwd from "./components/EditPwd.vue";
 export default {
   name: "PortalAdminVueUserManagement",
   components: {
     addUser,
     EditUser,
-    // EditPwd,
+    EditPwd,
   },
   data() {
     return {
@@ -149,7 +153,7 @@ export default {
       siteAuthorVis: false,
       tableLoading: false,
       visibleUserEdit: false,
-      // visibleEditPwd: false,
+      visibleEditPwd: false,
       tablePagination: {
         current: 1,
         pageSize: 10,
@@ -258,10 +262,10 @@ export default {
       this.getUserList();
     },
     // 修改密码
-    // editPwd(account) {
-    //   this.visibleEditPwd = true;
-    //   this.$refs.editPwd.onEdit(account);
-    // },
+    editPwd(account) {
+      this.visibleEditPwd = true;
+      this.$refs.editPwd.onEdit(account);
+    },
     addSuccess() {
       this.getUserList();
     },