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

Merge branch 'dev-3.7' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.8

Browse Source
This commit is contained in:
zhangyu
2023-07-20 18:12:11 +08:00
parent adbd03525a 4eac2b928e
commit 31d84624b5
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,7 +194,7 @@ export default {
}, },
// 参数 isRefresh 标识是否是刷新操作 // 参数 isRefresh 标识是否是刷新操作
getChartData (isRefresh, params) { // 获取chart的数据前的准备 主要用于处理时间参数 getChartData (isRefresh, params) { // 获取chart的数据前的准备 主要用于处理时间参数
if (!this.variablesInit || !this.timerInit) { // 变量未加载完成 不请求数据 if (!this.variablesInit) { // 变量未加载完成 不请求数据
return return
} }
this.chartData = window.dataJson ? this.chartData : [] this.chartData = window.dataJson ? this.chartData : []

1
nezha-fronted/src/components/page/dashboard/dashboard.vue
View File

@@ -103,7 +103,6 @@
<chart-list <chart-list
ref="chartList" ref="chartList"
:variablesInit="variablesInit" :variablesInit="variablesInit"
:timerInit="true"
name="dashboard" name="dashboard"
:dashboardId="showPanel.id" :dashboardId="showPanel.id"
:class="{'show-top':showTopBtn, 'is-dashboard': true}" :class="{'show-top':showTopBtn, 'is-dashboard': true}"