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

# Conflicts: # nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
2022-04-06 10:24:57 +08:00
parent 1f535bd87a 1ec39433ac
commit f446981d0e
9 changed files with 55 additions and 14 deletions
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -319,11 +319,11 @@ export default {
        nowTimeType: JSON.stringify(this.nowTimeType),
        searchTime: JSON.stringify(this.searchTime)
      }
-      // this.dateChange()
      // this.getTableData()
      const path = this.fromRoute.panel
      this.updatePath(param, path)
-      this.getData(this.filter)
+      this.dateChange()
+      // this.getData(this.filter)
      this.$refs.chartList.cleanData()
    },