From 22da5f9052c6d4aae141d2febe89645538a97f69 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Wed, 11 Mar 2020 18:48:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:dashboard=20=E6=96=B0=E5=A2=9Eunit=20?=
 =?UTF-8?q?=E4=B8=BATime=E6=97=B6=E7=9A=84=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.dashboard 新增unit 为Time时的格式化方法
2.dashboard table value值添加格式化
3.endpoint-query及view graph添加loading动画
4.chart 配置样式调整
---
 .../src/components/charts/chart-list.vue      |   2 +-
 .../src/components/charts/chart-table.vue     |  25 +-
 .../src/components/charts/chartDataFormat.js  | 313 ++++++++++++++----
 .../components/charts/line-chart-block.vue    |  23 +-
 .../src/components/common/language/en.js      |   1 +
 .../components/common/rightBox/cabinetBox.vue |   2 +-
 .../components/page/dashboard/chartBox.vue    |  49 +--
 .../src/components/page/project/project.vue   |  26 +-
 .../static/template/en/asset-template.xlsx    | Bin 12823 -> 12626 bytes
 9 files changed, 341 insertions(+), 100 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index 09af8ca28..2d5db8aa5 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -263,7 +263,7 @@ export default {
                       };
                       if(chartInfo.type === 'stackArea'){
                         seriesItem.theData.type='line';
-                        seriesItem.theData.stack='stack'
+                        seriesItem.theData.stack=chartInfo.title
                         seriesItem.theData.areaStyle={};
                       }
                       // 图表中每条线的名字,后半部分
diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue
index d3e5981e2..37c486b75 100644
--- a/nezha-fronted/src/components/charts/chart-table.vue
+++ b/nezha-fronted/src/components/charts/chart-table.vue
@@ -1,6 +1,11 @@
 <style lang="scss" scoped>
 @import './chart-table.scss';
 </style>
+<style>
+  .max-width-90{
+    max-width: 90px;
+  }
+</style>
 <template>
     <div class="chart-table" :id="'chartTableDiv'+chartIndex" v-show="divFirstShow">
         <loading  :ref="'localLoading'+chartIndex"></loading>
@@ -34,11 +39,15 @@
                     {{ scope.row.element.alias?scope.row.element.alias:scope.row.element.element}}
                   </template>
                 </el-table-column>
-                <el-table-column sortable prop="value" :label="$t('dashboard.panel.chartTableColumn.value')" ></el-table-column>
+                <el-table-column sortable prop="value" :label="$t('dashboard.panel.chartTableColumn.value')" class-name="max-width-90">
+                  <template slot-scope="scope">
+                    {{ unit.compute(scope.row.value,null,2)}}
+                  </template>
+                </el-table-column>
             </el-table>
         </div>
         <!--全屏-->
-          <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"  :visible.sync="screenModal" width="96%"  @close="screenModal = false;" >
+          <el-dialog class="nz-dialog table-chart-dialog" :title="$t('dashboard.panel.view')"  :visible.sync="screenModal" width="96%"  @close="screenModal = false" >
             <div slot="title">
               <span class="nz-dialog-title">{{data.title}}</span>
               <div class="float-right panel-calendar dialog-tool">
@@ -56,7 +65,11 @@
                       {{ scope.row.element.alias?scope.row.element.alias:scope.row.element.element}}
                     </template>
                   </el-table-column>
-                    <el-table-column sortable prop="value" :label="$t('dashboard.panel.chartTableColumn.value')" ></el-table-column>
+                    <el-table-column sortable prop="value" :label="$t('dashboard.panel.chartTableColumn.value')" width="90">
+                      <template slot-scope="scope">
+                        {{ unit.compute(scope.row.value,null,2)}}
+                      </template>
+                    </el-table-column>
 
                 </el-table>
                 <loading  :ref="'localLoadingScreen'+chartIndex"></loading>
@@ -75,6 +88,7 @@
 <script>
 import bus from '../../libs/bus';
 import {Loading} from 'element-ui';
