From ca58dee1c5df6e020ff950fc85c704593fdff1be Mon Sep 17 00:00:00 2001
From: zhangtao <9480807882@qq.com>
Date: Mon, 6 Oct 2025 01:37:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor(前端): 统一按钮权限属性顺序
style(前端): 格式化代码缩进和换行
---
 backend/app/scripts/data/system_menu.json     |  6 +--
 frontend/src/views/application/ai/index.vue   | 49 ++-----------------
 frontend/src/views/application/job/index.vue  | 11 +----
 frontend/src/views/current/profile.vue        | 12 ++---
 frontend/src/views/monitor/cache/index.vue    | 15 +++---
 frontend/src/views/monitor/resource/index.vue | 18 +++----
 frontend/src/views/system/dept/index.vue      | 14 +++---
 frontend/src/views/system/dict/index.vue      | 16 +++---
 frontend/src/views/system/log/index.vue       | 10 ++--
 frontend/src/views/system/menu/index.vue      | 16 +++---
 frontend/src/views/system/notice/index.vue    | 23 ++++-----
 .../components/ConfigInfoDrawer.vue           |  2 +-
 .../views/system/{config => param}/index.vue  | 16 +++---
 frontend/src/views/system/position/index.vue  | 18 +++----
 .../role/components/PermissonDrawer.vue       | 11 +++--
 frontend/src/views/system/role/index.vue      | 12 ++---
 .../views/system/user/components/DeptTree.vue |  5 +-
 frontend/src/views/system/user/index.vue      | 14 +++---
 18 files changed, 113 insertions(+), 155 deletions(-)
 rename frontend/src/views/system/{config => param}/components/ConfigInfoDrawer.vue (98%)
 rename frontend/src/views/system/{config => param}/index.vue (94%)

diff --git a/backend/app/scripts/data/system_menu.json b/backend/app/scripts/data/system_menu.json
index 18d3b5f6..939820bd 100644
--- a/backend/app/scripts/data/system_menu.json
+++ b/backend/app/scripts/data/system_menu.json
@@ -838,9 +838,9 @@
         "icon": "setting",
         "order": 8,
         "permission": "system:param:query",
-        "route_name": "Config",
-        "route_path": "/system/config",
-        "component_path": "system/config/index",
+        "route_name": "Params",
+        "route_path": "/system/param",
+        "component_path": "system/param/index",
         "status": true,
         "keep_alive": true,
         "hidden": false,
diff --git a/frontend/src/views/application/ai/index.vue b/frontend/src/views/application/ai/index.vue
index 511afa33..9f77eab6 100644
--- a/frontend/src/views/application/ai/index.vue
+++ b/frontend/src/views/application/ai/index.vue
@@ -16,23 +16,8 @@
             </el-icon>
             <span class="status-text">{{ connectionStatusText }}</span>
           </div>
-          <el-button 
-            v-if="messages.length > 0"
-            text 
-            @click="clearCurrentChat"
-            v-hasPerm="['ai:mcp:clear']"
-          >
-            <el-icon><Delete /></el-icon>
-            清空对话
-          </el-button>
-          <el-button 
-            text 
-            @click="toggleConnection"
-            v-hasPerm="['ai:mcp:connection']"
-          >
-            <el-icon><Setting /></el-icon>
-            {{ isConnected ? '断开连接' : '重新连接' }}
-          </el-button>
+          <el-button v-if="messages.length > 0" v-hasPerm="['ai:mcp:clear']" text :icon="Delete" @click="clearCurrentChat">清空对话</el-button>
+          <el-button v-hasPerm="['ai:mcp:connection']" text :icon="Setting" @click="toggleConnection">{{ isConnected ? '断开连接' : '重新连接' }}</el-button>
         </div>
       </div>
 
@@ -100,12 +85,8 @@
                 <div v-else class="message-text" v-html="formatMessage(message.content)"></div>
               </div>
               <div v-if="!message.loading" class="message-actions">
-                <el-button text size="small" @click="copyMessage(message.content)">
-                  <el-icon><CopyDocument /></el-icon>
-                </el-button>
-                <el-button v-if="message.type === 'assistant'" text size="small">
-                  <el-icon><RefreshLeft /></el-icon>
-                </el-button>
+                <el-button text size="small" :icon="CopyDocument" @click="copyMessage(message.content)"></el-button>
+                <el-button v-if="message.type === 'assistant'" text size="small" :icon="RefreshLeft"></el-button>
               </div>
             </div>
           </div>
@@ -324,7 +305,7 @@ const sendMessage = async () => {
     // 发送消息到 WebSocket
     if (ws?.readyState === WebSocket.OPEN) {
       const payload = {
-        message: message,
+        message,
         timestamp: Date.now()
       }
       ws.send(JSON.stringify(payload))
@@ -405,26 +386,6 @@ const scrollToBottom = () => {
   })
 }
 
