From 853807fafd9dffad1fd8d04683af54d51bfc1727 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Mon, 1 Nov 2021 17:59:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcahrt-alert-list?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=85=A8=E5=B1=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/charts/chart-alert-list.vue      |  2 +-
 .../src/components/common/alert/alertLabel.vue      | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue
index 3901689fd..6b5086f82 100644
--- a/nezha-fronted/src/components/charts/chart-alert-list.vue
+++ b/nezha-fronted/src/components/charts/chart-alert-list.vue
@@ -78,7 +78,7 @@
           <Pagination :pageObj="pageObj" @pageNo='pageNo'  @pageSize='pageSize' ref="Pagination" :append-to-body="false" pop-class="out-popper-fix" style="margin-top: 15px;"></Pagination>
         </div>
         <!--全屏-->
-        <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"  :visible.sync="screenModal" width="96%"  @close="screenDialogClose" :modal-append-to-body="false">
+        <el-dialog class="nz-dialog table-chart-dialog" id="dialog-alert-massage" :title="$t('dashboard.panel.view')"  :visible.sync="screenModal" width="96%"  @close="screenDialogClose" :modal-append-to-body="false">
           <div slot="title">
             <span class="nz-dialog-title">{{data.name}}</span>
             <div class="float-right panel-calendar dialog-tool">
diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 312b94c69..442ce28e6 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -257,8 +257,7 @@ export default {
     type: {},
     // labelLoading:{},
     that: {},
-    detailList: Boolean,
-    alertTableDialog: Boolean
+    detailList: Boolean
   },
   /* watch:{
       labelLoading: {
@@ -333,8 +332,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 dialog = document.querySelector('#dialog-alert-massage .el-dialog')
+        const dialogHeight = dialog.getBoundingClientRect()
         const leftOffSetView = this.detailList ? -80 : 10
         const topOffSetView = this.detailList ? 0 : 0
         const leftOffSet = this.detailList ? -80 : 10
@@ -345,10 +344,10 @@ export default {
             left: `${position.left + position.width + leftOffSet}px`,
             top: `${position.top - elHeight + topOffSet}px`
           }
-        } else if (dialogHeight && this.alertTableDialog) { // dialogHeight 为获取的元素窗口,this.alertTableDialog // 为了判断是alertMessageTable页面使用的组件
+        } else if (dialogHeight) {
           return {
-            left: `${position.left + position.width - 40}px`,
-            top: `${position.top - 95}px`
+            left: `${position.left + position.width + 10 - dialogHeight.x}px`,
+            top: `${position.top - dialogHeight.y}px`
           }
         } else {
           return {

From f72eee081aa791fd93d9ba76185e13eebd87bb01 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 1 Nov 2021 18:28:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?NEZ-1151=20=20style=EF=BC=9A=20=E7=BB=84?=
 =?UTF-8?q?=E5=90=88=E7=AD=9B=E9=80=89=E6=A1=86=20Skeleton=20=E6=9C=AA?=
 =?UTF-8?q?=E5=B1=85=E4=B8=AD=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/labelFilter/clickSearch.vue         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
index 6ebb9e013..5f15424d3 100644
--- a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
+++ b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue
@@ -462,10 +462,12 @@ export default {
   padding-right: 80px;
   background: #FFFFFF;
   &.search-items--checkbox .el-skeleton {
-    height: 21px;
+    height: 28px;
+    line-height: 40px;
   }
   &.search-items--dropdown .el-skeleton {
     height: 28px;
+    line-height: 40px;
   }
   .el-checkbox{
     line-height: 40px;