From ea660721f0ea9621470e107f778a7fd5f7bc83df Mon Sep 17 00:00:00 2001
From: hanyuxia <hanyuxia@iie.ac.cn>
Date: Wed, 12 Feb 2020 19:01:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9BUG=20dashboard=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=9B=BE=E8=A1=A8=201.=20=E5=9B=BE=E4=BE=8B=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E8=B0=83=E6=95=B4=EF=BC=9B=202.=20y=E8=BD=B4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C=E5=9D=87?=
 =?UTF-8?q?=E4=B8=BA0=EF=BC=88bug=20NEZ-97=EF=BC=89=EF=BC=9B=203.=20toolti?=
 =?UTF-8?q?p=E5=86=85=E5=AE=B9=E4=BC=98=E5=8C=96=EF=BC=88bug=20NEZ-103?=
 =?UTF-8?q?=EF=BC=89=EF=BC=8C=E9=92=88=E5=AF=B9expert=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84=E8=BF=98=E6=9C=AA=E5=81=9A=E7=89=B9=E6=AE=8A=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/charts/line-chart-block.scss   |  2 +
 .../components/charts/line-chart-block.vue    | 51 +++++++++++++++++--
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/charts/line-chart-block.scss b/nezha-fronted/src/components/charts/line-chart-block.scss
index 734ab71d8..14f6e674c 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.scss
+++ b/nezha-fronted/src/components/charts/line-chart-block.scss
@@ -26,6 +26,8 @@
   font-size:12px;
   text-align:left;
   margin:0 auto;
+  line-height: 18px;
+  font-family: Roboto,Helvetica Neue,Arial,sans-serif;
 }
 .legend-item{
   text-overflow:ellipsis;
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index 6c17080fe..26955d95d 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -323,7 +323,7 @@ export default {
           trigger: 'axis',
           confine:true,
           formatter:function(params){
-            let str = `<div  style='width:100%;display:block;word-break:break-all;word-wrap:break-word;white-space:normal'>`;
+            let str = `<div  style='width:100%;display:block;word-break:break-all;word-wrap:break-word;white-space:normal;line-height: 18px;font-size:12px;font-family: Roboto,Helvetica Neue,Arial,sans-serif;'>`;
             params.forEach((item, i) => {
               if(i===0){
                 let t_date = new Date(item.data[0]);
@@ -332,8 +332,45 @@ export default {
               }
               str +=`<br/>`;
               let val = parseFloat(Number(item.data[1]).toFixed(2));
-              str +=`<span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${item.color};}'></span> ${item.seriesName}:`;
-              str +=val;
+              if(val===0){
+                val = Number(item.data[1]);
+              }
+              let itemNameList = ["instance","module","project","job","dc","asset"];
+              //let seriesNameTmp = this.filterItem(item.seriesName,itemNameList);
+              let seriesNameTmp = item.seriesName;
+              itemNameList.forEach((itemName, i) => {
+                let insIndex = seriesNameTmp.indexOf(itemName+"=");
+                if(insIndex>-1){//{dd=""22,instance="aa",job="nn"},如果最后只有{},则去掉{}
+                  let start = seriesNameTmp.substring(0,insIndex);
+                  let endTmp = seriesNameTmp.substring(insIndex+itemName.length+1,seriesNameTmp.length);
+                  let sepInd = endTmp.indexOf(',');
+                  let end = "";
+                  if(sepInd>-1){
+                    end = endTmp.substring(sepInd+1,endTmp.length);
+                  }else {
+                    sepInd = endTmp.indexOf('"',1);
+                    end = endTmp.substring(sepInd+1,endTmp.length);
+                  }
+                  seriesNameTmp = start+end;
+                }
+              });
+              if(seriesNameTmp.indexOf(",}")>-1){
+                seriesNameTmp = seriesNameTmp.replace(",}","}");
+              }
+              if(seriesNameTmp.indexOf("{}")>-1){
+                seriesNameTmp = seriesNameTmp.replace("{}","");
+              }
+              /*
+              if(chartInfo.elements[serIndex].type==='normal'){
+                str +=`<span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${item.color};}'></span> `;
+                str +=seriesNameTmp+":"+val;
+              }else if(chartInfo.elements[serIndex].type==='expert'){
+                str +=`<span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${item.color};}'></span>${item.seriesName} `;
+                str +=val;
+              }
+               */
+              str +=`<span style='display:inline-block;margin-right:5px;border-radius:10px;width:15px;height:5px;background-color: ${item.color};}'></span> `;
+              str +=seriesNameTmp+":"+val;
             });
             str +=`</div>`;
             return str;
@@ -473,8 +510,14 @@ export default {
                   return `${parseFloat(mbNum.toFixed(2))}M`;
                 }
                 return `${parseFloat(kbNum.toFixed(2))}K`;
+              }else {
+                let rlt = parseFloat(num.toFixed(2));
+                if(rlt===0){
+                  return num;
+                }else {
+                  return rlt;
+                }
               }
-              return parseFloat(num.toFixed(2));
             },
           },
           //boundaryGap:[0,0.2]