From 32ee59f763692d9de237207aed9b976cde8a4815 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 27 Mar 2022 21:13:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84ElOnlyChild=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue | 12 ++++--------
 src/views/system/user/index.vue | 12 ++++--------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index bdc3810..86242c0 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -115,36 +115,32 @@
          </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
-              <el-tooltip content="修改" placement="top">
+              <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
                 <el-button
-                  v-if="scope.row.roleId !== 1"
                   type="text"
                   icon="Edit"
                   @click="handleUpdate(scope.row)"
                   v-hasPermi="['system:role:edit']"
                 ></el-button>
               </el-tooltip>
-              <el-tooltip content="删除" placement="top">
+              <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
                 <el-button
-                  v-if="scope.row.roleId !== 1"
                   type="text"
                   icon="Delete"
                   @click="handleDelete(scope.row)"
                   v-hasPermi="['system:role:remove']"
                 ></el-button>
               </el-tooltip>
-              <el-tooltip content="数据权限" placement="top">
+              <el-tooltip content="数据权限" placement="top" v-if="scope.row.roleId !== 1">
                 <el-button
-                  v-if="scope.row.roleId !== 1"
                   type="text"
                   icon="CircleCheck"
                   @click="handleDataScope(scope.row)"
                   v-hasPermi="['system:role:edit']"
                 ></el-button>
               </el-tooltip>
-              <el-tooltip content="分配用户" placement="top">
+              <el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">
                 <el-button
-                  v-if="scope.row.roleId !== 1"
                   type="text"
                   icon="User"
                   @click="handleAuthUser(scope.row)"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 3f988fa..ce053c0 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -151,36 +151,32 @@
                </el-table-column>
                <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
                   <template #default="scope">
-                     <el-tooltip content="修改" placement="top">
+                     <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
                         <el-button
-                           v-if="scope.row.userId !== 1"
                            type="text"
                            icon="Edit"
                            @click="handleUpdate(scope.row)"
                            v-hasPermi="['system:user:edit']"
                         ></el-button>
                      </el-tooltip>
-                     <el-tooltip content="删除" placement="top">
+                     <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
                         <el-button
-                           v-if="scope.row.userId !== 1"
                            type="text"
                            icon="Delete"
                            @click="handleDelete(scope.row)"
                            v-hasPermi="['system:user:remove']"
                         ></el-button>
                      </el-tooltip>
-                     <el-tooltip content="重置密码" placement="top">
+                     <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
                         <el-button
-                           v-if="scope.row.userId !== 1"
                            type="text"
                            icon="Key"
                            @click="handleResetPwd(scope.row)"
                            v-hasPermi="['system:user:resetPwd']"
                         ></el-button>
                      </el-tooltip>
-                     <el-tooltip content="分配角色" placement="top">
+                     <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
                         <el-button
-                           v-if="scope.row.userId !== 1"
                            type="text"
                            icon="CircleCheck"
                            @click="handleAuthRole(scope.row)"