From 1f80e197195273528f2086901b97350e1b8f5f23 Mon Sep 17 00:00:00 2001
From: jiangyitao <451988022@163.com>
Date: Tue, 14 Dec 2021 22:39:31 +0800
Subject: [PATCH 01/11] =?UTF-8?q?1.=E7=99=BB=E9=99=86api=202.=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=93=8D=E5=BA=94=E6=8B=A6=E6=88=AA=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=203.=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                  |  2 +-
 src/api/console/customer/index.ts | 12 +++++++++
 src/utils/yqhp/request.ts         | 42 +++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 src/api/console/customer/index.ts
 create mode 100644 src/utils/yqhp/request.ts

diff --git a/.env.development b/.env.development
index 058274c..ca43837 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://localhost:8888/'
\ No newline at end of file
+VITE_API_URL = 'http://localhost:18888/'
\ No newline at end of file
diff --git a/src/api/console/customer/index.ts b/src/api/console/customer/index.ts
new file mode 100644
index 0000000..4ecc809
--- /dev/null
+++ b/src/api/console/customer/index.ts
@@ -0,0 +1,12 @@
+import request from '/@/utils/yqhp/request';
+
+export function auth(form: object) {
+	const formData = new FormData();
+	formData.append('username', form.username);
+	formData.append('password', form.password);
+	return request({
+		url: '/console/customer/auth',
+		method: 'post',
+		data: formData
+	});
+}
diff --git a/src/utils/yqhp/request.ts b/src/utils/yqhp/request.ts
new file mode 100644
index 0000000..abd56fd
--- /dev/null
+++ b/src/utils/yqhp/request.ts
@@ -0,0 +1,42 @@
+import axios from 'axios';
+import {ElMessage} from 'element-plus';
+import {Session} from '/@/utils/storage';
+
+const service = axios.create({
+    baseURL: import.meta.env.VITE_API_URL as any,
+    timeout: 120000,
+});
+
+service.interceptors.request.use(
+    (config) => {
+        const token = Session.get('token');
+        if (token) {
+            config.headers.common['Authorization'] = `Bearer ${token}`;
+        }
+        return config;
+    },
+    (error) => {
+        return Promise.reject(error);
+    }
+);
+
+service.interceptors.response.use(
+    (response) => {
+        return response;
+    },
+    (error) => {
+        const response = error.response;
+        if (response && response.data) {
+            if (response.data.code === 401) {
+                Session.clear();
+                window.location.href = '/'; // 去登录页
+            }
+            ElMessage.error(response.data.msg || response.data.error_description || 'error');
+        } else {
+            ElMessage.error(error.message);
+        }
+        return Promise.reject(error);
+    }
+);
+
+export default service;
-- 
Gitee


From b9d39949c97af44c427832edc95547681310a6c8 Mon Sep 17 00:00:00 2001
From: jiangyitao <451988022@163.com>
Date: Tue, 14 Dec 2021 22:43:21 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/yqhp/request.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/yqhp/request.ts b/src/utils/yqhp/request.ts
index abd56fd..eab808e 100644
--- a/src/utils/yqhp/request.ts
+++ b/src/utils/yqhp/request.ts
@@ -31,7 +31,7 @@ service.interceptors.response.use(
                 Session.clear();
                 window.location.href = '/'; // 去登录页
             }
-            ElMessage.error(response.data.msg || response.data.error_description || 'error');
+            ElMessage.error(response.data.msg || response.data.error_description || response.data.error || 'error');
         } else {
             ElMessage.error(error.message);
         }
-- 
Gitee


From 5434025fec58e3b746f80944ec82a26c27da20c1 Mon Sep 17 00:00:00 2001
From: jiangyitao <451988022@163.com>
Date: Tue, 14 Dec 2021 22:54:43 +0800
Subject: [PATCH 03/11] style

---
 src/api/console/customer/index.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/api/console/customer/index.ts b/src/api/console/customer/index.ts
index 4ecc809..97771c3 100644
--- a/src/api/console/customer/index.ts
+++ b/src/api/console/customer/index.ts
@@ -1,12 +1,12 @@
 import request from '/@/utils/yqhp/request';
 
 export function auth(form: object) {
-	const formData = new FormData();
-	formData.append('username', form.username);
-	formData.append('password', form.password);
-	return request({
-		url: '/console/customer/auth',
-		method: 'post',
-		data: formData
-	});
+    const formData = new FormData();
+    formData.append('username', form.username);
+    formData.append('password', form.password);
+    return request({
+        url: '/console/customer/auth',
+        method: 'post',
+        data: formData
+    });
 }
-- 
Gitee


From c09616a2f080718ce3fafdf5a11295b9b692d82c Mon Sep 17 00:00:00 2001
From: jiangyitao <451988022@163.com>
Date: Wed, 15 Dec 2021 09:56:46 +0800
Subject: [PATCH 04/11] style

---
 src/api/console/customer/index.ts | 16 ++++-----
 src/utils/yqhp/request.ts         | 60 +++++++++++++++----------------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/api/console/customer/index.ts b/src/api/console/customer/index.ts
index 97771c3..4ecc809 100644
--- a/src/api/console/customer/index.ts
+++ b/src/api/console/customer/index.ts
@@ -1,12 +1,12 @@
 import request from '/@/utils/yqhp/request';
 
 export function auth(form: object) {
-    const formData = new FormData();
-    formData.append('username', form.username);
-    formData.append('password', form.password);
-    return request({
-        url: '/console/customer/auth',
-        method: 'post',
-        data: formData
-    });
+	const formData = new FormData();
+	formData.append('username', form.username);
+	formData.append('password', form.password);
+	return request({
+		url: '/console/customer/auth',
+		method: 'post',
+		data: formData
+	});
 }
diff --git a/src/utils/yqhp/request.ts b/src/utils/yqhp/request.ts
index eab808e..3028034 100644
--- a/src/utils/yqhp/request.ts
+++ b/src/utils/yqhp/request.ts
@@ -1,42 +1,42 @@
 import axios from 'axios';
