From e3f9dcaa1d4b29d3f720bc1c5198827d577fd1b3 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 19 Feb 2020 14:33:24 +0800
Subject: [PATCH] keeplive

---
 src/router/getRouter.js                       |  2 +-
 .../ProcessAdjustQuery/index.vue              |  1 -
 src/views/layout/components/AppMain.vue       | 19 +++++++++++++++----
 src/views/layout/components/TagsView.vue      | 11 +++++++++++
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/router/getRouter.js b/src/router/getRouter.js
index a8b32be5..f0d307c5 100644
--- a/src/router/getRouter.js
+++ b/src/router/getRouter.js
@@ -4,7 +4,7 @@ export default function fn(data, pid) {
   let temp
   for (let i = 0; i < data.length; i++) {
     if (data[i].pid === pid) {
-      const obj = { 'path': data[i].path, 'component': () => import(`@/views${(data[i].component)}`), 'redirect': data[i].redirect, alwaysShow: true, 'name': data[i].name, meta: { 'title': data[i].title, 'icon': data[i].icon }}
+      const obj = { 'path': data[i].path, 'component': () => import(`@/views${(data[i].component)}`), 'redirect': data[i].redirect, alwaysShow: true, 'name': data[i].name, meta: { 'title': data[i].title, 'icon': data[i].icon, 'keepAlive': true }}
       temp = fn(data, data[i].id)
       if (temp.length > 0) {
         obj.children = temp
diff --git a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
index 0d010e04..dc5fe119 100644
--- a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
@@ -122,7 +122,6 @@ export default {
     },
     searchChart() {
       searchChart().then(response => {
-        console.log(response, 11)
         for (let i = 0; i < response.data.length; i++) {
           this.dataX.push(response.data[i].姓名)
           this.partsNum.push(response.data[i].零件数量)
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
index ebda6754..ec0f64cc 100644
--- a/src/views/layout/components/AppMain.vue
+++ b/src/views/layout/components/AppMain.vue
@@ -1,19 +1,30 @@
 <template>
   <section class="app-main">
+    <!-- <router-view :key="key"></router-view> -->
     <transition name="fade-transform" mode="out-in">
-      <!-- or name="fade" -->
-      <!-- <router-view :key="key"></router-view> -->
-      <keep-alive>
-        <router-view/>
+      <keep-alive id="keepAlive">
+        <router-view v-if="$route.meta.keepAlive"/>
       </keep-alive>
     </transition>
+    <transition name="fade-transform" mode="out-in">
+      <router-view v-if="!$route.meta.keepAlive"/>
+    </transition>
   </section>
 </template>
 
 <script>
+import store from '@/store'
 export default {
   name: 'AppMain',
   computed: {
+    keepAliveList() {
+      var keepAliveList = ''
+      store.state.tagsView.cachedViews.map(v => {
+        keepAliveList = keepAliveList + v + ','
+      })
+      console.log(keepAliveList)
+      return keepAliveList
+    }
     // key() {
     //   return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
     // }
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index b4e5b8f7..941f3912 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -71,6 +71,11 @@ export default {
       return false
     },
     isActive(route) {
+      console.log(this.contactList)
+      this.contactList = []
+      if (!this.$route.meta.keepAlive) {
+        this.$route.meta.keepAlive = true
+      }
       return route.path === this.$route.path || route.name === this.$route.name
     },
     addViewTags() {
@@ -101,8 +106,14 @@ export default {
         if (this.isActive(view)) {
           const latestView = views.slice(-1)[0]
           if (latestView) {
+            if (this.$route.meta.keepAlive) {
+              this.$route.meta.keepAlive = false
+            }
             this.$router.push(latestView.path)
           } else {
+            if (this.$route.meta.keepAlive) {
+              this.$route.meta.keepAlive = false
+            }
             this.$router.push('/')
           }
         }