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

# Conflicts:
#	nezha-fronted/src/components/layout/path_navigation/PathNavigation.vue
This commit is contained in:
zhangyu
2021-05-10 16:37:19 +08:00
33 changed files with 596 additions and 784 deletions

View File

@@ -155,7 +155,7 @@ export const alertMessage = {
{ value: 'P3', label: i18n.t('alert.config.P3') }
],
states: [
{ value: '1', label: i18n.t('alert.list.pending') },
{ value: '1', label: i18n.t('overall.active') },
{ value: '2', label: i18n.t('overall.silence') },
{ value: '3', label: i18n.t('alert.list.expired') }
]
@@ -172,6 +172,55 @@ export const statisticsList = [
{ value: 'different', label: i18n.t('dashboard.panel.chartForm.statisticsVal.different') }
]
export const chart = {
varType: [
{ value: '1', label: i18n.t('asset.asset') },
{ value: '2', label: i18n.t('asset.endpoint') }
],
type: [
{
value: 'line',
label: i18n.t('dashboard.panel.chartForm.typeVal.line.label')
},
{
value: 'stackArea',
label: i18n.t('dashboard.panel.chartForm.typeVal.stackArea.label')
},
{
value: 'bar',
label: i18n.t('dashboard.panel.chartForm.typeVal.bar.label')
},
{
value: 'singleStat',
label: i18n.t('dashboard.panel.chartForm.typeVal.singleStat.label')
},
{
value: 'pie',
label: i18n.t('dashboard.panel.chartForm.typeVal.pie.label')
},
{
value: 'table',
label: i18n.t('dashboard.panel.chartForm.typeVal.table.label')
},
{
value: 'alertList',
label: i18n.t('dashboard.panel.chartForm.typeVal.alertList.label')
},
{
value: 'text',
label: i18n.t('dashboard.panel.chartForm.typeVal.text.label')
},
{
value: 'url',
label: i18n.t('dashboard.panel.chartForm.typeVal.url.label')
},
{
value: 'group',
label: i18n.t('dashboard.panel.chartForm.typeVal.group.label')
}
]
}
export const intervalList = [
{ value: -1, label: i18n.t('dashboard.panel.refreshInterval.never') },
{ value: 30, label: '30s' },