From 9c08d0b108e3c4b43ebc9ab1f9029862bbef612b Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Wed, 20 Apr 2022 18:00:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/alert/alertLabel.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 0440bb3f7..f9866bbb5 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -676,19 +676,11 @@ export default {
           if (!dialog) {
             dialog = document.querySelector("#viewGraphDialog .el-dialog");
           }
-<<<<<<< HEAD
-          const dialogHeight = dialog.getBoundingClientRect();
-          leftOffSet = leftOffSet - dialogHeight.x;
-          leftOffSetView = dialogHeight.x;
-          topOffSet = topOffSet - dialogHeight.y;
-          topOffSetView = topOffSet;
-=======
           const dialogHeight = dialog.getBoundingClientRect()
           leftOffSet = leftOffSet - 3 * dialogHeight.x
           leftOffSetView = dialogHeight.x
           topOffSet = topOffSet - dialogHeight.y
           topOffSetView = topOffSet
->>>>>>> 367c493975c4bbf015cdbba1e145e67964759399
         }
         if (position.top > clientHeight / 2) {
           labelPosition = {