diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index f2245ec96..039135ccc 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -240,26 +240,26 @@ export default { language () { return this.$store.getters.getLanguage }, // 显示新版导入 importType () { - // asset module endpoint dc cabinet - const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import'] + // 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'] return arr.some(item => item === this.importUrl) }, // 已存在的内容处理方式 showEexisted () { - // asset module endpoint dc cabinet - const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import'] + // 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'] return arr.some(item => item === this.importUrl) }, // 遇到错误是否继续导入 showIgnoreError () { - // asset module endpoint dc cabinet - const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import'] + // 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'] return arr.some(item => item === this.importUrl) }, // 是否同步更新关联的dashboard showSyncDashboard () { - // asset endpoint - const arr = ['/asset/asset/import', '/monitor/endpoint/import'] + // asset endpoint model + const arr = ['/asset/asset/import', '/monitor/endpoint/import', '/asset/model/import'] return arr.some(item => item === this.importUrl) }, // 是否同步更新关联的endpoint diff --git a/nezha-fronted/src/components/page/config/ldap.vue b/nezha-fronted/src/components/page/config/ldap.vue index 7dacce8dc..08d51717d 100644 --- a/nezha-fronted/src/components/page/config/ldap.vue +++ b/nezha-fronted/src/components/page/config/ldap.vue @@ -78,7 +78,3 @@ export default { } } - - diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue index 2dbce9d7f..2de76ce92 100644 --- a/nezha-fronted/src/components/page/config/model.vue +++ b/nezha-fronted/src/components/page/config/model.vue @@ -10,8 +10,7 @@ @search="search" > @@ -64,8 +64,7 @@ @getTableData="getTableData" >