From 1383969fb2ebfa39f7e65c8e6c0e81174d16ad0d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 6 Dec 2021 10:25:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BC=98=E5=8C=96=20=E8=9C=82?=
 =?UTF-8?q?=E7=AA=9D=E5=9B=BE=E7=9A=84tooltip=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/alert/alertLabel.scss   | 32 +++++++++----------
 .../components/chart/chart/chartHexagon.vue   | 22 ++++++-------
 .../src/components/chart/testData.js          |  1 +
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss b/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss
index ed0064154..0b7ff93ba 100644
--- a/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss
+++ b/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss
@@ -58,19 +58,19 @@
     max-width: 210px;
   }
 }
-.alert-label::after, .alert-labelUp::after {
-  content: '';
-  display: block;
-  width:0;
-  height:0;
-  overflow: hidden;
-  font-size: 0;
-  line-height: 0;
-  border: 5px;
-  border-style: dashed solid dashed dashed;
-  border-color: transparent $--popover-background-color transparent transparent;
-  position: absolute;
-  top: 20px;
-  left: 0;
-  transform: translate(-100%, -50%);
-}
+//.alert-label::after, .alert-labelUp::after {
+//  content: '';
+//  display: block;
+//  width:0;
+//  height:0;
+//  overflow: hidden;
+//  font-size: 0;
+//  line-height: 0;
+//  border: 5px;
+//  border-style: dashed solid dashed dashed;
+//  border-color: transparent $--popover-background-color transparent transparent;
+//  position: absolute;
+//  top: 20px;
+//  left: 0;
+//  transform: translate(-100%, -50%);
+//}
diff --git a/nezha-fronted/src/components/chart/chart/chartHexagon.vue b/nezha-fronted/src/components/chart/chart/chartHexagon.vue
index f9d1b803c..ddabdaac5 100644
--- a/nezha-fronted/src/components/chart/chart/chartHexagon.vue
+++ b/nezha-fronted/src/components/chart/chart/chartHexagon.vue
@@ -26,10 +26,6 @@
       :that="assetData"
       :type="fromType"
       :LRTriangle="LRTriangle"
-      :style="{
-        'transform-origin': `0px 300px`,
-        transform:`scale(${assetData.rate})`
-      }"
     ></alertLabel>
   </div>
 </template>
@@ -260,7 +256,8 @@ export default {
         clearTimeout(this.timer)
       }
       this.assetData.id = data
-      const boxWidth = document.getElementsByClassName('list-page')[0].offsetWidth
+      const boxWidth = this.$refs.hexagonBox.$el.offsetWidth
+      console.log(boxWidth)
       this.boxWidth = boxWidth
       // this.assetData.rate=window.screen.height/1297;
       this.$nextTick(() => {
@@ -275,23 +272,26 @@ export default {
       this.calcPosition(e)
     },
     calcPosition (e) {
+      console.log(e)
       const boxWidth = this.boxWidth
       const distance = this.fromType === 'asset' ? 300 : 50
-      const minus = (e.pageY - distance) + this.$refs.alertLabel.$el.offsetHeight - window.innerHeight
+      const minus = (e.offsetY - distance) + this.$refs.alertLabel.$el.offsetHeight - window.innerHeight
       // window.innerHeight
       if (minus <= 0) {
-        this.assetData.position.top = e.pageY - distance
+        this.assetData.position.top = e.offsetY - distance
         this.assetData.position.mt = distance
       } else if (minus > 0) {
         this.assetData.position.top = window.innerHeight - this.$refs.alertLabel.$el.offsetHeight
-        this.assetData.position.mt = e.pageY - (window.innerHeight - this.$refs.alertLabel.$el.offsetHeight)
+        this.assetData.position.mt = e.offsetY - (window.innerHeight - this.$refs.alertLabel.$el.offsetHeight)
       }
-      if (boxWidth / 2 > e.pageX - 200) {
-        this.assetData.position.left = e.pageX + 35
+      if (boxWidth / 2 > e.offsetX) {
+        console.log(123)
+        this.assetData.position.left = e.offsetX + 35
         this.assetData.position.right = 0
         this.LRTriangle = true
       } else {
-        this.assetData.position.right = window.innerWidth - (e.pageX - 35)
+        console.log(456)
+        this.assetData.position.right = boxWidth - (e.offsetX - 35)
         this.assetData.position.left = 0
         this.LRTriangle = false
       }
diff --git a/nezha-fronted/src/components/chart/testData.js b/nezha-fronted/src/components/chart/testData.js
index 8d10e7845..6496ae824 100644
--- a/nezha-fronted/src/components/chart/testData.js
+++ b/nezha-fronted/src/components/chart/testData.js
@@ -463,6 +463,7 @@ const chartData = {
         dataSource: 4,
         param: '{' +
           '   "from":"module",' +
+          '   "showHeader":true,' +
           '   "length":"48",' +
           '   "showTooltip": true ,' +
           '   "col":"8"' +