Merge pull request #4557 from break60/dev

[Improvement-4556][ui]Repair the workflow instance, click the browser to return to the previous page, always start the query from the first page

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()

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({
+  router.push({
-  //   query: merge(router.history.current.query, o)
+    query: merge(router.history.current.query, o)
-  // })
+  })
 }