From b4954bbdb1ff5fe83fa6dbb42e438a9aba9359b9 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 6 Dec 2021 16:13:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20datasource=20?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=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/chartList.vue    |  3 +++
 nezha-fronted/src/components/chart/panelChart.vue   |  7 ++++---
 nezha-fronted/src/components/chart/testData.js      | 12 ++++++------
 nezha-fronted/src/components/common/js/constants.js |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 69123679c..36109da01 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -121,6 +121,9 @@ export default {
     showFullscreen (show, chartInfo) {
       this.fullscreen.chartInfo = chartInfo
       this.fullscreen.visible = show
+    },
+    cleanData () {
+
     }
   },
   mounted () {
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 0a92b1500..1a7851517 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -77,14 +77,15 @@ export default {
       this.query(elements, startTime, endTime, step)
     },
     query (elements, startTime, endTime, step) {
+      console.log(this.chartInfo.datasource,elements, startTime, endTime, step)
       try {
-        switch (this.chartInfo.dataSource) {
+        switch (this.chartInfo.datasource) {
           case 'metrics':
           case 'logs': {
             let urlPre = ''
-            if (this.chartInfo.dataSource === 1) {
+            if (this.chartInfo.datasource === 'metrics') {
               urlPre = '/prom'
-            } else if (this.chartInfo.dataSource === 2) {
+            } else if (this.chartInfo.datasource === 'logs') {
               urlPre = '/logs/loki'
             }
             const requests = elements.map((element) => {
diff --git a/nezha-fronted/src/components/chart/testData.js b/nezha-fronted/src/components/chart/testData.js
index 31d9e630c..8bbb60c7f 100644
--- a/nezha-fronted/src/components/chart/testData.js
+++ b/nezha-fronted/src/components/chart/testData.js
@@ -12,7 +12,7 @@ const chartData = {
         name: '123',
         panelId: 1243,
         groupId: 0,
-        dataSource: 'metrics',
+        datasource: 'metrics',
         span: 12,
         height: 6,
         updateBy: 1,
@@ -126,7 +126,7 @@ const chartData = {
         name: '233',
         panelId: 1243,
         groupId: 0,
-        dataSource: 'metrics',
+        datasource: 'metrics',
         span: 6,
         height: 4,
         updateBy: 1,
@@ -236,7 +236,7 @@ const chartData = {
         type: 'line',
         unit: 2,
         weight: 2,
-        dataSource: 'metrics',
+        datasource: 'metrics',
         param: '{' +
           '   "style":"line",' +
           '   "showHeader":true,' +
@@ -460,7 +460,7 @@ const chartData = {
         type: 'hexagonFigure',
         unit: 2,
         weight: 2,
-        dataSource: 'misc',
+        datasource: 'misc',
         param: '{' +
           '   "from":"module",' +
           '   "showHeader":true,' +
@@ -667,7 +667,7 @@ const chartData = {
         name: '123',
         panelId: 1243,
         groupId: 0,
-        dataSource: 6,
+        datasource: 6,
         span: 12,
         height: 6,
         updateBy: 1,
@@ -782,7 +782,7 @@ const chartData = {
         name: '123',
         panelId: 1243,
         groupId: 0,
-        dataSource: 5,
+        datasource: 5,
         span: 12,
         height: 6,
         updateBy: 1,
diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js
index 2ef2553cc..29cdcb386 100644
--- a/nezha-fronted/src/components/common/js/constants.js
+++ b/nezha-fronted/src/components/common/js/constants.js
@@ -367,7 +367,7 @@ export const fromRoute = {
   chartTemp: 'chartTemp'
 }
 
-export const chartDataSource = [
+export const chartdatasource = [
   {
     label: 'metrics',
     value: 1