From 8f67589328d0d05b54af71640546941fdd4b58e0 Mon Sep 17 00:00:00 2001
From: wangzenghua <1048523306@qq.com>
Date: Wed, 9 Apr 2025 10:25:06 +0100
Subject: [PATCH] feat:role

---
 .../components/custom-import-excel/index.vue  |   9 +-
 .../src/apis/system/user.js                   | 166 ++++++++++++++++++
 .../src/assets/template/用户-导入模板.xlsx    | Bin 0 -> 3796 bytes
 .../src/router/modules/system.js              |  14 +-
 .../src/utils/index.js                        |   5 +-
 .../src/views/system/role/authUser.vue        |   7 +-
 .../src/views/system/role/selectUser.vue      |   7 +-
 7 files changed, 194 insertions(+), 14 deletions(-)
 create mode 100644 sub-government-affairs-service/src/assets/template/用户-导入模板.xlsx

diff --git a/main/src/components/custom-import-excel/index.vue b/main/src/components/custom-import-excel/index.vue
index 7529540..e90047f 100644
--- a/main/src/components/custom-import-excel/index.vue
+++ b/main/src/components/custom-import-excel/index.vue
@@ -2,7 +2,8 @@
   <el-dialog
     v-model="state.visible"
     draggable
-    title="文件导入"
+    append-to-body
+    :title="title"
     width="50%"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
@@ -16,7 +17,7 @@
       <el-icon class="el-icon--upload"><upload-filled /></el-icon>
       <div class="el-upload__text">将文件放在此处或单击上传</div>
       <template #tip>
-        <div class="el-upload__tip">excel文件大小小于500kb</div>
+        <div class="el-upload__tip">仅允许导入xls、xlsx格式文件，excel文件大小小于500kb</div>
       </template>
     </el-upload>
     <template #footer>