-// 格式化时间
-const formatTime = (timestamp: number) => {
-  const date = new Date(timestamp)
-  const now = new Date()
-  
-  if (date.toDateString() === now.toDateString()) {
-    return date.toLocaleTimeString('zh-CN', { 
-      hour: '2-digit', 
-      minute: '2-digit' 
-    })
-  } else {
-    return date.toLocaleString('zh-CN', { 
-      month: '2-digit',
-      day: '2-digit',
-      hour: '2-digit', 
-      minute: '2-digit' 
-    })
-  }
-}
-
 // 格式化消息内容
 const formatMessage = (content: string) => {
   if (!content) return ''
diff --git a/frontend/src/views/application/job/index.vue b/frontend/src/views/application/job/index.vue
index 79a954ed..b89d5c23 100644
--- a/frontend/src/views/application/job/index.vue
+++ b/frontend/src/views/application/job/index.vue
@@ -570,15 +570,8 @@
         <div class="dialog-footer">
           <!-- 详情弹窗不需要确定按钮的提交逻辑 -->
           <el-button @click="handleCloseDialog">取消</el-button>
-          <el-button
-            v-if="dialogVisible.type !== 'detail'"
-            type="primary"
-            @click="handleSubmit"
-            >确定</el-button
-          >
-          <el-button v-else type="primary" @click="handleCloseDialog" v-hasPerm="['app:job:detail']"
-            >确定</el-button
-          >
+          <el-button v-if="dialogVisible.type !== 'detail'" type="primary" @click="handleSubmit">确定</el-button>
+          <el-button v-else v-hasPerm="['app:job:detail']" type="primary" @click="handleCloseDialog" >确定</el-button>
         </div>
       </template>
     </el-dialog>
diff --git a/frontend/src/views/current/profile.vue b/frontend/src/views/current/profile.vue
index 6a085e0f..3ef21ec6 100644
--- a/frontend/src/views/current/profile.vue
+++ b/frontend/src/views/current/profile.vue
@@ -24,8 +24,8 @@
                 
               <el-upload
                   ref="uploadRef"
-                  class="el-upload"
                   v-model:file-list="fileList"
+                  class="el-upload"
                   name="file"
                   :show-file-list="false"
                   :before-upload="handleBeforeUpload"
@@ -36,7 +36,7 @@
                   @change="handleFileChange"
                 >
                   <template #trigger>
-                      <el-button type="primary" :icon="Camera" class="upload-trigger" v-hasPerm="['system:user:update']"/>
+                      <el-button v-hasPerm="['system:user:update']" type="primary" :icon="Camera" class="upload-trigger"/>
                     </template>
                 </el-upload>
             </div>
@@ -145,7 +145,7 @@
                   </el-form-item>
 
                   <el-form-item>
-                    <el-button type="primary" :loading="infoSubmitting" icon="edit" @click="handleSave" v-hasPerm="['system:user:update']">保存更改</el-button>
+                    <el-button v-hasPerm="['system:user:update']" type="primary" :loading="infoSubmitting" icon="edit" @click="handleSave">保存更改</el-button>
                   </el-form-item>
                 </el-form>
               </div>
@@ -185,7 +185,7 @@
                   </el-form-item>
 
                   <el-form-item>
-                    <el-button type="primary" :loading="passwordChanging" icon="edit" @click="handlePasswordChange" v-hasPerm="['current:profile:change_password']">更新密码</el-button>
+                    <el-button v-hasPerm="['current:profile:change_password']" type="primary" :loading="passwordChanging" icon="edit" @click="handlePasswordChange">更新密码</el-button>
                   </el-form-item>
                 </el-form>
               </div>
@@ -198,12 +198,12 @@
 </template>
 
 <script lang="ts" setup>
-import type { FormInstance, UploadRequestOptions, UploadFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadFile, ElUpload } from 'element-plus'
 import UserAPI, { type InfoFormState, type PasswordFormState } from '@/api/system/user';
 import { useUserStore, useDictStore } from "@/store";
 import { useUserStoreHook } from "@/store/modules/user.store";
 import { Camera } from '@element-plus/icons-vue';
-import { ElUpload, ElMessage } from 'element-plus';
+import { ElMessage } from 'element-plus';
 import { useI18n } from "vue-i18n";
 import { nextTick } from 'vue';
 import router from "@/router";
diff --git a/frontend/src/views/monitor/cache/index.vue b/frontend/src/views/monitor/cache/index.vue
index c4775efa..62a075c5 100644
--- a/frontend/src/views/monitor/cache/index.vue
+++ b/frontend/src/views/monitor/cache/index.vue
@@ -124,7 +124,7 @@
                     </el-tooltip>
                   </div>
                   <div>
-                    <el-button type="primary" link icon="RefreshRight" @click="refreshCacheNames" v-hasPerm="['monitor:cache:refresh']" />
+                    <el-button v-hasPerm="['monitor:cache:refresh']" type="primary" link icon="RefreshRight" @click="refreshCacheNames"/>
                   </div>
                 </div>
               </template>
@@ -134,7 +134,7 @@
                 </template>
                 <el-table-column prop="cache_name" label="缓存名称" show-overflow-tooltip>
                   <template #default="{ row }">
-                    <el-button type="primary" link @click="getCacheKeyList(row)" v-hasPerm="['monitor:cache:view']">{{ row.cache_name }}</el-button>
+                    <el-button v-hasPerm="['monitor:cache:view']" type="primary" link @click="getCacheKeyList(row)">{{ row.cache_name }}</el-button>
                   </template>
                 </el-table-column>
                 <el-table-column prop="remark" label="备注" show-overflow-tooltip />
@@ -142,7 +142,7 @@
                   <template #default="{ row }">
                     <el-popconfirm class="box-item" :title="`确认删除缓存 ${row.cache_name} 吗？`" placement="top" @confirm="handleClearCacheName(row)">
                       <template #reference>
-                        <el-button type="danger" size="small" link icon="delete" v-hasPerm="['monitor:cache:delete']" />
+                        <el-button v-hasPerm="['monitor:cache:delete']" type="danger" size="small" link icon="delete"/>
                       </template>
                     </el-popconfirm>
                   </template>
@@ -168,7 +168,7 @@
                     </el-tooltip>
                   </div>
                   <div>
-                    <el-button type="primary" link icon="RefreshRight" @click="refreshCacheKeys" v-hasPerm="['monitor:cache:refresh']" />
+                    <el-button v-hasPerm="['monitor:cache:refresh']" type="primary" link icon="RefreshRight" @click="refreshCacheKeys"/>
                   </div>
                 </div>
               </template>
@@ -178,15 +178,14 @@
                 </template>
                 <el-table-column prop="cacheKey" label="缓存键名" show-overflow-tooltip>
                   <template #default="{ row }">
-                    <el-button type="primary" link @click="handleCacheValue(row.cacheKey)" v-hasPerm="['monitor:cache:detail']">{{ row.cacheKey
-                      }}</el-button>
+                    <el-button v-hasPerm="['monitor:cache:detail']" type="primary" link @click="handleCacheValue(row.cacheKey)">{{ row.cacheKey}}</el-button>
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" width="60" align="center">
                   <template #default="{ row }">
                     <el-popconfirm class="box-item" :title="`确认删除键 ${row.cacheKey} 吗？`" placement="top" @confirm="handleClearCacheKey(row.cacheKey)">
                       <template #reference>
-                        <el-button type="danger" size="small" link icon="delete" v-hasPerm="['monitor:cache:delete']" />
+                        <el-button v-hasPerm="['monitor:cache:delete']" type="danger" size="small" link icon="delete"/>
                       </template>
                     </el-popconfirm>
                   </template>
@@ -212,7 +211,7 @@
                     </el-tooltip>
                   </div>
                   <div>
-                    <el-button type="danger" link icon="delete" @click="handleClearCacheAll" v-hasPerm="['monitor:cache:delete_all']">清理全部</el-button>
+                    <el-button v-hasPerm="['monitor:cache:delete_all']" type="danger" link icon="delete" @click="handleClearCacheAll">清理全部</el-button>
                   </div>
                 </div>
               </template>
diff --git a/frontend/src/views/monitor/resource/index.vue b/frontend/src/views/monitor/resource/index.vue
index 9fae6da0..e8c875dc 100644
--- a/frontend/src/views/monitor/resource/index.vue
+++ b/frontend/src/views/monitor/resource/index.vue
@@ -7,8 +7,8 @@
           <el-input v-model="queryFormData.name" placeholder="请输入文件名或目录名" clearable />
         </el-form-item>
         <el-form-item class="search-buttons">
-          <el-button type="primary" icon="search" @click="handleQuery" v-hasPerm="['monitor:resource:query']">查询</el-button>
-          <el-button icon="refresh" @click="handleResetQuery" v-hasPerm="['monitor:resource:query']">重置</el-button>
+          <el-button v-hasPerm="['monitor:resource:query']" type="primary" icon="search" @click="handleQuery">查询</el-button>
+          <el-button v-hasPerm="['monitor:resource:query']" icon="refresh" @click="handleResetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -123,9 +123,9 @@
                 <Document v-else />
               </el-icon>
               <span 
+                v-hasPerm="['monitor:resource:preview']"
                 :class="{ 'file-name-clickable': true }"
                 @click="handleFileNameClick(row)"
-                v-hasPerm="['monitor:resource:preview']"
               >
                 {{ row.name }}
               </span>
@@ -147,19 +147,19 @@
           <template #default="{ row }">
             <el-button
               v-if="!row.is_dir"
+              v-hasPerm="['monitor:resource:download']"
               type="success"
               size="small"
               link
               icon="download"
               @click="handleDownload(row)"
-              v-hasPerm="['monitor:resource:download']"
             >
               下载
             </el-button>
-            <el-button type="primary" size="small" link icon="edit" @click="handleRename(row)" v-hasPerm="['monitor:resource:rename']">
+            <el-button v-hasPerm="['monitor:resource:rename']" type="primary" size="small" link icon="edit" @click="handleRename(row)">
               重命名
             </el-button>
-            <el-button type="danger" size="small" link icon="delete" @click="handleDelete(row)" v-hasPerm="['monitor:resource:delete']">
+            <el-button v-hasPerm="['monitor:resource:delete']" type="danger" size="small" link icon="delete" @click="handleDelete(row)">
               删除
             </el-button>
           </template>
@@ -227,7 +227,7 @@
       </el-upload>
       <template #footer>
         <el-button @click="uploadDialogVisible = false">取消</el-button>
-        <el-button type="primary" :loading="uploading" @click="handleUploadConfirm" v-hasPerm="['monitor:resource:upload']">
+        <el-button v-hasPerm="['monitor:resource:upload']" type="primary" :loading="uploading" @click="handleUploadConfirm">
           确定上传
         </el-button>
       </template>
@@ -250,7 +250,7 @@
       </el-form>
       <template #footer>
         <el-button @click="createDirDialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="handleCreateDirConfirm" v-hasPerm="['monitor:resource:create_dir']">确定</el-button>
+        <el-button v-hasPerm="['monitor:resource:create_dir']" type="primary" @click="handleCreateDirConfirm">确定</el-button>
       </template>
     </el-dialog>
 
@@ -271,7 +271,7 @@
       </el-form>
       <template #footer>
         <el-button @click="renameDialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="handleRenameConfirm" v-hasPerm="['monitor:resource:rename']">确定</el-button>
+        <el-button v-hasPerm="['monitor:resource:rename']" type="primary" @click="handleRenameConfirm">确定</el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/frontend/src/views/system/dept/index.vue b/frontend/src/views/system/dept/index.vue
index c83aa306..af3aa76c 100644
--- a/frontend/src/views/system/dept/index.vue
+++ b/frontend/src/views/system/dept/index.vue
@@ -22,8 +22,8 @@
         </el-form-item>
         <!-- 查询、重置、展开/收起按钮 -->
         <el-form-item class="search-buttons">
-          <el-button type="primary" icon="search" @click="handleQuery" v-hasPerm="['system:dept:query']">查询</el-button>
-          <el-button icon="refresh" @click="handleResetQuery" v-hasPerm="['system:dept:query']">重置</el-button>
+          <el-button v-hasPerm="['system:dept:query']" type="primary" icon="search" @click="handleQuery">查询</el-button>
+          <el-button v-hasPerm="['system:dept:query']" icon="refresh" @click="handleResetQuery">重置</el-button>
           <!-- 展开/收起 -->
           <template v-if="isExpandable">
             <el-link class="ml-3" type="primary" underline="never" @click="isExpand = !isExpand">
@@ -82,12 +82,12 @@
           <el-row :gutter="10">
             <el-col :span="1.5">
               <el-tooltip content="刷新">
-                <el-button type="primary" icon="refresh" circle @click="handleRefresh" v-hasPerm="['system:dept:refresh']" />
+                <el-button v-hasPerm="['system:dept:refresh']" type="primary" icon="refresh" circle @click="handleRefresh"/>
               </el-tooltip>
             </el-col>
             <el-col :span="1.5">
               <el-tooltip content="列表筛选">
-                <el-dropdown trigger="click" v-hasPerm="['system:dept:filter']">
+                <el-dropdown v-hasPerm="['system:dept:filter']" trigger="click">
                   <el-button type="default" icon="operation" circle />
                   <template #dropdown>
                     <el-dropdown-menu>
@@ -127,7 +127,7 @@
         <el-table-column v-if="tableColumns.find(col => col.prop === 'operation')?.show" fixed="right" label="操作" align="center"  min-width="200">
           <template #default="scope">
             <el-button v-hasPerm="['system:dept:create']" type="success" size="small" link icon="plus" @click="handleOpenDialog('create', undefined, scope.row.id)">新增</el-button>
-            <el-button type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)" v-hasPerm="['system:dept:detail']">详情</el-button>
+            <el-button v-hasPerm="['system:dept:detail']" type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)">详情</el-button>
             <el-button v-hasPerm="['system:dept:update']" type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', scope.row.id)">编辑</el-button>
             <el-button v-hasPerm="['system:dept:delete']" type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])">删除</el-button>
           </template>
