航班视图、行李视图keepAlive相关逻辑修改

src/layout/components/Navbar.vue

@@ -138,6 +138,7 @@ export default {
       font-family: Microsoft YaHei;
       font-weight: 400;
       color: #101116;
+      pointer-events: none;
     }
   }
   > .navbar_top {

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

@@ -37,7 +37,7 @@ const departureRoutes = {
               path: '/departure',
               name: 'DepartureTerminalView',
               component: () => import('@/views/baggageManagement/components/departure'),
-              meta: { title: '航站视图', keepAlive: true }
+              meta: { keepAlive: true }
             },
             {
               path: '/departure/flightView',
@@ -68,6 +68,7 @@ const departureRoutes = {
 
 const arrivalRoutes = {
   path: '/arrival',
+  name: 'arrival',
   component: Layout,
   meta: { roles: ['inbound_management'] },
   children: [

src/store/modules/keepAlive.js

@@ -7,6 +7,8 @@
  * have a nice day!
  */
 
+import _ from 'lodash'
+
 const state = {
   clickedCells: JSON.parse(sessionStorage.getItem('clickedCells')) || [],
   savedPages: JSON.parse(sessionStorage.getItem('savedPages')) || []
@@ -21,12 +23,14 @@ const mutations = {
     ) || (state.clickedCells.push(cell), sessionStorage.setItem('clickedCells', JSON.stringify(state.clickedCells)))
   },
   SAVE_PAGE(state, { name, query, fullPath }) {
-    const index = state.savedPages.findIndex(savedPage => savedPage.name === name)
+    const savedPages = _.cloneDeep(state.savedPages)
+    const index = savedPages.findIndex(savedPage => savedPage.name === name)
     if (index > -1) {
-      state.savedPages = state.savedPages.splice(index, 1, { name, query, fullPath })
+      savedPages[index] = { name, query, fullPath }
     } else {
-      state.savedPages.push({ name, query, fullPath })
+      savedPages.push({ name, query, fullPath })
     }
+    state.savedPages = _.cloneDeep(savedPages)
     sessionStorage.setItem('savedPages', JSON.stringify(state.savedPages))
   }
 }

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

@@ -504,27 +504,41 @@ export default {
     }
   },
   watch: {
-    '$route.query': {
-      handler(query) {
-        this.queryData = query
+    $route: {
+      handler({ path, query }) {
+        if (path.includes('baggageView')) {
+          const { flightNO, flightDate, bagSN } = query
+          if (flightNO && flightDate && bagSN) {
+            const { flightNO: oldFlightNO, flightDate: oldFlightDate, bagSN: oldBagSN } = this.queryData
+            if (flightNO !== oldFlightNO || flightDate !== oldFlightDate || bagSN !== oldBagSN) {
+              this.queryData = { flightNO, flightDate, bagSN }
+              this.infoBtn = this.infoRadios[0]
+            }
+          } else {
+            this.$router.push('/advance')
+          }
+        }
       },
       deep: true,
       immediate: true
     },
-    infoBtn(val) {
-      this.clearIntervalAll()
-      const that = this
-      if (val === this.infoRadios[0]) {
-        this.queryBaggageAll()
-        this.loopEvent = setInterval(function () {
-          that.queryBaggageAll()
-        }, 3000)
-      } else if (val === this.infoRadios[1]) {
-        this.baggageMessageQuery()
-        this.queryMessageLoop = setInterval(function () {
-          that.baggageMessageQuery()
-        }, 3000)
-      }
+    infoBtn: {
+      handler(val) {
+        this.clearIntervalAll()
+        const that = this
+        if (val === this.infoRadios[0]) {
+          this.queryBaggageAll()
+          this.loopEvent = setInterval(function () {
+            that.queryBaggageAll()
+          }, 3000)
+        } else if (val === this.infoRadios[1]) {
+          this.baggageMessageQuery()
+          this.queryMessageLoop = setInterval(function () {
+            that.baggageMessageQuery()
+          }, 3000)
+        }
+      },
+      immediate: true
     },
     hoveredRow: {
       handler(row) {
@@ -536,12 +550,6 @@ export default {
     }
   },
   activated() {
-    const { flightNO, flightDate, bagSN } = this.queryData
-    if (flightNO && flightDate && bagSN) {
-      this.infoBtn = this.infoRadios[0]
-    } else {
-      this.$router.push('/advance')
-    }
     this.basicInfoHeight = this.$refs['basicInfo'].offsetHeight
     this.$refs['table']?.doLayout()
   },
@@ -550,10 +558,10 @@ export default {
     this.$refs['table']?.doLayout()
   },
   deactivated() {
-    this.infoBtn = ''
+    this.clearIntervalAll()
   },
   beforeDestroy() {
-    this.infoBtn = ''
+    this.clearIntervalAll()
   },
   methods: {
     clearIntervalAll() {

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

@@ -662,15 +662,21 @@ export default {
   watch: {
     $route: {
       handler({ path, query }) {
-        this.queryData = this._.cloneDeep(query)
-        const { flightNO, flightDate } = query
-        if (flightNO && flightDate) {
-          this.queryAirline([flightNO, flightDate])
-        } else if (path.includes('flight')) {
-          this.$router.push('/advance')
+        if (path.includes('flightView')) {
+          const { flightNO, flightDate } = query
+          if (flightNO && flightDate) {
+            const { flightNO: oldFlightNO, flightDate: oldFlightDate } = this.queryData
+            if (flightNO !== oldFlightNO || flightDate !== oldFlightDate) {
+              this.queryData = { flightNO, flightDate }
+              this.queryAirline([flightNO, flightDate])
+            }
+          } else {
+            this.$router.push('/')
+          }
         }
       },
-      deep: true
+      deep: true,
+      immediate: true
     },
     fullscreenLoading(val) {
       if (val) {
@@ -701,15 +707,6 @@ export default {
       }
     })
   },
-  mounted() {
-    this.queryData = this._.cloneDeep(this.$route.query)
-    const { flightNO, flightDate } = this.queryData
-    if (flightNO && flightDate) {
-      this.queryAirline([flightNO, flightDate])
-    } else {
-      this.$router.push('/advance')
-    }
-  },
   activated() {
     this.$nextTick(() => {
       this.$refs['containerTable']?.doLayout()
@@ -935,7 +932,9 @@ export default {
           label: `${airline.departureAirport}-${airline.landingAirport}`,
           value: `${airline.departureAirport}-${airline.landingAirport}`
         }))
-        this.selectedAirline = this.airlineList[0].value
+        if (this.airlineList.length) {
+          this.selectedAirline = this.airlineList[0].value
+        }
       } catch (error) {
         console.log('出错了', error.message || error)
       }