diff options
| author | zyh <[email protected]> | 2023-11-01 17:24:40 +0800 |
|---|---|---|
| committer | zyh <[email protected]> | 2023-11-01 17:24:40 +0800 |
| commit | abd248793f635222cf4c856d7e43e6b30c58232f (patch) | |
| tree | 291f36f05a374064e69057510d1c2128da13c63c | |
| parent | 134217eae3200a9e5f9481ac9744ad4b0f3a7ea5 (diff) | |
NEZ-3309 fix：DashBoard templates双y轴图表中未显示双y轴
| -rw-r--r-- | nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss | 2 | ||||
| -rw-r--r-- | 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) |