From 068d66e1f3a39c7a67a8990ec88549f26fc91275 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Thu, 16 Dec 2021 18:15:52 +0800 Subject: [PATCH] =?UTF-8?q?=20NEZ-1433=20feat:chart-endpointInfo=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chart.vue | 2 +- .../components/chart/chart/chartAssetInfo.vue | 17 +-- .../chart/chart/chartEndpointInfo.vue | 12 +- .../src/components/chart/chartDetail.vue | 115 +++++++++--------- .../src/components/chart/chartList.vue | 27 ++-- .../src/components/chart/panelChart.vue | 34 +++--- .../common/bottomBox/tabs/panelTabNew.vue | 62 +++++++--- nezha-fronted/src/components/common/login.vue | 6 +- 8 files changed, 143 insertions(+), 132 deletions(-) diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue index 90a146ef5..8bcb1e917 100644 --- a/nezha-fronted/src/components/chart/chart.vue +++ b/nezha-fronted/src/components/chart/chart.vue @@ -196,7 +196,7 @@ export default { }, computed: { isNoData () { - return lodash.isEmpty(this.chartData) && ['text', 'url'].indexOf(this.chartInfo.type) === -1 + return lodash.isEmpty(this.chartData) && ['text', 'url', 'assetInfo', 'endpointInfo'].indexOf(this.chartInfo.type) === -1 }, chartOption () { if (this.customChartOption) { diff --git a/nezha-fronted/src/components/chart/chart/chartAssetInfo.vue b/nezha-fronted/src/components/chart/chart/chartAssetInfo.vue index 203357cc4..3ba9e19ce 100644 --- a/nezha-fronted/src/components/chart/chart/chartAssetInfo.vue +++ b/nezha-fronted/src/components/chart/chart/chartAssetInfo.vue @@ -1,5 +1,5 @@ - - diff --git a/nezha-fronted/src/components/chart/chart/chartEndpointInfo.vue b/nezha-fronted/src/components/chart/chart/chartEndpointInfo.vue index 66e8e2a81..3e995ccdf 100644 --- a/nezha-fronted/src/components/chart/chart/chartEndpointInfo.vue +++ b/nezha-fronted/src/components/chart/chart/chartEndpointInfo.vue @@ -1,12 +1,16 @@ - - diff --git a/nezha-fronted/src/components/chart/chartDetail.vue b/nezha-fronted/src/components/chart/chartDetail.vue index ec77df14f..5fb37c544 100644 --- a/nezha-fronted/src/components/chart/chartDetail.vue +++ b/nezha-fronted/src/components/chart/chartDetail.vue @@ -1,32 +1,33 @@ - + @@ -121,7 +130,7 @@