From 97036f0f6883f1cf6d82fb4a98b368b6091239c7 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 14 Jan 2025 16:09:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=85=A8=E5=B1=80=E4=BA=BA=E8=84=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/admin/user.ts | 121 +++++++++++++-------------
src/api/admin/userFace.ts | 67 +++++++-------
src/views/admin/system/user/index.vue | 33 +++++--
3 files changed, 123 insertions(+), 98 deletions(-)
diff --git a/src/api/admin/user.ts b/src/api/admin/user.ts
index e2f8abf..eea44dd 100644
--- a/src/api/admin/user.ts
+++ b/src/api/admin/user.ts
@@ -1,94 +1,95 @@
-import request from '/@/utils/request';
+import request from "/@/utils/request"
export const list = () => {
return request({
- url: '/admin/user/list',
- method: 'get',
- });
-};
+ url: "/admin/user/list",
+ method: "get",
+ })
+}
+
export const pageList = (params?: Object) => {
return request({
- url: '/admin/user/page',
- method: 'get',
+ url: "/admin/user/page",
+ method: "get",
params,
- });
-};
+ })
+}
export const addObj = (obj: Object) => {
return request({
- url: '/admin/user',
- method: 'post',
+ url: "/admin/user",
+ method: "post",
data: obj,
- });
-};
+ })
+}
export const getObj = (id: String) => {
return request({
- url: '/admin/user/details/' + id,
- method: 'get',
- });
-};
+ url: "/admin/user/details/" + id,
+ method: "get",
+ })
+}
export const delObj = (ids: Object) => {
return request({
- url: '/admin/user',
- method: 'delete',
+ url: "/admin/user",
+ method: "delete",
data: ids,
- });
-};
+ })
+}
export const putObj = (obj: Object) => {
return request({
- url: '/admin/user',
- method: 'put',
+ url: "/admin/user",
+ method: "put",
data: obj,
- });
-};
+ })
+}
export function getDetails(obj: Object) {
return request({
- url: '/admin/user/details',
- method: 'get',
+ url: "/admin/user/details",
+ method: "get",
params: obj,
- });
+ })
}
// 更改个人信息
export function editInfo(obj: Object) {
return request({
- url: '/admin/user/personal/edit',
- method: 'put',
+ url: "/admin/user/personal/edit",
+ method: "put",
data: obj,
- });
+ })
}
// 更改个人密码
export function password(obj: Object) {
return request({
- url: '/admin/user/personal/password',
- method: 'put',
+ url: "/admin/user/personal/password",
+ method: "put",
data: obj,
- });
+ })
}
export function unbindingUser(type) {
return request({
- url: '/admin/user/unbinding',
- method: 'post',
+ url: "/admin/user/unbinding",
+ method: "post",
params: {
type,
},
- });
+ })
}
export function checkPassword(password: string) {
return request({
- url: '/admin/user/check',
- method: 'post',
+ url: "/admin/user/check",
+ method: "post",
params: {
password,
},
- });
+ })
}
/**
@@ -96,50 +97,50 @@ export function checkPassword(password: string) {
*/
export const registerUser = (userInfo: object) => {
return request({
- url: '/admin/register/user',
- method: 'post',
+ url: "/admin/register/user",
+ method: "post",
data: userInfo,
- });
-};
+ })
+}
export const resetUserPassword = (userInfo: object) => {
return request({
- url: '/admin/register/password',
- method: 'post',
+ url: "/admin/register/password",
+ method: "post",
data: userInfo,
- });
-};
+ })
+}
export function validateUsername(rule: any, value: any, callback: any, isEdit: boolean) {
- const flag = new RegExp(/^([a-z\d]+?)$/).test(value);
+ const flag = new RegExp(/^([a-z\d]+?)$/).test(value)
if (!flag) {
- callback(new Error('用户名支持小写英文、数字'));
+ callback(new Error("用户名支持小写英文、数字"))
}
if (isEdit) {
- return callback();
+ return callback()
}
getDetails({ username: value }).then((response) => {
- const result = response.data;
+ const result = response.data
if (result !== null) {
- callback(new Error('用户名已经存在'));
+ callback(new Error("用户名已经存在"))
} else {
- callback();
+ callback()
}
- });
+ })
}
export function validatePhone(rule: any, value: any, callback: any, isEdit: boolean) {
if (isEdit) {
- return callback();
+ return callback()
}
getDetails({ phone: value }).then((response) => {
- const result = response.data;
+ const result = response.data
if (result !== null) {
- callback(new Error('手机号已经存在'));
+ callback(new Error("手机号已经存在"))
} else {
- callback();
+ callback()
}
- });
+ })
}
diff --git a/src/api/admin/userFace.ts b/src/api/admin/userFace.ts
index f9b5816..8a09b1b 100644
--- a/src/api/admin/userFace.ts
+++ b/src/api/admin/userFace.ts
@@ -1,49 +1,56 @@
import request from "/@/utils/request"
+export const putGlobalFace = (obj: Object) => {
+ return request({
+ url: "/admin/user-face/global-face",
+ method: "post",
+ data: obj,
+ })
+}
+
export function pageJoin(query?: Object) {
- return request({
- url: '/admin/user-face/page-join',
- method: 'get',
- params: query
- })
+ return request({
+ url: "/admin/user-face/page-join",
+ method: "get",
+ params: query,
+ })
}
export function fetchList(query?: Object) {
- return request({
- url: '/admin/user-face/page',
- method: 'get',
- params: query
- })
+ return request({
+ url: "/admin/user-face/page",
+ method: "get",
+ params: query,
+ })
}
export function addObj(obj?: Object) {
- return request({
- url: '/admin/user-face',
- method: 'post',
- data: obj
- })
+ return request({
+ url: "/admin/user-face",
+ method: "post",
+ data: obj,
+ })
}
export function getObj(id?: string) {
- return request({
- url: '/admin/user-face/' + id,
- method: 'get'
- })
+ return request({
+ url: "/admin/user-face/" + id,
+ method: "get",
+ })
}
export function delObjs(ids?: Object) {
- return request({
- url: '/admin/user-face',
- method: 'delete',
- data: ids
- })
+ return request({
+ url: "/admin/user-face",
+ method: "delete",
+ data: ids,
+ })
}
export function putObj(obj?: Object) {
- return request({
- url: '/admin/user-face',
- method: 'put',
- data: obj
- })
+ return request({
+ url: "/admin/user-face",
+ method: "put",
+ data: obj,
+ })
}
-
diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index 1a241a2..c3c5d14 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -113,11 +113,6 @@
{{ item.roleName }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -180,11 +191,8 @@
-
-
-
import { delObj, pageList, putObj } from "/@/api/admin/user"
+import { putGlobalFace } from "/@/api/admin/userFace"
import { deptTree } from "/@/api/admin/dept"
import { BasicTableProps, useTable } from "/@/hooks/table"
import { useMessage, useMessageBox } from "/@/hooks/message"
@@ -299,6 +308,14 @@ const changeSwitch = async (row: any) => {
getDataList()
}
+const changeGlobalFaceSwitch = async (row: any) => {
+ if (!row.isGlobalFace) return
+ // 不修改密码
+ await putGlobalFace({ userId: row.userId, isGlobalFace: row.isGlobalFace })
+ useMessage().success(t("common.optSuccessText"))
+ getDataList()
+}
+
//修改用户密码
const changePassword = async (row: any) => {
if (!inputPassword.value || inputPassword.value.length < 6 || inputPassword.value.length > 20) {