From 7dfc34f9c24c471d9eda594c68c75a4a8b5c190e Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Mon, 1 Nov 2021 16:35:58 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1145=20fix:=20System=20node=20exporter=20al?=
 =?UTF-8?q?ert=20nums=E9=A1=B5=E9=9D=A2=E5=AD=98=E5=9C=A8=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E6=82=AC=E6=B5=AE=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/alert/alertLabel.vue         | 10 +++++++++-
 nezha-fronted/src/components/common/language/cn.js     |  8 ++++----
 .../common/table/alert/alertMessageTable.vue           |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 55097d571..312b94c69 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -257,7 +257,8 @@ export default {
     type: {},
     // labelLoading:{},
     that: {},
-    detailList: Boolean
+    detailList: Boolean,
+    alertTableDialog: Boolean
   },
   /* watch:{
       labelLoading: {
@@ -332,6 +333,8 @@ export default {
       const self = this
       return function (position) {
         const clientHeight = (document.body.clientHeight < document.documentElement.clientHeight) ? document.body.clientHeight : document.documentElement.clientHeight
+        const dialog = document.getElementsByClassName('el-dialog')[2] // 获取元素类名为 el-dialog的元素数组第二个
+        const dialogHeight = dialog.clientHeight // 获取元素窗口
         const leftOffSetView = this.detailList ? -80 : 10
         const topOffSetView = this.detailList ? 0 : 0
         const leftOffSet = this.detailList ? -80 : 10
@@ -342,6 +345,11 @@ export default {
             left: `${position.left + position.width + leftOffSet}px`,
             top: `${position.top - elHeight + topOffSet}px`
           }
+        } else if (dialogHeight && this.alertTableDialog) { // dialogHeight 为获取的元素窗口,this.alertTableDialog // 为了判断是alertMessageTable页面使用的组件
+          return {
+            left: `${position.left + position.width - 40}px`,
+            top: `${position.top - 95}px`
+          }
         } else {
           return {
             left: `${position.left + position.width + leftOffSetView}px`,
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 33c8bed85..b82b513c6 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -1057,14 +1057,14 @@ const cn = {
         metrics_storage_type: '保存模式',
         metrics_storage_s3_endpoint: 'Endpoint',
         metrics_storage_s3_bucket: 'Bucket name',
-        metrics_storage_s3_access_key: 'Access key',
-        metrics_storage_s3_secret_access_key: 'Secret key',
+        metrics_storage_s3_access_key: '访问密钥',
+        metrics_storage_s3_secret_access_key: '密钥',
         logs_storage_retention: '保存天数',
         logs_storage_type: '保存模式',
         logs_storage_s3_endpoint: 'Endpoint',
         logs_storage_s3_bucket: 'Bucket name',
-        logs_storage_s3_access_key: 'Access key',
-        logs_storage_s3_secret_access_key: 'Secret key',
+        logs_storage_s3_access_key: '访问密钥',
+        logs_storage_s3_secret_access_key: '密钥',
         logs_query_range_default_limit: '查询最大条数',
         local: '本地文件存储',
         s3: 'S3对象存储'
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index fa961db2d..49c811a5e 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -94,6 +94,7 @@
               :id="scope.row[item.label].id"
               :that="scope.row[item.label]"
               :type="item.label"
+              :alert-table-dialog="true"
             ></alertLabel>
           </span>
         </template>