diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index be0f616b9..9def618c8 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -44,10 +44,11 @@
-
+
+
@@ -61,6 +62,7 @@ import endpointQuery from './tabs/endpointQuery'
import endpointTab from './tabs/endpointTab'
import endpointTabNew from './tabs/endpointTabNew'
import panelTab from './tabs/panelTab'
+import panelTabNew from './tabs/panelTabNew'
import terminalLogRecordTab from './tabs/terminalLogRecordTab'
import terminalLogMonitorTab from './tabs/terminalLogMonitorTab'
import terminalLogCMDTab from './tabs/terminalLogCMDTab'
@@ -82,7 +84,8 @@ export default {
'terminal-log-cmd-tab': terminalLogCMDTab,
endpointTabNew,
alertMessageTabNew,
- endpointQuery
+ endpointQuery,
+ panelTabNew
},
props: {
isFullScreen: Boolean, // 是否全屏
@@ -114,13 +117,15 @@ export default {
module: {
moduleTabTitle: [
{ prop: 'endpoint', name: this.$t('asset.tableTitle.endpoint') },
- { prop: 'moduleAlertMessage', name: 'AlertMessage' }
+ { prop: 'moduleAlertMessage', name: 'Alerts' },
+ { prop: 'panel', name: 'Detail' }
]
},
endpoint: {
endpointTabTitle: [
- { prop: 'endpointQuery', name: 'EndpointQuery' },
- { prop: 'endpointAlertMessage', name: 'AlertMessage' }
+ { prop: 'endpointQuery', name: 'Query' },
+ { prop: 'endpointAlertMessage', name: 'Alerts' },
+ { prop: 'panel', name: 'Detail' }
]
}
}
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
index 24b833cf3..4dd888b01 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
@@ -54,7 +54,7 @@
:formatTime="formatTime"
:hideSameLabels="hideSameLabels"
:queryExpression="queryExpression"
- @changSelection="changSelection"
+ @changSelection="changSelectionF"
/>
@@ -157,9 +157,21 @@ export default {
}, 700)
}
},
- changSelection (arr) {
+ changSelectionF (arr) {
this.changSelection = arr
- }
+ },
+ toTop (wrap) {
+ let currentTop = wrap.scrollTop
+ const interval = currentTop / 10
+ const intervalFunc = setInterval(function () { // 花200ms分10次回到顶部,模拟动画效果
+ if (currentTop === 0) {
+ clearInterval(intervalFunc)
+ } else {
+ currentTop = (currentTop - interval) < interval * 0.5 ? 0 : currentTop - interval
+ wrap.scrollTop = currentTop
+ }
+ }, 20)
+ },
}
}
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
new file mode 100644
index 000000000..526177bd8
--- /dev/null
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -0,0 +1,681 @@
+
+
+
+ {{obj.name}}
+
+
+
+
+
+
+
+
+
+
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 71b8d6d95..6a3fe3843 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -6,7 +6,7 @@
-
+
@@ -110,7 +110,7 @@
-
+
{{topologyInfo.name}}