From 0966334b78dff4584ee2c7e32fc2c93c5b291516 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 21 Jan 2021 11:06:12 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Adashboard=20overview=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20module=20tooltip=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/overView/messageAsset.vue | 13 ++++++++-----
 .../page/dashboard/overview/overview2.vue           |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/common/overView/messageAsset.vue b/nezha-fronted/src/components/common/overView/messageAsset.vue
index 9ffbfc4c8..56958bf96 100644
--- a/nezha-fronted/src/components/common/overView/messageAsset.vue
+++ b/nezha-fronted/src/components/common/overView/messageAsset.vue
@@ -24,7 +24,7 @@
       ref="alertLabel"
       :id="assetData.id"
       :that="assetData"
-      :type="'asset'"
+      :type="fromType"
       :LRTriangle="LRTriangle"
       :style="{
         'transform-origin': `0px 300px`,
@@ -59,12 +59,14 @@
       from:{},
       hexagonSvgID:{
         type:String,
-        default:'hexagonSvg'
       },
       showTooltip:{
         type:Boolean,
         default:false,
       },
+      fromType:{
+        type:String,
+      },
     },
     watch:{
       data:{
@@ -270,11 +272,12 @@
       },
       calcPosition(e){
         let boxWidth=this.boxWidth;
-        let minus=(e.pageY-300)+this.$refs.alertLabel.$el.offsetHeight-window.innerHeight;
+        let distance=this.fromType==='asset'?300:50;
+        let minus=(e.pageY-distance)+this.$refs.alertLabel.$el.offsetHeight-window.innerHeight;
         // window.innerHeight
         if(minus<=0){
-          this.assetData.position.top=e.pageY-300;
-          this.assetData.position.mt=300;
+          this.assetData.position.top=e.pageY-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);
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
index 9b5b28c93..afd1a30a0 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
@@ -191,7 +191,7 @@
           <div class="content-col-content" style="overflow: hidden">
             <!--<chart-box axis-tooltip="y" v-show="alertMessageShow == 'asset'" :tooltip-formatter="simpleFormatter" chart-type="ruleBar" ref="assetMessage" name="assetMessage" :show-toolbox="false" @is-loading="(isLoading)=>{this.assetMessageLoading = isLoading}"></chart-box>-->
             <!--<chart-box axis-tooltip="y" v-show="alertMessageShow == 'module'" :tooltip-formatter="simpleFormatter" chart-type="bar" ref="moduleMessage" name="moduleMessage" :show-toolbox="false" @is-loading="(isLoading)=>{this.moduleMessageLoading = isLoading}"></chart-box>-->
-            <messageAsset v-show="messageAssetData.length>0" :data="messageAssetData" :col="col" :length="length" ref="assetHexagon" :from="'asset'" :hexagonSvgID="'hexagonSvg1'" :show-tooltip="true"/>
+            <messageAsset v-show="messageAssetData.length>0" :data="messageAssetData" :col="col" :length="length" ref="assetHexagon" :from="'asset'" :hexagonSvgID="'hexagonSvg1'" :show-tooltip="true" :from-type="'asset'"/>
             <div class="chart-no-data" v-if="messageAssetData.length===0">No Data</div>
           </div>
         </div>
@@ -211,7 +211,7 @@
           <div class="content-col-content" style="overflow: hidden">
             <!--<chart-box axis-tooltip="y" chart-type="ruleBar" ref="ruleMessage" :tooltip-formatter="simpleFormatter" :show-toolbox="false" name="ruleMessage" @is-loading="(isLoading)=>{this.ruleMessageLoading = isLoading}"></chart-box>-->
             <!--                <div class="no-data-tip" v-if="!ruleMessageLoading && ((!messageByRuleSeries.data && !messageByRuleSeries.category) || (messageByRuleSeries.data.length == 0 && messageByRuleSeries.category.length == 0))">N/A</div>-->
-            <messageAsset v-show="messageModuleData.length>0" :data="messageModuleData" :col="col" :length="length" ref="moduleHexagon" :from="'module'" :hexagonSvgID="'hexagonSvg2'"/>
+            <messageAsset v-show="messageModuleData.length>0" :data="messageModuleData" :col="col" :length="length" ref="moduleHexagon" :from="'module'" :hexagonSvgID="'hexagonSvg2'" :show-tooltip="true" :from-type="'module'"/>
             <div class="chart-no-data" v-if="messageModuleData.length===0">No Data</div>
           </div>
         </div>