diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue index 7ae3cebba..8f4e1b096 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue @@ -14,6 +14,35 @@ @changeTab="changeTab" > + - @@ -55,13 +79,17 @@ import subDataListMixin from '@/components/common/mixin/subDataList' import detailViewRightMixin from '@/components/common/mixin/detailViewRightMixin' import ipDetailsTable from '@/components/common/table/settings/ipDetailsTable' import ipDetailsBox from '@/components/common/rightBox/ipDetailsBox' +import topToolMoreOptions from '@/components/common/popBox/topToolMoreOptions' +import deleteButton from '@/components/common/deleteButton' export default { name: 'IpDetails', mixins: [dataListMixin, subDataListMixin, detailViewRightMixin], components: { nzBottomDataList, ipDetailsTable, - ipDetailsBox + ipDetailsBox, + topToolMoreOptions, + deleteButton }, data () { return { diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index 567087b2e..74d450187 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -215,6 +215,8 @@ export default { url = '/dc/cancelImport' } else if (this.importUrl.indexOf('/ipam/subnet') > -1) { url = '/ipam/subnet/cancelImport' + } else if (this.importUrl.indexOf('/ipam/ip') > -1) { + url = '/ipam/ip/cancelImport' } this.$delete(url + '?seq=' + this.importResult.seq).then(response => { if (response.code == 200) { @@ -310,6 +312,8 @@ export default { url = '/dc/template' } else if (this.importUrl.indexOf('/ipam/subnet') > -1) { url = '/ipam/subnet/template' + } else if (this.importUrl.indexOf('/ipam/ip') > -1) { + url = ' /ipam/ip/template' } if (!url) { console.error('no interface support') diff --git a/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue b/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue index b60f2b339..95cb5637c 100644 --- a/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue +++ b/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue @@ -20,9 +20,6 @@ - - -