From e7df3b927035202f3eee68806d87722763e35832 Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Thu, 16 Jul 2020 10:17:07 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix=EF=BC=9A=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=9C=A8=E6=9A=82=E4=B8=8D=E6=B7=BB=E5=8A=A0=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/config/account.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue
index eb804c2c4..bc77efa1d 100644
--- a/nezha-fronted/src/components/page/config/account.vue
+++ b/nezha-fronted/src/components/page/config/account.vue
@@ -68,7 +68,6 @@
             :width="item.width"
             :key="`col-${index}`"
             :label="item.label"
-            :sortable="item.prop!='option'&&item.prop!='status'?'custom':false"
             :prop="item.prop"
           >
             <template slot-scope="scope" :column="item">

From 5e39a2b4baf795bd00542350778cb7077db93cc6 Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Thu, 16 Jul 2020 13:58:38 +0800
Subject: [PATCH 2/5] =?UTF-8?q?NEZ-354=20fix=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/config/model.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index d9c4756c3..c145f04e4 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -380,7 +380,7 @@
         switch(prop){
           case 'id': return'mo.id';
           case 'name': return'mo.name';
-          case 'type': return'dict1.value';
+          case 'type': return'dictt.value';
           case 'vendor': return'dict.value';
           default : return prop;
         }

From a3193364a582a6a627d8aa4541a0a711bdcf659e Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Thu, 16 Jul 2020 16:01:08 +0800
Subject: [PATCH 3/5] =?UTF-8?q?style=EF=BC=9A=E5=AF=BC=E8=88=AA=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E5=90=91=E4=B8=8B=E7=A7=BB=E5=8A=A8=E4=B8=80px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/header.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue
index 245598cd2..97c05c535 100644
--- a/nezha-fronted/src/components/common/header.vue
+++ b/nezha-fronted/src/components/common/header.vue
@@ -764,6 +764,7 @@
   }
   .nz-icon-navmore{
     font-size: 18px;
+    line-height: 51.5px;
   }
 </style>
 

From 670a5759c25c65a36b703ca7a548fbf883402ae2 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Thu, 16 Jul 2020 16:03:45 +0800
Subject: [PATCH 4/5] =?UTF-8?q?perf:=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/charts/chartDataFormat.js       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js
index c42011589..c5bfb3bdb 100644
--- a/nezha-fronted/src/components/charts/chartDataFormat.js
+++ b/nezha-fronted/src/components/charts/chartDataFormat.js
@@ -3,7 +3,9 @@
 * index:yAxis 默认第二个参数 y轴的位置
 * type:自定义参数，用于区分是y轴调用还是tooltip调用,以设置不同精度  type =1 y轴调用 type=2 tooltip调用
 * */
-function none(value,index){
+import {parse} from "echarts/extension-src/dataTool/gexf";
+
+function none(value, index){
   return value;
 }
 function short(value,index,type=1){
@@ -255,6 +257,16 @@ function days(value,index,type=1){
 * unitIndex：不需要传递，用于递归获取units中的单位
 * */
 function asciiCompute(num,ascii,units,dot=2,unitIndex=0){
+  num=Number(num)
+  let carry=0;
+  if(num > 0){
+    let log=Math.log(num)/Math.log(ascii)
+    carry = parseInt(log)
+    num = num / Math.pow(ascii,carry)
+  }
+  return num.toFixed(dot) +' '+units[carry];
+}
+function asciiCompute2(num,ascii,units,dot=2,unitIndex=0){
   num=Number(num)
   let quotient=num / ascii;
   if(unitIndex <= units.length-1){

From 4ea3fb7b3a5b7fc3e1545dc05064bd0d55e6cfaa Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Thu, 16 Jul 2020 17:01:00 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:alert=20message=20=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/alertMessageTab.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
index a1e1d4886..03a01f3bd 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
@@ -57,7 +57,7 @@
         <template slot-scope="scope" :column="item">
           <template v-if="item.prop == 'alertRule'">
             <div class="too-long-split" :id="'view-rule-'+scope.row[item.prop].id"
-                 v-if="scope.row[item.prop].alertName">{{scope.row[item.prop].alertName + ' ' + $t('overall.active')}}</div>
+                 v-if="scope.row[item.prop].alertName">{{scope.row[item.prop].alertName}}</div>
             <template v-else>-</template>
           </template>
           <!--<div v-else-if="item.prop == 'type'" class="content-right-options">