From 3ef0ee19b5991ee38ec6404a36c325171014f7fa Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 07 一月 2025 18:01:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
index b22e484..8a6717e 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
@@ -7,7 +7,7 @@
           <div style="height:  calc(100vh - 195px);">
             <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
               <span slot-scope="{ node, data }" class="el-tree-node__label">
-               <span style="font-size: 15px">
+               <span>
                   <i class="el-icon-user-solid"></i>
                     {{ (node || {}).label }}
                 </span>
@@ -22,9 +22,14 @@
       <basic-container v-loading="mainLoading">
         <h3 style="margin: 0 0 10px 0">UI鏉冮檺閰嶇疆</h3>
         <div>
-          <el-button v-if="permissionList.rightBtn" icon="el-icon-place" plain size="small" type="primary" @click="saveHandler">鎺堟潈</el-button>
-          <el-button v-if="permissionList.resetBtn" icon="el-icon-close" plain size="small" style="margin-right: 40px;" type="primary"
-                     @click="clearValue">閲嶇疆
+          <el-button v-if="permissionList.rightBtn" class="button-custom-icon" plain size="small" type="primary" @click="saveHandler">
+            <icon-show :name="permissionList.rightBtn.source"></icon-show>
+            鎺堟潈
+          </el-button>
+          <el-button v-if="permissionList.resetBtn" class="button-custom-icon" plain size="small" style="margin-right: 40px;" type="primary"
+                     @click="clearValue">
+            <icon-show :name="permissionList.resetBtn.source"></icon-show>
+            閲嶇疆
           </el-button>
           涓氬姟绫诲瀷锛�
           <el-select v-model="type" :clearable="true" placeholder="璇烽�夋嫨" size="small"
@@ -51,7 +56,7 @@
         <div style="height:  calc(100vh - 232px);margin-top: 10px;">
           <avue-tree ref="uiTree" :data="uiTreeData" :node-key="oid" :option="uiTreeOption">
             <span slot-scope="{ node, data }" class="el-tree-node__label">
-               <span style="font-size: 15px">
+               <span>
                   <i :class="data.icon"></i>
                     {{ (node || {}).label }}
                 </span>
@@ -112,7 +117,7 @@
     permissionList() {
       return {
         rightBtn: this.vaildData(this.permission[this.$route.query.id].RIGHT, false),
-        resetBtn: this.vaildData(this.permission[this.$route.query.id].reset, false),
+        resetBtn: this.vaildData(this.permission[this.$route.query.id].RESET, false),
       };
     },
   },

--
Gitblit v1.9.3