This commit is contained in:
Vergil
2020-02-19 14:33:24 +08:00
parent 6510d0b2ab
commit e3f9dcaa1d
4 changed files with 27 additions and 6 deletions

View File

@@ -4,7 +4,7 @@ export default function fn(data, pid) {
let temp let temp
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
if (data[i].pid === pid) { 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) temp = fn(data, data[i].id)
if (temp.length > 0) { if (temp.length > 0) {
obj.children = temp obj.children = temp

View File

@@ -122,7 +122,6 @@ export default {
}, },
searchChart() { searchChart() {
searchChart().then(response => { searchChart().then(response => {
console.log(response, 11)
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.dataX.push(response.data[i].姓名) this.dataX.push(response.data[i].姓名)
this.partsNum.push(response.data[i].零件数量) this.partsNum.push(response.data[i].零件数量)

View File

@@ -1,19 +1,30 @@
<template> <template>
<section class="app-main"> <section class="app-main">
<!-- <router-view :key="key"></router-view> -->
<transition name="fade-transform" mode="out-in"> <transition name="fade-transform" mode="out-in">
<!-- or name="fade" --> <keep-alive id="keepAlive">
<!-- <router-view :key="key"></router-view> --> <router-view v-if="$route.meta.keepAlive"/>
<keep-alive>
<router-view/>
</keep-alive> </keep-alive>
</transition> </transition>
<transition name="fade-transform" mode="out-in">
<router-view v-if="!$route.meta.keepAlive"/>
</transition>
</section> </section>
</template> </template>
<script> <script>
import store from '@/store'
export default { export default {
name: 'AppMain', name: 'AppMain',
computed: { computed: {
keepAliveList() {
var keepAliveList = ''
store.state.tagsView.cachedViews.map(v => {
keepAliveList = keepAliveList + v + ','
})
console.log(keepAliveList)
return keepAliveList
}
// key() { // key() {
// return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date() // return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
// } // }

View File

@@ -71,6 +71,11 @@ export default {
return false return false
}, },
isActive(route) { 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 return route.path === this.$route.path || route.name === this.$route.name
}, },
addViewTags() { addViewTags() {
@@ -101,8 +106,14 @@ export default {
if (this.isActive(view)) { if (this.isActive(view)) {
const latestView = views.slice(-1)[0] const latestView = views.slice(-1)[0]
if (latestView) { if (latestView) {
if (this.$route.meta.keepAlive) {
this.$route.meta.keepAlive = false
}
this.$router.push(latestView.path) this.$router.push(latestView.path)
} else { } else {
if (this.$route.meta.keepAlive) {
this.$route.meta.keepAlive = false
}
this.$router.push('/') this.$router.push('/')
} }
} }