缓存问题修改

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

@@ -257,7 +257,7 @@ const advanceRoutes = {
               path: 'baggageView',
               name: 'advancedBag',
               component: () => import('@/views/advancedQuery/views/advancedBag.vue'),
-              meta: { title: '行李视图', keepAlive: true }
+              meta: { title: '行李视图', keepAlive: false }
             }
           ]
         }

src/views/advancedQuery/views/advancedHome.vue

@@ -643,6 +643,7 @@ export default {
       spanArr: [],
       contactDot: 0,
       scrollTop:0,
+      dom: null
     }
   },
   computed: {
@@ -726,16 +727,14 @@ export default {
     // this.statItemsQueryByStatMain(dataContent);
   },
   mounted() {
-
-  },
-  activated(){
     this.baggageTypeQuery()
     this.dom = this.$refs.table.bodyWrapper;
     let that = this
     this.dom.addEventListener('scroll',()=>{
       that.scrollTop = this.dom.scrollTop
     })
-
+  },
+  activated(){
     let flag = false
     const query = this.$route.query
     const { startDate, endDate, singleJump } = query
@@ -745,8 +744,14 @@ export default {
         this.form[key] = ['unLoad', 'checkIn', 'active', 'transferIn', 'canceled'].includes(key) ? Number(value) : value
       }
     })
-    startDate && (this.flightDate[0] = startDate)
-    endDate && (this.flightDate[1] = endDate)
+    if (startDate) {
+      this.$set(this.flightDate, 0, startDate)
+    }
+    if (endDate) {
+      this.$set(this.flightDate, 1, endDate)
+    }
+    // startDate && (this.flightDate[0] = startDate)
+    // endDate && (this.flightDate[1] = endDate)
     if (flag) {
       this.onCheckGj(singleJump)
     } else if (this.queryForm) {
@@ -765,7 +770,6 @@ export default {
       this.$refs.table.doLayout()
     })
   },