@@ -186,8 +186,8 @@
         <div class="dialog-footer">
           <!-- 详情弹窗不需要确定按钮的提交逻辑 -->
           <el-button @click="handleCloseDialog">取消</el-button>
-          <el-button v-if="dialogVisible.type !== 'detail'" type="primary" @click="handleSubmit" v-hasPerm="['system:dept:submit']">确定</el-button>
-          <el-button v-else type="primary" @click="handleCloseDialog" v-hasPerm="['system:dept:detail']">确定</el-button>
+          <el-button v-if="dialogVisible.type !== 'detail'" v-hasPerm="['system:dept:submit']" type="primary" @click="handleSubmit">确定</el-button>
+          <el-button v-else v-hasPerm="['system:dept:detail']" type="primary" @click="handleCloseDialog">确定</el-button>
         </div>
       </template>
     </el-dialog>
diff --git a/frontend/src/views/system/dict/index.vue b/frontend/src/views/system/dict/index.vue
index 6bcbae37..24474b3d 100644
--- a/frontend/src/views/system/dict/index.vue
+++ b/frontend/src/views/system/dict/index.vue
@@ -25,8 +25,8 @@
         </el-form-item>
         <!-- 查询、重置、展开/收起按钮 -->
         <el-form-item class="search-buttons">
