From 8cf5c75be2e26ebf287429c7019ac22835d26b4c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 28 Sep 2020 10:10:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=A1=86=20=E5=A7=8B=E7=BB=88=E5=9C=A8=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E4=B8=8B=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/charts/chart-list.vue        |  1 +
 .../src/components/charts/line-chart-block.vue  | 17 ++++++++++-------
 .../page/dashboard/overview/chart.vue           | 11 ++++++-----
 .../src/components/page/dashboard/panel.vue     |  1 +
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index 985d0cc9e..2f1724fa2 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -13,6 +13,7 @@
     padding: 5px 15px 5px 10px;
     box-sizing: border-box;
     overflow: hidden;/*避免鼠标第一次放到曲线时，x轴出现滚动条后消失*/
+    min-height: calc(100vh - 150px);
   }
 </style>
 <style lang="scss">
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index 847deb89b..d9acd0fbf 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -575,10 +575,10 @@
                   }else{
                     x = pointX - boxWidth;
                   }
-                  if((parClientHeight-pointY-(parTop-parScrollTop)-20)>=boxHeight){//说明鼠标上面放不下提示框
-                    y = pointY+10;
+                  if(windowMouse.y + 15 +boxHeight<windowHeight){//说明鼠标上面放不下提示框
+                    y = pointY + 15;
                   }else {
-                    y = pointY-boxHeight;
+                    y = pointY - boxHeight - 15;
                   }
                   return [x,y];
                 }else {//preview page
@@ -601,10 +601,10 @@
                 }else{
                   x = pointX - boxWidth;
                 }
-                if(pointY<(viewHeight/2)){//说明鼠标上面放不下提示框
-                  y = pointY+10;
+                if(windowMouse.y + 15 +boxHeight<windowHeight){//说明鼠标上面放不下提示框
+                  y = pointY + 15;
                 }else {
-                  y = pointY-boxHeight;
+                  y = pointY - boxHeight - 15;
                 }
                 return [x,y];
               }
@@ -747,6 +747,9 @@
                 chartUnit=chartUnit?chartUnit:2;
                 let unit=chartDataFormat.getUnit(chartUnit);
                 let flag=JSON.stringify(value).length>JSON.stringify(chartDataFormat.Interval(maxValue,copies,unit.type)).length;
+                if(chartDataFormat.Interval(maxValue,copies,unit.type,'min')<1){
+                  dot=1;
+                }
                 if(dot===0&&flag){
                   dot=1;
                 }
@@ -1037,7 +1040,7 @@
       // 设置数据, filter区分
       setData(chartItem, seriesItem, panelId, filter,legend,area,errorMsg) {
         this.setColor(legend.length);
-        legend.forEach((t,i)=>{t.color = this.bgColorList[i]})
+        legend.forEach((t,i)=>{t.color = this.bgColorList[i]});
         this.filter.from = filter.from;
         if(errorMsg && errorMsg!==''){
           this.isError = true;
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
index ce33b30b3..122c9bd18 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
@@ -308,11 +308,12 @@
           }else{
             x = pointX - boxWidth;
           }
-          if((parClientHeight-pointY-(parTop-parScrollTop)-20)>=boxHeight){//说明鼠标上面放不下提示框
-            y = pointY+10;
-          }else {
-            y = pointY-boxHeight;
-          }
+          // if((parClientHeight-pointY-(parTop-parScrollTop)-20)>=boxHeight){//说明鼠标上面放不下提示框
+          //   y = pointY+10;
+          // }else {
+          //   y = pointY-boxHeight;
+          // }
+          y = pointY+10;
           return [x,y];
         }else {
           x = pointX - boxWidth;
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 3700d7760..5e678423f 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -770,6 +770,7 @@
 
   .box-content {
     position: relative;
+    min-height: 100%;
   }
 
   /* end-chart list*/