+import chartDataFormat from './chartDataFormat'
 import loading from "../common/loading";
 
 export default {
@@ -100,6 +114,7 @@ export default {
     data() {
         return {
             data: {}, // 该图表信息,chartItem
+            unit:{},
             seriesItem: [], // 保存信息
             seriesItemScreen:[],//全屏数据
             images: '',
@@ -346,6 +361,9 @@ export default {
         setData(chartItem, seriesItem, panelId, filter,area) {
             if(area==='showFullScreen'){//全屏按时间查询
               this.data = chartItem;
+              this.unit = chartDataFormat.getUnit(this.data.unit);
+              console.log("unit-->")
+              console.log(this.unit);
               this.searchTime[0] = filter.start_time;//将列表的查询时间复制给全屏的查询时间
               this.searchTime[1] = filter.end_time;
               this.seriesItemScreen = seriesItem;
@@ -368,6 +386,7 @@ export default {
 
               this.panelIdInner = panelId;
               this.data = chartItem;
+              this.unit = chartDataFormat.getUnit(this.data.unit);
               this.seriesItem = seriesItem;
               this.seriesItemScreen = seriesItem;
               if (filter) { // 保存数据,用于同步时间
diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js
index ea4d344aa..a061634bd 100644
--- a/nezha-fronted/src/components/charts/chartDataFormat.js
+++ b/nezha-fronted/src/components/charts/chartDataFormat.js
@@ -1,14 +1,24 @@
+/*
+* value:yAxis 默认第一个参数  传递的数值
+* index:yAxis 默认第二个参数 y轴的位置
+* type:自定义参数，用于区分是y轴调用还是tooltip调用,以设置不同精度  type =1 y轴调用 type=2 tooltip调用
+* */
 function none(value,index){
   return value;
 }
-function short(value,index){
-  return asciiCompute(value,1000,['','K','Mil','Bil'],0)
+function short(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['','K','Mil','Bil'],0)
+  }else{
+    return asciiCompute(value,1000,['','K','Mil','Bil'],2)
+  }
+
 }
 function percent01(value,index){
-  return `${value}%`;
+  return `${value} %`;
 }
 function percent02(value,index){
-  return `${value * 100 }%`;
+  return `${value * 100 } %`;
 }
 function localFormat(value,index){
   let num = (value || 0).toString();
@@ -20,70 +30,220 @@ function localFormat(value,index){
   if (num) { result = num + result; }
   return result;
 }
-function bits(value,index){
-  return asciiCompute(value,1024,['b','B','KB','MB','GB','TB','PB','EB','ZB','YB'],0)
+function bits(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1024,['b','B','KB','MB','GB','TB','PB','EB','ZB','YB'],0)
+  }else{
+    return asciiCompute(value,1024,['b','B','KB','MB','GB','TB','PB','EB','ZB','YB'],2)
+  }
 }
-function bytes(value,index){
-  return asciiCompute(value,1024,['B','KB','MB','GB','TB','PB','EB','ZB','YB'],0)
+function bytes(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1024,['B','KB','MB','GB','TB','PB','EB','ZB','YB'],0)
+  }else{
+    return asciiCompute(value,1024,['B','KB','MB','GB','TB','PB','EB','ZB','YB'],2)
+  }
+
 }
-function kilobytes(value,index){
-  return asciiCompute(value,1024,['KB','MB','GB','TB','PB','EB','ZB','YB'],0)
+function kilobytes(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1024,['KB','MB','GB','TB','PB','EB','ZB','YB'],0)
+  }else{
+    return asciiCompute(value,1024,['KB','MB','GB','TB','PB','EB','ZB','YB'],2)
+  }
+
 }
-function megabytes(value,index){
-  return asciiCompute(value,1024,['MB','GB','TB','PB','EB','ZB','YB'],0)
+function megabytes(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1024,['MB','GB','TB','PB','EB','ZB','YB'],0)
+  }else{
+    return asciiCompute(value,1024,['MB','GB','TB','PB','EB','ZB','YB'],2)
+  }
+
 }
-function gigabytes(value,index){
-  return asciiCompute(value,1024,['GB','TB','PB','EB','ZB','YB'],0)
+function gigabytes(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1024,['GB','TB','PB','EB','ZB','YB'],0)
+  }else{
+    return asciiCompute(value,1024,['GB','TB','PB','EB','ZB','YB'],2)
+  }
 }
-function terabytes(value,index){
-  return asciiCompute(value,1024,['TB','PB','EB','ZB','YB'],0)
+function terabytes(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1024,['TB','PB','EB','ZB','YB'],0)
+  }else{
+    return asciiCompute(value,1024,['TB','PB','EB','ZB','YB'],2)
+  }
 }
-function petabytes(value,index){
-  return asciiCompute(value,1024,['PB','EB','ZB','YB'],0)
+function petabytes(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1024,['PB','EB','ZB','YB'],0)
+  }else{
+    return asciiCompute(value,1024,['PB','EB','ZB','YB'],2)
+  }
 }
-function packetsSec(value,index){
-  return asciiCompute(value,1000,['pps','Kpps','Mpps','Gpps','Tpps','Ppps','Epps','Zpps','Ypps'],1)
+function packetsSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['pps','Kpps','Mpps','Gpps','Tpps','Ppps','Epps','Zpps','Ypps'],1)
+  }else{
+    return asciiCompute(value,1000,['pps','Kpps','Mpps','Gpps','Tpps','Ppps','Epps','Zpps','Ypps'],2)
+  }
 }
