From cdeb0c520b903082648066c553e0c00377b95bea Mon Sep 17 00:00:00 2001 From: Qiuxia Fan Date: Fri, 1 Apr 2022 21:54:45 +0800 Subject: [PATCH] fix query --- src/layout/components/NavBar.vue | 3 +++ src/views/dashboard/controls/Widget.vue | 25 ++++++++++++++----------- src/views/dashboard/panel/Tool.vue | 7 +++++-- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/layout/components/NavBar.vue b/src/layout/components/NavBar.vue index 126619c2..9b571dcf 100644 --- a/src/layout/components/NavBar.vue +++ b/src/layout/components/NavBar.vue @@ -94,6 +94,9 @@ watch( } ); async function getVersion() { + if (appStore.version) { + return; + } const res = await appStore.fetchVersion(); if (res.errors) { ElMessage.error(res.errors); diff --git a/src/views/dashboard/controls/Widget.vue b/src/views/dashboard/controls/Widget.vue index 29c50792..131f5f2a 100644 --- a/src/views/dashboard/controls/Widget.vue +++ b/src/views/dashboard/controls/Widget.vue @@ -109,11 +109,14 @@ export default defineComponent({ const selectorStore = useSelectorStore(); const graph = computed(() => props.data.graph || {}); const widget = computed(() => props.data.widget || {}); - const isList = ListChartTypes.includes( - (props.data.graph && props.data.graph.type) || "" + const isList = computed(() => + ListChartTypes.includes((props.data.graph && props.data.graph.type) || "") ); - if ((props.needQuery || !dashboardStore.currentDashboard.id) && !isList) { + if ( + (props.needQuery || !dashboardStore.currentDashboard.id) && + !isList.value + ) { queryMetrics(); } @@ -162,11 +165,8 @@ export default defineComponent({ if (props.data.i !== dashboardStore.selectedGrid.i) { return; } - const isList = ListChartTypes.includes( - (props.data.graph && props.data.graph.type) || "" - ); const chart = dashboardStore.selectedGrid.graph || {}; - if (ListChartTypes.includes(chart.type) || isList) { + if (ListChartTypes.includes(chart.type) || isList.value) { return; } queryMetrics(); @@ -175,10 +175,7 @@ export default defineComponent({ watch( () => [selectorStore.currentService, selectorStore.currentDestService], () => { - const isList = ListChartTypes.includes( - (props.data.graph && props.data.graph.type) || "" - ); - if (isList) { + if (isList.value) { return; } if ( @@ -195,12 +192,18 @@ export default defineComponent({ if (dashboardStore.entity === EntityType[0].value) { return; } + if (isList.value) { + return; + } queryMetrics(); } ); watch( () => appStore.durationTime, () => { + if (isList.value) { + return; + } if (dashboardStore.entity === EntityType[1].value) { queryMetrics(); } diff --git a/src/views/dashboard/panel/Tool.vue b/src/views/dashboard/panel/Tool.vue index 0b83d014..ab91a37e 100644 --- a/src/views/dashboard/panel/Tool.vue +++ b/src/views/dashboard/panel/Tool.vue @@ -245,9 +245,9 @@ async function setSourceSelector() { return; } const pod = params.podId || selectorStore.pods[0].id; - const currentPod = selectorStore.pods.filter( + const currentPod = selectorStore.pods.find( (d: { id: string }) => d.id === pod - )[0]; + ); if (currentPod) { selectorStore.setCurrentPod(currentPod); states.currentPod = currentPod.label; @@ -278,6 +278,9 @@ async function setDestSelector() { } async function getServices() { + if (key.value === 10 || key.value === 0) { + return; + } if (!dashboardStore.layerId) { return; }