From b905acc9d5c9f3e0bac52dd2dc2ec8a483fd03b5 Mon Sep 17 00:00:00 2001
From: "jinlan.du" <jinlan.du@cyberplus.com>
Date: Mon, 18 May 2020 14:53:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=8A=98=E8=A1=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/style/main.scss                       | 29 -------------------
 web/src/view/example/table/table.vue          |  4 +--
 .../view/superAdmin/authority/authority.vue   |  2 +-
 3 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/web/src/style/main.scss b/web/src/style/main.scss
index e8389c02..1d7402d7 100644
--- a/web/src/style/main.scss
+++ b/web/src/style/main.scss
@@ -1040,32 +1040,3 @@ li {
         }
     }
 }
-@media screen and (max-width: 1080px) {
-    .admin-box{
-            tr{
-                td{
-                    .el-button{
-                        padding: 7px 5px;
-                    }
-                }
-            }
-    }
-}
-@media screen and (max-width: 885px) {
-    .admin-box{
-        .el-table__fixed-right{
-            tr{
-                td{
-                    .el-button{
-                        padding: 7px 0px;
-                    }
-                }
-            }
-        }
-        .el-table__row{
-            .el-button.el-button--text.el-button--small::after{
-                margin-left: 8px;
-            }
-        } 
-    }
-}
\ No newline at end of file
diff --git a/web/src/view/example/table/table.vue b/web/src/view/example/table/table.vue
index 1efdb649..6166c898 100644
--- a/web/src/view/example/table/table.vue
+++ b/web/src/view/example/table/table.vue
@@ -17,12 +17,12 @@
       <el-table-column label="姓名" prop="name" width="120"></el-table-column>
       <el-table-column label="年龄" prop="age" width="120"></el-table-column>
       <el-table-column label="住址" prop="address" min-width="200" show-overflow-tooltip></el-table-column>
-      <el-table-column label="是否禁用" prop="switch" min-width="180">
+      <el-table-column label="是否禁用" prop="switch" width="180">
         <template slot-scope="scope">
           <el-switch active-text="开启" inactive-text="禁用" v-model="scope.row.switch"></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="按钮组" min-width="180">
+      <el-table-column label="按钮组" width="200">
         <template slot-scope="scope" >
             <el-button type="text" size="small" @click="toggleSelection([scope.row])">按钮1</el-button>
             <el-button type="text" size="small" @click="toggleSelection([scope.row])">按钮2</el-button>
diff --git a/web/src/view/superAdmin/authority/authority.vue b/web/src/view/superAdmin/authority/authority.vue
index 3394a7ef..2c95dc5f 100644
--- a/web/src/view/superAdmin/authority/authority.vue
+++ b/web/src/view/superAdmin/authority/authority.vue
@@ -13,7 +13,7 @@
     >
       <el-table-column label="角色id" min-width="180" prop="authorityId"></el-table-column>
       <el-table-column label="角色名称" min-width="180" prop="authorityName"></el-table-column>
-      <el-table-column fixed="right" label="操作" min-width="350">
+      <el-table-column fixed="right" label="操作" width="460">
         <template slot-scope="scope">
           <el-button @click="opdendrawer(scope.row)" size="small" type="text">设置权限</el-button>
           <el-button @click="addAuthority(scope.row.authorityId)" size="small" type="text">新增子角色</el-button>
-- 
GitLab