@@ -29,6 +30,10 @@
 import { reactive, ref, shallowRef } from 'vue';
 import { isEmpty } from '@/utils';
 const props = defineProps({
+  title: {
+    type: String,
+    default: '文件导入',
+  },
   tips: {
     type: String,
     default: '提示：导入前请先下载模板填写信息，然后再导入！',
diff --git a/sub-government-affairs-service/src/apis/system/user.js b/sub-government-affairs-service/src/apis/system/user.js
index d624f21..c13749a 100644
--- a/sub-government-affairs-service/src/apis/system/user.js
+++ b/sub-government-affairs-service/src/apis/system/user.js
@@ -1 +1,167 @@
 import request from '@/utils/axios';
+
+/**
+ * @Title: 列表
+ */
+export function GetEntityList(params = {}) {
+  return request('/system/user/list', {
+    method: 'GET',
+    params,
+  });
+}
+
+/**
+ * @Title: 新增
+ */
+export function AddEntity(data = {}) {
+  return request('/system/user', {
+    method: 'POST',
+    data,
+  });
+}
+
+/**
+ * @Title: 修改
+ */
+export function UpdateEntity(data = {}) {
+  return request('/system/user', {
+    method: 'PUT',
+    data,
+  });
+}
+
+/**
+ * @Title: 删除
+ */
+export function DeleteEntity(params = {}) {
+  return request(`/system/user/${params.id}`, {
+    method: 'DELETE',
+  });
+}
+
+/**
+ * @Title: 导入
+ */
+export function ImportEntity(data = {}) {
+  return request('/system/user/importData', {
+    method: 'POST',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data,
+  });
+}
+
+/**
+ * @Title: 导出
+ */
+export function ExportEntity(params = {}) {
+  return request('/system/user/export', {
+    method: 'POST',
+    params,
+    responseType: 'blob',
+  });
+}
+
+/**
+ * @Title: 状态修改
+ */
+export function UpdateStatus(data = {}) {
+  return request('/system/user/changeStatus', {
+    method: 'PUT',
+    data,
+  });
+}
+
+/**
+ * @Title: 信息
+ */
+export function GetUser(id) {
+  return request(`/system/user/${id}`, {
+    method: 'GET',
+  });
+}
+
+/**
+ * @Title: 用户密码重置
+ */
+export function ResetUserPwd(data = {}) {
+  return request(`/system/user/resetPwd`, {
+    method: 'PUT',
+    data,
+  });
+}
+
+/**
+ * @Title: 查询用户个人信息
+ */
+export function GetUserProfile() {
+  return request(`/system/user/profile`, {
+    method: 'GET',
+  });
+}
+
+/**
+ * @Title: 修改用户个人信息
+ */
+export function UpdateUserProfile(data = {}) {
+  return request(`/system/user/profile`, {
+    method: 'PUT',
+    data,
+  });
+}
+
+/**
+ * @Title: 用户密码重置
+ */
+export function UpdateUserPwd(data = {}) {
+  return request(`/system/user/profile/updatePwd`, {
+    method: 'PUT',
+    data,
+  });
+}
+
+/**
+ * @Title: 用户头像上传
+ */
+export function UploadAvatar(data = {}) {
+  return request(`/system/user/profile/avatar`, {
+    method: 'POST',
+    data,
+  });
+}
+
+/**
+ * @Title: 查询授权角色
+ */
+export function GetAuthRole(id) {
+  return request(`/system/user/authRole/${id}`, {
+    method: 'GET',
+  });
+}
+
+/**
+ * @Title: 保存授权角色
+ */
+export function UpdateAuthRole(params = {}) {
+  return request('/system/user/authRole', {
+    method: 'PUT',
+    params,
+  });
+}
+
+/**
+ * @Title: 查询部门
+ */
+export function GetDeptList() {
+  return request('/system/dept/list', {
+    method: 'GET',
+  });
+}
+
+/**
+ * @Title: 查询部门下拉树结构
+ */
+export function GetDeptTreeSelect() {
+  return request('/system/user/deptTree', {
+    method: 'GET',
+  });
+}
diff --git a/sub-government-affairs-service/src/assets/template/用户-导入模板.xlsx b/sub-government-affairs-service/src/assets/template/用户-导入模板.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..29bca85ae8524af88d6c1fddbfec9a647eab0725
GIT binary patch
literal 3796
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

literal 0
HcmV?d00001

diff --git a/sub-government-affairs-service/src/router/modules/system.js b/sub-government-affairs-service/src/router/modules/system.js
index 3644054..c4bf012 100644
--- a/sub-government-affairs-service/src/router/modules/system.js
+++ b/sub-government-affairs-service/src/router/modules/system.js
@@ -20,6 +20,12 @@ export default [
         name: 'system-dict',
         meta: { title: '字典管理', icon: 'Document' },
       },
+      {
+        path: '/sub-government-affairs-service/system-menu',
+        component: () => import('@/views/system/menu/index.vue'),
+        name: 'system-menu',
+        meta: { title: '菜单管理', icon: 'Document' },
+      },
       {
         path: '/sub-government-affairs-service/system-role',
         component: () => import('@/views/system/role/index.vue'),
@@ -34,10 +40,10 @@ export default [
         hidden: true,
       },
       {
-        path: '/sub-government-affairs-service/system-menu',
-        component: () => import('@/views/system/menu/index.vue'),
-        name: 'system-menu',
-        meta: { title: '菜单管理', icon: 'Document' },
+        path: '/sub-government-affairs-service/system-user',
+        component: () => import('@/views/system/user/index.vue'),
+        name: 'system-user',
+        meta: { title: '用户管理', icon: 'Document' },
       },
     ],
   },
diff --git a/sub-government-affairs-service/src/utils/index.js b/sub-government-affairs-service/src/utils/index.js
index 6f004ad..16adcd6 100644
--- a/sub-government-affairs-service/src/utils/index.js
+++ b/sub-government-affairs-service/src/utils/index.js
@@ -3,9 +3,9 @@
  * @Author: zenghua.wang
  * @Date: 2022-02-23 21:12:37
  * @LastEditors: zenghua.wang
- * @LastEditTime: 2025-04-02 14:21:56
+ * @LastEditTime: 2025-04-09 09:53:18
  */
-import lodash from 'lodash';
+import lodash, { deburr } from 'lodash';
 import dayjs from 'dayjs';
 import { Base64 } from 'js-base64';
 
@@ -303,6 +303,7 @@ export const getTree = (data, id = 'id', parentId = 'parentId', children = 'chil
  * @returns
  */
 export const getParentIds = (treeData, targetId, id = 'id', children = 'children') => {
+  if (isEmpty(targetId)) return [];
   const parentMap = {};
   function buildParentMap(node, parentId = null) {
     if (node[id]) {
diff --git a/sub-government-affairs-service/src/views/system/role/authUser.vue b/sub-government-affairs-service/src/views/system/role/authUser.vue
index 08c6b98..81be017 100644
--- a/sub-government-affairs-service/src/views/system/role/authUser.vue
+++ b/sub-government-affairs-service/src/views/system/role/authUser.vue
@@ -59,7 +59,7 @@ const state = reactive({
     rowKey: 'userId',
     column: [
       {
-        label: '用户名称',
+        label: '登录名',
         prop: 'userName',
         search: true,
         rules: {
@@ -69,7 +69,7 @@ const state = reactive({
         },
       },
       {
-        label: '用户昵称',
+        label: '用户名称',
         prop: 'nickName',
         rules: {
           required: true,
@@ -99,7 +99,7 @@ const state = reactive({
         },
       },
       {
-        label: '手机',
+        label: '手机号',
         prop: 'phonenumber',
         search: true,
         rules: {
@@ -111,6 +111,7 @@ const state = reactive({
       {
         label: '邮箱',
         prop: 'email',
+        hide: true,
         rules: {
           required: true,
           message: '请输入',
diff --git a/sub-government-affairs-service/src/views/system/role/selectUser.vue b/sub-government-affairs-service/src/views/system/role/selectUser.vue
index 4609d4e..948305e 100644
--- a/sub-government-affairs-service/src/views/system/role/selectUser.vue
+++ b/sub-government-affairs-service/src/views/system/role/selectUser.vue
@@ -71,7 +71,7 @@ const state = reactive({
     rowKey: 'userId',
     column: [
       {
-        label: '用户名称',
+        label: '登录名',
         prop: 'userName',
         search: true,
         rules: {
@@ -81,7 +81,7 @@ const state = reactive({
         },
       },
       {
-        label: '用户昵称',
+        label: '用户名称',
         prop: 'nickName',
         rules: {
           required: true,
@@ -111,7 +111,7 @@ const state = reactive({
         },
       },
       {
-        label: '手机',
+        label: '手机号',
         prop: 'phonenumber',
         search: true,
         rules: {
@@ -123,6 +123,7 @@ const state = reactive({
       {
         label: '邮箱',
         prop: 'email',
+        hide: true,
         rules: {
           required: true,
           message: '请输入',