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

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

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/charts/chart-alert-list.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
#	nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
This commit is contained in:
zhangyu
2022-04-12 10:46:19 +08:00
parent 8a2118f268 87c48a8f35
commit 257814f6b0
53 changed files with 55 additions and 12696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
View File

@@ -139,7 +139,7 @@
import bus from '../../../../libs/bus'
import axios from 'axios'
import table from '@/components/common/mixin/table'
import chartDataFormat from '../../../charts/chartDataFormat'
import chartDataFormat from '../../../chart/chartDataFormat'
import alertRuleInfo from '../../alert/alertRuleInfo'
import { calcDurationByStringTimeB } from '../../js/tools'
import { alertMessage as alertMessageConstant } from '@/components/common/js/constants'