From d8ae9ebb3e6aadecdb014711eecba84aaf318e35 Mon Sep 17 00:00:00 2001
From: "jinlan.du" <jinlan.du@cyberplus.com>
Date: Mon, 18 May 2020 13:29:48 +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/customer/customer.vue    |  2 +-
 web/src/view/example/table/table.vue          |  8 ++---
 web/src/view/example/upload/upload.vue        |  4 +--
 .../view/superAdmin/authority/authority.vue   |  2 +-
 5 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/web/src/style/main.scss b/web/src/style/main.scss
index 82e1fe3e..e8389c02 100644
--- a/web/src/style/main.scss
+++ b/web/src/style/main.scss
@@ -1039,4 +1039,33 @@ li {
             width: 10px;
         }
     }
+}
+@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/customer/customer.vue b/web/src/view/example/customer/customer.vue
index 4340468e..4bbd5746 100644
--- a/web/src/view/example/customer/customer.vue
+++ b/web/src/view/example/customer/customer.vue
@@ -22,7 +22,7 @@
       <el-table-column label="姓名" prop="customerName" width="120"></el-table-column>
       <el-table-column label="电话" prop="customerPhoneData" width="120"></el-table-column>
       <el-table-column label="接入人ID" prop="sysUserId" width="120"></el-table-column>
-      <el-table-column label="按钮组">
+      <el-table-column label="按钮组" min-width="160">
         <template slot-scope="scope">
           <el-button @click="updateCustomer(scope.row)" size="small" type="text">变更</el-button>
           <el-popover placement="top" width="160" v-model="scope.row.visible">
diff --git a/web/src/view/example/table/table.vue b/web/src/view/example/table/table.vue
index da9fd2e3..1efdb649 100644
--- a/web/src/view/example/table/table.vue
+++ b/web/src/view/example/table/table.vue
@@ -16,14 +16,14 @@
       </el-table-column>
       <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" show-overflow-tooltip></el-table-column>
-      <el-table-column label="是否禁用" prop="switch">
+      <el-table-column label="住址" prop="address" min-width="200" show-overflow-tooltip></el-table-column>
+      <el-table-column label="是否禁用" prop="switch" min-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="按钮组">
-        <template slot-scope="scope">
+      <el-table-column label="按钮组" min-width="180">
+        <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>
             <el-button type="text" size="small" @click="toggleSelection([scope.row])">按钮3</el-button>
diff --git a/web/src/view/example/upload/upload.vue b/web/src/view/example/upload/upload.vue
index f05ae8f8..5c2280bd 100644
--- a/web/src/view/example/upload/upload.vue
+++ b/web/src/view/example/upload/upload.vue
@@ -35,7 +35,7 @@
           prop="name"
           width="180"
         ></el-table-column>
-        <el-table-column label="链接" prop="url"></el-table-column>
+        <el-table-column label="链接" prop="url" min-width="300"></el-table-column>
         <el-table-column label="标签" prop="tag" width="100">
           <template slot-scope="scope">
             <el-tag
@@ -45,7 +45,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="100">
+        <el-table-column label="操作" width="160">
           <template slot-scope="scope">
             <el-button @click="downloadFile(scope.row)" size="small" type="text"
               >下载</el-button
diff --git a/web/src/view/superAdmin/authority/authority.vue b/web/src/view/superAdmin/authority/authority.vue
index dcaaf8e1..3394a7ef 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="300">
+      <el-table-column fixed="right" label="操作" min-width="350">
         <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>