-          <el-button type="primary" icon="search" @click="handleQuery" v-hasPerm="['system:dict_type:query']">查询</el-button>
-          <el-button icon="refresh" @click="handleResetQuery" v-hasPerm="['system:dict_type:query']">重置</el-button>
+          <el-button v-hasPerm="['system:dict_type:query']" type="primary" icon="search" @click="handleQuery">查询</el-button>
+          <el-button v-hasPerm="['system:dict_type:query']" icon="refresh" @click="handleResetQuery">重置</el-button>
           <!-- 展开/收起 -->
           <template v-if="isExpandable">
             <el-link class="ml-3" type="primary" underline="never" @click="isExpand = !isExpand">
@@ -147,10 +147,10 @@
         </el-table-column>
         <el-table-column v-if="tableColumns.find(col => col.prop === 'operation')?.show" fixed="right" label="操作" align="center" min-width="260">
           <template #default="scope">
-            <el-button type="warning" size="small" link icon="document" @click="handleDictDataDrawer(scope.row.dict_type, scope.row.dict_name)" v-hasPerm="['system:dict_data:query']">字典</el-button>
-            <el-button type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)" v-hasPerm="['system:dict_type:detail']">详情</el-button>
-            <el-button type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', scope.row.id)" v-hasPerm="['system:dict_type:update']">编辑</el-button>
-            <el-button type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])" v-hasPerm="['system:dict_type:delete']">删除</el-button>
+            <el-button v-hasPerm="['system:dict_data:query']" type="warning" size="small" link icon="document" @click="handleDictDataDrawer(scope.row.dict_type, scope.row.dict_name)">字典</el-button>
+            <el-button v-hasPerm="['system:dict_type:detail']" type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)">详情</el-button>
+            <el-button v-hasPerm="['system:dict_type:update']" type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', scope.row.id)">编辑</el-button>
+            <el-button v-hasPerm="['system:dict_type:delete']" type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -205,8 +205,8 @@
         <div class="dialog-footer">
           <!-- 详情弹窗不需要确定按钮的提交逻辑 -->
           <el-button @click="handleCloseDialog">取消</el-button>
-          <el-button v-if="dialogVisible.type !== 'detail'" type="primary" @click="handleSubmit" v-hasPerm="['system:dict_type:submit']">确定</el-button>
-          <el-button v-else type="primary" @click="handleCloseDialog" v-hasPerm="['system:dict_type:detail']">确定</el-button>
+          <el-button v-if="dialogVisible.type !== 'detail'" v-hasPerm="['system:dict_type:submit']" type="primary" @click="handleSubmit">确定</el-button>
+          <el-button v-else v-hasPerm="['system:dict_type:detail']" type="primary" @click="handleCloseDialog">确定</el-button>
         </div>
       </template>
     </el-dialog>
diff --git a/frontend/src/views/system/log/index.vue b/frontend/src/views/system/log/index.vue
index 28f077ac..c7e03ff6 100644
--- a/frontend/src/views/system/log/index.vue
+++ b/frontend/src/views/system/log/index.vue
@@ -25,8 +25,8 @@
         </el-form-item>
         <!-- 查询、重置、展开/收起按钮 -->
         <el-form-item class="search-buttons">
-          <el-button type="primary" icon="search" @click="handleQuery" v-hasPerm="['system:log:query']">查询</el-button>
-          <el-button icon="refresh" @click="handleResetQuery" v-hasPerm="['system:log:query']">重置</el-button>
+          <el-button v-hasPerm="['system:log:query']" type="primary" icon="search" @click="handleQuery">查询</el-button>
+          <el-button v-hasPerm="['system:log:query']" icon="refresh" @click="handleResetQuery">重置</el-button>
           <!-- 展开/收起 -->
           <template v-if="isExpandable">
             <el-link class="ml-3" type="primary" underline="never" @click="isExpand = !isExpand">
@@ -134,8 +134,8 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" min-width="150">
           <template #default="scope">
