From abd248793f635222cf4c856d7e43e6b30c58232f Mon Sep 17 00:00:00 2001 From: zyh Date: Wed, 1 Nov 2023 17:24:40 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-3309=20fix=EF=BC=9ADashBoard=20templates?= =?UTF-8?q?=E5=8F=8Cy=E8=BD=B4=E5=9B=BE=E8=A1=A8=E4=B8=AD=E6=9C=AA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=8Cy=E8=BD=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/common/bottomBox/bottomBox.scss | 2 +- nezha-fronted/src/components/chart/panelChart.vue | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss index 27e60897f..3a9419775 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -233,7 +233,7 @@ .bottom-box__top .my-loading-box { height: calc(100% + 20px) !important; } - .my-loading-parent--relative{ + .my-loading-parent--relative:not(.panel-chart){ height: calc(100% - 20px) !important; } } diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index fce3d9ced..679671164 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/nezha-fronted/src/components/chart/panelChart.vue @@ -271,11 +271,11 @@ export default { case 'logs': { if (this.from === fromRoute.chartTemp || this.from === fromRoute.dashboardTemp || this.from === fromRoute.integration) { setTimeout(() => { - this.chartData = [chartTempData.data.result] - this.chartData.forEach(item => { - item.forEach(children => { - children.elements = elements[0] - }) + this.chartData = [] + elements.forEach(item => { + const data = this.$lodash.cloneDeep(chartTempData.data.result) + data[0].elements = item + this.chartData.push(data) }) this.loading = false }, 100)