From 54557d1a27dd7850ac0c902df47f2ba7c7f88b87 Mon Sep 17 00:00:00 2001
From: jsy_zjg <31502350@qq.com>
Date: Fri, 22 Nov 2024 17:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/system/user.js | 57 +++++-
pages.json | 34 ++++
pages/mine/index.vue | 8 +-
pages/mine/pwd/index.vue | 165 +++++++++---------
pages/work/land/create-new.vue | 1 -
pages/work/land/index.vue | 18 +-
static/images/mine/userAvatar.png | Bin 0 -> 308087 bytes
static/images/work/user/camera_holder.png | Bin 0 -> 24506 bytes
static/images/work/user/editpassword.png | Bin 0 -> 8426 bytes
static/images/work/user/list-size-icon.png | Bin 0 -> 2486 bytes
.../images/work/user/user-index-del-icon.png | Bin 0 -> 1250 bytes
.../images/work/user/user-index-edit-icon.png | Bin 0 -> 1267 bytes
.../work/user/user-index-phone-icon.png | Bin 0 -> 1814 bytes
store/index.js | 6 +-
14 files changed, 197 insertions(+), 92 deletions(-)
create mode 100644 static/images/mine/userAvatar.png
create mode 100644 static/images/work/user/camera_holder.png
create mode 100644 static/images/work/user/editpassword.png
create mode 100644 static/images/work/user/list-size-icon.png
create mode 100644 static/images/work/user/user-index-del-icon.png
create mode 100644 static/images/work/user/user-index-edit-icon.png
create mode 100644 static/images/work/user/user-index-phone-icon.png
diff --git a/api/system/user.js b/api/system/user.js
index 632cfd4..7ecc418 100644
--- a/api/system/user.js
+++ b/api/system/user.js
@@ -8,12 +8,23 @@ export function updateUserPwd(oldPassword, newPassword) {
newPassword
}
return request({
- url: '/system/user/profile/updatePwd',
+ url: '/system/user/resetPwd',
method: 'put',
params: data
})
}
+//重置密码
+export function userResetPwd(data) {
+ return request({
+ url: "/system/user/resetPwd",
+ method: "post",
+ data:data
+ })
+}
+
+
+
// 查询用户个人信息
export function getUserProfile() {
return request({
@@ -49,3 +60,47 @@ export function allListUser (query) {
})
}
+// 查询用户列表
+export function getUserList(data) {
+ return request({
+ url: '/system/user/app/getUserList',
+ method: 'get',
+ data:data
+ })
+}
+
+
+// 查询用户详细
+export function getUser (userId) {
+ return request({
+ url: '/system/user/' + userId,
+ method: 'get'
+ })
+}
+
+// 新增用户
+export function addUser (data) {
+ return request({
+ url: '/system/user',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改用户
+export function updateUser (data) {
+ return request({
+ url: '/system/user',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除用户
+export function delUser (userId) {
+ return request({
+ url: '/system/user/' + userId,
+ method: 'delete'
+ })
+}
+
diff --git a/pages.json b/pages.json
index 4f8d53f..a6bd726 100644
--- a/pages.json
+++ b/pages.json
@@ -38,7 +38,41 @@
"navigationBarTitleText": "地块详情",
"enablePullDownRefresh": false
}
+ },{
+ "path": "pages/work/user/index",
+ "style": {
+ "navigationBarTitleText": "用户管理",
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ "titleNView": {
+ "buttons": [{
+ "text": "\ue67b",
+ "color": "#333",
+ "fontSrc": "/static/font/uniicons.ttf",
+ "fontSize": "24px"
+ }]
+ }
+ }
+ }
+ }, {
+ "path": "pages/work/user/create-user",
+ "style": {
+ "navigationBarTitleText": "新增用户",
+ "enablePullDownRefresh": false
+ }
}, {
+ "path": "pages/work/user/ground",
+ "style": {
+ "navigationBarTitleText": "用户地块",
+ "enablePullDownRefresh": false
+ }
+ },, {
+ "path": "pages/work/user/device",
+ "style": {
+ "navigationBarTitleText": "设备权限",
+ "enablePullDownRefresh": false
+ }
+ },{
"path": "pages/index",
"style": {
"navigationBarTitleText": "田间",
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 7625281..777848c 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -46,7 +46,7 @@
地块管理
-
+