gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-3309 fix：DashBoard templates双y轴图表中未显示双y轴

Browse Source
This commit is contained in:
zyh
2023-11-01 17:24:40 +08:00
parent 134217eae3
commit abd248793f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
View File

@@ -233,7 +233,7 @@
.bottom-box__top .my-loading-box { .bottom-box__top .my-loading-box {
height: calc(100% + 20px) !important; height: calc(100% + 20px) !important;
} }
.my-loading-parent--relative{ .my-loading-parent--relative:not(.panel-chart){
height: calc(100% - 20px) !important; height: calc(100% - 20px) !important;
} }
} }

10
nezha-fronted/src/components/chart/panelChart.vue
View File

@@ -271,11 +271,11 @@ export default {
case 'logs': { case 'logs': {
if (this.from === fromRoute.chartTemp || this.from === fromRoute.dashboardTemp || this.from === fromRoute.integration) { if (this.from === fromRoute.chartTemp || this.from === fromRoute.dashboardTemp || this.from === fromRoute.integration) {
setTimeout(() => { setTimeout(() => {
this.chartData = [chartTempData.data.result] this.chartData = []
this.chartData.forEach(item => { elements.forEach(item => {
item.forEach(children => { const data = this.$lodash.cloneDeep(chartTempData.data.result)
children.elements = elements[0] data[0].elements = item
}) this.chartData.push(data)
}) })
this.loading = false this.loading = false
}, 100) }, 100)