diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index 039135ccc..dbbd56e57 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -240,20 +240,44 @@ export default { language () { return this.$store.getters.getLanguage }, // 显示新版导入 importType () { - // asset module endpoint dc cabinet model - const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import', '/asset/model/import'] + // asset module endpoint dc cabinet model alertRule + const arr = [ + '/asset/asset/import', + '/monitor/module/import', + '/monitor/endpoint/import', + '/dc/import', + '/dc/cabinet/import', + '/asset/model/import', + '/alert/rule/import' + ] return arr.some(item => item === this.importUrl) }, // 已存在的内容处理方式 showEexisted () { - // asset module endpoint dc cabinet model - const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import', '/asset/model/import'] + // asset module endpoint dc cabinet model alertRule + const arr = [ + '/asset/asset/import', + '/monitor/module/import', + '/monitor/endpoint/import', + '/dc/import', + '/dc/cabinet/import', + '/asset/model/import', + '/alert/rule/import' + ] return arr.some(item => item === this.importUrl) }, // 遇到错误是否继续导入 showIgnoreError () { - // asset module endpoint dc cabinet model - const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import', '/asset/model/import'] + // asset module endpoint dc cabinet model alertRule + const arr = [ + '/asset/asset/import', + '/monitor/module/import', + '/monitor/endpoint/import', + '/dc/import', + '/dc/cabinet/import', + '/asset/model/import', + '/alert/rule/import' + ] return arr.some(item => item === this.importUrl) }, // 是否同步更新关联的dashboard diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue index 2cb2fe53a..845ebc9a2 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue @@ -76,8 +76,7 @@ - +