diff --git a/src/views/iot/runoverview/components/OverviewFilterBar.vue b/src/views/iot/runoverview/components/OverviewFilterBar.vue index 480a8804..3c71dc29 100644 --- a/src/views/iot/runoverview/components/OverviewFilterBar.vue +++ b/src/views/iot/runoverview/components/OverviewFilterBar.vue @@ -58,10 +58,10 @@ {{ t('DataCollection.RunOverview.resetButtonText') }} - + diff --git a/src/views/iot/runoverview/index.vue b/src/views/iot/runoverview/index.vue index 3363390f..6f10de82 100644 --- a/src/views/iot/runoverview/index.vue +++ b/src/views/iot/runoverview/index.vue @@ -22,7 +22,6 @@ @quick-range-change="handleQuickRangeChange" @query="handleQuery" @reset="resetQuery" - @export="handleExport" /> @@ -184,6 +183,14 @@ const refreshData = async () => { if (pageNo.value > maxPage) pageNo.value = maxPage } +const resetToFirstPageAndRefresh = () => { + if (pageNo.value !== 1) { + pageNo.value = 1 + return + } + void refreshData() +} + const handleQuickRangeChange = (key: QuickRangeKey) => { queryParams.value = { ...queryParams.value, @@ -194,14 +201,13 @@ const handleQuickRangeChange = (key: QuickRangeKey) => { } const handleQuery = () => { - pageNo.value = 1 - void refreshData() + resetToFirstPageAndRefresh() } const resetQuery = () => { queryParams.value = buildDefaultQueryParams() - pageNo.value = 1 pageSize.value = 10 + resetToFirstPageAndRefresh() } const handleExport = () => { @@ -255,6 +261,7 @@ watch( onMounted(async () => { await getOrganizationOptions() + await refreshData() })