From 17addd5a02e58d4b8679f3bbc2e0727119eb945c Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 27 Aug 2021 13:54:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E9=97=AE=E9=A2=98=EF=BC=8C=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/cn.js             | 1 +
 nezha-fronted/src/components/common/language/en.js             | 3 ++-
 .../src/components/common/project/popData/alertTable.vue       | 1 +
 .../src/components/common/project/popData/assetTable.vue       | 2 +-
 nezha-fronted/src/components/page/alert/alertMessage.vue       | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index d26253730..48ccd2c58 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -611,6 +611,7 @@ const cn = {
   },
   asset: {
     asset: '资产',
+    talonPrompt: 'Talon 是一个负责日志收集的客户端程序',
     alertNum: '告警',
     userName: '用户名',
     address: '地址',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 69b6acb3a..ab109b70c 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -117,7 +117,7 @@ const en = {
     active: 'Active',
     result: {
       total: 'Total',
-      failed: 'Failed',
+      failed: 'Fail',
       success: 'Success',
       failedDetail: 'Failed Detail',
       line: 'Line {0}:'
@@ -619,6 +619,7 @@ const en = {
   },
   asset: {
     asset: 'Asset ',
+    talonPrompt: 'Talon is a client program responsible for log collection.',
     userName: 'User name',
     address: 'Address',
     assets: 'Asset', // '资产'
diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue
index 2571f6bb2..8422e6b73 100644
--- a/nezha-fronted/src/components/common/project/popData/alertTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue
@@ -93,6 +93,7 @@ export default {
   data () {
     return {
       url: 'alert/message',
+      mainTableHeight: 'calc(100% - 64px)',
       state: '1',
       tableId: '',
       stateOptions: alertMessageConstant.states,
diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue
index 081d8a83f..ea060e61e 100644
--- a/nezha-fronted/src/components/common/project/popData/assetTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue
@@ -83,7 +83,7 @@ export default {
         pageSize: this.$CONSTANTS.defaultPageSize,
         total: 0
       },
-      mainTableHeight: '100%',
+      mainTableHeight: 'calc(100% - 64px)',
       tableTitle: [
         {
           label: 'ID',
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 58b948739..946183165 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -128,6 +128,7 @@ export default {
     return {
       stateOptions: alertMessageConstant.states,
       state: '1',
+      mainTableHeight: 'calc(100%- 64px)',
       url: 'alert/message',
       // 导出相关
       importBox: { show: false, title: this.$t('overall.exportExcel') },