-import {ElMessage} from 'element-plus';
-import {Session} from '/@/utils/storage';
+import { ElMessage } from 'element-plus';
+import { Session } from '/@/utils/storage';
 
 const service = axios.create({
-    baseURL: import.meta.env.VITE_API_URL as any,
-    timeout: 120000,
+	baseURL: import.meta.env.VITE_API_URL as any,
+	timeout: 120000
 });
 
 service.interceptors.request.use(
-    (config) => {
-        const token = Session.get('token');
-        if (token) {
-            config.headers.common['Authorization'] = `Bearer ${token}`;
-        }
-        return config;
-    },
-    (error) => {
-        return Promise.reject(error);
-    }
+	(config) => {
+		const token = Session.get('token');
+		if (token) {
+			config.headers.common['Authorization'] = `Bearer ${token}`;
+		}
+		return config;
+	},
+	(error) => {
+		return Promise.reject(error);
+	}
 );
 
 service.interceptors.response.use(
-    (response) => {
-        return response;
-    },
-    (error) => {
-        const response = error.response;
-        if (response && response.data) {
-            if (response.data.code === 401) {
-                Session.clear();
-                window.location.href = '/'; // 去登录页
-            }
-            ElMessage.error(response.data.msg || response.data.error_description || response.data.error || 'error');
-        } else {
-            ElMessage.error(error.message);
-        }
-        return Promise.reject(error);
-    }
+	(response) => {
+		return response;
+	},
+	(error) => {
+		const response = error.response;
+		if (response && response.data) {
+			if (response.data.code === 401) {
+				Session.clear();
+				window.location.href = '/'; // 去登录页
+			}
+			ElMessage.error(response.data.msg || response.data.error_description || response.data.error || 'error');
+		} else {
+			ElMessage.error(error.message);
+		}
+		return Promise.reject(error);
+	}
 );
 
 export default service;
-- 
Gitee


From 30db6e8c1260e4aa4c44985f09c5c8641517f74f Mon Sep 17 00:00:00 2001
From: jiangyitao <451988022@163.com>
Date: Wed, 15 Dec 2021 11:33:30 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/yqhp/request.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/yqhp/request.ts b/src/utils/yqhp/request.ts
index 3028034..86edf75 100644
--- a/src/utils/yqhp/request.ts
+++ b/src/utils/yqhp/request.ts
@@ -22,7 +22,7 @@ service.interceptors.request.use(
 
 service.interceptors.response.use(
 	(response) => {
-		return response;
+		return response.data;
 	},
 	(error) => {
 		const response = error.response;
-- 
Gitee


From 0d668991dcdc1c7a2b40a3705218caefadb0c538 Mon Sep 17 00:00:00 2001
From: jiangyitao <451988022@163.com>
Date: Wed, 15 Dec 2021 12:45:26 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                      |  2 +-
 src/api/console/customer/index.ts |  7 +++
 src/router/route.ts               |  2 +-
 src/views/yqhp/login/index.vue    | 94 +++++++++++++++++++++++++++++++
 4 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 src/views/yqhp/login/index.vue

diff --git a/.eslintrc.js b/.eslintrc.js
index 7b28cb7..a7c88a5 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -58,6 +58,6 @@ module.exports = {
 		'no-unused-vars': 'error',
 		'no-v-model-argument': 'off',
 		'no-case-declarations': 'off',
-		'no-console': 'error',
+		// 'no-console': 'error',
 	},
 };
diff --git a/src/api/console/customer/index.ts b/src/api/console/customer/index.ts
index 4ecc809..fcaf390 100644
--- a/src/api/console/customer/index.ts
+++ b/src/api/console/customer/index.ts
@@ -10,3 +10,10 @@ export function auth(form: object) {
 		data: formData
 	});
 }
+
+export function getUserInfo() {
+	return request({
+		url: '/console/customer/info',
+		method: 'get'
+	});
+}
diff --git a/src/router/route.ts b/src/router/route.ts
index ccf3fec..84b4e47 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -1148,7 +1148,7 @@ export const staticRoutes: Array<RouteRecordRaw> = [
 	{
 		path: '/login',
 		name: 'login',
-		component: () => import('/@/views/login/index.vue'),
+		component: () => import('/@/views/yqhp/login/index.vue'),
 		meta: {
 			title: '登录',
 		},
diff --git a/src/views/yqhp/login/index.vue b/src/views/yqhp/login/index.vue
new file mode 100644
index 0000000..d860c6d
--- /dev/null
+++ b/src/views/yqhp/login/index.vue
@@ -0,0 +1,94 @@
+<template>
+	<div>
+		<el-card>
+			<el-form :rules="rules" :model="ruleForm" ref="loginForm">
+				<el-form-item label="账号" prop="username">
+					<el-input type="text" v-model.trim="ruleForm.username" autocomplete="off" clearable></el-input>
+				</el-form-item>
+				<el-form-item label="密码" prop="password">
+					<el-input type="password" v-model.trim="ruleForm.password" autocomplete="off" clearable></el-input>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="submitForm" :loading="loginBtnLoading">立即登录</el-button>
+				</el-form-item>
+			</el-form>
+		</el-card>
+	</div>
+</template>
+
+<script>
+import { useRoute, useRouter } from 'vue-router';
+import { reactive, ref, toRefs, getCurrentInstance } from 'vue';
+import { auth, getUserInfo } from '/@/api/console/customer';
+import { initFrontEndControlRoutes } from '/@/router/frontEnd';
+import { Session } from '/@/utils/storage';
+import { useStore } from '/@/store/index';
+export default {
+	name: 'login',
+	setup() {
+		const { proxy } = getCurrentInstance();
+		const store = useStore();
+		const route = useRoute();
+		const router = useRouter();
+		const loginForm = ref(null);
+		const state = reactive({
+			ruleForm: {
+				username: '',
+				password: '',
+			},
+			rules: {
+				username: [{ required: 'true', message: '账号不能为空', trigger: 'blur' }],
+				password: [{ required: 'true', message: '密码不能为空', trigger: 'blur' }],
+			},
+			loginBtnLoading: false,
+		});
+		const submitForm = () => {
+			loginForm.value.validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				state.loginBtnLoading = true;
+
+				try {
+					const token = await auth(state.ruleForm);
+					Session.set('token', token);
+
+					const userInfo = await getUserInfo();
+					userInfo.roles = userInfo.roles.map((role) => role.name);
+					Session.set('userInfo', userInfo);
+					store.dispatch('userInfos/setUserInfos', userInfo);
+
+					await initFrontEndControlRoutes();
+					loginSuccess();
+				} finally {
+					state.loginBtnLoading = false;
+				}
+			});
+
+			const loginSuccess = () => {
+				if (route.query?.redirect) {
+					router.push({
+						path: route.query?.redirect,
+						query: Object.keys(route.query?.params).length > 0 ? JSON.parse(route.query?.params) : '',
+					});
+				} else {
+					router.push('/');
+				}
+				setTimeout(() => {
+					// 修复防止退出登录再进入界面时，需要刷新样式才生效的问题，初始化布局样式等(登录的时候触发，目前方案)
+					proxy.mittBus.emit('onSignInClick');
+				}, 300);
+			};
+		};
+		return {
+			...toRefs(state),
+			loginForm,
+			submitForm,
+		};
+	},
+};
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
-- 
Gitee