-
   beforeDestroy() {
     // console.log(this.$route.matched.filter(item => item.name && item.meta.title))
     if (this.$route.matched.filter(item => item.name && item.meta.title).length > 1) {

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

@@ -456,7 +456,8 @@ export default {
       loopEvent: null,
       arrivalCount: 0,
       baggageCount: 0,
-      hasSetTableScroll: false
+      hasSetTableScroll: false,
+      table: null
     }
   },
   computed: {
@@ -466,6 +467,20 @@ export default {
   },
   mounted() {
     this.getAirPortData()
+    this.table = this.$refs.table.bodyWrapper
+    let that = this
+    this.table.addEventListener('scroll', () => {
+      that.scrollTop = this.table.scrollTop
+    })
+  },
+  activated() {
+    this.table.scrollTop = this.scrollTop
+  },
+  deactivated() {
+    if (this.loopEvent) {
+      clearInterval(this.loopEvent)
+      this.loopEvent = null
+    }
   },
   beforeDestroy() {
     if (this.loopEvent) {

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

@@ -400,11 +400,20 @@ export default {
       loopEvent: null,
       leaveCount: 0,
       baggageCount: 0,
-      hasSetTableScroll: false
+      hasSetTableScroll: false,
+      table: null
     }
   },
-  activated() {
+  mounted() {
     this.getAirPortData()
+    this.table = this.$refs.table.bodyWrapper
+    let that = this
+    this.table.addEventListener('scroll', () => {
+      that.scrollTop = this.table.scrollTop
+    })
+  },
+  activated() {
+    this.table.scrollTop = this.scrollTop
   },
   deactivated() {
     if (this.loopEvent) {
@@ -467,7 +476,7 @@ export default {
       if (row.flightStatus === 'CAN') {
         classes.push('bgl-canceled')
       }
-      if (row.hasTakenOff === 0) {
+      if (row.hasTakeOff === 0) {
         classes.push('bgl-hui')
         if (rowIndex === this.leaveCount - 1) {
           classes.push('redBorder')
@@ -527,13 +536,13 @@ export default {
       this.baggageCount = 0
       tableData.forEach(item => {
         item['flightCanceled'] = item['flightStatus'] === 'CAN' ? 1 : 0
-        if (item['hasTakenOff'] === 0 && !item['flightCanceled']) {
+        if (item['hasTakeOff'] === 0 && !item['flightCanceled']) {
           this.leaveCount++
         }
         item['landingNumber'] = item['landingNumber'] ?? 0
         this.baggageCount = this.baggageCount + item.preLoad
       })
-      this.tableData = this._.sortBy(tableData, ['hasTakenOff', 'planDepartureTime'])
+      this.tableData = this._.sortBy(tableData, ['hasTakeOff', 'planDepartureTime'])
       setTableFilters(this.tableData, this.tableDataFilters)
       this.toOrderNum(this.baggageCount)
       // setInterval(() => {

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

@@ -470,7 +470,8 @@ export default {
       hasSetTableScroll: false,
       spanArr: [],
       contactDot: 0,
-      flag: 0
+      flag: 0,
+      table: null
     }
   },
   computed: {
@@ -505,27 +506,32 @@ export default {
   },
   created() {
     // this.getAirPortData()
-    const { startDate, endDate } = this.$route.query
-    Object.entries(this.$route.query).forEach(([key, value]) => {
-      if ((value ?? '') !== '' && JSON.stringify(value) !== '[]') {
-        this.formData[key] = value
-      }
-    })
-    if (startDate !== null && startDate !== undefined) {
-      this.formData.flightDate[0] = startDate
-    }
-    if (endDate !== null && endDate !== undefined) {
-      this.formData.flightDate[1] = endDate
-    }
   },
   mounted() {
-
-  },
-  activated(){
     this.$refs['form'].validateField('flightDate')
     this.getAirPortData()
+    this.table = this.$refs.table.bodyWrapper
+    let that = this
+    this.table.addEventListener('scroll', () => {
+      that.scrollTop = this.table.scrollTop
+    })
+  },
+  activated() {
+    this.table.scrollTop = this.scrollTop
+    // const { startDate, endDate } = this.$route.query
+    // Object.entries(this.$route.query).forEach(([key, value]) => {
+    //   if ((value ?? '') !== '' && JSON.stringify(value) !== '[]') {
+    //     this.formData[key] = value
+    //   }
+    // })
+    // if (startDate !== null && startDate !== undefined) {
+    //   this.formData.flightDate[0] = startDate
+    // }
+    // if (endDate !== null && endDate !== undefined) {
+    //   this.formData.flightDate[1] = endDate
+    // }
   },
-  deactivated(){
+  deactivated() {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
@@ -569,16 +575,17 @@ export default {
       return classes.join(' ')
     },
     changeView() {
-      const query = {
-        ...this.formData,
-        startDate: this.startDate,
-        endDate: this.endDate
-      }
-      delete query.flightDate
-      this.$router.replace({
-        path: '/transfer/departure',
-        query
-      })
+      // const query = {
+      //   ...this.formData,
+      //   startDate: this.startDate,
+      //   endDate: this.endDate
+      // }
+      // delete query.flightDate
+      // this.$router.replace({
+      //   path: '/transfer/departure',
+      //   query
+      // })
+      this.$router.push('/transfer/departure')
     },
     airPortChange() {
       this.getAviationData()

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

@@ -451,32 +451,38 @@ export default {
       hasSetTableScroll: false,
       spanArr: [],
       contactDot: 0,
-      flag: 0
+      flag: 0,
+      table: null
     }
   },
   created() {
     // this.getAirPortData()
-    const { startDate, endDate } = this.$route.query
-    Object.entries(this.$route.query).forEach(([key, value]) => {
-      if ((value ?? '') !== '' && JSON.stringify(value) !== '[]') {
-        this.formData[key] = value
-      }
-    })
-    if (startDate !== null && startDate !== undefined) {
-      this.formData.flightDate[0] = startDate
-    }
-    if (endDate !== null && endDate !== undefined) {
-      this.formData.flightDate[1] = endDate
-    }
   },
   mounted() {
-
-  },
-  activated(){
     this.$refs['form'].validateField('flightDate')
     this.getAirPortData()
+    this.table = this.$refs.table.bodyWrapper
+    let that = this
+    this.table.addEventListener('scroll', () => {
+      that.scrollTop = this.table.scrollTop
+    })
+  },
+  activated() {
+    this.table.scrollTop = this.scrollTop
+    // const { startDate, endDate } = this.$route.query
+    // Object.entries(this.$route.query).forEach(([key, value]) => {
+    //   if ((value ?? '') !== '' && JSON.stringify(value) !== '[]') {
+    //     this.formData[key] = value
+    //   }
+    // })
+    // if (startDate !== null && startDate !== undefined) {
+    //   this.formData.flightDate[0] = startDate
+    // }
+    // if (endDate !== null && endDate !== undefined) {
+    //   this.formData.flightDate[1] = endDate
+    // }
   },
-  deactivated(){
+  deactivated() {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
@@ -516,7 +522,7 @@ export default {
     },
     tableRowClassName({ row, rowIndex }) {
       const classes = []
-      if (row.hasTakenOff) {
+      if (row.hasTakeOff) {
         classes.push('bgl-hui')
         if (rowIndex === this.leaveCount - 1) {
           classes.push('redBorder')
@@ -525,16 +531,17 @@ export default {
       return classes.join(' ')
     },
     changeView() {
-      const query = {
-        ...this.formData,
-        startDate: this.startDate,
-        endDate: this.endDate
-      }
-      delete query.flightDate
-      this.$router.replace({
-        path: '/transfer/arrival',
-        query
-      })
+      // const query = {
+      //   ...this.formData,
+      //   startDate: this.startDate,
+      //   endDate: this.endDate
+      // }
+      // delete query.flightDate
+      // this.$router.replace({
+      //   path: '/transfer/arrival',
+      //   query
+      // })
+      this.$router.push('/transfer/arrival')
     },
     airPortChange() {
       this.getAviationData()
@@ -661,7 +668,7 @@ export default {
       this.leaveCount = 0
       // this.baggageCount = 0
       tableData.forEach(item => {
-        if (this.hasTakenOff(item)) {
+        if (this.hasTakeOff(item)) {
           this.leaveCount++
         }
         // this.baggageCount = this.baggageCount + item.preLoad
@@ -677,15 +684,15 @@ export default {
         this.setTableScroll()
       })
     },
-    hasTakenOff(flight) {
+    hasTakeOff(flight) {
       if (flight.actualDepartureTime) {
         const now = new Date()
         const actualDepartureTime = new Date(flight.actualDepartureTime.replace('T', ' '))
-        flight['hasTakenOff'] = now > actualDepartureTime && !flight['flightCanceled']
+        flight['hasTakeOff'] = now > actualDepartureTime && !flight['flightCanceled']
       } else {
-        flight['hasTakenOff'] = false
+        flight['hasTakeOff'] = false
       }
-      return flight['hasTakenOff']
+      return flight['hasTakeOff']
     },
     setTableScroll() {
       if (!this.singleDay || this.hasSetTableScroll || this.leaveCount === 0) {

src/views/baggageManagement/mixins/terminal.js

@@ -33,6 +33,12 @@ export default {
     const formWrapHeight = this.$refs['formWrap'].offsetHeight
     this.computedTableHeight = `calc(100vh - ${headerHeight + bottomBlankHeight + formWrapHeight}px)`
   },
+  activated() {
+    const headerHeight = 80
+    const bottomBlankHeight = 41
+    const formWrapHeight = this.$refs['formWrap'].offsetHeight
+    this.computedTableHeight = `calc(100vh - ${headerHeight + bottomBlankHeight + formWrapHeight}px)`
+  },
   computed: {
     ...mapGetters(['clickedCells']),
     dealedTableData() {
@@ -86,7 +92,7 @@ export default {
   },
   methods: {
     // 设置筛选和排序
-    setFilterAndSort (tableCols) {
+    setFilterAndSort(tableCols) {
       const self = this
       Object.values(tableCols).forEach(({ prop, filterable, sortable, children }) => {
         if (children) {