From b1c02025e83d5350089214fbdb8ba6b160ab1411 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 15 Jul 2018 23:00:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 15cf34c9ad219e1fe927c6a2fc12238b828e8d41 [formerly 9abe1f515b714236d6f6001b07c264aa4478f0a5] [formerly 15cf34c9ad219e1fe927c6a2fc12238b828e8d41 [formerly 9abe1f515b714236d6f6001b07c264aa4478f0a5] [formerly 15cf34c9ad219e1fe927c6a2fc12238b828e8d41 [formerly 9abe1f515b714236d6f6001b07c264aa4478f0a5] [formerly 9abe1f515b714236d6f6001b07c264aa4478f0a5 [formerly cc0373eb9690aed16a342ae2d17a180b178a6a71 [formerly 6b729125ce244ec16d3e23e5a89569622894b993]]]]]
Former-commit-id: 899d8fd267bcc2e511330c0290ccc460a5c4f20e
Former-commit-id: 85adbc0644ba410f197ac5c1753cbfe66878248d
Former-commit-id: b70047dffdc406f1ab1cc061d94ca99b1fc37229 [formerly 9b77b015e14ab573c98cdc777855cf504c6c4abe]
Former-commit-id: eb91f16efdc4d2895cc6e3eda24c3632c7899992
Former-commit-id: a1396131588a0eb54df97a4fff2efdd9ca84a18d
Former-commit-id: 2135c33b9317db787cfda7f1983dcb7d7cb01feb
Former-commit-id: 57ee841d100af4e390129d5ba71a57b03804f305
Former-commit-id: 3fc77ebb7561f32c50b2bdf9fa92dce80449dd34
---
 src/components/core/d2-multiple-page-control/index.vue | 7 ++-----
 src/main.js                                            | 6 +++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue
index 9472db4c..6f5c795d 100644
--- a/src/components/core/d2-multiple-page-control/index.vue
+++ b/src/components/core/d2-multiple-page-control/index.vue
@@ -97,12 +97,9 @@ export default {
     handleClick (tab, event) {
       // 找到点击的页面在 tag 列表里是哪个
       const page = this.pageOpenedList.find(page => page.name === tab.name)
+      const { name, params, query } = page
       if (page) {
-        this.$router.push({
-          name: page.name,
-          params: page.params,
-          query: page.query
-        })
+        this.$router.push({ name, params, query })
       }
     },
     /**
diff --git a/src/main.js b/src/main.js
index c0bda36a..7579b2e5 100755
--- a/src/main.js
+++ b/src/main.js
@@ -128,19 +128,19 @@ new Vue({
      */
     getAllTagFromRoutes () {
       // 所有加载在主框架内的页面
-      const tagPool = []
+      const pool = []
       const push = function (routes) {
         routes.forEach(route => {
           if (route.children) {
             push(route.children)
           } else {
             const { meta, name, path } = route
-            tagPool.push({ meta, name, path })
+            pool.push({ meta, name, path })
           }
         })
       }
       push(frameInRoutes)
-      this.$store.commit('d2adminTagPoolSet', tagPool)
+      this.$store.commit('d2adminTagPoolSet', pool)
     }
   }
 })