From 2ac064b75d35685a4e0c9c875f1198ca87af3fa2 Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Mon, 20 Jul 2020 13:45:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9AalerMessage=E9=A1=B5=E9=9D=A2=20?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=A0=B9=E6=8D=AEid=E5=92=8Cstate=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/alert/list.vue        |  4 ++++
 .../src/components/page/asset/asset.vue       | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue
index 7f0e19842..11ce0f201 100644
--- a/nezha-fronted/src/components/page/alert/list.vue
+++ b/nezha-fronted/src/components/page/alert/list.vue
@@ -909,6 +909,8 @@
       //是否需要排序
       sortableShow(prop){
         switch(prop){
+          case 'id':
+          case 'state':
           case 'alertRule':
           case 'severity':
           case 'startAt':
@@ -920,6 +922,8 @@
       // prop字段
       propTitle(prop){
         switch(prop){
+          case 'id': return'am.id';
+          case 'state': return'am.state';
           case 'alertRule': return'ar.alert_name';
           case 'severity': return'am.severity';
           case 'startAt': return'am.start_at';
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 3cce58bfa..290d974dc 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -16,8 +16,8 @@
                       </el-popover>
                       <span v-else>{{item.name}}</span>
                     </div>
-                    <el-tooltip :content="item.total" placement="top" effect="light" :disabled="item.total<99">
-                      <el-badge class="mark" :value="item.total" max="99"/>
+                    <el-tooltip :content="''+item.total" placement="top" effect="light" :disabled="item.total<99">
+                      <el-badge class="mark" :value="item.total" :max="99"/>
                     </el-tooltip>
                   </el-checkbox>
                 </el-checkbox-group>
@@ -31,8 +31,8 @@
                       </el-popover>
                       <span v-else>{{item.name}}</span>
                     </div>
-                    <el-tooltip :content="item.total" placement="top" effect="light" :disabled="item.total<99">
-                      <el-badge class="mark" :value="item.total" max="99"/>
+                    <el-tooltip :content="''+item.total" placement="top" effect="light" :disabled="item.total<99">
+                      <el-badge class="mark" :value="item.total" :max="99"/>
                     </el-tooltip>
                   </el-checkbox>
                 </el-checkbox-group>
@@ -46,8 +46,8 @@
                       </el-popover>
                       <span v-else>{{item.name}}</span>
                     </div>
-                    <el-tooltip :content="item.total" placement="top" effect="light" :disabled="item.total<99">
-                      <el-badge class="mark" :value="item.total" max="99"/>
+                    <el-tooltip :content="''+item.total" placement="top" effect="light" :disabled="item.total<99">
+                      <el-badge class="mark" :value="item.total" :max="99"/>
                     </el-tooltip>
                   </el-checkbox>
                 </el-checkbox-group>
@@ -61,8 +61,8 @@
                       </el-popover>
                       <span v-else>{{item.label}}</span>
                     </div>
-                    <el-tooltip :content="item.total" placement="top" effect="light" :disabled="item.total<99">
-                      <el-badge class="mark" :value="item.total" max="99"/>
+                    <el-tooltip :content="''+item.total" placement="top" effect="light" :disabled="item.total<99">
+                      <el-badge class="mark" :value="item.total" :max="99"/>
                     </el-tooltip>
                   </el-checkbox>
                 </el-checkbox-group>
@@ -97,7 +97,8 @@
                 :height="mainTableHeight"
                 style="width: 100%;"
                 :data="tableData"
-                v-scrollBar:el-table="'large'"
+                v-scrollBar
+                :el-table="'large'"
                 v-show="mainResizeShow"
                 border
                 v-loading="loading"