From 233494b19c74c7678f36eef42d481f01ed0b360c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 26 十月 2023 17:31:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/system/topmenu.vue |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/system/topmenu.vue b/Source/UBCS-WEB/src/views/system/topmenu.vue
index b55335f..a2509d3 100644
--- a/Source/UBCS-WEB/src/views/system/topmenu.vue
+++ b/Source/UBCS-WEB/src/views/system/topmenu.vue
@@ -20,18 +20,20 @@
                @row-click="clickRowChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <el-button v-if="permissionList.delBtn"
+                   type="danger"
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   v-if="permission.topmenu_delete"
-                   @click="handleDelete">鍒� 闄�
+                   @click="handleDelete">
+                   鍒� 闄�
         </el-button>
-        <el-button size="small"
-                   icon="el-icon-delete"
+        <el-button v-if="permissionList.settingBtn"
+                   size="small"
+                   icon="iconfont iconicon_setting"
                    @click="handleMenuSetting"
-                   v-if="permission.topmenu_setting"
-                   plain>鑿滃崟閰嶇疆
+                   plain>
+                   鑿滃崟閰嶇疆
         </el-button>
       </template>
       <template slot-scope="{row}" slot="source">
@@ -159,10 +161,11 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn: this.vaildData(this.permission.topmenu_add, false),
-          viewBtn: this.vaildData(this.permission.topmenu_view, false),
-          delBtn: this.vaildData(this.permission.topmenu_delete, false),
-          editBtn: this.vaildData(this.permission.topmenu_edit, false)
+          addBtn: this.vaildData(this.permission.topmenu.topmenu_add, false),
+          viewBtn: this.vaildData(this.permission.topmenu.topmenu_view, false),
+          delBtn: this.vaildData(this.permission.topmenu.topmenu_delete, false),
+          editBtn: this.vaildData(this.permission.topmenu.topmenu_edit, false),
+          settingBtn: this.vaildData(this.permission.topmenu.topmenu_setting,false),
         };
       },
       ids() {

--
Gitblit v1.9.3