diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index d04ac8f76..f2245ec96 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -240,20 +240,20 @@ export default { language () { return this.$store.getters.getLanguage }, // 显示新版导入 importType () { - // asset module endpoint - const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import'] + // asset module endpoint dc cabinet + const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import'] return arr.some(item => item === this.importUrl) }, // 已存在的内容处理方式 showEexisted () { - // asset module endpoint - const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import'] + // asset module endpoint dc cabinet + const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import'] return arr.some(item => item === this.importUrl) }, // 遇到错误是否继续导入 showIgnoreError () { - // asset module endpoint - const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import'] + // asset module endpoint dc cabinet + const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import'] return arr.some(item => item === this.importUrl) }, // 是否同步更新关联的dashboard @@ -441,11 +441,11 @@ export default { const language = localStorage.getItem('nz-language') || 'en' // 初始未选择默认 en 英文 // 导出模板后缀 let suffix = '.xlsx' - if (this.importBox.templateFormat == 1) { + if (templateFormat == 1) { suffix = '.xlsx' - } else if (this.importBox.templateFormat == 2) { + } else if (templateFormat == 2) { suffix = '.csv' - } else if (this.importBox.templateFormat == 3) { + } else if (templateFormat == 3) { suffix = '.json' } const fileName = this.exportFileName + '-' + this.$t('overall.template') + '-' + this.getTimeString() + suffix diff --git a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue index 70995c055..a46bdac57 100644 --- a/nezha-fronted/src/components/common/table/settings/cabinetTable.vue +++ b/nezha-fronted/src/components/common/table/settings/cabinetTable.vue @@ -61,7 +61,7 @@ import table from '@/components/common/mixin/table' import Template from '../../../page/config/template' import alertDaysInfo from '@/components/common/alert/alertDaysInfo' export default { - name: 'cabinet Table', + name: 'cabinetTable', components: { Template, alertDaysInfo }, mixins: [table], props: { diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index 2e5ed2211..1a9f617f9 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -28,9 +28,9 @@ :params="searchLabel" :params2="searchCheckBox" :permissions="{ - import: 'dc_add', - export: 'dc_edit' - }" + import: 'dc_add', + export: 'dc_edit' + }" class="top-tool-export margin-r-10 margin-l-10" export-file-name="datacenter" export-url="/dc/export" @@ -65,7 +65,7 @@ > @@ -84,8 +84,7 @@ @getTableData="getTableData" > diff --git a/nezha-fronted/src/components/page/monitor/project/project.vue b/nezha-fronted/src/components/page/monitor/project/project.vue index 0150fca85..2bf9bc5b4 100644 --- a/nezha-fronted/src/components/page/monitor/project/project.vue +++ b/nezha-fronted/src/components/page/monitor/project/project.vue @@ -3,29 +3,40 @@ - + + - + + - + +