From dfdc4c33bff134581d686906817d725391b54d67 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Wed, 2 Aug 2023 10:52:01 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3027=20fix=EF=BC=9A=E3=80=90E21=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=BA=E3=80=91NZ=E5=BF=AB=E7=85=A7=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=9B=BE=E8=A1=A8=E6=97=A0=E6=B3=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=B6=85=E8=BF=8720=E6=9D=A1=E4=B9=8B=E5=A4=96?=
 =?UTF-8?q?=E7=9A=84=E6=8C=87=E6=A0=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/package-lock.json                   | 14 +++++++-------
 nezha-fronted/src/components/chart/panelChart.vue |  9 ++++++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json
index 733cf7072..68ce93d9f 100644
--- a/nezha-fronted/package-lock.json
+++ b/nezha-fronted/package-lock.json
@@ -3988,7 +3988,7 @@
     },
     "clipboard": {
       "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
+      "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
       "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
       "requires": {
         "good-listener": "^1.2.2",
@@ -6133,7 +6133,7 @@
     },
     "delegate": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
       "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
     },
     "delegates": {
@@ -8445,7 +8445,7 @@
     },
     "good-listener": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+      "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
       "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
       "requires": {
         "delegate": "^3.1.2"
@@ -16361,7 +16361,7 @@
     },
     "select": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
       "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
     },
     "select-hose": {
@@ -17837,7 +17837,7 @@
     },
     "tiny-emitter": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
     "tinycolor2": {
@@ -17848,7 +17848,7 @@
     "tmp": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz",
-      "integrity": "sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=",
+      "integrity": "sha512-89PTqMWGDva+GqClOqBV9s3SMh7MA3Mq0pJUdAoHuF65YoE7O0LermaZkVfT5/Ngfo18H4eYiyG7zKOtnEbxsw==",
       "dev": true,
       "requires": {
         "os-tmpdir": "~1.0.1"
@@ -18521,7 +18521,7 @@
     },
     "vue-clipboard2": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz",
       "integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==",
       "requires": {
         "clipboard": "^2.0.0"
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 71bf575c6..b3fae64e8 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -459,7 +459,14 @@ export default {
           case 'logs': {
             this.chartData = []
             elements.forEach((element, index) => {
-              this.chartData.push(this.dataJson[this.chartInfo.id + '_' + index].data.result)
+              const data = this.dataJson[this.chartInfo.id + '_' + index].data.result.map(item => {
+                this.allDataLength++
+                return {
+                  ...item,
+                  elements: element
+                }
+              })
+              this.chartData.push(data)
             })
             break
           }