-function bitsSec(value,index){
-  return asciiCompute(value,1000,['bps','Kbps','Mbps','Gbps','Tbps','Pbps','Epps','Zpps','Ypps'],1)
+function bitsSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['bps','Kbps','Mbps','Gbps','Tbps','Pbps','Epps','Zpps','Ypps'],1)
+  }else{
+    return asciiCompute(value,1000,['bps','Kbps','Mbps','Gbps','Tbps','Pbps','Epps','Zpps','Ypps'],2)
+  }
 }
-function bytesSec(value,index){
-  return asciiCompute(value,1000,['Bs','KBs','MBs','GBs','TBs','PBs','EBs','ZBs','YBs'],1)
+function bytesSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['Bs','KBs','MBs','GBs','TBs','PBs','EBs','ZBs','YBs'],1)
+  }else{
+    return asciiCompute(value,1000,['Bs','KBs','MBs','GBs','TBs','PBs','EBs','ZBs','YBs'],2)
+  }
 }
-function kilobytesSec(value,index){
-  return asciiCompute(value,1000,['KBs','MBs','GBs','TBs','PBs','EBs','ZBs','YBs'],1)
+function kilobytesSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['KBs','MBs','GBs','TBs','PBs','EBs','ZBs','YBs'],1)
+  }else{
+    return asciiCompute(value,1000,['KBs','MBs','GBs','TBs','PBs','EBs','ZBs','YBs'],1)
+  }
 }
-function kilobitsSec(value,index){
-  return asciiCompute(value,1000,['Kbps','Mbps','Gbps','Tbps','Pbps','Ebps','Zbps','Ybps'],1)
+function kilobitsSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['Kbps','Mbps','Gbps','Tbps','Pbps','Ebps','Zbps','Ybps'],1)
+  }else{
+    return asciiCompute(value,1000,['Kbps','Mbps','Gbps','Tbps','Pbps','Ebps','Zbps','Ybps'],2)
+  }
+
 }
-function megabytesSec(value,index){
-  return asciiCompute(value,1000,['MBs','GBs','TBs','PBs','EBs','ZBs','YBs'],1)
+function megabytesSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['MBs','GBs','TBs','PBs','EBs','ZBs','YBs'],1)
+  }else{
+    return asciiCompute(value,1000,['MBs','GBs','TBs','PBs','EBs','ZBs','YBs'],2)
+  }
+
 }