-            <el-button type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)" v-hasPerm="['system:log:detail']">详情</el-button>
-            <el-button type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])" v-hasPerm="['system:log:delete']">删除</el-button>
+            <el-button v-hasPerm="['system:log:detail']" type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)">详情</el-button>
+            <el-button v-hasPerm="['system:log:delete']" type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -189,7 +189,7 @@
         <div class="dialog-footer">
           <!-- 详情弹窗不需要确定按钮的提交逻辑 -->
           <el-button @click="handleCloseDialog">取消</el-button>
-          <el-button type="primary" @click="handleCloseDialog" v-hasPerm="['system:log:detail']">确定</el-button>
+          <el-button v-hasPerm="['system:log:detail']" type="primary" @click="handleCloseDialog">确定</el-button>
         </div>
       </template>
     </el-dialog>
diff --git a/frontend/src/views/system/menu/index.vue b/frontend/src/views/system/menu/index.vue
index b35360d3..ec67b6f3 100644
--- a/frontend/src/views/system/menu/index.vue
+++ b/frontend/src/views/system/menu/index.vue
@@ -22,8 +22,8 @@
         </el-form-item>
         <!-- 查询、重置、展开/收起按钮 -->
         <el-form-item class="search-buttons">
-          <el-button type="primary" icon="search" @click="handleQuery" v-hasPerm="['system:menu:query']">查询</el-button>
-          <el-button icon="refresh" @click="handleResetQuery" v-hasPerm="['system:menu:query']">重置</el-button>
+          <el-button v-hasPerm="['system:menu:query']" type="primary" icon="search" @click="handleQuery">查询</el-button>
+          <el-button v-hasPerm="['system:menu:query']" icon="refresh" @click="handleResetQuery">重置</el-button>
           <!-- 展开/收起 -->
           <template v-if="isExpandable">
             <el-link class="ml-3" type="primary" underline="never" @click="isExpand = !isExpand">
@@ -166,10 +166,10 @@
 
         <el-table-column fixed="right" label="操作" align="center" min-width="260">
           <template #default="scope">
-            <el-button v-if="scope.row.type == MenuTypeEnum.CATALOG || scope.row.type == MenuTypeEnum.MENU" type="success" link size="small" icon="plus" @click.stop="handleOpenDialog('create', undefined, scope.row.id)" v-hasPerm="['system:menu:create']">新增</el-button>
-            <el-button type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)" v-hasPerm="['system:menu:detail']">详情</el-button>
-            <el-button type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', scope.row.id)" v-hasPerm="['system:menu:update']">编辑</el-button>
-            <el-button type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])" v-hasPerm="['system:menu:delete']">删除</el-button>
+            <el-button v-if="scope.row.type == MenuTypeEnum.CATALOG || scope.row.type == MenuTypeEnum.MENU" v-hasPerm="['system:menu:create']" type="success" link size="small" icon="plus" @click.stop="handleOpenDialog('create', undefined, scope.row.id)">新增</el-button>
+            <el-button v-hasPerm="['system:menu:detail']" type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)">详情</el-button>
+            <el-button v-hasPerm="['system:menu:update']" type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', scope.row.id)">编辑</el-button>
+            <el-button v-hasPerm="['system:menu:delete']" type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -464,8 +464,8 @@
       <template #footer>
         <div class="dialog-footer">
           <!-- 详情弹窗不需要确定按钮的提交逻辑 -->
-          <el-button v-if="dialogVisible.type !== 'detail'" type="primary" @click="handleSubmit" v-hasPerm="['system:menu:submit']">确定</el-button>
-          <el-button v-else type="primary" @click="handleCloseDialog" v-hasPerm="['system:menu:detail']">确定</el-button>
+          <el-button v-if="dialogVisible.type !== 'detail'" v-hasPerm="['system:menu:submit']" type="primary" @click="handleSubmit">确定</el-button>
+          <el-button v-else v-hasPerm="['system:menu:detail']" type="primary" @click="handleCloseDialog">确定</el-button>
           <el-button @click="handleCloseDialog">取消</el-button>
         </div>
       </template>
diff --git a/frontend/src/views/system/notice/index.vue b/frontend/src/views/system/notice/index.vue
index 870c8b09..b94c8600 100644
--- a/frontend/src/views/system/notice/index.vue
+++ b/frontend/src/views/system/notice/index.vue
@@ -32,10 +32,10 @@
         </el-form-item>
         <!-- 查询、重置、展开/收起按钮 -->
         <el-form-item class="search-buttons">
-          <el-button type="primary" icon="search" @click="handleQuery" v-hasPerm="['system:notice:query']">
+          <el-button v-hasPerm="['system:notice:query']" type="primary" icon="search" @click="handleQuery">
               查询
             </el-button>
-          <el-button icon="refresh" @click="handleResetQuery" v-hasPerm="['system:notice:query']">
+          <el-button v-hasPerm="['system:notice:query']" icon="refresh" @click="handleResetQuery">
               重置
             </el-button>
           <!-- 展开/收起 -->
@@ -96,17 +96,17 @@
           <el-row :gutter="10">
             <el-col :span="1.5">
               <el-tooltip content="导出">
-                <el-button type="warning" icon="download" circle @click="handleExport" v-hasPerm="['system:notice:export']" />
+                <el-button v-hasPerm="['system:notice:export']" type="warning" icon="download" circle @click="handleExport" />
               </el-tooltip>
             </el-col>
             <el-col :span="1.5">
               <el-tooltip content="刷新">
-                <el-button type="primary" icon="refresh" circle @click="handleRefresh" v-hasPerm="['system:notice:refresh']" />
+                <el-button v-hasPerm="['system:notice:refresh']" type="primary" icon="refresh" circle @click="handleRefresh" />
               </el-tooltip>
             </el-col>
             <el-col :span="1.5">
               <el-tooltip content="列表筛选">
-                <el-dropdown trigger="click" v-hasPerm="['system:notice:filter']">
+                <el-dropdown v-hasPerm="['system:notice:filter']" trigger="click">
                   <el-button type="default" icon="operation" circle />
                   <template #dropdown>
                     <el-dropdown-menu>
@@ -162,9 +162,9 @@
 
         <el-table-column v-if="tableColumns.find(col => col.prop === 'operation')?.show" fixed="right" label="操作" align="center" min-width="200">
           <template #default="scope">
