From dd1dadbc12b9c8664a45277ff7e05598829ea027 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Fri, 3 Dec 2021 11:48:17 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-1390=20=20feat:=20endpoint=20metric=20info?= =?UTF-8?q?=20=E5=9B=BE=E6=A0=87=20hover=20=E6=98=BE=E7=A4=BA=20metadata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/common.scss | 9 ++ .../src/assets/css/common/tableCommon.scss | 5 + .../src/components/common/alert/nzTooltip.vue | 103 ------------------ .../src/components/common/metaData.vue | 25 +++++ .../common/table/special/endpointQueryTab.vue | 26 +++-- 5 files changed, 53 insertions(+), 115 deletions(-) create mode 100644 nezha-fronted/src/components/common/metaData.vue diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 0d44c5092..802476418 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -342,3 +342,12 @@ td .nz-icon-gear:before{ border-top: none; } } + +.el-tooltip__popper.is-dark { + background-color: $--background-color-empty !important; + color: $--color-text-regular !important; + border: 1px solid $--border-color-light; +} +.project-calendar.nz-input-group-middle { + border: 1px solid $--border-color-light; +} diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 97bb2963f..9eebdf6f1 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -113,6 +113,11 @@ width: auto; min-width: 36px; } + .top-tools--sub.top-tools { + background-color: $--background-color-empty; + padding: 0 70px 0 15px; + height: 44px; + } .top-tools--sub { .top-tool-left { height: 100%; diff --git a/nezha-fronted/src/components/common/alert/nzTooltip.vue b/nezha-fronted/src/components/common/alert/nzTooltip.vue index 54623b3a1..82c27f1b2 100644 --- a/nezha-fronted/src/components/common/alert/nzTooltip.vue +++ b/nezha-fronted/src/components/common/alert/nzTooltip.vue @@ -82,106 +82,3 @@ export default { } - diff --git a/nezha-fronted/src/components/common/metaData.vue b/nezha-fronted/src/components/common/metaData.vue new file mode 100644 index 000000000..a26fa1256 --- /dev/null +++ b/nezha-fronted/src/components/common/metaData.vue @@ -0,0 +1,25 @@ + + + diff --git a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue index cbf47af4f..ad4357ca3 100644 --- a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue +++ b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue @@ -24,16 +24,9 @@ :show-overflow-tooltip="true" :label="$t('project.endpoint.element')"> @@ -87,12 +80,14 @@ import axios from 'axios' import bus from '../../../../libs/bus' import chart from '@/components/page/dashboard/overview/chart' import { sameLabels } from '@/components/common/js/constants' +import metaData from '@/components/common/metaData' export default { name: 'endpointQueryTab', components: { chartBox, - chart + chart, + metaData }, props: { from: {}, @@ -153,7 +148,9 @@ export default { pageSize: 20, pageNo: 1, total: 0 - } + }, + metaDataList: [], + metaName: '' } }, methods: { @@ -552,6 +549,11 @@ export default { (this.pageObj.pageNo - 1) * this.pageObj.pageSize, this.pageObj.pageNo * this.pageObj.pageSize ) + }, + metricMetaData (data) { + this.$get('/prom/api/v1/metadata?' + 'metric=' + data.metricTip.metric + '&limit=' + 1).then(res => { + this.metaDataList = res.data.jvm_gc_live_data_size_bytes + }) } }, computed: {