From 15f2c1ee4196f1afe9cc20ce687023731f4e8d7c Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Thu, 29 May 2025 10:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/authority/role/index.vue | 6 +++---
 frontend/src/views/authority/user/index.vue | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/authority/role/index.vue b/frontend/src/views/authority/role/index.vue
index a4a3b06..3fa2944 100644
--- a/frontend/src/views/authority/role/index.vue
+++ b/frontend/src/views/authority/role/index.vue
@@ -16,9 +16,9 @@
       </template>
       <!-- 表格操作 -->
       <template #operation='scope'>
-        <el-button v-auth.role="'edit'" type='primary' link :icon='EditPen' @click="openDrawer('edit', scope.row)">编辑</el-button>
-        <el-button v-auth.role="'delete'" v-if="scope.row.type !== 0 && scope.row.type !== 1" type='primary' link :icon='Delete' @click='deleteAccount(scope.row)'>删除</el-button>
-        <el-button v-auth.role="'SetPermissions'" type='primary' link :icon='Share' @click="openDrawer('设置权限', scope.row)">设置权限</el-button>
+        <el-button v-auth.role="'edit'" type='primary' link :icon='EditPen' @click="openDrawer('edit', scope.row)" :disabled="scope.row.code == 'root'">编辑</el-button>
+        <el-button v-auth.role="'delete'"  type='primary' link :icon='Delete' @click='deleteAccount(scope.row)' :disabled="scope.row.code == 'root'">删除</el-button>
+        <el-button v-auth.role="'SetPermissions'" type='primary' link :icon='Share' @click="openDrawer('设置权限', scope.row)" :disabled="scope.row.code == 'root'">设置权限</el-button>
       </template>
 
     </ProTable>
diff --git a/frontend/src/views/authority/user/index.vue b/frontend/src/views/authority/user/index.vue
index 66e08d7..100552f 100644
--- a/frontend/src/views/authority/user/index.vue
+++ b/frontend/src/views/authority/user/index.vue
@@ -16,9 +16,9 @@
         </template>
         <!-- 表格操作 -->
         <template #operation='scope'>
-          <el-button v-auth.user="'edit'" type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)">编辑</el-button>
-          <el-button v-auth.user="'delete'" type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
-          <el-button v-auth.user="'editPassWord'" type='primary' link :icon='Delete' @click='EditPassWord(scope.row)'>修改密码</el-button>
+          <el-button v-auth.user="'edit'" type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)" :disabled="scope.row.loginName == 'root'">编辑</el-button>
+          <el-button v-auth.user="'delete'" type='primary' link :icon='Delete' @click='handleDelete(scope.row)' :disabled="scope.row.loginName == 'root'">删除</el-button>
+          <el-button v-auth.user="'editPassWord'" type='primary' link :icon='Delete' @click='EditPassWord(scope.row)' :disabled="scope.row.loginName == 'root'">修改密码</el-button>
           </template>
 
       </ProTable>
@@ -91,6 +91,7 @@
       render: (scope) => {
       const roleNames = scope.row.roleNames;
       const roleArray = Array.isArray(roleNames) ? roleNames : [roleNames];
+   
       if (roleArray.length > 1) {
         return roleArray.join(', ');
       }