keepalive修改

src/layout/components/AppMain.vue

@@ -10,11 +10,11 @@
   <section class="app-main">
     <div class="app-main-content">
       <transition name="fade-transform" mode="out-in">
-        <keep-alive>
-          <router-view  :key="key" v-if="$route.meta.keepAlive" class="router-view">
+        <keep-alive v-if="$route.meta && $route.meta.keepAlive">
+          <router-view  :key="key"  class="router-view">
           </router-view>
-      </keep-alive>
-      <router-view  :key="key" v-if="!$route.meta.keepAlive" class="router-view" ></router-view>
+        </keep-alive>
+        <router-view  :key="key" v-else class="router-view" ></router-view>
       </transition>
     </div>
   </section>

src/router/index.js

@@ -87,30 +87,6 @@ const createRouter = () =>
 
 const router = createRouter()
 
-router.beforeEach((to, from, next) => {
-  // 如果 要 from(离开) 的页面是 keepAlive缓存的，
-  // 再根据 deepth 来判断是前进还是后退
-  if (from.meta.keepAlive && to.meta.deepth) {
-    if (to.meta.deepth > from.meta.deepth) {
-      store.dispatch('keepAlive/editPage', from)
-    } else if (to.meta.deepth < from.meta.deepth) {
-      store.dispatch('keepAlive/deletePage', to)
-    }
-  }
-  // 如果要to(进入)的页面是需要keepAlive缓存的，把name push进keepAlive数组中
-  if (to.meta.keepAlive) {
-    const currentPage = store.state.keepAlive.keepAlivePages.find(page => page.name === to.name)
-    if (currentPage) {
-      if (currentPage.fullPath !== to.fullPath && to.meta.deepth < from.meta.deepth) {
-        next(currentPage.fullPath)
-      }
-    } else {
-      store.dispatch('keepAlive/addPage', to)
-    }
-  }
-  next()
-})
-
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
 export function resetRouter() {
   const newRouter = createRouter()

src/router/routes/routes-file-five.js

@@ -9,7 +9,7 @@ import Layout from '@/layout'
 
 const departureRoutes = {
   path: '/departure',
-  name:'departure',
+  name: 'departure',
   component: Layout,
   meta: { roles: ['departure_menu'] },
   children: [
@@ -30,8 +30,7 @@ const departureRoutes = {
             title: '离港视图',
             // title: "行李视图",
             roles: ['departure_page'],
-            keepAlive: true,
-            deepth: 1
+            keepAlive: true
           },
           redirect: '/departure',
           // redirect: "/departure/baggageView",
@@ -40,25 +39,25 @@ const departureRoutes = {
               path: '/departure',
               name: 'DepartureTerminalView',
               component: () => import('@/views/baggageManagement/components/departure'),
-              meta: { title: '航站视图',keepAlive: true }
+              meta: { title: '航站视图', keepAlive: true }
             },
             {
               path: '/departure/flightView',
               name: 'DepartureTwo',
               component: () => import('@/views/baggageManagement'),
-              meta: { title: '航班视图', keepAlive: true, deepth: 2 },
+              meta: { title: '航班视图', keepAlive: true },
               children: [
                 {
                   path: '/departure/flightView',
                   name: 'DepartureFlightView',
                   component: () => import('@/views/baggageManagement/components/departure/flight'),
-                  meta: { keepAlive: true, deepth: 3 }
+                  meta: { keepAlive: true }
                 },
                 {
                   path: '/departure/baggageView',
                   name: 'DepartureBaggageView',
                   component: () => import('@/views/baggageManagement/components/departure/baggage'),
-                  meta: { title: '行李视图', keepAlive: true, deepth: 4 }
+                  meta: { title: '行李视图', keepAlive: true }
                 }
               ]
             }
@@ -87,32 +86,32 @@ const arrivalRoutes = {
           path: '/arrival',
           name: 'ArrivalOne',
           component: () => import('@/views/baggageManagement'),
-          meta: { title: '进港视图', roles: ['departure_page'], keepAlive: true, deepth: 1 },
+          meta: { title: '进港视图', roles: ['departure_page'], keepAlive: true },
           redirect: '/arrival',
           children: [
             {
               path: '/arrival',
               name: 'ArrivalTerminalView',
               component: () => import('@/views/baggageManagement/components/arrival'),
-              meta: { keepAlive: true, deepth: 2 }
+              meta: { keepAlive: true }
             },
             {
               path: '/arrival/flightView',
               name: 'ArrivalFlightTwo',
               component: () => import('@/views/baggageManagement'),
-              meta: { title: '航班视图', keepAlive: true, deepth: 2 },
+              meta: { title: '航班视图', keepAlive: true },
               children: [
                 {
                   path: '/arrival/flightView',
                   name: 'ArrivalFlightView',
                   component: () => import('@/views/baggageManagement/components/arrival/flight'),
-                  meta: { keepAlive: true, deepth: 3 }
+                  meta: { keepAlive: true }
                 },
                 {
                   path: '/arrival/baggageView',
                   name: 'ArrivalBaggageView',
                   component: () => import('@/views/baggageManagement/components/arrival/baggage'),
-                  meta: { title: '行李视图', deepth: 4,keepAlive: true }
+                  meta: { title: '行李视图', keepAlive: true }
                 }
               ]
             }
@@ -142,32 +141,32 @@ const transferRoutes = {
           path: '/transfer/arrival',
           name: 'TransferArrivalOne',
           component: () => import('@/views/baggageManagement'),
-          meta: { title: '中转进港', roles: ['transit_inbound_page'], keepAlive: true, deepth: 1 },
+          meta: { title: '中转进港', roles: ['transit_inbound_page'], keepAlive: true },
           redirect: '/transfer/arrival',
           children: [
             {
               path: '/transfer/arrival',
               name: 'TransferArrivalTerminalView',
               component: () => import('@/views/baggageManagement/components/transferArrival'),
-              meta: { keepAlive: true, deepth: 2 }
+              meta: { keepAlive: true }
             },
             {
               path: '/transfer/arrival/flightView',
               name: 'TransferArrivalTwo',
               component: () => import('@/views/baggageManagement'),
-              meta: { title: '航班视图', keepAlive: true, deepth: 2 },
+              meta: { title: '航班视图', keepAlive: true },
               children: [
                 {
                   path: '/transfer/arrival/flightView',
                   name: 'TransferArrivalFlightView',
                   component: () => import('@/views/baggageManagement/components/transferArrival/flight'),
-                  meta: { keepAlive: true, deepth: 3 }
+                  meta: { keepAlive: true }
                 },
                 {
                   path: '/transfer/arrival/baggageView',
                   name: 'TransferArrivalBaggageView',
                   component: () => import('@/views/baggageManagement/components/transferArrival/baggage'),
-                  meta: { title: '行李视图', keepAlive: true, deepth: 4 }
+                  meta: { title: '行李视图', keepAlive: true }
                 }
               ]
             }
@@ -177,32 +176,32 @@ const transferRoutes = {
           path: '/transfer/departure',
           name: 'TransferDepartureOne',
           component: () => import('@/views/baggageManagement'),
-          meta: { title: '中转离港', roles: ['transit_departure_page'], keepAlive: true, deepth: 1 },
+          meta: { title: '中转离港', roles: ['transit_departure_page'], keepAlive: true },
           redirect: '/transfer/departure',
           children: [
             {
               path: '/transfer/departure',
               name: 'TransferDepartureTerminalView',
               component: () => import('@/views/baggageManagement/components/transferDeparture'),
-              meta: { keepAlive: true, deepth: 2 }
+              meta: { keepAlive: true }
             },
             {
               path: '/transfer/departure/flightView',
               name: 'TransferDepartureTwo',
               component: () => import('@/views/baggageManagement'),
-              meta: { title: '航班视图', keepAlive: true, deepth: 2 },
+              meta: { title: '航班视图', keepAlive: true },
               children: [
                 {
                   path: '/transfer/departure/flightView',
                   name: 'TransferDepartureFlightView',
                   component: () => import('@/views/baggageManagement/components/transferDeparture/flight'),
-                  meta: { keepAlive: true, deepth: 3 }
+                  meta: { keepAlive: true }
                 },
                 {
                   path: '/transfer/departure/baggageView',
                   name: 'TransferDepartureBaggageView',
                   component: () => import('@/views/baggageManagement/components/transferDeparture/baggage'),
-                  meta: { title: '行李视图', keepAlive: true, deepth: 4 }
+                  meta: { title: '行李视图', keepAlive: true }
                 }
               ]
             }
@@ -226,39 +225,39 @@ const advanceRoutes = {
         title: '高级查询',
         icon: 'dataParser',
         imgstyle: 'ic_list_nav_search_default.png',
-        imgstyleup: 'ic_list_nav_search_check.png',
+        imgstyleup: 'ic_list_nav_search_check.png'
       },
       children: [
         {
           path: '/',
           name: 'advanceHome',
           component: {
-            render (c) {
+            render(c) {
               return c('router-view')
             }
           },
           redirect: '/',
-          meta: { title: '高级查询', isPage: 'advance_page',keepAlive:true },
+          meta: { title: '高级查询', isPage: 'advance_page', keepAlive: true },
           children: [
             {
               path: '/',
               component: () => import('@/views/advancedQuery/views/advancedHome.vue'),
-              meta:{
+              meta: {
                 title: '高级查询',
-                keepAlive:true
+                keepAlive: true
               }
             },
             {
               path: 'flightView',
               name: 'advancedFlight',
               component: () => import('@/views/advancedQuery/views/advancedFlight.vue'),
-              meta: { title: '航班视图',keepAlive:true}
+              meta: { title: '航班视图', keepAlive: true }
             },
             {
               path: 'baggageView',
               name: 'advancedBag',
               component: () => import('@/views/advancedQuery/views/advancedBag.vue'),
-              meta: { title: '行李视图',keepAlive:true}
+              meta: { title: '行李视图', keepAlive: true }
             }
           ]
         }
@@ -267,4 +266,4 @@ const advanceRoutes = {
   ]
 }
 
-export default [departureRoutes, arrivalRoutes, transferRoutes,advanceRoutes]
+export default [departureRoutes, arrivalRoutes, transferRoutes, advanceRoutes]

src/store/getters.js

@@ -29,7 +29,6 @@ const getters = {
   userRole: state => state.app.OpenRole,
   userPowerList: state => state.user.userPoewrList,
   permission_routes: state => state.permission.routes,
-  keepAlivePages: state => state.keepAlive.keepAlivePages.map(page => page.name),
   queryForm: state => state.app.queryForm,
   timeZone: state => state.timeZone.currentTimeZone,
   clickedCells: state => state.keepAlive.clickedCells

src/store/modules/keepAlive.js

@@ -6,39 +6,12 @@
  * @Description: 页面缓存
  * have a nice day!
  */
-const defaultPages = [{ name: 'BaggageManagement' }]
-const savedPages = JSON.parse(sessionStorage.getItem('keepAlivePages'))
 
 const state = {
-  keepAlivePages: savedPages || defaultPages,
   clickedCells: JSON.parse(sessionStorage.getItem('clickedCells')) || []
 }
 
 const mutations = {
-  ADD_PAGE(state, { name, fullPath }) {
-    if (state.keepAlivePages.every(page => page.name !== name)) {
-      state.keepAlivePages = [...state.keepAlivePages, { name, fullPath }]
-    }
-    sessionStorage.setItem('keepAlivePages', JSON.stringify(state.keepAlivePages))
-  },
-  EDIT_PAGE(state, { name, fullPath }) {
-    state.keepAlivePages = state.keepAlivePages.map(page => {
-      if (page.name === name) {
-        page.fullPath = fullPath
-      }
-      return page
-    })
-    sessionStorage.setItem('keepAlivePages', JSON.stringify(state.keepAlivePages))
-  },
-  DELETE_PAGE(state, { name }) {
-    const index = state.keepAlivePages.findIndex(page => page.name === name)
-    if (index > -1) {
-      state.keepAlivePages = state.keepAlivePages.slice(0, index + 1)
-    } else {
-      state.keepAlivePages = defaultPages
-    }
-    sessionStorage.setItem('keepAlivePages', JSON.stringify(state.keepAlivePages))
-  },
   ADD_CLICKED_CELL(state, cell) {
     state.clickedCells.some(item =>
       Object.keys(item).every(key => {
@@ -49,15 +22,6 @@ const mutations = {
 }
 
 const actions = {
-  addPage({ commit }, page) {
-    commit('ADD_PAGE', page)
-  },
-  deletePage({ commit }, page) {
-    commit('DELETE_PAGE', page)
-  },
-  editPage({ commit }, page) {
-    commit('EDIT_PAGE', page)
-  },
   addClickedCell({ commit }, cell) {
     commit('ADD_CLICKED_CELL', cell)
   }

src/utils/table.js

@@ -66,7 +66,7 @@ export function mergeTableRow(config) {
 // 表格单元格class设置
 export function commonTableCellClass({ row, column, rowIndex, columnIndex }) {
   const classes = []
-  if (['ActualDepartureTime', 'ActualLandingTime'].includes(column.property)) {
+  if (['actualDepartureTime', 'actualLandingTime'].includes(column.property)) {
     classes.push('pre-line')
   }
   return classes

src/views/baggageManagement/components/baggage/index.vue

@@ -684,13 +684,13 @@ export default {
           const { hover, tableHover } = this.stepData[index] ?? {}
           this.stepData.splice(index, 1, {
             NodeNameEN: item.nodeCode,
-            DealTime: item.dealTime.replace('T', '\n'),
+            DealTime: item.dealTime?.replace('T', '\n'),
             resourceFile: item.resourceFile,
             hover: !!hover,
             tableHover: !!tableHover
           })
 
-          if (item['dealTime'].split('T').length > 1) {
+          if (item['dealTime']) {
             item['dealTime'] = item['dealTime'].replace('T', ' ')
           }
           item['departureAirport'] = `${item['departureAirport']}\n${item['departureTime'] ? item['departureTime'].replace('T', '\n') : ''}`

src/views/baggageManagement/components/departure/index.vue

@@ -403,9 +403,15 @@ export default {
       hasSetTableScroll: false
     }
   },
-  mounted() {
+  activated() {
     this.getAirPortData()
   },
+  deactivated() {
+    if (this.loopEvent) {
+      clearInterval(this.loopEvent)
+      this.loopEvent = null
+    }
+  },
   beforeDestroy() {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
@@ -524,7 +530,7 @@ export default {
         if (item['hasTakenOff'] === 0 && !item['flightCanceled']) {
           this.leaveCount++
         }
-        item['landingNumber'] = item['loadNumber']
+        item['landingNumber'] = item['landingNumber'] ?? 0
         this.baggageCount = this.baggageCount + item.preLoad
       })
       this.tableData = this._.sortBy(tableData, ['hasTakenOff', 'planDepartureTime'])

src/views/baggageManagement/components/transferDeparture/index.vue

@@ -691,7 +691,6 @@ export default {
       setTimeout(() => {
         const scrollMid = lastRow.offsetTop + lastRow.offsetHeight - scrollParent.offsetHeight / 2
         const scrollMax = scrollParent.scrollHeight - scrollParent.offsetHeight
-        console.log(scrollMid, scrollMax)
         if (scrollMid > 0) {
           const scrollHeight = Math.min(scrollMid, scrollMax)
           scrollParent.scrollTo(0, scrollHeight)

src/views/baggageManagement/index.vue

@@ -8,18 +8,11 @@
 -->
 
 <template>
-  <keep-alive :include="keepAlivePages">
-    <router-view />
-  </keep-alive>
+  <router-view />
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-
 export default {
-  name: 'BaggageManagement',
-  computed: {
-    ...mapGetters(['keepAlivePages'])
-  }
+  name: 'BaggageManagement'
 }
 </script>

src/views/baggageManagement/mixins/terminal.js

@@ -121,6 +121,7 @@ export default {
               'security_all',
               'sortNumber',
               'loadNumber',
+              'landingNumber',
               'tounLoad',
               'unLoad',
               'delbag',