From ad38ac2fba71dd51453d24a12bff1a0ecfd782c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E6=98=8E?= <hem@yoozoo.com>
Date: Wed, 15 Dec 2021 18:25:23 +0800
Subject: [PATCH 07/11] =?UTF-8?q?1.=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=202.=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=203?=
 =?UTF-8?q?.=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/user/index.ts                    |  37 +++++
 src/router/route.ts                           |   2 +-
 .../yqhp/system/user/component/SaveUser.vue   | 108 ++++++++++++++
 src/views/yqhp/system/user/index.vue          | 133 ++++++++++++++++++
 4 files changed, 279 insertions(+), 1 deletion(-)
 create mode 100644 src/api/auth/user/index.ts
 create mode 100644 src/views/yqhp/system/user/component/SaveUser.vue
 create mode 100644 src/views/yqhp/system/user/index.vue

diff --git a/src/api/auth/user/index.ts b/src/api/auth/user/index.ts
new file mode 100644
index 0000000..6c64ce2
--- /dev/null
+++ b/src/api/auth/user/index.ts
@@ -0,0 +1,37 @@
+import request from '/@/utils/yqhp/request';
+
+/**
+ * 获取用户列表
+ */
+export function getUserList(params: object) {
+	return request({
+		url: '/auth/user/page',
+		method: 'get',
+		params,
+	});
+}
+
+/**
+ * 创建用户
+ * @param params
+ */
+export function createUser(params: object) {
+	return request({
+		url: '/auth/user',
+		method: 'post',
+		data: params,
+	});
+}
+
+/**
+ * 更新用户
+ * @param userId
+ * @param data
+ */
+export function updateUser(userId: number, data: object) {
+	return request({
+		url: `/auth/user/${userId}`,
+		method: 'put',
+		data
+	})
+}
diff --git a/src/router/route.ts b/src/router/route.ts
index 84b4e47..ae74248 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -94,7 +94,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					{
 						path: '/system/user',
 						name: 'systemUser',
-						component: () => import('/@/views/system/user/index.vue'),
+						component: () => import('/@/views/yqhp/system/user/index.vue'),
 						meta: {
 							title: 'message.router.systemUser',
 							isLink: '',
diff --git a/src/views/yqhp/system/user/component/SaveUser.vue b/src/views/yqhp/system/user/component/SaveUser.vue
new file mode 100644
index 0000000..8c1ff1f
--- /dev/null
+++ b/src/views/yqhp/system/user/component/SaveUser.vue
@@ -0,0 +1,108 @@
+<template>
+	<div class="system-add-user-container">
+		<el-dialog title="新增用户" v-model="isShowDialog" width="769px">
+			<el-form :model="ruleForm" size="small" label-width="90px">
+				<el-row :gutter="35">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="isAdd">
+						<el-form-item label="帐号">
+							<el-input v-model="ruleForm.username" placeholder="请输入帐号" clearable></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="isAdd">
+						<el-form-item label="密码">
+							<el-input v-model="ruleForm.password" placeholder="请输入" type="password" clearable></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="昵称">
+							<el-input v-model="ruleForm.nickname" placeholder="请输入昵称" clearable></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="邮箱">
+							<el-input v-model="ruleForm.email" placeholder="请输入邮箱" clearable></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="状态">
+							<el-switch v-model="ruleForm.status" :active-value=1 :inactive-value=0 inline-prompt active-text="启" inactive-text="禁"></el-switch>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="small">取 消</el-button>
+					<el-button type="primary" @click="onSubmit" size="small">确 定</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script lang="ts">
+import { reactive, toRefs } from 'vue';
+import { createUser, updateUser } from '/@/api/auth/user';
+export default {
+	name: 'SaveUser',
+	setup(props, context) {
+		const state = reactive({
+			isShowDialog: false,
+			isAdd: true,
+			ruleForm: {
+				id:	Number,
+				username: '', // 帐号
+				nickname: '', // 昵称
+				email: '', // 邮箱
+				password: '', // 密码
+				status: 1, // 用户状态
+			},
+		});
+		// 打开弹窗
+		const openDialog = (row: Object) => {
+			if (row){
+				state.ruleForm = {...row};
+				state.isAdd = false;
+			}else {
+				state.ruleForm = {
+					id:	Number,
+					username: '', // 帐号
+					nickname: '', // 昵称
+					email: '', // 邮箱
+					password: '', // 密码
+					status: 1, // 用户状态
+				};
+				state.isAdd = true;
+			}
+			state.isShowDialog = true;
+		};
+		// 关闭弹窗
+		const closeDialog = () => {
+			state.isShowDialog = false;
+		};
+		// 取消
+		const onCancel = () => {
+			closeDialog();
+		};
+		const onSubmit = async () => {
+			if (state.isAdd){
+				//新增用户
+				await createUser(state.ruleForm);
+			}else {
+				//修改用户
+				await updateUser(state.ruleForm.id,state.ruleForm);
+			}
+			//调用父组件方法，刷新用户列表页面
+			context.emit('initTableData');
+			closeDialog();
+		};
+		return {
+			openDialog,
+			closeDialog,
+			onCancel,
+			onSubmit,
+			...toRefs(state),
+		};
+	},
+};
+</script>
diff --git a/src/views/yqhp/system/user/index.vue b/src/views/yqhp/system/user/index.vue
new file mode 100644
index 0000000..a96d9b9
--- /dev/null
+++ b/src/views/yqhp/system/user/index.vue
@@ -0,0 +1,133 @@
+<template>
+	<div class="system-user-container">
+		<el-card shadow="hover">
+			<div class="system-user-search mb15">
+				<el-input size="small" placeholder="请输入用户名称" style="max-width: 180px"> </el-input>
+				<el-button size="small" type="primary" class="ml10">
+					<el-icon>
+						<elementSearch />
+					</el-icon>
+					查询
+				</el-button>
+				<el-button size="small" type="success" class="ml10" @click="onOpenAddUser">
+					<el-icon>
+						<elementFolderAdd />
+					</el-icon>
+					新增用户
+				</el-button>
+			</div>
+			<el-table :data="tableData.data" style="width: 100%">
+				<el-table-column prop="username" label="用户名" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="nickname" label="用户昵称" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="email" label="邮箱" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="status" label="用户状态" show-overflow-tooltip>
+					<template #default="scope">
+						<el-tag type="success" v-if="scope.row.status">启用</el-tag>
+						<el-tag type="info" v-else>禁用</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
+				<el-table-column label="操作" width="100">
+					<template #default="scope">
+						<el-button :disabled="scope.row.userName === 'admin'" size="mini" type="text" @click="onOpenEditUser(scope.row)">修改</el-button>
+						<el-button :disabled="scope.row.userName === 'admin'" size="mini" type="text" @click="onRowDel(scope.row)">删除</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				@size-change="onHandleSizeChange"
+				@current-change="onHandleCurrentChange"
+				class="mt15"
+				:pager-count="5"
+				:page-sizes="[10, 20, 30]"
+				v-model:current-page="tableData.param.pageNum"
+				background
+				v-model:page-size="tableData.param.pageSize"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="tableData.total"
+			>
+			</el-pagination>
+		</el-card>
+		<SaveUser ref="SaveUserRef" @initTableData="initTableData"/>
+	</div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref } from 'vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import { getUserList } from '/@/api/auth/user';
+import SaveUser from '/@/views/yqhp/system/user/component/SaveUser.vue';
+export default {
+	name: 'systemUser',
+	components: { SaveUser },
+	setup() {
+		const SaveUserRef = ref();
+		const state: any = reactive({
+			tableData: {
+				data: [],
+				total: 0,
+				loading: false,
+				param: {
+					pageNumb: 1,
+					pageSize: 10,
+				},
+			},
+		});
+		// 获取用户列表数据
+		const initTableData = async () => {
+			const userList = await getUserList(state.tableData.param);
+			state.tableData.data = userList.records;
+			state.tableData.total = userList.total;
+		};
+		// 打开新增用户弹窗
+		const onOpenAddUser = () => {
+			SaveUserRef.value.openDialog();
+		};
+		// 打开修改用户弹窗
+		const onOpenEditUser = (row: Object) => {
+			SaveUserRef.value.openDialog(row);
+		};
+		// 删除用户
+		const onRowDel = (row: Object) => {
+			ElMessageBox.confirm(`此操作将永久删除账户名称：“${row.userName}”，是否继续?`, '提示', {
+				confirmButtonText: '确认',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					ElMessage.success('删除成功');
+				})
+				.catch(() => {});
+		};
+		// 分页改变
+		const onHandleSizeChange = (val: number) => {
+			state.tableData.param.pageSize = val;
+			initTableData();
+		};
+		// 分页改变
+		const onHandleCurrentChange = (val: number) => {
+			state.tableData.param.pageNumb = val;
+			initTableData();
+		};
+		// 页面加载时
+		onMounted(() => {
+			initTableData();
+		});
+		return {
+			SaveUserRef,
+			initTableData,
+			onOpenAddUser,
+			onOpenEditUser,
+			onRowDel,
+			onHandleSizeChange,
+			onHandleCurrentChange,
+			...toRefs(state),
+		};
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.system-user-container {
+}
+</style>
-- 
Gitee


From 1ad51dbe3968074d3b0794fcf613844086c02edd Mon Sep 17 00:00:00 2001
From: jiangyitao <451988022@163.com>
Date: Wed, 15 Dec 2021 18:47:49 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/user/index.ts                    |  6 ++---
 .../yqhp/system/user/component/SaveUser.vue   | 25 ++++++++++++-------
 src/views/yqhp/system/user/index.vue          |  2 +-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/api/auth/user/index.ts b/src/api/auth/user/index.ts
index 6c64ce2..fedd306 100644
--- a/src/api/auth/user/index.ts
+++ b/src/api/auth/user/index.ts
@@ -7,7 +7,7 @@ export function getUserList(params: object) {
 	return request({
 		url: '/auth/user/page',
 		method: 'get',
-		params,
+		params
 	});
 }
 
@@ -19,7 +19,7 @@ export function createUser(params: object) {
 	return request({
 		url: '/auth/user',
 		method: 'post',
-		data: params,
+		data: params
 	});
 }
 
@@ -33,5 +33,5 @@ export function updateUser(userId: number, data: object) {
 		url: `/auth/user/${userId}`,
 		method: 'put',
 		data
-	})
+	});
 }
