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

# Conflicts:
#	.gitignore
#	nezha-fronted/src/assets/css/font/iconfont.js
#	nezha-fronted/src/components/chart/chart/chartAutotopology.vue
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/js/common.js
#	nezha-fronted/src/components/common/js/tools.js
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/static/config.json
This commit is contained in:
zhangyu
2022-07-14 10:19:06 +08:00
519 changed files with 13170 additions and 16 deletions

View File

@@ -144,6 +144,7 @@
</template>
<script>
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'
@@ -562,6 +563,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()
@@ -570,6 +572,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