From 2ecf2acae9c18c4432408273ef19621110bd1379 Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Wed, 5 Aug 2020 09:24:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=20model=E5=88=97=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/alert/alertMessageTable.vue         | 3 ---
 nezha-fronted/src/components/page/asset/asset.vue             | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
index b2a95ee3f..6b5b067c2 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
@@ -861,9 +861,6 @@
       showSubList(n) {
         this.$bottomBoxWindow.showSubListWatch(vm, n);
       },
-      from(n){
-        console.log(n)
-      },
     },
     mounted() {
       //是否存在分页缓存
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 7463f4f59..faf3c3577 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -652,7 +652,7 @@
           case 'pingStatus':
           case 'dataCenter':
           case 'cabinet':
-          case 'Module':
+          case 'model':
           case 'vendor':
           case 'principal':
             return'custom';
@@ -671,7 +671,7 @@
           case 'pingStatus': return 'assp.rtt';
           case 'dataCenter': return 'idc.name';
           case 'cabinet': return 'cab.name';
-          case 'Module': return 'mo.name';
+          case 'model': return 'mo.name';
           case 'vendor': return 'sdt.value';
           case 'principal': return 'su.username';
           default : return prop;