From 750738e2ab7a5bb7cfbdc46c8a1a1fb04bc198d7 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 7 Jan 2022 09:33:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20chartType=20?=
 =?UTF-8?q?=3D=20log=20=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartMixin.js  | 3 +++
 nezha-fronted/src/components/chart/panelChart.vue | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index 75d6b673e..8276edeed 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -91,6 +91,9 @@ export default {
         // legend += 'Previous '
         alias += 'Previous '
       }
+      if (!data.metric) {
+        data.metric = data.stream
+      }
       if (data.metric.__name__) {
         legend += `${data.metric.__name__}{`
       }
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 9c8d5f904..832e9350c 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -190,6 +190,9 @@ export default {
               if (element.filter) {
                 query += `&filter=${element.filter}`
               }
+              if (this.chartInfo.datasource === 'logs') {
+                query += '&format=1'
+              }
               // if (isChartPie(this.chartInfo.type)) {
               //   query += `&statistics=${this.chartInfo.param.statistics || 'last'}`
               // }
@@ -208,6 +211,9 @@ export default {
                 if (element.filter) {
                   query += `&filter=${element.filter}`
                 }
+                if (this.chartInfo.datasource === 'logs') {
+                  query += '&format=1'
+                }
                 // if (isChartPie(this.chartInfo.type)) {
                 //   query += `&statistics=${this.chartInfo.param.statistics || 'last'}`
                 // }