-            <el-button type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)" v-hasPerm="['system:notice:detail']">详情</el-button>
-            <el-button type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', scope.row.id)" v-hasPerm="['system:notice:update']">编辑</el-button>
-            <el-button type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])" v-hasPerm="['system:notice:delete']">删除</el-button>
+            <el-button v-hasPerm="['system:notice:detail']" type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)">详情</el-button>
+            <el-button v-hasPerm="['system:notice:update']" type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', scope.row.id)">编辑</el-button>
+            <el-button v-hasPerm="['system:notice:delete']" type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -218,7 +218,8 @@
           </el-form-item>
           <el-form-item label="类型" prop="notice_type">
             <el-select v-model="formData.notice_type" placeholder="请选择类型" clearable>
-              <el-option v-for="item in dictStore.getDictArray('sys_notice_type')"
+              <el-option
+                v-for="item in dictStore.getDictArray('sys_notice_type')"
                 :key="item.dict_value"
                 :value="item.dict_value"
                 :label="item.dict_label"
@@ -250,8 +251,8 @@
         <div class="dialog-footer">
           <!-- 详情弹窗不需要确定按钮的提交逻辑 -->
           <el-button @click="handleCloseDialog">取消</el-button>
-          <el-button v-if="dialogVisible.type !== 'detail'" type="primary" @click="handleSubmit" v-hasPerm="['system:notice:submit']">确定</el-button>
-          <el-button v-else type="primary" @click="handleCloseDialog" v-hasPerm="['system:notice:detail']">确定</el-button>
+          <el-button v-if="dialogVisible.type !== 'detail'" v-hasPerm="['system:notice:submit']" type="primary" @click="handleSubmit">确定</el-button>
+          <el-button v-else v-hasPerm="['system:notice:detail']" type="primary" @click="handleCloseDialog">确定</el-button>
         </div>
       </template>
     </el-dialog>
diff --git a/frontend/src/views/system/config/components/ConfigInfoDrawer.vue b/frontend/src/views/system/param/components/ConfigInfoDrawer.vue
similarity index 98%
rename from frontend/src/views/system/config/components/ConfigInfoDrawer.vue
rename to frontend/src/views/system/param/components/ConfigInfoDrawer.vue
index 62a7d3e2..a59d9820 100644
--- a/frontend/src/views/system/config/components/ConfigInfoDrawer.vue
+++ b/frontend/src/views/system/param/components/ConfigInfoDrawer.vue
@@ -40,7 +40,7 @@
     <template #footer> 
       <!-- 操作按钮 -->
       <el-button @click="resetForm">取消</el-button>
-      <el-button type="primary" :disabled="!hasChanges" @click="submitChanges" v-hasPerm="['system:config:update']">保存</el-button>
+      <el-button v-hasPerm="['system:config:update']" type="primary" :disabled="!hasChanges" @click="submitChanges">保存</el-button>
     </template>
   </el-drawer>
 </template>
diff --git a/frontend/src/views/system/config/index.vue b/frontend/src/views/system/param/index.vue
similarity index 94%
rename from frontend/src/views/system/config/index.vue
rename to frontend/src/views/system/param/index.vue
index d7d93979..e761323e 100644
--- a/frontend/src/views/system/config/index.vue
+++ b/frontend/src/views/system/param/index.vue
@@ -24,8 +24,8 @@
           />
         </el-form-item>
         <el-form-item class="search-buttons">
-          <el-button type="primary" icon="search" @click="handleQuery" v-hasPerm="['system:config:query']">查询</el-button>
-          <el-button icon="refresh" @click="handleResetQuery" v-hasPerm="['system:config:query']">重置</el-button>
+          <el-button v-hasPerm="['system:config:query']" type="primary" icon="search" @click="handleQuery">查询</el-button>
+          <el-button v-hasPerm="['system:config:query']" icon="refresh" @click="handleResetQuery">重置</el-button>
           <!-- 展开/收起 -->
           <template v-if="isExpandable">
             <el-link class="ml-3" type="primary" underline="never" @click="isExpand = !isExpand">
@@ -129,9 +129,9 @@
         </el-table-column>
         <el-table-column v-if="tableColumns.find(col => col.prop === 'operation')?.show" fixed="right" label="操作" align="center" min-width="200">
           <template #default="scope">
-            <el-button type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)" v-hasPerm="['system:config:detail']">详情</el-button>
-            <el-button type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', scope.row.id)" v-hasPerm="['system:config:update']">编辑</el-button>
-            <el-button type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])" v-hasPerm="['system:config:delete']">删除</el-button>
+            <el-button v-hasPerm="['system:config:detail']" type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)">详情</el-button>
+            <el-button v-hasPerm="['system:config:update']" type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', scope.row.id)">编辑</el-button>
+            <el-button v-hasPerm="['system:config:delete']" type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -188,8 +188,8 @@
         <div class="dialog-footer">
           <!-- 详情弹窗不需要确定按钮的提交逻辑 -->
           <el-button @click="handleCloseDialog">取消</el-button>
-          <el-button v-if="dialogVisible.type !== 'detail'" type="primary" @click="handleSubmit" v-hasPerm="['system:config:submit']">确定</el-button>
-          <el-button v-else type="primary" @click="handleCloseDialog" v-hasPerm="['system:config:detail']">确定</el-button>
+          <el-button v-if="dialogVisible.type !== 'detail'" v-hasPerm="['system:config:create']" type="primary" @click="handleSubmit">确定</el-button>
+          <el-button v-else v-hasPerm="['system:config:detail']" type="primary" @click="handleCloseDialog">确定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -200,7 +200,7 @@
 
 <script setup lang="ts">
 defineOptions({
-  name: "Config",
+  name: "Params",
   inheritAttrs: false,
 });
 
diff --git a/frontend/src/views/system/position/index.vue b/frontend/src/views/system/position/index.vue
index 1dcd6bbc..787d2df2 100644
--- a/frontend/src/views/system/position/index.vue
+++ b/frontend/src/views/system/position/index.vue
@@ -22,8 +22,8 @@
         </el-form-item>
         <!-- 查询、重置、展开/收起按钮 -->
         <el-form-item class="search-buttons">
