From 21318c1b71af6a93214dbd1a1cc64b037cd7a955 Mon Sep 17 00:00:00 2001 From: Qiuxia Fan Date: Thu, 17 Feb 2022 23:05:48 +0800 Subject: [PATCH] fix: bugs fix --- .../related/topology/components/Graph.vue | 6 +- .../topology/components/PodTopology.vue | 2 +- .../related/topology/components/Sankey.vue | 9 +- .../related/topology/components/Settings.vue | 82 ++++++++++--------- 4 files changed, 54 insertions(+), 45 deletions(-) diff --git a/src/views/dashboard/related/topology/components/Graph.vue b/src/views/dashboard/related/topology/components/Graph.vue index ea678c38..f394f279 100644 --- a/src/views/dashboard/related/topology/components/Graph.vue +++ b/src/views/dashboard/related/topology/components/Graph.vue @@ -206,7 +206,7 @@ function handleLinkClick(event: any, d: Call) { event.stopPropagation(); topologyStore.setNode(null); topologyStore.setLink(d); - if (settings.value.linkDashboard) { + if (!settings.value.linkDashboard) { return; } const e = @@ -239,9 +239,7 @@ function update() { topologyStore.nodeMetrics[m].values.filter( (val: { id: string; value: unknown }) => val.id === data.id )[0] || {}; - const val = m.includes("_sla") - ? metric.value / 100 - : metric.value.value; + const val = m.includes("_sla") ? metric.value / 100 : metric.value; return `
${m}: ${val}
`; }); return [ diff --git a/src/views/dashboard/related/topology/components/PodTopology.vue b/src/views/dashboard/related/topology/components/PodTopology.vue index 4674753d..3a58c22c 100644 --- a/src/views/dashboard/related/topology/components/PodTopology.vue +++ b/src/views/dashboard/related/topology/components/PodTopology.vue @@ -213,7 +213,7 @@ function handleClick(event: any) { position: absolute; top: 40px; right: 0; - width: 360px; + width: 380px; height: 700px; background-color: #2b3037; overflow: auto; diff --git a/src/views/dashboard/related/topology/components/Sankey.vue b/src/views/dashboard/related/topology/components/Sankey.vue index e42b1702..4aa6a656 100644 --- a/src/views/dashboard/related/topology/components/Sankey.vue +++ b/src/views/dashboard/related/topology/components/Sankey.vue @@ -82,7 +82,8 @@ function linkTooltip(data: Call) { (val: { id: string; value: unknown }) => val.id === data.id )[0]; if (metric) { - return `
${m}: ${metric.value}
`; + const val = m.includes("_sla") ? metric.value / 100 : metric.value; + return `
${m}: ${val}
`; } }); const htmlClient = clientMetrics.map((m) => { @@ -90,7 +91,8 @@ function linkTooltip(data: Call) { (val: { id: string; value: unknown }) => val.id === data.id )[0]; if (metric) { - return `
${m}: ${metric.value}
`; + const val = m.includes("_sla") ? metric.value / 100 : metric.value; + return `
${m}: ${val}
`; } }); const html = [ @@ -109,7 +111,8 @@ function nodeTooltip(data: Node) { topologyStore.nodeMetrics[m].values.filter( (val: { id: string; value: unknown }) => val.id === data.id )[0] || {}; - return `
${m}: ${metric.value}
`; + const val = m.includes("_sla") ? metric.value / 100 : metric.value; + return `
${m}: ${val}
`; }); return [`
name: ${data.serviceName}
`, ...html].join( " " diff --git a/src/views/dashboard/related/topology/components/Settings.vue b/src/views/dashboard/related/topology/components/Settings.vue index 8e0485de..80dc76b8 100644 --- a/src/views/dashboard/related/topology/components/Settings.vue +++ b/src/views/dashboard/related/topology/components/Settings.vue @@ -50,40 +50,42 @@ limitations under the License. -->
{{ t("nodeSettings") }}
-
{{ t("nodeDashboard") }}
-
- - - - +
{{ t("nodeDashboard") }}
+
+ - - -
+ + + + +
+
{{ t("nodeMetrics") }}
@change="changeNodeMetrics" />
-
+
{{ t("legendSettings") }}
{{ t("metrics") }}
- dashboardStore.entity === (MetricCatalog as any)[d.catalog] + (d: { catalog: string }) => entity === (MetricCatalog as any)[d.catalog] ); const e = dashboardStore.entity === EntityType[1].value @@ -358,7 +366,7 @@ async function changeNodeMetrics(options: Option[]) { } .input-small { - width: 60px; + width: 45px; } .title { @@ -371,7 +379,7 @@ async function changeNodeMetrics(options: Option[]) { } .legend-btn { - margin-top: 20px; + margin: 20px 0; cursor: pointer; }