From 746372ae3c1f59e40fc2026444c321b2d5cb3ab4 Mon Sep 17 00:00:00 2001
From: piexlmax <qimiaojiangjizhao@gmail.com>
Date: Sat, 18 Sep 2021 17:39:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/resource/template/web/table.vue.tpl               | 2 +-
 web/src/style/main.scss                                  | 4 ++--
 web/src/view/example/customer/customer.vue               | 2 +-
 web/src/view/example/upload/upload.vue                   | 4 ++--
 web/src/view/superAdmin/api/api.vue                      | 8 +++++++-
 web/src/view/superAdmin/authority/authority.vue          | 9 +++++++--
 web/src/view/superAdmin/dictionary/sysDictionary.vue     | 4 ++--
 .../view/superAdmin/dictionary/sysDictionaryDetail.vue   | 2 +-
 web/src/view/superAdmin/menu/menu.vue                    | 2 +-
 9 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/server/resource/template/web/table.vue.tpl b/server/resource/template/web/table.vue.tpl
index 3c760863..87b7f914 100644
--- a/server/resource/template/web/table.vue.tpl
+++ b/server/resource/template/web/table.vue.tpl
@@ -67,7 +67,7 @@
         {{- end }}
         <el-table-column label="按钮组">
             <template #default="scope">
-            <el-button size="small" type="text" icon="el-icon-edit" class="table-button" @click="update{{.StructName}}(scope.row)">变更</el-button>
+            <el-button type="text" icon="el-icon-edit" size="small" class="table-button" @click="update{{.StructName}}(scope.row)">变更</el-button>
             <el-button type="text" icon="el-icon-delete" size="mini" @click="deleteRow(scope.row)">删除</el-button>
             </template>
         </el-table-column>
diff --git a/web/src/style/main.scss b/web/src/style/main.scss
index 3a5e899b..669089bb 100644
--- a/web/src/style/main.scss
+++ b/web/src/style/main.scss
@@ -1080,7 +1080,7 @@ li {
 .el-input-number__increase {
     position: absolute;
     z-index: 1;
-    top: 6px !important;
+    top: 3px !important;
     width: 42px;
     height: 29px;
     line-height: 29px;
@@ -1484,7 +1484,7 @@ $mainHight: 100vh;
     }
     .el-pagination__jump{
         .el-pagination__editor{
-                
+
         }
     }
 }
diff --git a/web/src/view/example/customer/customer.vue b/web/src/view/example/customer/customer.vue
index 539a3279..74be9b2a 100644
--- a/web/src/view/example/customer/customer.vue
+++ b/web/src/view/example/customer/customer.vue
@@ -21,7 +21,7 @@
         <el-table-column label="接入人ID" prop="sysUserId" width="120" />
         <el-table-column label="按钮组" min-width="160">
           <template #default="scope">
-            <el-button size="small" type="text" @click="updateCustomer(scope.row)">变更</el-button>
+            <el-button size="small" type="text" icon="el-icon-edit" @click="updateCustomer(scope.row)">变更</el-button>
             <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
               <p>确定要删除吗？</p>
               <div style="text-align: right; margin: 0">
diff --git a/web/src/view/example/upload/upload.vue b/web/src/view/example/upload/upload.vue
index 86b00911..1c2c1c54 100644
--- a/web/src/view/example/upload/upload.vue
+++ b/web/src/view/example/upload/upload.vue
@@ -45,8 +45,8 @@
         </el-table-column>
         <el-table-column label="操作" width="160">
           <template #default="scope">
-            <el-button size="small" type="text" @click="downloadFile(scope.row)">下载</el-button>
-            <el-button size="small" type="text" @click="deleteFile(scope.row)">删除</el-button>
+            <el-button size="small" icon="el-icon-download" type="text" @click="downloadFile(scope.row)">下载</el-button>
+            <el-button size="small" icon="el-icon-delete" type="text" @click="deleteFile(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/web/src/view/superAdmin/api/api.vue b/web/src/view/superAdmin/api/api.vue
index ceedfb97..7d79caba 100644
--- a/web/src/view/superAdmin/api/api.vue
+++ b/web/src/view/superAdmin/api/api.vue
@@ -60,8 +60,14 @@
 
         <el-table-column fixed="right" label="操作" width="200">
           <template #default="scope">