-          <el-button type="primary" icon="search" @click="handleQuery" v-hasPerm="['system:position:query']">查询</el-button>
-          <el-button icon="refresh" @click="handleResetQuery" v-hasPerm="['system:position:query']">重置</el-button>
+          <el-button v-hasPerm="['system:position:query']" type="primary" icon="search" @click="handleQuery">查询</el-button>
+          <el-button v-hasPerm="['system:position:query']" icon="refresh" @click="handleResetQuery">重置</el-button>
           <!-- 展开/收起 -->
           <template v-if="isExpandable">
             <el-link class="ml-3" type="primary" underline="never" @click="isExpand = !isExpand">
@@ -82,12 +82,12 @@
           <el-row :gutter="10">
             <el-col :span="1.5">
               <el-tooltip content="导出">
-                <el-button type="warning" icon="download" circle @click="handleExport" v-hasPerm="['system:position:export']" />
+                <el-button v-hasPerm="['system:position:export']" type="warning" icon="download" circle @click="handleExport" />
               </el-tooltip>
             </el-col>
             <el-col :span="1.5">
               <el-tooltip content="刷新">
-                <el-button type="primary" icon="refresh" circle @click="handleRefresh" v-hasPerm="['system:position:refresh']" />
+                <el-button v-hasPerm="['system:position:refresh']" type="primary" icon="refresh" circle @click="handleRefresh" />
               </el-tooltip>
             </el-col>
             <el-col :span="1.5">
@@ -139,9 +139,9 @@
 
         <el-table-column v-if="tableColumns.find(col => col.prop === 'operation')?.show" fixed="right" label="操作" align="center" min-width="200">
           <template #default="scope">
-            <el-button type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)" v-hasPerm="['system:position:detail']">详情</el-button>
-            <el-button type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', scope.row.id)" v-hasPerm="['system:position:update']">编辑</el-button>
-            <el-button type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])" v-hasPerm="['system:position:delete']">删除</el-button>
+            <el-button v-hasPerm="['system:position:detail']" type="info" size="small" link icon="document" @click="handleOpenDialog('detail', scope.row.id)">详情</el-button>
+            <el-button v-hasPerm="['system:position:update']" type="primary" size="small" link icon="edit" @click="handleOpenDialog('update', scope.row.id)">编辑</el-button>
+            <el-button v-hasPerm="['system:position:delete']" type="danger" size="small" link icon="delete" @click="handleDelete([scope.row.id])">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -196,8 +196,8 @@
         <div class="dialog-footer">
           <!-- 详情弹窗不需要确定按钮的提交逻辑 -->
           <el-button @click="handleCloseDialog">取消</el-button>
-          <el-button v-if="dialogVisible.type !== 'detail'" type="primary" @click="handleSubmit" v-hasPerm="['system:position:submit']">确定</el-button>
-          <el-button v-else type="primary" @click="handleCloseDialog" v-hasPerm="['system:position:detail']">确定</el-button>
+          <el-button v-if="dialogVisible.type !== 'detail'" v-hasPerm="['system:position:submit']" type="primary" @click="handleSubmit">确定</el-button>
+          <el-button v-else v-hasPerm="['system:position:detail']" type="primary" @click="handleCloseDialog">确定</el-button>
         </div>
       </template>
     </el-dialog>
diff --git a/frontend/src/views/system/role/components/PermissonDrawer.vue b/frontend/src/views/system/role/components/PermissonDrawer.vue
index c62bd0f8..d876d13e 100644
--- a/frontend/src/views/system/role/components/PermissonDrawer.vue
+++ b/frontend/src/views/system/role/components/PermissonDrawer.vue
@@ -35,7 +35,7 @@
                 </el-form-item>
               </el-form>
               
-              <div class="mt-5 max-h-[60vh] b-1 b-solid b-[#e5e7eb] p-10px overflow-auto box-border" v-if="permissionState.data_scope === 5 && deptTreeData.length">
+              <div v-if="permissionState.data_scope === 5 && deptTreeData.length" class="mt-5 max-h-[60vh] b-1 b-solid b-[#e5e7eb] p-10px overflow-auto box-border">
                 <el-input v-model="deptFilterText" placeholder="部门名称" />
                 <el-tree 
                   ref="deptTreeRef"
@@ -46,8 +46,8 @@
                   default-expand-all
                   :highlight-current="true"
                   :check-strictly="!parentChildLinked"
-                  @check="deptTreeCheck"
                   style="height: calc(100% - 60px); overflow-y: auto; margin-top: 10px;"
+                  @check="deptTreeCheck"
                   >
                   <template #empty>
                     <el-empty :image-size="80" description="暂无数据" />
@@ -108,8 +108,9 @@
             default-expand-all
             :highlight-current="true"
             :check-strictly="!parentChildLinked"
+            style="height: calc(100% - 60px); overflow: auto; margin-top: 10px;"
             @check="menuTreeCheck"
-            style="height: calc(100% - 60px); overflow: auto; margin-top: 10px;">
+          >
             <template #empty>
               <el-empty :image-size="80" description="暂无数据" />
             </template>
