diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index e6846df96..0fba8614b 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -82,6 +82,10 @@
+
+
+
+
@@ -241,6 +245,11 @@ export default {
{ prop: 'moduleAlertMessage', name: this.$t('overall.alert') }
]
},
+ softwareAsset: {
+ softwareAssetTabTitle: [
+ { prop: 'endpoint', name: this.$t('asset.endpoint') },
+ ]
+ },
endpoint: {
endpointTabTitle: [
{ prop: 'dashboardTab', name: this.$t('overall.dashboard') },
@@ -268,6 +277,9 @@ export default {
model: [
{ prop: 'asset', name: this.$t('asset.asset'), active: true }
],
+ softwareType: [
+ { prop: 'asset', name: this.$t('asset.asset'), active: true }
+ ],
dc: {
cabinet: [
{ prop: 'cabinet', name: this.$t('asset.cabinet'), active: true },
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
index 46c5ba665..da4465659 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
@@ -233,6 +233,7 @@ export default {
// this.$store.commit('addConsole', consoleParam)
},
getTableData (params) {
+ let url = this.url
if (params && Object.keys(params).length > 0) {
for (const key in params) {
this.$set(this.searchLabel, key, params[key])
@@ -249,9 +250,12 @@ export default {
this.$set(this.searchLabel, 'modelIds', this.obj.id)
} else if (this.from === fromRoute.dc) {
this.$set(this.searchLabel, 'dcIds', this.obj.id)
+ } else if (this.from === fromRoute.softwareType) {
+ url = '/asset/software'
+ this.$set(this.searchLabel, 'typeIds', this.obj.id)
}
this.tools.loading = true
- this.$get(this.url, { ...this.searchLabel, ...this.searchCheckBox }).then(response => {
+ this.$get(url, { ...this.searchLabel, ...this.searchCheckBox }).then(response => {
this.tools.loading = false
if (response.code === 200) {
for (let i = 0; i < response.data.list.length; i++) {
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
index b233c42d1..6d2e68443 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
@@ -138,6 +138,8 @@ export default {
params.moduleIds = this.obj.id
} else if (this.from === fromRoute.asset) {
params.assetIds = this.obj.id
+ } else if (this.from === fromRoute.softwareAsset) {
+ params.softwareAssetIds = this.obj.id
}
this.$get(this.url, params).then(response => {
this.tools.loading = false
diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js
index 11ffc53bb..07a03d330 100644
--- a/nezha-fronted/src/components/common/js/constants.js
+++ b/nezha-fronted/src/components/common/js/constants.js
@@ -424,6 +424,8 @@ export const fromRoute = {
assetType: 'assetType',
assetState: 'assetState',
assetLabel: 'assetLabel',
+ softwareAsset: 'softwareAsset',
+ softwareType: 'softwareType',
assetDiscovery: 'assetDiscovery',
user: 'user',
agent: 'agent',
diff --git a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
index 09854fe6e..c138b8ae7 100644
--- a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
@@ -92,7 +92,7 @@
{{$t('overall.option')}}
-
+
diff --git a/nezha-fronted/src/components/page/asset/software/softwareAsset.vue b/nezha-fronted/src/components/page/asset/software/softwareAsset.vue
index 6189325a9..b3449e6c7 100644
--- a/nezha-fronted/src/components/page/asset/software/softwareAsset.vue
+++ b/nezha-fronted/src/components/page/asset/software/softwareAsset.vue
@@ -4,7 +4,7 @@
ref="dataList"
:api="url"
:custom-table-title.sync="tools.customTableTitle"
- :from="fromRoute.model"
+ :from="fromRoute.softwareAsset"
:layout="['searchInput', 'elementSet', 'pagination']"
:search-msg="searchMsg"
@search="search"
diff --git a/nezha-fronted/src/components/page/asset/software/softwareType.vue b/nezha-fronted/src/components/page/asset/software/softwareType.vue
index bc987b7c0..d0650510d 100644
--- a/nezha-fronted/src/components/page/asset/software/softwareType.vue
+++ b/nezha-fronted/src/components/page/asset/software/softwareType.vue
@@ -4,7 +4,7 @@
ref="dataList"
:api="url"
:custom-table-title.sync="tools.customTableTitle"
- :from="fromRoute.model"
+ :from="fromRoute.softwareType"
:layout="['searchInput', 'elementSet', 'pagination']"
:search-msg="searchMsg"
@search="search"