Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4
# Conflicts: # nezha-fronted/src/components/page/dashboard/panel.vue
This commit is contained in:
@@ -146,6 +146,7 @@
|
||||
|
||||
<script>
|
||||
import { chartCache } from '@/components/common/js/common'
|
||||
import { data as le5leData, observers as le5leObservers } from 'le5le-store/store/data.js'
|
||||
import chartRightBox from '@/components/common/rightBox/chart/chartRightBox'
|
||||
import bus from '../../../libs/bus'
|
||||
import pickTime from '../../common/pickTime'
|
||||
@@ -639,6 +640,7 @@ export default {
|
||||
if (!this.hasButton('panel_view')) {
|
||||
return
|
||||
}
|
||||
this.dataList = []
|
||||
this.chartListLoading = true
|
||||
if (params.start_time === '' || params.end_time === '') {
|
||||
const now = bus.getTimezontDateRange()
|
||||
@@ -647,6 +649,18 @@ export default {
|
||||
params.start_time = startTimeTmp
|
||||
params.end_time = endTimeTmp
|
||||
}
|
||||
if (le5leData) {
|
||||
Object.keys(le5leData).forEach(key => {
|
||||
le5leData[key] = null
|
||||
delete le5leData[key]
|
||||
})
|
||||
}
|
||||
if (le5leObservers) {
|
||||
Object.keys(le5leObservers).forEach(key => {
|
||||
le5leObservers[key] = null
|
||||
delete le5leObservers[key]
|
||||
})
|
||||
}
|
||||
this.$get('visual/panel/chart?panelId=' + params.panelId + '&groupId=0' + '&pageSize=-1').then(response => {
|
||||
if (response.code === 200) {
|
||||
this.chartListLoading = false
|
||||
|
||||
Reference in New Issue
Block a user