From 0ac7a129996801e2a146fd820f47f70e4b9518f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?=
 <10549902+zhuangruibo@user.noreply.gitee.com>
Date: Tue, 9 Jun 2026 11:55:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/Navbar.vue          |  4 +--
 .../src/store/modules/permission.ts           | 13 ++++++-
 .../efcode/virtualUnit/unitUserManager.vue    | 35 ++++++++++++++++---
 .../views/system/role/index-dept-separate.vue | 12 +++----
 4 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/Navbar.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/Navbar.vue
index bb854856..577a97bd 100644
--- a/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/Navbar.vue
+++ b/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/Navbar.vue
@@ -12,7 +12,7 @@
           placeholder="切换菜单组"
           @change="handleSystemCodeChange"
         >
-          <el-option v-for="item in systemCodeOptions" :key="item.value" :label="item.label" :value="item.value">
+          <el-option v-for="item in permissionStore.visibleSystemCodeOptions" :key="item.value" :label="item.label" :value="item.value">
             <el-icon style="vertical-align: middle; margin-right: 4px;"><component :is="item.icon" /></el-icon>
             <span>{{ item.label }}</span>
           </el-option>
@@ -102,7 +102,7 @@
 
 <script setup lang="ts">
 import SearchMenu from './TopBar/search.vue';
-import { usePermissionStore, systemCodeOptions } from '@/store/modules/permission';
+import { usePermissionStore } from '@/store/modules/permission';
 import { useAppStore } from '@/store/modules/app';
 import { useUserStore } from '@/store/modules/user';
 import { useSettingsStore } from '@/store/modules/settings';
diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts b/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts
index b2a88dc4..f2baf7af 100644
--- a/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts
+++ b/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts
@@ -7,7 +7,7 @@ import { RouteRecordRaw } from 'vue-router';
 import Layout from '@/layout/index.vue';
 import ParentView from '@/components/ParentView/index.vue';
 import InnerLink from '@/layout/components/InnerLink/index.vue';
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { createCustomNameComponent } from '@/utils/createCustomNameComponent';
 import { isHttp } from '@/utils/validate';
 
@@ -212,6 +212,16 @@ export const usePermissionStore = defineStore('permission', () => {
     iframeUrl.value = defaultOption?.iframeUrl || '';
   };
 
+  /** 根据后端返回的路由数据，动态过滤可见的系统分类选项（首页始终显示） */
+  const visibleSystemCodeOptions = computed(() => {
+    return systemCodeOptions.filter((option) => {
+      // 首页（有 iframeUrl 的）始终显示
+      if (option.iframeUrl) return true;
+      // 其他选项：只有当后端路由中存在匹配的 systemCode 时才显示
+      return allRouteDataCache.value.some((route: any) => route.systemCode === option.value);
+    });
+  });
+
   return {
     routes,
     topbarRouters,
@@ -220,6 +230,7 @@ export const usePermissionStore = defineStore('permission', () => {
     currentSystemCode,
     iframeMode,
     iframeUrl,
+    visibleSystemCodeOptions,
 
     getRoutes,
     getDefaultRoutes,
diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/virtualUnit/unitUserManager.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/virtualUnit/unitUserManager.vue
index ab86336f..ce03c9f7 100644
--- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/virtualUnit/unitUserManager.vue
+++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/virtualUnit/unitUserManager.vue
@@ -353,6 +353,22 @@ const roleLoading = ref(false);
 const roleList = ref<RoleVO[]>([]);
 const roleTableRef = ref<InstanceType<typeof import('element-plus')['ElTable']>>();
 const currentRoleUser = ref<{ userId: number; fullname: string }>({ userId: 0, fullname: '' });
+const roleSearchKeyword = ref('');
+
+/** 根据搜索关键词过滤角色列表 */
+const filteredRoleList = computed(() => {
+  const keyword = roleSearchKeyword.value.trim();
+  if (!keyword) return roleList.value;
+  return roleList.value.filter((role) => role.roleName?.includes(keyword) || role.roleKey?.includes(keyword));
+});
+
+/** 高亮角色名称中匹配的文字 */
+const highlightRoleName = (name: string | undefined) => {
+  if (!name) return '';
+  const keyword = roleSearchKeyword.value.trim();
+  if (!keyword) return name;
+  return name.replace(new RegExp(`(${keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')})`, 'g'), '<span class="search-match">$1</span>');
+};
 
 /** 打开分配角色对话框 */
 const handleAuthRole = async (row: UnitUserVo) => {
@@ -537,21 +553,32 @@ const submitResetPwd = async () => {
     </div>
 
     <!-- 分配角色对话框 -->
-    <el-dialog v-model="roleDialogVisible" title="分配角色" width="600px" append-to-body>
-      <div style="margin-bottom: 12px;">
+    <el-dialog v-model="roleDialogVisible" title="分配角色" width="860px" append-to-body @close="roleSearchKeyword = ''">
+      <div style="margin-bottom: 12px; display: flex; align-items: center; justify-content: space-between;">
         <span>当前用户：<strong>{{ currentRoleUser.fullname }}</strong></span>
+        <el-input
+          v-model="roleSearchKeyword"
+          placeholder="搜索角色名称"
+          :prefix-icon="Search"
+          clearable
+          style="width: 220px;"
+        />
       </div>
       <el-table
         ref="roleTableRef"
         v-loading="roleLoading"
-        :data="roleList"
+        :data="filteredRoleList"
         border
         row-key="roleId"
         max-height="400px"
         @row-click="(row: RoleVO) => { if (row.status === '0') roleTableRef?.toggleRowSelection(row) }"
       >
         <el-table-column type="selection" width="55" :selectable="(row: RoleVO) => row.status === '0'" />
-        <el-table-column label="角色名称" align="center" prop="roleName" />
+        <el-table-column label="角色名称" align="center">
+          <template #default="{ row }">
+            <span v-html="highlightRoleName(row.roleName)"></span>
+          </template>
+        </el-table-column>
         <el-table-column label="权限字符" align="center" prop="roleKey" />
         <el-table-column label="状态" align="center" width="80">
           <template #default="{ row }">
diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/system/role/index-dept-separate.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/system/role/index-dept-separate.vue
index f90d9eb5..e628a96d 100644
--- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/system/role/index-dept-separate.vue
+++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/system/role/index-dept-separate.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="p-2">
     <el-row :gutter="20">
-      <!-- 部门树 -->
-      <el-col :lg="4" :xs="24">
+      <!-- 部门树（暂时隐藏） -->
+      <el-col v-if="false" :lg="4" :xs="24">
         <el-card shadow="hover" style="position: sticky; top: 0;">
           <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
           <div style="max-height: calc(100vh - 180px); overflow-y: auto; overflow-x: hidden;">
@@ -23,7 +23,7 @@
       </el-col>
 
       <!-- 右侧角色管理 -->
-      <el-col :lg="20" :xs="24">
+      <el-col :lg="24" :xs="24">
         <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
           <div v-show="showSearch" class="mb-[10px]">
             <el-card shadow="hover">
@@ -81,15 +81,15 @@
           <el-table ref="roleTableRef" border v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column v-if="false" label="角色编号" prop="roleId" width="120" />
-            <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
-            <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="200" />
+            <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" />
+            <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="400" />
             <el-table-column label="显示顺序" prop="roleSort" width="100" />
             <el-table-column label="状态" align="center" width="100">
               <template #default="scope">
                 <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
               </template>
             </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime">
+            <el-table-column label="创建时间" align="center" prop="createTime" width="250">
               <template #default="scope">
                 <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
               </template>