@@ -188,11 +189,11 @@ const init = async () => {
   try {
     // 获取全部部门树
     const deptResponse = await DeptAPI.getDeptList();
-    deptTreeData.value = formatTree(listToTree(deptResponse.data.data.items));
+    deptTreeData.value = formatTree(listToTree(deptResponse.data.data));
 
     // 获取全部菜单树
     const menuResponse = await MenuAPI.getMenuList();
-    menuTreeData.value = formatTree(listToTree(menuResponse.data.data.items));
+    menuTreeData.value = formatTree(listToTree(menuResponse.data.data));
 
     // 获取角色详情
     const roleResponse = await RoleAPI.getRoleDetail(props.roleId);
diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue
index 7757ef0a..d4769367 100644
--- a/frontend/src/views/system/role/index.vue
+++ b/frontend/src/views/system/role/index.vue
@@ -22,8 +22,8 @@
         </el-form-item>
         <!-- 查询、重置、展开/收起按钮 -->
         <el-form-item class="search-buttons">
-          <el-button type="primary" icon="search" @click="handleQuery" v-hasPerm="['system:role:query']">查询</el-button>
-          <el-button icon="refresh" @click="handleResetQuery" v-hasPerm="['system:role:query']">重置</el-button>
+          <el-button v-hasPerm="['system:role:query']" type="primary" icon="search" @click="handleQuery">查询</el-button>
+          <el-button v-hasPerm="['system:role:query']" icon="refresh" @click="handleResetQuery">重置</el-button>
           <!-- 展开/收起 -->
           <template v-if="isExpandable">
             <el-link class="ml-3" type="primary" underline="never" @click="isExpand = !isExpand">
@@ -87,12 +87,12 @@
           <el-row :gutter="10">
             <el-col :span="1.5">
               <el-tooltip content="导出">
-                <el-button type="warning" icon="download" circle @click="handleExport" v-hasPerm="['system:role:export']" />
+                <el-button v-hasPerm="['system:role:export']" type="warning" icon="download" circle @click="handleExport" />
               </el-tooltip>
             </el-col>
             <el-col :span="1.5">
               <el-tooltip content="刷新">
-                <el-button type="primary" icon="refresh" circle @click="handleRefresh" v-hasPerm="['system:role:refresh']" />
+                <el-button v-hasPerm="['system:role:refresh']" type="primary" icon="refresh" circle @click="handleRefresh" />
               </el-tooltip>
             </el-col>
             <el-col :span="1.5">
@@ -163,12 +163,12 @@
               @click="scope.row.id === 1 ? ElMessage.warning('系统默认角色，不可操作') : handleOpenAssignPermDialog(scope.row.id, scope.row.name)"
             >分配权限</el-button>
             <el-button 
+              v-hasPerm="['system:role:detail']"
               type="info" 
               size="small" 
               link 
               icon="document" 
               @click="handleOpenDialog('detail', scope.row.id)"
-              v-hasPerm="['system:role:detail']"
             >详情</el-button>
             <el-button 
               v-hasPerm="['system:role:update']" 
@@ -258,7 +258,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="handleCloseDialog">取 消</el-button>
-          <el-button type="primary" @click="handleSubmit" v-hasPerm="['system:role:submit']">确 定</el-button>
+          <el-button v-hasPerm="['system:role:submit']" type="primary" @click="handleSubmit">确 定</el-button>
         </div>
       </template>
     </el-dialog>
diff --git a/frontend/src/views/system/user/components/DeptTree.vue b/frontend/src/views/system/user/components/DeptTree.vue
index d590f9eb..dcd9dd6c 100644
--- a/frontend/src/views/system/user/components/DeptTree.vue
+++ b/frontend/src/views/system/user/components/DeptTree.vue
@@ -9,7 +9,10 @@
       </template>
     </el-input>
 
-    <el-tree ref="deptTreeRef" class="mt-2" :data="deptOptions"
+    <el-tree 
+      ref="deptTreeRef"
+      class="mt-2" 
+      :data="deptOptions"
       :props="{ children: 'children', label: 'label', disabled: '' }" 
       :expand-on-click-node="false"
       :filter-node-method="handleFilter" 
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 47fadf8a..ade4a79c 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -33,8 +33,8 @@
             </el-form-item>
             <!-- 查询、重置、展开/收起按钮 -->
             <el-form-item class="search-buttons">
-              <el-button type="primary" icon="search" @click="handleQuery" v-hasPerm="['system:user:query']">查询</el-button>
-              <el-button icon="refresh" @click="handleResetQuery" v-hasPerm="['system:user:query']">重置</el-button>
+              <el-button v-hasPerm="['system:user:query']" type="primary" icon="search" @click="handleQuery">查询</el-button>
+              <el-button v-hasPerm="['system:user:query']" icon="refresh" @click="handleResetQuery">重置</el-button>
               <!-- 展开/收起 -->
               <template v-if="isExpandable">
                 <el-link class="ml-3" type="primary" underline="never" @click="isExpand = !isExpand">
@@ -105,7 +105,7 @@
                 </el-col>
                 <el-col :span="1.5">
                   <el-tooltip content="刷新">
-                    <el-button type="default" icon="refresh" circle @click="handleRefresh" v-hasPerm="['system:user:refresh']" />
+                    <el-button v-hasPerm="['system:user:refresh']" type="default" icon="refresh" circle @click="handleRefresh"/>
                   </el-tooltip>
                 </el-col>
               </el-row>
@@ -178,12 +178,12 @@
                   @click="hancleResetPassword(scope.row)"
                 >重置密码</el-button>
                 <el-button 
+                  v-hasPerm="['system:user:detail']"
                   type="info" 
                   size="small" 
                   link 
                   icon="document" 
                   @click="handleOpenDialog('detail', scope.row.id)"
-                  v-hasPerm="['system:user:detail']"
                 >详情</el-button>
                 <el-button 
                   v-if="scope.row.username !== 'admin'" 
@@ -323,8 +323,8 @@
           <template #footer>
             <div class="dialog-footer">
               <!-- 详情弹窗不需要确定按钮的提交逻辑 -->
-              <el-button v-if="dialogVisible.type === 'create' || dialogVisible.type === 'update'" type="primary" @click="handleSubmit" v-hasPerm="['system:user:submit']">确定</el-button>
-              <el-button v-else type="primary" @click="handleCloseDialog" v-hasPerm="['system:user:detail']">确定</el-button>
+              <el-button v-if="dialogVisible.type === 'create' || dialogVisible.type === 'update'" v-hasPerm="['system:user:create']" type="primary" @click="handleSubmit">确定</el-button>
+              <el-button v-else v-hasPerm="['system:user:detail']" type="primary" @click="handleCloseDialog">确定</el-button>
               <el-button @click="handleCloseDialog">取消</el-button>
             </div>
           </template>
@@ -333,7 +333,7 @@
 
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="handleSubmit" v-hasPerm="['system:user:submit']">确 定</el-button>
+          <el-button v-hasPerm="['system:user:submit']" type="primary" @click="handleSubmit">确 定</el-button>
           <el-button @click="handleCloseDialog">取 消</el-button>
         </div>
       </template>