-            <el-button size="small" type="text" @click="editApi(scope.row)">编辑</el-button>
             <el-button
+              icon="el-icon-edit"
+              size="small"
+              type="text"
+              @click="editApi(scope.row)"
+            >编辑</el-button>
+            <el-button
+              icon="el-icon-delete"
               size="small"
               type="text"
               @click="deleteApi(scope.row)"
diff --git a/web/src/view/superAdmin/authority/authority.vue b/web/src/view/superAdmin/authority/authority.vue
index 86f89061..b401509b 100644
--- a/web/src/view/superAdmin/authority/authority.vue
+++ b/web/src/view/superAdmin/authority/authority.vue
@@ -14,7 +14,12 @@
         <el-table-column label="角色名称" min-width="180" prop="authorityName" />
         <el-table-column label="操作" width="460">
           <template #default="scope">
-            <el-button size="mini" type="text" @click="opdendrawer(scope.row)">设置权限</el-button>
+            <el-button
+              icon="el-icon-setting"
+              size="mini"
+              type="text"
+              @click="opdendrawer(scope.row)"
+            >设置权限</el-button>
             <el-button
               icon="el-icon-plus"
               size="mini"
@@ -42,8 +47,8 @@
           </template>
         </el-table-column>
       </el-table>
+      <warning-bar title="注：右上角头像下拉可切换角色" style="margin-top:12px;" />
     </div>
-    <warning-bar title="注：右上角头像下拉可切换角色" style="margin-top:12px;" />
     <!-- 新增角色弹窗 -->
     <el-dialog v-model="dialogFormVisible" :title="dialogTitle">
       <el-form ref="authorityForm" :model="form" :rules="rules" label-width="80px">
diff --git a/web/src/view/superAdmin/dictionary/sysDictionary.vue b/web/src/view/superAdmin/dictionary/sysDictionary.vue
index 37c3c1fc..e813eade 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionary.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionary.vue
@@ -49,8 +49,8 @@
 
         <el-table-column label="按钮组">
           <template #default="scope">
-            <el-button size="mini" type="text" @click="toDetile(scope.row)">详情</el-button>
-            <el-button size="mini" type="text" @click="updateSysDictionary(scope.row)">变更</el-button>
+            <el-button size="mini" icon="el-icon-document" type="text" @click="toDetile(scope.row)">详情</el-button>
+            <el-button size="mini" icon="el-icon-edit" type="text" @click="updateSysDictionary(scope.row)">变更</el-button>
             <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
               <p>确定要删除吗？</p>
               <div style="text-align: right; margin: 0">
diff --git a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
index c69feeb8..7e76efa6 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
@@ -46,7 +46,7 @@
 
         <el-table-column label="按钮组">
           <template #default="scope">
-            <el-button size="small" type="text" @click="updateSysDictionaryDetail(scope.row)">变更</el-button>
+            <el-button size="small" type="text" icon="el-icon-edit" @click="updateSysDictionaryDetail(scope.row)">变更</el-button>
             <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
               <p>确定要删除吗？</p>
               <div style="text-align: right; margin: 0">
diff --git a/web/src/view/superAdmin/menu/menu.vue b/web/src/view/superAdmin/menu/menu.vue
index 1b57a661..ef77cfa3 100644
--- a/web/src/view/superAdmin/menu/menu.vue
+++ b/web/src/view/superAdmin/menu/menu.vue
@@ -34,7 +34,7 @@
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-edit"
+              icon="el-icon-plus"
               @click="addMenu(scope.row.ID)"
             >添加子菜单</el-button>
             <el-button