diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss b/nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss
index 58281a018..029964ee1 100644
--- a/nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss
@@ -24,3 +24,17 @@
white-space:nowrap;
width: 199px;
}
+.ip-detail-available,.ip-detail-transient,.ip-detail-used {
+ font-size: 12px;
+ margin-right: 3px;
+ display: inline-block;
+}
+.ip-detail-used {
+ color: $--color-danger !important;
+}
+.ip-detail-transient {
+ color:$--color-silence !important;
+}
+.ip-detail-available {
+ color:$--color-success !important;
+}
diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index e9dad029b..a0266a7c8 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -254,10 +254,10 @@ export default {
{ prop: 'agent', name: this.$t('config.agent.scrapeEndpoint'), active: true }
],
ipam: [
- { prop: 'ipam', name: this.$t('config.ipam.ipDetails'), active: true }
+ { prop: 'ipam', name: this.$t('ipam.subnet.ipDetails'), active: true }
],
alertSilence: [
- { prop: 'alertMessageTab', name: this.$t('config.ipam.alertSilence'), active: true }
+ { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true }
]
}
}
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 371880a00..61abbd155 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -16,7 +16,7 @@
>
{{obj.name}}
-
+
@@ -153,6 +153,9 @@ export default {
immediate: true,
handler (n) {
if (n) {
+ if (this.from === fromRoute.alertSilence) {
+ this.state = '2'
+ }
this.getTableData()
}
}
diff --git a/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue b/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue
index 95cb5637c..61ea90f1c 100644
--- a/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue
@@ -44,14 +44,35 @@