From dfa31d833aa4659d5901adb57df5e6af0101d809 Mon Sep 17 00:00:00 2001 From: panqihua Date: Thu, 12 Jan 2023 06:33:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/user.js | 124 +++++------ src/assets/styles/ruoyi.scss | 1 - src/views/system/user/index.vue | 207 ++++++++++--------- src/views/system/user/profile/userAvatar.vue | 54 ++--- 4 files changed, 209 insertions(+), 177 deletions(-) diff --git a/src/api/system/user.js b/src/api/system/user.js index f2f76ef..e5c5d14 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -1,135 +1,143 @@ -import request from '@/utils/request' +import request from "@/utils/request"; import { parseStrEmpty } from "@/utils/ruoyi"; // 查询用户列表 export function listUser(query) { return request({ - url: '/system/user/list', - method: 'get', - params: query - }) + url: "/system/user/list", + method: "get", + params: query, + }); } // 查询用户详细 export function getUser(userId) { return request({ - url: '/system/user/' + parseStrEmpty(userId), - method: 'get' - }) + url: "/system/user/" + parseStrEmpty(userId), + method: "get", + }); } // 新增用户 export function addUser(data) { return request({ - url: '/system/user', - method: 'post', - data: data - }) + url: "/system/user", + method: "post", + data: data, + }); } // 修改用户 export function updateUser(data) { return request({ - url: '/system/user', - method: 'put', - data: data - }) + url: "/system/user", + method: "put", + data: data, + }); } // 删除用户 export function delUser(userId) { return request({ - url: '/system/user/' + userId, - method: 'delete' - }) + url: "/system/user/" + userId, + method: "delete", + }); } // 用户密码重置 export function resetUserPwd(userId, password) { const data = { userId, - password - } + password, + }; return request({ - url: '/system/user/resetPwd', - method: 'put', - data: data - }) + url: "/system/user/resetPwd", + method: "put", + data: data, + }); } // 用户状态修改 export function changeUserStatus(userId, status) { const data = { userId, - status - } + status, + }; return request({ - url: '/system/user/changeStatus', - method: 'put', - data: data - }) + url: "/system/user/changeStatus", + method: "put", + data: data, + }); } // 查询用户个人信息 export function getUserProfile() { return request({ - url: '/system/user/profile', - method: 'get' - }) + url: "/system/user/profile", + method: "get", + }); } // 修改用户个人信息 export function updateUserProfile(data) { return request({ - url: '/system/user/profile', - method: 'put', - data: data - }) + url: "/system/user/profile", + method: "put", + data: data, + }); } // 用户密码重置 export function updateUserPwd(oldPassword, newPassword) { const data = { oldPassword, - newPassword - } + newPassword, + }; return request({ - url: '/system/user/profile/updatePwd', - method: 'put', - params: data - }) + url: "/system/user/profile/updatePwd", + method: "put", + params: data, + }); } // 用户头像上传 export function uploadAvatar(data) { return request({ - url: '/system/user/profile/avatar', - method: 'post', - data: data - }) + url: "/system/user/profile/avatar", + method: "post", + data: data, + }); } // 查询授权角色 export function getAuthRole(userId) { return request({ - url: '/system/user/authRole/' + userId, - method: 'get' - }) + url: "/system/user/authRole/" + userId, + method: "get", + }); } // 保存授权角色 export function updateAuthRole(data) { return request({ - url: '/system/user/authRole', - method: 'put', - params: data - }) + url: "/system/user/authRole", + method: "put", + params: data, + }); } // 查询部门下拉树结构 export function deptTreeSelect() { return request({ - url: '/system/user/deptTree', - method: 'get' - }) + url: "/system/user/deptTree", + method: "get", + }); +} + +//根据手机号模糊查询 +export function phoneSelect(phonenumber) { + return request({ + url: `/system/user/phonenumber/${phonenumber}`, + method: "get", + }); } diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index db8c29b..8409fd7 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -259,7 +259,6 @@ transform: translate(-50%, -50%); width: 200px; height: 200px; - border-radius: 50%; box-shadow: 0 0 4px #ccc; overflow: hidden; } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 8fdcd1d..86141c5 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -88,10 +88,9 @@ {{ parseTime(scope.row.createTime) }} - + @@ -121,92 +120,94 @@ - + + + +

基本信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ - dict.label - }} - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ + dict.label + }} + + + + - - - - - - - - - - - - - + + -
- 确 定 - 取 消 +
+ 保存 + 重置
@@ -235,16 +236,17 @@ \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue index 70d8487..770068b 100644 --- a/src/views/system/user/profile/userAvatar.vue +++ b/src/views/system/user/profile/userAvatar.vue @@ -1,24 +1,20 @@