-function megabitsSec(value,index){
-  return asciiCompute(value,1000,['Mbps','Gbps','Tbps','Pbps','Ebps','Zbps','Ybps'],1)
+function megabitsSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['Mbps','Gbps','Tbps','Pbps','Ebps','Zbps','Ybps'],1)
+  }else{
+    return asciiCompute(value,1000,['Mbps','Gbps','Tbps','Pbps','Ebps','Zbps','Ybps'],2)
+  }
+
 }
-function gigabytesSec(value,index){
-  return asciiCompute(value,1000,['GBs','TBs','PBs','EBs','ZBs','YBs'],1)
+function gigabytesSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['GBs','TBs','PBs','EBs','ZBs','YBs'],1)
+  }else{
+    return asciiCompute(value,1000,['GBs','TBs','PBs','EBs','ZBs','YBs'],2)
+  }
+
 }
-function gigabitsSec(value,index){
-  return asciiCompute(value,1000,['Gbps','Tbps','Pbps','Ebps','Zbps','Ybps'],1)
+function gigabitsSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['Gbps','Tbps','Pbps','Ebps','Zbps','Ybps'],1)
+  }else{
+    return asciiCompute(value,1000,['Gbps','Tbps','Pbps','Ebps','Zbps','Ybps'],2)
+  }
+
 }
-function terabytesSec(value,index){
-  return asciiCompute(value,1000,['TBs','PBs','EBs','ZBs','YBs'],1)
+function terabytesSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['TBs','PBs','EBs','ZBs','YBs'],1)
+  }else{
+    return asciiCompute(value,1000,['TBs','PBs','EBs','ZBs','YBs'],2)
+  }
+
 }
-function terabitsSec(value,index){
-  return asciiCompute(value,1000,['Tbps','Pbps','Ebps','Zbps','Ybps'],1)
+function terabitsSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['Tbps','Pbps','Ebps','Zbps','Ybps'],1)
+  }else{
+    return asciiCompute(value,1000,['Tbps','Pbps','Ebps','Zbps','Ybps'],2)
+  }
+
 }
-function petabytesSec(value,index){
-  return asciiCompute(value,1000,['PBs','EBs','ZBs','YBs'],1)
+function petabytesSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['PBs','EBs','ZBs','YBs'],1)
+  }else{
+    return asciiCompute(value,1000,['PBs','EBs','ZBs','YBs'],2)
+  }
+
 }
-function petabitsSec(value,index){
-  return asciiCompute(value,1000,['Pbps','Ebps','Zbps','Ybps'],1)
+function petabitsSec(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['Pbps','Ebps','Zbps','Ybps'],1)
+  }else{
+    return asciiCompute(value,1000,['Pbps','Ebps','Zbps','Ybps'],2)
+  }
+
 }
