From 7224423e35f0fb64df77c6cca9289627a13ac05a Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Tue, 28 Jul 2020 10:19:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8F=AA=E5=9C=A8=E6=AD=A3=E5=BA=8F=E5=80=92?=
 =?UTF-8?q?=E5=BA=8F=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-alert-list.vue    | 1 +
 nezha-fronted/src/components/common/alert/alertLabel.vue    | 6 +++---
 .../components/common/bottomBox/tabs/alertMessageTab.vue    | 1 +
 .../src/components/common/bottomBox/tabs/endpointTab.vue    | 1 +
 nezha-fronted/src/components/page/asset/asset.vue           | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue
index 7bca21891..92e25e6ad 100644
--- a/nezha-fronted/src/components/charts/chart-alert-list.vue
+++ b/nezha-fronted/src/components/charts/chart-alert-list.vue
@@ -78,6 +78,7 @@
               min-width="110px"
               :sortable="sortableShow(item.prop)"
               :prop="propTitle(item.prop)"
+              :sort-orders="['ascending', 'descending']"
             >
               <template slot-scope="scope" :column="item">
                 <template v-if="item.prop == 'alertRule'">
diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 74d4f99cf..a1e60c96d 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -25,7 +25,7 @@
     </div>
     <div class="alertLabelBox">
       <div class="alertLabelTitle">Description</div>
-      <div class="alertLabelValue">{{alertLabelData?alertLabelData.remark:''}}</div>
+      <div class="alertLabelValue">{{alertLabelData?(alertLabelData.remark?alertLabelData.remark:'-'):''}}</div>
     </div>
   </div>
   <div class="alertLabelInfo" v-if="type==='project'">
@@ -39,7 +39,7 @@
     </div>
     <div class="alertLabelBox">
       <div class="alertLabelTitle">Description</div>
-      <div class="alertLabelValue">{{alertLabelData?alertLabelData.remark:''}}</div>
+      <div class="alertLabelValue">{{alertLabelData?(alertLabelData.remark?alertLabelData.remark:'-'):''}}</div>
     </div>
   </div>
   </span>
@@ -93,7 +93,7 @@
     data() {
       return {
         alertLabelData:null,
-        loading:module
+        loading:true
       }
     },
     components:{
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
index 6be94759a..b9c0c0297 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
@@ -57,6 +57,7 @@
         min-width="110px"
         :sortable="sortableShow(item.prop)"
         :prop="propTitle(item.prop)"
+        :sort-orders="['ascending', 'descending']"
       >
         <template slot-scope="scope" :column="item">
           <template v-if="item.prop == 'alertRule'">
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
index c44b0a448..636c47de3 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
@@ -47,6 +47,7 @@
         min-width="110px"
         :sortable="sortableShow(item.prop)"
         :prop="propTitle(item.prop)"
+        :sort-orders="['ascending', 'descending']"
       >
         <template slot-scope="scope" :column="item">
           <span v-if="item.prop == 'asset' && scope.row[item.prop]" class="link" @click="">{{scope.row[item.prop].host}}</span>
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 32466da98..c58433ed7 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -117,6 +117,7 @@
                   :class-name="item.prop == 'option' ? 'content-right-options' : ''"
                   :sortable="sortableShow(item.prop)"
                   :prop="propTitle(item.prop)"
+                  :sort-orders="['ascending', 'descending']"
                 >
                   <template slot-scope="scope" :column="item">
                     <div v-if="item.prop=='ID'">