From b5acea2e47005f5f0960f22bef237b064536387d Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Mon, 1 Apr 2024 15:02:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/menu/DistributeRole.vue |  8 ++++----
 src/views/system/menu/index.vue          | 14 ++++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/views/system/menu/DistributeRole.vue b/src/views/system/menu/DistributeRole.vue
index 4f48e03..9972b54 100644
--- a/src/views/system/menu/DistributeRole.vue
+++ b/src/views/system/menu/DistributeRole.vue
@@ -39,7 +39,7 @@
         @select="handleSelect"
         v-tabh
     >
-      <el-table-column type="selection" width="55"/>
+      <el-table-column type="selection" width="55" fixed="left" />
       <el-table-column label="序号" type="index" align="center" width="60"/>
       <el-table-column prop="roleName" label="角色名称" align="center"/>
       <el-table-column prop="roleKey" label="角色标识符" align="center"/>
@@ -59,7 +59,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="创建时间" align="center" width="180px"/>
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center" fixed="right">
         <template #default="scope">
           <popover-delete :name="scope.row.roleName" :type="'角色'" :btn-text="'取消授权'"
                           @delete="handleCancelAuthorization([scope.row.roleId])"/>
@@ -98,7 +98,7 @@
           v-loading="dialogLoading"
           @select="handleDialogSelect"
       >
-        <el-table-column type="selection" width="55"/>
+        <el-table-column type="selection" width="55"  fixed="left" />
         <el-table-column label="序号" type="index" align="center" width="60"/>
         <el-table-column prop="roleName" label="角色名称" align="center"/>
         <el-table-column prop="roleKey" label="角色标识符" align="center"/>
@@ -117,7 +117,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="创建时间" align="center" width="180px"/>
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
             <el-button type="primary" size="mini"
                        @click="handleSubmit(scope.row.roleId)"  link>添加
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index b1ee86f..253d023 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -16,7 +16,7 @@
       </el-form-item>
     </el-form>
     <div class="table-header-btn">
-      <el-button type="primary" @click="handleAdd" :icon="Plus">新增</el-button>
+      <el-button type="primary" @click="handleAdd" :icon="Plus" v-perm="['admin:menu:add']">新增</el-button>
       <el-button type="info" @click="handleExpand" :icon="Sort">{{ isExpand ? '全部收起' : '全部展开' }}</el-button>
     </div>
 
@@ -42,15 +42,13 @@
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="创建时间"/>
-      <el-table-column label="操作" prop="operation">
+      <el-table-column label="操作" prop="operation" align="right">
         <template #default="scope">
-          <el-button type="primary" v-if="scope.row.menuType!=='B'" size="mini" @click="handleAdd(scope.row)" link>新增
+          <el-button type="primary" size="mini" @click="handleAdd(scope.row)" link v-perm="['admin:menu:add']">新增
           </el-button>
-          <div v-else style="display: inline-block">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          </div>
-          <el-button type="primary" size="mini" @click="handleEdit(scope.row.menuId)" link>修改</el-button>
-          <el-button type="primary" size="mini" @click="handleAssignRoles(scope.row)" link>分配角色</el-button>
-          <popover-delete :name="scope.row.menuName" :type="'菜单'" @delete="handleDel(scope.row.menuId)"/>
+          <el-button type="primary" size="mini" @click="handleEdit(scope.row.menuId)" link v-perm="['admin:menu:edit']">修改</el-button>
+          <!-- <el-button type="primary" size="mini" @click="handleAssignRoles(scope.row)" link>分配角色</el-button> -->
+          <popover-delete :name="scope.row.menuName" :type="'菜单'" @delete="handleDel(scope.row.menuId)" :perm="['admin:menu:del']" />
         </template>
       </el-table-column>
     </el-table>