-function Hertz(value,index){
-  return asciiCompute(value,1000,['Hz','KHz','MHz','GHz','THz','PHz','EHz','ZHz','YHz'],1);
+function Hertz(value,index,type=1){
+  if(type == 1){
+    return asciiCompute(value,1000,['Hz','KHz','MHz','GHz','THz','PHz','EHz','ZHz','YHz'],1);
+  }else{
+    return asciiCompute(value,1000,['Hz','KHz','MHz','GHz','THz','PHz','EHz','ZHz','YHz'],2);
+  }
+
 }
-function nanoseconds(value,index){
+function nanoseconds(value,index,type=1){
+  if(type == 1){
+    return timeCompute(value,'ns');
+  }else{
+    return timeCompute(value,'ns',2);
+  }
+
+}
+function microseconds(value,index,type=1){
+  if(type == 1){
+    return timeCompute(value,'us')
+  }else{
+    return timeCompute(value,'us',2)
+  }
+
+}
+function milliseconds(value,index,type=1){
+  if(type == 1){
+    return timeCompute(value,'ms')
+  }else{
+    return timeCompute(value,'ms',2)
+  }
+
+}
+function seconds(value,index,type=1){
+  if(type == 1){
+    return timeCompute(value,'s');
+  }else{
+    return timeCompute(value,'s',2);
+  }
+
+}
+function minutes(value,index,type=1){
+  if(type == 1){
+    return timeCompute(value,'m');
+  }else{
+    return timeCompute(value,'m',2);
+  }
+
+}
+function hours(value,index,type=1){
+  if(type == 1){
+    return timeCompute(value,'h');
+  }else{
+    return timeCompute(value,'h',2);
+  }
+
+}
+function days(value,index,type=1){
+  if(type == 1){
+    return timeCompute(value,'day');
+  }else{
+    return timeCompute(value,'day',3);
+  }
 
 }
 /*
@@ -101,9 +261,9 @@ function asciiCompute(num,ascii,units,dot=2,unitIndex=0){
     if(quotient <1 ){ //不足以进位
       let toFixed=parseFloat(num.toFixed(dot));
       if(toFixed == 0){
-        return `${num}${units[unitIndex]}`
+        return `${num} ${units[unitIndex]}`
       }else{
-        return `${num.toFixed(dot)}${units[unitIndex]}`;
+        return `${num.toFixed(dot)} ${units[unitIndex]}`;
       }
     }else if(quotient >= 1 && quotient <10){ //可以进位，但是又不足以更进一位
       if(unitIndex >= units.length-1){
@@ -111,7 +271,7 @@ function asciiCompute(num,ascii,units,dot=2,unitIndex=0){
         return asciiCompute(num,ascii,units,dot,unitIndex);
       }else{
         unitIndex++;
-        return `${quotient.toFixed(dot)}${units[unitIndex]}`;
+        return `${quotient.toFixed(dot)} ${units[unitIndex]}`;
       }
     } else{ //可以更进一位
       if(unitIndex >=  units.length-1){
@@ -124,13 +284,49 @@ function asciiCompute(num,ascii,units,dot=2,unitIndex=0){
       }
     }
   }else{
-    return `${num.toFixed(2)}${units[units.length-1]}`;
+    return `${num.toFixed(2)} ${units[units.length-1]}`;
   }
 
 }
 /*
 * 时间格式化方法
+* value:需要格式化的数值
+* unit:设置的单位
 * */
+function timeCompute(value,unit,dot=0){
+  if(unit == 'year'){
+    return `${value.toFixed(dot)} ${unit}`;
+  }
+  let units=[
+    {unit:'ns',ascii:1},
+    {unit:'us',ascii:1000},
+    {unit:'ms',ascii:1000},
+    {unit:'s',ascii:60},
+    {unit:'m',ascii:60},
+    {unit:'h',ascii:24},
+    {unit:'day',ascii:7},
+    {unit:'week',ascii:52},
+    {unit:'year',ascii:''}
+  ]
+  for(let i in units){
+    let u = units[i];
+    if(u.unit == unit){ //找到最小单位
+      let result = (time,minUnit)=>{
+        if(minUnit.unit == 'year'){
+          return `${time.toFixed(dot)} ${minUnit.unit}`
+        }
+        let quotient = time / minUnit.ascii;
+        if(quotient < 1){
+          return `${time.toFixed(dot)} ${minUnit.unit}`;
+        }else{
+          minUnit = units[++i];
+          return result(quotient,minUnit);
+        }
+      }
+      return result(value,u);
+    }
+  }
+}
 
 //unit转化配置信息
 /*
@@ -298,32 +494,32 @@ let unitOptions=[
       },
       {
         value:28,
-        compute:null,
+        compute:microseconds,
         label:'microseconds (us)'
       },
       {
         value:29,
-        compute:null,
+        compute:milliseconds,
         label:'milliseconds (ms)'
       },
       {
         value:30,
-        compute:null,
+        compute:seconds,
         label:'seconds (s)'
       },
       {
         value:31,
-        compute:null,
+        compute:minutes,
         label:'minutes (m)'
       },
       {
         value:32,
-        compute:null,
+        compute:hours,
         label:'hours (h)'
       },
       {
         value:33,
-        compute:null,
+        compute:days,
         label:'days (d)'
       },
     ]
@@ -345,6 +541,5 @@ export default {
   },
   getUnit:function(index){
     return units[index-1];
-  },
-  short,
+  }
 }
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index b1cc9be9a..efdbe2c0f 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -561,7 +561,7 @@
                 str +=`</div>`;
                 // str +=`<div style="display: inline-block;max-width: 10px; min-width: 5px;line-height: 18px;"></div>`;
                 str += `<div style='max-width:90px;min-width:20px;float:right;text-align:right;display:inline-block;white-space:nowrap;overflow-x:hidden;text-overflow:ellipsis;line-height: 18px;font-size:12px;font-family: Roboto,Helvetica Neue,Arial,sans-serif;'>`;
-                str +=val;
+                str +=chartDataFormat.getUnit(chartInfo.unit).compute(val,null,2);
                 str +=`</div>`;
               });
               str +=`</div>`;
@@ -775,6 +775,8 @@
             this.echartStore.clear();
             //option.title = title;
             this.echartStore.setOption(option);//创建图表
+            console.log('图表参数')
+            console.log(option)
             this.$refs['localLoading'+this.chartIndex].endLoading();
             this.firstShow = true; // 展示操作按键
           });
@@ -943,7 +945,14 @@
         }
 
       },
-
+      clearChart(){
+        if(this.echartStore){
+          this.echartStore.clear();
+        }
+        if(this.echartModalStore){
+          this.echartModalStore.clear();
+        }
+      },
       // 删除该图表
       removeChart() {
         this.$emit('on-remove-chart-block', this.data.id);
@@ -954,6 +963,7 @@
       },
       // 重新请求数据 刷新操作
       refreshChart() {
+        this.clearChart();
         this.$refs['localLoading'+this.chartIndex].startLoading();
         this.firstShow = false;
         this.$emit('on-refresh-data', this.data.id);
@@ -1069,6 +1079,11 @@
                         },
                         metric_name: '',
                       };
+                      if(chartInfo.type === 'stackArea'){
+                        seriesItem.theData.type='line';
+                        seriesItem.theData.stack=chartInfo.title
+                        seriesItem.theData.areaStyle={};
+                      }
                       // 图表中每条线的名字,后半部分
                       // let host = `${queryItem.metric.__name__}{`;//up,
                       let host = '';//up,
@@ -1391,9 +1406,7 @@
 */
     },
     beforeDestroy() {
-      if(this.echartStore){
-        this.echartStore.clear();
-      }
+      this.clearChart();
     },
   };
 
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 182ea48f0..99dc85fb8 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -110,6 +110,7 @@ const en = {
         width:'Width', //"宽"
         high:'High', //"高"
         metric:'Metric', //"指标"
+        option:'Option',
         addMetric:'Add metric', //"添加指标"
       },
       chartTableColumn:{
diff --git a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue
index 05ca8ef17..173cb21be 100644
--- a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue
@@ -33,7 +33,7 @@
             <div :class="{'right-box-form-content-txt':!rightBox.isEdit}" >{{cabinet.uSize}}</div>
             <el-slider v-model.number="cabinet.uSize" :max="47" v-if="rightBox.isEdit"></el-slider>
           </el-form-item>
-          <el-form-item :label="this.$t('asset.createAssetTab.AddCabinetTab.remark')">
+          <el-form-item :label="this.$t('config.dc.remark')">
             <el-input size='mini' v-model="cabinet.remark" type="textarea" :rows="2" v-if="rightBox.isEdit"/>
             <div class="right-box-form-content-txt" v-if="!rightBox.isEdit">{{cabinet.remark}}</div>
           </el-form-item>
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index 474be4e28..7c132f06c 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -99,11 +99,15 @@
               <el-input size="small" maxlength="64" show-word-limit v-model="chart.title"></el-input>
             </el-form-item>
 
-            <el-row :gutter="10">
+            <div class="right-box-sub-title">{{$t('dashboard.panel.chartForm.option')}}</div>
+            <div class="line-100"></div>
+
+            <!-- type unit start-->
+            <el-row :gutter="10" style="padding-top:20px">
               <el-col :span="2" >
                 <div class="label-center" >{{$t('dashboard.panel.chartForm.type')}}</div>
               </el-col>
-              <el-col :span="6" style="margin-left:-7px;">
+              <el-col :span="10" style="margin-left:-7px;">
                 <div class="grid-content ">
                   <el-form-item prop="type">
                     <el-select class="right-box-row-with-btn" value-key="chartType" popper-class="chart-box-dropdown-mini" v-model="chart.type" placeholder="" size="mini">
@@ -114,10 +118,27 @@
                   </el-form-item>
                 </div>
               </el-col>
-              <el-col :span="2" style="margin-left: 7px;">
+              <el-col :span="2" style="margin-left: 7px">
+                <div class="label-center" >{{$t('dashboard.panel.chartForm.unit')}}</div>
+              </el-col>
+              <el-col :span="10">
+                <el-cascader filterable placeholder="" popper-class="dc-dropdown" size="mini"
+                             :options="unitOptions"
+                             :props="{ expandTrigger: 'hover' }"
+                             :show-all-levels="false"
+                             v-model="chart.unit"
+                             @change="unitSelected"
+                >
+                </el-cascader>
+              </el-col>
+            </el-row>
+            <!--type unit end-->
+
+            <el-row :gutter="10">
+              <el-col :span="2" >
                 <div class="label-center"  >{{$t('dashboard.panel.chartForm.width')}}</div>
               </el-col>
-              <el-col :span="6" style="margin-left:0px;">
+              <el-col :span="10" style="margin-left:0px;">
                 <div class="grid-content ">
                   <el-form-item prop="span">
                     <el-select class="right-box-row-with-btn"  value-key="chartSpan" popper-class="chart-box-dropdown-mini" v-model="chart.span" placeholder="" size="mini">
@@ -128,10 +149,10 @@
                   </el-form-item>
                 </div>
               </el-col>
-              <el-col :span="2" style="padding-left: 10px;">
+              <el-col :span="2" >
                 <div class="label-center" >{{$t('dashboard.panel.chartForm.high')}}</div>
               </el-col>
-              <el-col :span="6" style="margin-left: 0px;">
+              <el-col :span="10" style="margin-left: 0px;">
                 <div class="grid-content" >
                   <el-form-item prop="height">
                     <!--                  <el-input label="" v-model="chart.height" placeholder="" size="mini"></el-input>-->
@@ -152,22 +173,6 @@
               </el-col>
             </el-row>
 
-            <el-row :gutter="10">
-              <el-col :span="2">
-                <div class="label-center" >{{$t('dashboard.panel.chartForm.unit')}}</div>
-              </el-col>
-              <el-col :span="22">
-                <el-cascader filterable placeholder="" popper-class="chart-box-dropdown" size="small" style="width: 100%"
-                             :options="unitOptions"
-                             :props="{ expandTrigger: 'hover' }"
-                             :show-all-levels="false"
-                             v-model="chart.unit"
-                             @change="unitSelected"
-                >
-                </el-cascader>
-              </el-col>
-            </el-row>
-
             <div class="right-box-sub-title">{{$t('dashboard.panel.chartForm.metric')}}</div>
             <div class="line-100"></div>
 
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index f28b5d5e7..3e71191af 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -225,9 +225,9 @@
 <!--          </button>-->
         </div>
       </div>
-      <div class="table-header-inner" @click="clearSelectedMetrics"><span><i style="font-size: 12px;margin-left: 2px;" class="nz-icon nz-icon-close " :class="{'control-icon-unchecked':selectedEndpoints.length<1,'control-icon-checked':selectedEndpoints.length>0}"></i></span></div>
+      <div v-show="showTableData && showTableData.length>0" class="table-header-inner" @click="clearSelectedMetrics"><span><i style="font-size: 12px;margin-left: 2px;" class="nz-icon nz-icon-close " :class="{'control-icon-unchecked':selectedEndpoints.length<1,'control-icon-checked':selectedEndpoints.length>0}"></i></span></div>
       <el-table
-        v-loading="queryEdpLoading"
+        v-show="showTableData && showTableData.length>0"
         :data="showTableData"
         border
         v-scrollBar:el-table
@@ -271,8 +271,9 @@
         </el-table-column>
       </el-table>
       <button class="to-top" v-show="showTopBtn2" @click="toTop"><i class="nz-icon nz-icon-top"></i></button>
-    </div>
 
+    </div>
+    <loading  ref="loading"></loading>
     <element-set
       v-clickoutside="elementsetHide"
       :table-title="endpointTableTitle"
@@ -318,6 +319,7 @@
       <div class="chart-bottom">
         <button class="nz-btn nz-btn-size-large nz-btn-style-normal nz-btn-min-width-82" @click="saveChart">{{$t('dashboard.metric.saveChart')}}</button>
       </div>
+      <loading  ref="graphLoading"></loading>
     </el-dialog>
 
     <module-box :currentProject="currentProject" :module="editModule" @reload="getModuleList" ref="moduleBox"></module-box>
@@ -334,11 +336,13 @@
   import bus from "../../../libs/bus";
   import axios from 'axios';
   import exportXLSX from "../../common/exportXLSX";
+  import loading from "../../common/loading";
   export default {
     name: "project2",
     components: {
       'chart-box': chartBox,
-      'export-excel':exportXLSX
+      'export-excel':exportXLSX,
+      'loading': loading,
     },
     data() {
       let temp=this;
@@ -1140,8 +1144,10 @@
         this.$refs.assetEditUnit.tabView=true;
       },
       showEndpoint:function(endpoint){
-
-        this.queryEdpLoading=true;
+        this.tableShow=3;
+        // this.queryEdpLoading=true;
+        console.log(this.$refs)
+        this.$refs.loading.startLoading();
         if(endpoint){
           this.curEndpoint=endpoint;
           this.formatTime='';
@@ -1211,8 +1217,8 @@
                 this.showTableData.push(edpQueryData);
               }
               this.showTableDataCopy=JSON.stringify(this.showTableData);
-              this.tableShow=3;
-              this.queryEdpLoading=false;
+              // this.queryEdpLoading=false;
+              this.$refs.loading.endLoading();
               this.gutterHandler(".endpoint-query-table"); //控制table右边距
               this.showTopBtn2 = false;
               this.$nextTick(() => {
@@ -1313,8 +1319,8 @@
 
         this.chartDatas=[];
         this.legend=[];
-        this.queryChartDate();
         this.graphShow=true;
+        setTimeout(()=>{this.queryChartDate();},10)
 
       },
       dialogClose:function(){
@@ -1404,6 +1410,7 @@
                 this.$refs.chartScrollbar.update();
               }
             });
+          this.$refs.graphLoading.endLoading();
         })
       },
       dateChange:function(){
@@ -1414,6 +1421,7 @@
 
       },
       initDialog:function(){
+        this.$refs.graphLoading.startLoading();
         this.graphChart = echarts.init(document.getElementById('viewGraphChart'));
         // this.queryChartDate();
         // this.chartOptions.legend.data=this.legend;
diff --git a/nezha-fronted/static/template/en/asset-template.xlsx b/nezha-fronted/static/template/en/asset-template.xlsx
index ae9838ded41ef19e405da0f6ee93b1155eea0dbb..dc2626ccc1ff1e07e5b91b9c55638c7d411a96a1 100644
GIT binary patch
delta 7021
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

delta 7166
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
S*w_GUK>44XTa)cC$$tSaM>%`|