From 698c7dc354e86d7352914364dbddcc7741ea7ca1 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 1 Jun 2020 20:11:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dmessage=E7=9A=84?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/element-ui.scss           |  4 ++++
 src/views/assets/Asset/AssetList.vue | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index d1a508e47..557b35ef8 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -430,3 +430,7 @@ a {
   background: white;
   border-color: $--color-danger;
 }
+
+.el-alert .el-alert__description {
+  margin: 1px 0 0;
+}
diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index 2e5baed65..01ad64f32 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -24,6 +24,9 @@ export default {
       tableConfig: {
         url: '/api/v1/assets/assets/',
         hasTree: true,
+        columns: [
+          'hostname', 'ip', 'hardware_info', 'reachable', 'actions'
+        ],
         columnsMeta: {
           hostname: {
             formatter: DetailFormatter,
@@ -33,7 +36,7 @@ export default {
           },
           ip: {
             sortable: 'custom',
-            width: '120px'
+            width: '140px'
           },
           hardware_info: {
             showOverflowTooltip: true
@@ -54,10 +57,7 @@ export default {
               }
             }
           }
-        },
-        columns: [
-          'hostname', 'ip', 'hardware_info', 'reachable', 'actions'
-        ]
+        }
       },
       headerActions: {
         createRoute: 'AssetCreate'