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

NEZ-2208 feat：IPAM & ip detail批量导入页面开发

Browse Source
This commit is contained in:
zyh
2022-09-20 16:21:32 +08:00
parent 331da887f3
commit 5efbfebc2c
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
View File

@@ -15,8 +15,7 @@
>
<template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
<template v-slot:top-tool-right>
<button id="account-add" v-has="'ipam_add'" :title="$t('overall.createipamDetail')" class="top-tool-btn margin-r-10"
type="button" @click="add">
<button id="account-add" v-has="'ipam_add'" :title="$t('overall.createipamDetail')" class="top-tool-btn margin-r-10" type="button" @click="add">
<i class="nz-icon-create-square nz-icon"></i>
</button>
<top-tool-more-options
@@ -25,9 +24,9 @@
id="ipam-ip"
:params="searchLabel"
:permissions="{
import: 'ipam_add',
export: 'ipam_edit'
}"
import: 'ipam_add',
export: 'ipam_edit'
}"
class="top-tool-export margin-r-10"
export-file-name="ipam"
export-url="/ipam/ip/export"

18
nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
View File

@@ -240,7 +240,7 @@ export default {
language () { return this.$store.getters.getLanguage },
// 显示新版导入
importType () {
// asset module endpoint dc cabinet model alertRule
// asset module endpoint dc cabinet model alertRule ipamSubnet ipamIp
const arr = [
'/asset/asset/import',
'/monitor/module/import',
@@ -248,13 +248,15 @@ export default {
'/dc/import',
'/dc/cabinet/import',
'/asset/model/import',
'/alert/rule/import'
'/alert/rule/import',
'/ipam/subnet/import',
'/ipam/ip/import'
]
return arr.some(item => item === this.importUrl)
},
// 已存在的内容处理方式
showEexisted () {
// asset module endpoint dc cabinet model alertRule
// asset module endpoint dc cabinet model alertRule ipamSubnet ipamIp
const arr = [
'/asset/asset/import',
'/monitor/module/import',
@@ -262,13 +264,15 @@ export default {
'/dc/import',
'/dc/cabinet/import',
'/asset/model/import',
'/alert/rule/import'
'/alert/rule/import',
'/ipam/subnet/import',
'/ipam/ip/import'
]
return arr.some(item => item === this.importUrl)
},
// 遇到错误是否继续导入
showIgnoreError () {
// asset module endpoint dc cabinet model alertRule
// asset module endpoint dc cabinet model alertRule ipamSubnet ipamIp
const arr = [
'/asset/asset/import',
'/monitor/module/import',
@@ -276,7 +280,9 @@ export default {
'/dc/import',
'/dc/cabinet/import',
'/asset/model/import',
'/alert/rule/import'
'/alert/rule/import',
'/ipam/subnet/import',
'/ipam/ip/import'
]
return arr.some(item => item === this.importUrl)
},