diff --git a/src/views/yqhp/system/user/component/SaveUser.vue b/src/views/yqhp/system/user/component/SaveUser.vue
index 8c1ff1f..9cc0a11 100644
--- a/src/views/yqhp/system/user/component/SaveUser.vue
+++ b/src/views/yqhp/system/user/component/SaveUser.vue
@@ -25,7 +25,14 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="状态">
-							<el-switch v-model="ruleForm.status" :active-value=1 :inactive-value=0 inline-prompt active-text="启" inactive-text="禁"></el-switch>
+							<el-switch
+								v-model="ruleForm.status"
+								:active-value="1"
+								:inactive-value="0"
+								inline-prompt
+								active-text="启"
+								inactive-text="禁"
+							></el-switch>
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -50,7 +57,7 @@ export default {
 			isShowDialog: false,
 			isAdd: true,
 			ruleForm: {
-				id:	Number,
+				id: Number,
 				username: '', // 帐号
 				nickname: '', // 昵称
 				email: '', // 邮箱
@@ -60,12 +67,12 @@ export default {
 		});
 		// 打开弹窗
 		const openDialog = (row: Object) => {
-			if (row){
-				state.ruleForm = {...row};
+			if (row) {
+				state.ruleForm = { ...row };
 				state.isAdd = false;
-			}else {
+			} else {
 				state.ruleForm = {
-					id:	Number,
+					id: Number,
 					username: '', // 帐号
 					nickname: '', // 昵称
 					email: '', // 邮箱
@@ -85,12 +92,12 @@ export default {
 			closeDialog();
 		};
 		const onSubmit = async () => {
-			if (state.isAdd){
+			if (state.isAdd) {
 				//新增用户
 				await createUser(state.ruleForm);
-			}else {
+			} else {
 				//修改用户
-				await updateUser(state.ruleForm.id,state.ruleForm);
+				await updateUser(state.ruleForm.id, state.ruleForm);
 			}
 			//调用父组件方法，刷新用户列表页面
 			context.emit('initTableData');
diff --git a/src/views/yqhp/system/user/index.vue b/src/views/yqhp/system/user/index.vue
index a96d9b9..1c393e6 100644
--- a/src/views/yqhp/system/user/index.vue
+++ b/src/views/yqhp/system/user/index.vue
@@ -48,7 +48,7 @@
 			>
 			</el-pagination>
 		</el-card>
-		<SaveUser ref="SaveUserRef" @initTableData="initTableData"/>
+		<SaveUser ref="SaveUserRef" @initTableData="initTableData" />
 	</div>
 </template>
 
-- 
Gitee


From 42ee9d03ba165d3630495cca85b7674a41e396a3 Mon Sep 17 00:00:00 2001
From: jiangyitao <451988022@163.com>
Date: Thu, 16 Dec 2021 07:34:50 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yqhp/system/user/component/SaveUser.vue   | 81 +++++++++++--------
 1 file changed, 49 insertions(+), 32 deletions(-)

diff --git a/src/views/yqhp/system/user/component/SaveUser.vue b/src/views/yqhp/system/user/component/SaveUser.vue
index 9cc0a11..3cdadf2 100644
--- a/src/views/yqhp/system/user/component/SaveUser.vue
+++ b/src/views/yqhp/system/user/component/SaveUser.vue
@@ -1,38 +1,34 @@
 <template>
 	<div class="system-add-user-container">
-		<el-dialog title="新增用户" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" size="small" label-width="90px">
+		<el-dialog :title="isAdd ? '新增用户' : '修改用户'" v-model="isShowDialog" width="769px">
+			<el-form ref="formRef" :model="ruleForm" :rules="rules" size="small" label-width="90px">
 				<el-row :gutter="35">
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="isAdd">
-						<el-form-item label="帐号">
-							<el-input v-model="ruleForm.username" placeholder="请输入帐号" clearable></el-input>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item prop="username" label="用户名">
+							<el-input v-model="ruleForm.username" clearable :disabled="!isAdd"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="isAdd">
-						<el-form-item label="密码">
-							<el-input v-model="ruleForm.password" placeholder="请输入" type="password" clearable></el-input>
+						<el-form-item prop="password" label="密码">
+							<el-input v-model="ruleForm.password" type="password" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="昵称">
-							<el-input v-model="ruleForm.nickname" placeholder="请输入昵称" clearable></el-input>
+						<el-form-item prop="nickname" label="昵称">
+							<el-input v-model="ruleForm.nickname" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="邮箱">
-							<el-input v-model="ruleForm.email" placeholder="请输入邮箱" clearable></el-input>
+						<el-form-item prop="email" label="邮箱">
+							<el-input v-model="ruleForm.email" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="状态">
-							<el-switch
-								v-model="ruleForm.status"
-								:active-value="1"
-								:inactive-value="0"
-								inline-prompt
-								active-text="启"
-								inactive-text="禁"
-							></el-switch>
+						<el-form-item prop="status" label="状态">
+							<el-radio-group v-model="ruleForm.status">
+								<el-radio :label="1">启用</el-radio>
+								<el-radio :label="0">禁用</el-radio>
+							</el-radio-group>
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -40,7 +36,7 @@
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="onCancel" size="small">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="small">确 定</el-button>
+					<el-button type="primary" @click="onSubmit" size="small" :loading="saveBtnLoading">确 定</el-button>
 				</span>
 			</template>
 		</el-dialog>
@@ -48,14 +44,18 @@
 </template>
 
 <script lang="ts">
-import { reactive, toRefs } from 'vue';
+import { ref, reactive, toRefs, nextTick } from 'vue';
 import { createUser, updateUser } from '/@/api/auth/user';
+import { ElMessage } from 'element-plus';
 export default {
 	name: 'SaveUser',
 	setup(props, context) {
+		const formRef = ref();
+
 		const state = reactive({
 			isShowDialog: false,
 			isAdd: true,
+			saveBtnLoading: false,
 			ruleForm: {
 				id: Number,
 				username: '', // 帐号
@@ -64,6 +64,13 @@ export default {
 				password: '', // 密码
 				status: 1, // 用户状态
 			},
+			rules: {
+				username: [{ required: true, message: '请输入用户名' }],
+				password: [{ required: true, message: '请输入密码' }],
+				nickname: [{ required: true, message: '请输入昵称' }],
+				email: [{ required: true, message: '请输入邮箱' }],
+				status: [{ required: true, message: '请选择状态' }],
+			},
 		});
 		// 打开弹窗
 		const openDialog = (row: Object) => {
@@ -81,6 +88,7 @@ export default {
 				};
 				state.isAdd = true;
 			}
+			nextTick(() => formRef.value.clearValidate());
 			state.isShowDialog = true;
 		};
 		// 关闭弹窗
@@ -92,22 +100,31 @@ export default {
 			closeDialog();
 		};
 		const onSubmit = async () => {
-			if (state.isAdd) {
-				//新增用户
-				await createUser(state.ruleForm);
-			} else {
-				//修改用户
-				await updateUser(state.ruleForm.id, state.ruleForm);
-			}
-			//调用父组件方法，刷新用户列表页面
-			context.emit('initTableData');
-			closeDialog();
+			formRef.value.validate(async (valid: boolean) => {
+				if (!valid) {
+					return;
+				}
+
+				state.saveBtnLoading = true;
+				if (state.isAdd) {
+					// 新增用户
+					await createUser(state.ruleForm).finally(() => (state.saveBtnLoading = false));
+				} else {
+					// 修改用户
+					await updateUser(state.ruleForm.id, state.ruleForm).finally(() => (state.saveBtnLoading = false));
+				}
+				ElMessage.success('保存成功');
+				// 调用父组件方法，刷新用户列表页面
+				context.emit('initTableData');
+				closeDialog();
+			});
 		};
 		return {
 			openDialog,
 			closeDialog,
 			onCancel,
 			onSubmit,
+			formRef,
 			...toRefs(state),
 		};
 	},
-- 
Gitee


From 9f6c00f5de33d46b8b37831337401161b96742c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E6=98=8E?= <hem@yoozoo.com>
Date: Fri, 17 Dec 2021 11:06:42 +0800
Subject: [PATCH 10/11] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=202.=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=203.=E5=A2=9E=E5=8A=A0=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/user/index.ts                    | 24 ++++++
 .../yqhp/system/user/component/SaveUser.vue   |  4 +-
 .../system/user/component/resetPassword.vue   | 74 +++++++++++++++++++
 src/views/yqhp/system/user/index.vue          | 42 +++++++++--
 4 files changed, 134 insertions(+), 10 deletions(-)
 create mode 100644 src/views/yqhp/system/user/component/resetPassword.vue

diff --git a/src/api/auth/user/index.ts b/src/api/auth/user/index.ts
index fedd306..a51d5ac 100644
--- a/src/api/auth/user/index.ts
+++ b/src/api/auth/user/index.ts
@@ -35,3 +35,27 @@ export function updateUser(userId: number, data: object) {
 		data
 	});
 }
+
+/**
+ * 删除用户
+ * @param userId
+ */
+export function deleteUser(userId: number) {
+	return request({
+		url: `/auth/user/${userId}`,
+		method: 'delete'
+	})
+}
+
+/**
+ * 重置密码
+ * @param userId
+ * @param data
+ */
+export function resetPassword(userId: number, params: object) {
+	return request({
+		url: `/auth/user/${userId}/resetPassword`,
+		method: 'put',
+		params
+	});
+}
diff --git a/src/views/yqhp/system/user/component/SaveUser.vue b/src/views/yqhp/system/user/component/SaveUser.vue
index 3cdadf2..de22256 100644
--- a/src/views/yqhp/system/user/component/SaveUser.vue
+++ b/src/views/yqhp/system/user/component/SaveUser.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="system-add-user-container">
+	<div class="system-save-user-container">
 		<el-dialog :title="isAdd ? '新增用户' : '修改用户'" v-model="isShowDialog" width="769px">
 			<el-form ref="formRef" :model="ruleForm" :rules="rules" size="small" label-width="90px">
 				<el-row :gutter="35">
@@ -68,7 +68,7 @@ export default {
 				username: [{ required: true, message: '请输入用户名' }],
 				password: [{ required: true, message: '请输入密码' }],
 				nickname: [{ required: true, message: '请输入昵称' }],
-				email: [{ required: true, message: '请输入邮箱' }],
+				email: [{ required: true, message: '请输入邮箱' },{type: 'email', message: '请输入正确的邮箱', trigger: ['blur']}],
 				status: [{ required: true, message: '请选择状态' }],
 			},
 		});
diff --git a/src/views/yqhp/system/user/component/resetPassword.vue b/src/views/yqhp/system/user/component/resetPassword.vue
new file mode 100644
index 0000000..a14698e
--- /dev/null
+++ b/src/views/yqhp/system/user/component/resetPassword.vue
@@ -0,0 +1,74 @@
+<template>
+	<div class="system-reset-password-container">
+		<el-dialog title="重置密码" v-model="isShowDialog" width="400px">
+			<el-form ref="formRef" :model="ruleForm" :rules="rules" size="small" label-width="70px">
+				<el-form-item prop="password" label="新密码">
+					<el-input v-model="ruleForm.password" type="password" clearable></el-input>
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="small">取 消</el-button>
+					<el-button type="primary" @click="onSubmit" size="small" :loading="saveBtnLoading">确 定</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script lang="ts">
+import { ref, reactive, toRefs, nextTick } from 'vue';
+import { resetPassword } from '/@/api/auth/user';
+import { ElMessage } from 'element-plus';
+export default {
+	name: 'resetPassword',
+	setup() {
+		const formRef = ref();
+		const state = reactive({
+			isShowDialog: false,
+			saveBtnLoading: false,
+			userId: Number,
+			ruleForm: {
+				password: '', // 密码
+			},
+			rules: {
+				password: [{ required: true, message: '请输入密码' }],
+			},
+		});
+		// 打开弹窗
+		const openDialog = (userId: number) => {
+			state.userId = userId;
+			nextTick(() => formRef.value.clearValidate());
+			state.isShowDialog = true;
+		};
+		// 关闭弹窗
+		const closeDialog = () => {
+			state.ruleForm.password = '';
+			state.isShowDialog = false;
+		};
+		// 取消
+		const onCancel = () => {
+			closeDialog();
+		};
+		const onSubmit = async () => {
+			formRef.value.validate(async (valid: boolean) => {
+				if (!valid) {
+					return;
+				}
+				state.saveBtnLoading = true;
+				await resetPassword(state.userId,state.ruleForm).finally(() => (state.saveBtnLoading = false));
+				ElMessage.success('重置成功');
+				closeDialog();
+			});
+		};
+		return {
+			openDialog,
+			closeDialog,
+			onCancel,
+			onSubmit,
+			formRef,
+			...toRefs(state),
+		};
+	},
+};
+</script>
diff --git a/src/views/yqhp/system/user/index.vue b/src/views/yqhp/system/user/index.vue
index 1c393e6..9c2309f 100644
--- a/src/views/yqhp/system/user/index.vue
+++ b/src/views/yqhp/system/user/index.vue
@@ -2,8 +2,8 @@
 	<div class="system-user-container">
 		<el-card shadow="hover">
 			<div class="system-user-search mb15">
-				<el-input size="small" placeholder="请输入用户名称" style="max-width: 180px"> </el-input>
-				<el-button size="small" type="primary" class="ml10">
+				<el-input size="small" placeholder="请输入用户名或用户昵称" style="max-width: 200px" clearable="true" v-model="tableData.param.keyword"> </el-input>
+				<el-button size="small" type="primary" class="ml10" @click="initTableData">
 					<el-icon>
 						<elementSearch />
 					</el-icon>
@@ -29,8 +29,22 @@
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="100">
 					<template #default="scope">
-						<el-button :disabled="scope.row.userName === 'admin'" size="mini" type="text" @click="onOpenEditUser(scope.row)">修改</el-button>
-						<el-button :disabled="scope.row.userName === 'admin'" size="mini" type="text" @click="onRowDel(scope.row)">删除</el-button>
+						<el-dropdown size="mini" split-button type="primary">
+							更多
+							<template #dropdown>
+								<el-dropdown-menu>
+									<el-dropdown-item>
+										<el-button :disabled="scope.row.userName === 'admin'" size="mini" type="text" @click="onOpenEditUser(scope.row)">修改用户</el-button>
+									</el-dropdown-item>
+									<el-dropdown-item>
+										<el-button :disabled="scope.row.userName === 'admin'" size="mini" type="text" @click="onRowDel(scope.row)">删除用户</el-button>
+									</el-dropdown-item>
+									<el-dropdown-item>
+										<el-button :disabled="scope.row.userName === 'admin'" size="mini" type="text" @click="onOpenResetPassword(scope.row)">重置密码</el-button>
+									</el-dropdown-item>
+								</el-dropdown-menu>
+							</template>
+						</el-dropdown>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -49,25 +63,29 @@
 			</el-pagination>
 		</el-card>
 		<SaveUser ref="SaveUserRef" @initTableData="initTableData" />
+		<ResetPassword ref="ResetPasswordRef" />
 	</div>
 </template>
 
 <script lang="ts">
 import { toRefs, reactive, onMounted, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { getUserList } from '/@/api/auth/user';
+import { getUserList, deleteUser } from '/@/api/auth/user';
 import SaveUser from '/@/views/yqhp/system/user/component/SaveUser.vue';
+import ResetPassword from '/@/views/yqhp/system/user/component/resetPassword.vue';
 export default {
 	name: 'systemUser',
-	components: { SaveUser },
+	components: { SaveUser, ResetPassword },
 	setup() {
 		const SaveUserRef = ref();
+		const ResetPasswordRef = ref();
 		const state: any = reactive({
 			tableData: {
 				data: [],
 				total: 0,
 				loading: false,
 				param: {
+					keyword: '',
 					pageNumb: 1,
 					pageSize: 10,
 				},
@@ -89,16 +107,22 @@ export default {
 		};
 		// 删除用户
 		const onRowDel = (row: Object) => {
-			ElMessageBox.confirm(`此操作将永久删除账户名称：“${row.userName}”，是否继续?`, '提示', {
+			ElMessageBox.confirm(`此操作将永久删除账户名称：“${row.username}”，是否继续?`, '提示', {
 				confirmButtonText: '确认',
 				cancelButtonText: '取消',
 				type: 'warning',
 			})
-				.then(() => {
+				.then(async () => {
+					await deleteUser(row.id);
+					initTableData();
 					ElMessage.success('删除成功');
 				})
 				.catch(() => {});
 		};
+		//打开修改密码弹窗
+		const onOpenResetPassword = (row: Object) => {
+			ResetPasswordRef.value.openDialog(row.id);
+		};
 		// 分页改变
 		const onHandleSizeChange = (val: number) => {
 			state.tableData.param.pageSize = val;
@@ -115,10 +139,12 @@ export default {
 		});
 		return {
 			SaveUserRef,
+			ResetPasswordRef,
 			initTableData,
 			onOpenAddUser,
 			onOpenEditUser,
 			onRowDel,
+			onOpenResetPassword,
 			onHandleSizeChange,
 			onHandleCurrentChange,
 			...toRefs(state),
-- 
Gitee


From 6fe398ccaa922b6bf8c95c28b7ea33e1d7876a95 Mon Sep 17 00:00:00 2001
From: jiangyitao <451988022@163.com>
Date: Fri, 17 Dec 2021 11:56:41 +0800
Subject: [PATCH 11/11] style

---
 src/api/auth/user/index.ts                    |  2 +-
 .../yqhp/system/user/component/SaveUser.vue   |  5 +-
 .../system/user/component/resetPassword.vue   |  6 +-
 src/views/yqhp/system/user/index.vue          | 86 ++++++++++---------
 4 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/src/api/auth/user/index.ts b/src/api/auth/user/index.ts
index a51d5ac..a92ddb5 100644
--- a/src/api/auth/user/index.ts
+++ b/src/api/auth/user/index.ts
@@ -44,7 +44,7 @@ export function deleteUser(userId: number) {
 	return request({
 		url: `/auth/user/${userId}`,
 		method: 'delete'
-	})
+	});
 }
 
 /**
diff --git a/src/views/yqhp/system/user/component/SaveUser.vue b/src/views/yqhp/system/user/component/SaveUser.vue
index de22256..5c12297 100644
--- a/src/views/yqhp/system/user/component/SaveUser.vue
+++ b/src/views/yqhp/system/user/component/SaveUser.vue
@@ -68,7 +68,10 @@ export default {
 				username: [{ required: true, message: '请输入用户名' }],
 				password: [{ required: true, message: '请输入密码' }],
 				nickname: [{ required: true, message: '请输入昵称' }],
-				email: [{ required: true, message: '请输入邮箱' },{type: 'email', message: '请输入正确的邮箱', trigger: ['blur']}],
+				email: [
+					{ required: true, message: '请输入邮箱' },
+					{ type: 'email', message: '请输入正确的邮箱', trigger: ['blur'] },
+				],
 				status: [{ required: true, message: '请选择状态' }],
 			},
 		});
diff --git a/src/views/yqhp/system/user/component/resetPassword.vue b/src/views/yqhp/system/user/component/resetPassword.vue
index a14698e..c96f6c5 100644
--- a/src/views/yqhp/system/user/component/resetPassword.vue
+++ b/src/views/yqhp/system/user/component/resetPassword.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="system-reset-password-container">
+	<div>
 		<el-dialog title="重置密码" v-model="isShowDialog" width="400px">
 			<el-form ref="formRef" :model="ruleForm" :rules="rules" size="small" label-width="70px">
 				<el-form-item prop="password" label="新密码">
@@ -21,7 +21,7 @@ import { ref, reactive, toRefs, nextTick } from 'vue';
 import { resetPassword } from '/@/api/auth/user';
 import { ElMessage } from 'element-plus';
 export default {
-	name: 'resetPassword',
+	name: 'ResetPassword',
 	setup() {
 		const formRef = ref();
 		const state = reactive({
@@ -56,7 +56,7 @@ export default {
 					return;
 				}
 				state.saveBtnLoading = true;
-				await resetPassword(state.userId,state.ruleForm).finally(() => (state.saveBtnLoading = false));
+				await resetPassword(state.userId, state.ruleForm).finally(() => (state.saveBtnLoading = false));
 				ElMessage.success('重置成功');
 				closeDialog();
 			});
diff --git a/src/views/yqhp/system/user/index.vue b/src/views/yqhp/system/user/index.vue
index 9c2309f..808f6c6 100644
--- a/src/views/yqhp/system/user/index.vue
+++ b/src/views/yqhp/system/user/index.vue
@@ -1,9 +1,14 @@
 <template>
-	<div class="system-user-container">
+	<div>
 		<el-card shadow="hover">
-			<div class="system-user-search mb15">
-				<el-input size="small" placeholder="请输入用户名或用户昵称" style="max-width: 200px" clearable="true" v-model="tableData.param.keyword"> </el-input>
-				<el-button size="small" type="primary" class="ml10" @click="initTableData">
+			<div class="mb15">
+				<el-select size="small" v-model="queryParam.status" style="width: 100px">
+					<el-option label="全部" value=""></el-option>
+					<el-option label="启用" value="1"></el-option>
+					<el-option label="禁用" value="0"></el-option>
+				</el-select>
+				<el-input size="small" class="ml10" placeholder="用户名/昵称 模糊查询" style="max-width: 200px" clearable v-model="queryParam.keyword" />
+				<el-button size="small" type="primary" class="ml10" @click="onSearch">
 					<el-icon>
 						<elementSearch />
 					</el-icon>
@@ -18,29 +23,29 @@
 			</div>
 			<el-table :data="tableData.data" style="width: 100%">
 				<el-table-column prop="username" label="用户名" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="nickname" label="用户昵称" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="nickname" label="昵称" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="email" label="邮箱" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="status" label="用户状态" show-overflow-tooltip>
-					<template #default="scope">
-						<el-tag type="success" v-if="scope.row.status">启用</el-tag>
+				<el-table-column prop="status" label="状态" show-overflow-tooltip>
+					<template #default="{ row }">
+						<el-tag type="success" v-if="row.status">启用</el-tag>
 						<el-tag type="info" v-else>禁用</el-tag>
 					</template>
 				</el-table-column>
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="100">
-					<template #default="scope">
+					<template #default="{ row }">
 						<el-dropdown size="mini" split-button type="primary">
 							更多
 							<template #dropdown>
 								<el-dropdown-menu>
 									<el-dropdown-item>
-										<el-button :disabled="scope.row.userName === 'admin'" size="mini" type="text" @click="onOpenEditUser(scope.row)">修改用户</el-button>
+										<el-button type="text" @click="onOpenEditUser(row)">修改用户</el-button>
 									</el-dropdown-item>
 									<el-dropdown-item>
-										<el-button :disabled="scope.row.userName === 'admin'" size="mini" type="text" @click="onRowDel(scope.row)">删除用户</el-button>
+										<el-button type="text" @click="onRowDel(row)">删除用户</el-button>
 									</el-dropdown-item>
 									<el-dropdown-item>
-										<el-button :disabled="scope.row.userName === 'admin'" size="mini" type="text" @click="onOpenResetPassword(scope.row)">重置密码</el-button>
+										<el-button type="text" @click="onOpenResetPassword(row)">重置密码</el-button>
 									</el-dropdown-item>
 								</el-dropdown-menu>
 							</template>
@@ -54,16 +59,16 @@
 				class="mt15"
 				:pager-count="5"
 				:page-sizes="[10, 20, 30]"
-				v-model:current-page="tableData.param.pageNum"
+				v-model:current-page="queryParam.pageNum"
 				background
-				v-model:page-size="tableData.param.pageSize"
+				v-model:page-size="queryParam.pageSize"
 				layout="total, sizes, prev, pager, next, jumper"
 				:total="tableData.total"
 			>
 			</el-pagination>
 		</el-card>
-		<SaveUser ref="SaveUserRef" @initTableData="initTableData" />
-		<ResetPassword ref="ResetPasswordRef" />
+		<save-user ref="saveUserRef" @initTableData="initTableData" />
+		<reset-password ref="resetPasswordRef" />
 	</div>
 </template>
 
@@ -71,43 +76,43 @@
 import { toRefs, reactive, onMounted, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { getUserList, deleteUser } from '/@/api/auth/user';
-import SaveUser from '/@/views/yqhp/system/user/component/SaveUser.vue';
-import ResetPassword from '/@/views/yqhp/system/user/component/resetPassword.vue';
+import SaveUser from './component/SaveUser.vue';
+import ResetPassword from './component/ResetPassword.vue';
 export default {
 	name: 'systemUser',
 	components: { SaveUser, ResetPassword },
 	setup() {
-		const SaveUserRef = ref();
-		const ResetPasswordRef = ref();
+		const saveUserRef = ref();
+		const resetPasswordRef = ref();
 		const state: any = reactive({
+			queryParam: {
+				status: '',
+				keyword: '',
+				pageNumb: 1,
+				pageSize: 10,
+			},
 			tableData: {
 				data: [],
 				total: 0,
-				loading: false,
-				param: {
-					keyword: '',
-					pageNumb: 1,
-					pageSize: 10,
-				},
 			},
 		});
 		// 获取用户列表数据
 		const initTableData = async () => {
-			const userList = await getUserList(state.tableData.param);
+			const userList = await getUserList(state.queryParam);
 			state.tableData.data = userList.records;
 			state.tableData.total = userList.total;
 		};
 		// 打开新增用户弹窗
 		const onOpenAddUser = () => {
-			SaveUserRef.value.openDialog();
+			saveUserRef.value.openDialog();
 		};
 		// 打开修改用户弹窗
 		const onOpenEditUser = (row: Object) => {
-			SaveUserRef.value.openDialog(row);
+			saveUserRef.value.openDialog(row);
 		};
 		// 删除用户
 		const onRowDel = (row: Object) => {
-			ElMessageBox.confirm(`此操作将永久删除账户名称：“${row.username}”，是否继续?`, '提示', {
+			ElMessageBox.confirm(`删除${row.username}?`, '提示', {
 				confirmButtonText: '确认',
 				cancelButtonText: '取消',
 				type: 'warning',
@@ -119,18 +124,22 @@ export default {
 				})
 				.catch(() => {});
 		};
-		//打开修改密码弹窗
-		const onOpenResetPassword = (row: Object) => {
-			ResetPasswordRef.value.openDialog(row.id);
+		// 打开修改密码弹窗
+		const onOpenResetPassword = (row: object) => {
+			resetPasswordRef.value.openDialog(row.id);
 		};
 		// 分页改变
 		const onHandleSizeChange = (val: number) => {
-			state.tableData.param.pageSize = val;
+			state.queryParam.pageSize = val;
 			initTableData();
 		};
 		// 分页改变
 		const onHandleCurrentChange = (val: number) => {
-			state.tableData.param.pageNumb = val;
+			state.queryParam.pageNumb = val;
+			initTableData();
+		};
+		const onSearch = () => {
+			state.queryParam.pageNumb = 1;
 			initTableData();
 		};
 		// 页面加载时
@@ -138,8 +147,8 @@ export default {
 			initTableData();
 		});
 		return {
-			SaveUserRef,
-			ResetPasswordRef,
+			saveUserRef,
+			resetPasswordRef,
 			initTableData,
 			onOpenAddUser,
 			onOpenEditUser,
@@ -147,6 +156,7 @@ export default {
 			onOpenResetPassword,
 			onHandleSizeChange,
 			onHandleCurrentChange,
+			onSearch,
 			...toRefs(state),
 		};
 	},
@@ -154,6 +164,4 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.system-user-container {
-}
 </style>
-- 
Gitee