From 7031aa7e6dd85c534c638640608190097ce647ce Mon Sep 17 00:00:00 2001
From: wangzenghua <1048523306@qq.com>
Date: Thu, 10 Apr 2025 04:25:23 +0100
Subject: [PATCH] feat:user

---
 .../src/layouts/component/Avatar/index.vue             | 10 ++++++++--
 .../src/views/system/user/index.vue                    |  5 +++++
 .../src/layouts/component/Avatar/index.vue             | 10 ++++++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue
index 5dab309..a249430 100644
--- a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue
+++ b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue
@@ -3,7 +3,7 @@
  * @Author: zenghua.wang
  * @Date: 2023-06-20 14:29:45
  * @LastEditors: zenghua.wang
- * @LastEditTime: 2025-02-18 09:48:18
+ * @LastEditTime: 2025-04-10 11:15:23
 -->
 <template>
   <el-dropdown class="layout-avatar">
@@ -16,7 +16,9 @@
     </span>
     <template #dropdown>
       <el-dropdown-menu>
-        <el-dropdown-item :command="0"> 当前角色：{{ userInfo.nickName }} </el-dropdown-item>
+        <el-dropdown-item> 用户姓名：{{ userInfo.nickName }} </el-dropdown-item>
+        <el-dropdown-item> 用户角色：{{ roles }} </el-dropdown-item>
+        <el-dropdown-item> 部门组织：{{ userInfo?.dept?.deptName }} </el-dropdown-item>
         <el-dropdown-item :command="5" divided @click="logOut">
           <el-icon><SwitchButton /></el-icon>退出登录
         </el-dropdown-item>
@@ -42,6 +44,10 @@ const PermissionStore = usePermissionStore();
 
 // 用户信息
 const userInfo = computed(() => UserStore.getUserInfo());
+const roles = computed(() => {
+  const arr = userInfo.value.roles.map((item) => item.roleName);
+  return arr.join(' | ');
+});
 
 const logOut = async () => {
   ElMessageBox.confirm('您是否确认退出登录?', '温馨提示', {
diff --git a/sub-government-affairs-service/src/views/system/user/index.vue b/sub-government-affairs-service/src/views/system/user/index.vue
index 76734bb..798b7c8 100644
--- a/sub-government-affairs-service/src/views/system/user/index.vue
+++ b/sub-government-affairs-service/src/views/system/user/index.vue
@@ -32,6 +32,11 @@
               @row-update="rowUpdate"
               @row-del="rowDel"
             >
+              <template #menu-left>
+                <el-button type="warning" icon="upload" @click="rowImport">导入</el-button>
+                <el-button type="success" icon="download" @click="rowExport">导出</el-button>
+              </template>
+
               <template #status="{ row }">
                 <el-tag v-if="row.status == 0" type="success">启用</el-tag>
                 <el-tag v-if="row.status == 1" type="danger">禁用</el-tag>
diff --git a/sub-operation-admin/src/layouts/component/Avatar/index.vue b/sub-operation-admin/src/layouts/component/Avatar/index.vue
index 5dab309..a249430 100644
--- a/sub-operation-admin/src/layouts/component/Avatar/index.vue
+++ b/sub-operation-admin/src/layouts/component/Avatar/index.vue
@@ -3,7 +3,7 @@
  * @Author: zenghua.wang
  * @Date: 2023-06-20 14:29:45
  * @LastEditors: zenghua.wang
- * @LastEditTime: 2025-02-18 09:48:18
+ * @LastEditTime: 2025-04-10 11:15:23
 -->
 <template>
   <el-dropdown class="layout-avatar">
@@ -16,7 +16,9 @@
     </span>
     <template #dropdown>
       <el-dropdown-menu>
-        <el-dropdown-item :command="0"> 当前角色：{{ userInfo.nickName }} </el-dropdown-item>
+        <el-dropdown-item> 用户姓名：{{ userInfo.nickName }} </el-dropdown-item>
+        <el-dropdown-item> 用户角色：{{ roles }} </el-dropdown-item>
+        <el-dropdown-item> 部门组织：{{ userInfo?.dept?.deptName }} </el-dropdown-item>
         <el-dropdown-item :command="5" divided @click="logOut">
           <el-icon><SwitchButton /></el-icon>退出登录
         </el-dropdown-item>
@@ -42,6 +44,10 @@ const PermissionStore = usePermissionStore();
 
 // 用户信息
 const userInfo = computed(() => UserStore.getUserInfo());
+const roles = computed(() => {
+  const arr = userInfo.value.roles.map((item) => item.roleName);
+  return arr.join(' | ');
+});
 
 const logOut = async () => {
   ElMessageBox.confirm('您是否确认退出登录?', '温馨提示', {