diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index c2775694a..debb68b54 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -31,7 +31,7 @@ } .list-width{ width: 100%; - /*height: 100%;*/ + //height: 100%; padding: 0 10px 5px 10px; box-sizing: border-box; overflow: hidden;/*避免鼠标第一次放到曲线时,x轴出现滚动条后消失*/ @@ -723,6 +723,7 @@ export default { response.data.list.forEach((item, index) => { item.isLoaded = false }) + this.$emit('panel-list-loading', response.data.list) // chart数据存在dataTotalListBak中 if (response.data.list.length > 0) { this.dataTotalListBak = response.data.list diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index e00073546..a937a9db9 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -80,8 +80,8 @@
-
- +
+
@@ -124,6 +124,7 @@ export default { panelLock: true, showTopBtn: false, // top按钮 visible: false, + chartListLoading: true, rightBox: { // 面板弹出框相关 chart: { show: false }, chartTemp: { show: false }, @@ -835,6 +836,13 @@ export default { wrap.scrollTop = currentTop } }, 20) + }, + load (dataList) { + if (dataList.length > 0) { + this.chartListLoading = false + } else { + this.chartListLoading = !dataList.length === 0 + } } }, created () {