From 3e467dff2211e6c88a2ecfcf2b851964682881e1 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Mon, 25 Jan 2021 15:08:25 +0800
Subject: [PATCH] [Improvement-4556][ui]Repair the workflow instance, click the
 browser to return to the previous page, always start the query from the first
 page

---
 .../pages/projects/pages/instance/pages/list/index.vue    | 1 +
 dolphinscheduler-ui/src/js/module/util/routerUtil.js      | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
index 162df69d7e..05b905ac8b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
@@ -95,6 +95,7 @@
        * Query
        */
       _onQuery (o) {
+        this.searchParams.pageNo = 1
         this.searchParams = _.assign(this.searchParams, o)
         setUrlParams(this.searchParams)
         this._debounceGET()
diff --git a/dolphinscheduler-ui/src/js/module/util/routerUtil.js b/dolphinscheduler-ui/src/js/module/util/routerUtil.js
index a4a70520ae..1274a590cd 100644
--- a/dolphinscheduler-ui/src/js/module/util/routerUtil.js
+++ b/dolphinscheduler-ui/src/js/module/util/routerUtil.js
@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import merge from 'webpack-merge'
+import router from '@/conf/home/router'
 
 export function setUrlParams (o) {
-  // router.push({
-  //   query: merge(router.history.current.query, o)
-  // })
+  router.push({
+    query: merge(router.history.current.query, o)
+  })
 }