Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

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

@@ -390,7 +390,7 @@ export default {
       baggageBasicInfo: {},
       dialogVisibledele: false,
       active: 2,
-      infoBtn: '跟踪信息',
+      infoBtn: '',
       infoRadios: ['跟踪信息', '跟踪报文'],
       messageList: [
         // {
@@ -504,43 +504,26 @@ export default {
     }
   },
   watch: {
-    $route: {
-      handler({ path, query }) {
-        clearInterval(this.loopEvent)
-        this.loopEvent = null
-        clearInterval(this.queryMessageLoop)
-        this.queryMessageLoop = null
-
-        this.queryData = this._.cloneDeep(query)
-        const { flightNO, flightDate, bagSN } = this.queryData
-        if (flightNO && flightDate && bagSN) {
-          const that = this
-          this.queryBaggageAll()
-          this.loopEvent = setInterval(function () {
-            that.queryBaggageAll()
-          }, 3000)
-        } else if (path.includes('baggage')) {
-          this.$router.push('/advance')
-        }
+    '$route.query': {
+      handler(query) {
+        this.queryData = query
       },
-      deep: true
+      deep: true,
+      immediate: true
     },
     infoBtn(val) {
+      this.clearIntervalAll()
       const that = this
-      if (val === '跟踪报文') {
-        clearInterval(this.loopEvent)
-        this.loopEvent = null
-        this.baggageMessageQuery()
-        this.queryMessageLoop = setInterval(function () {
-          that.baggageMessageQuery()
-        }, 5000)
-      } else {
-        clearInterval(this.queryMessageLoop)
-        this.queryMessageLoop = null
+      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)
       }
     },
     hoveredRow: {
@@ -552,21 +535,13 @@ export default {
       deep: true
     }
   },
-  mounted() {
-    this.queryData = this._.cloneDeep(this.$route.query)
+  activated() {
     const { flightNO, flightDate, bagSN } = this.queryData
-    if (!flightNO || !flightDate || !bagSN) {
-      this.$router.push('/advance')
+    if (flightNO && flightDate && bagSN) {
+      this.infoBtn = this.infoRadios[0]
     } else {
-      const that = this
-      this.queryBaggageAll()
-      this.loopEvent = setInterval(function () {
-        that.queryBaggageAll()
-      }, 3000)
+      this.$router.push('/advance')
     }
-  },
-  activated() {
-    this.infoBtn = '跟踪信息'
     this.basicInfoHeight = this.$refs['basicInfo'].offsetHeight
     this.$refs['table']?.doLayout()
   },
@@ -575,18 +550,18 @@ export default {
     this.$refs['table']?.doLayout()
   },
   deactivated() {
-    clearInterval(this.loopEvent)
-    this.loopEvent = null
-    clearInterval(this.queryMessageLoop)
-    this.queryMessageLoop = null
+    this.infoBtn = ''
   },
   beforeDestroy() {
-    clearInterval(this.loopEvent)
-    this.loopEvent = null
-    clearInterval(this.queryMessageLoop)
-    this.queryMessageLoop = null
+    this.infoBtn = ''
   },
   methods: {
+    clearIntervalAll() {
+      this.loopEvent && clearInterval(this.loopEvent)
+      this.loopEvent = null
+      this.queryMessageLoop && clearInterval(this.queryMessageLoop)
+      this.queryMessageLoop = null
+    },
     // objectSpanMethod({ row, column, rowIndex, columnIndex }) {
     //   if (columnIndex < 4) {
     //     const _row = this.spanArr[rowIndex]

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

@@ -497,6 +497,9 @@ export default {
   directives: {
     dragHeight: {
       inserted(el, binding, vnode) {
+        if (!el) {
+          return
+        }
         const that = vnode.context
         let mousedownY
         let dragY
@@ -701,10 +704,11 @@ export default {
   mounted() {
     this.queryData = this._.cloneDeep(this.$route.query)
     const { flightNO, flightDate } = this.queryData
-    if (!flightNO || !flightDate) {
+    if (flightNO && flightDate) {
+      this.queryAirline([flightNO, flightDate])
+    } else {
       this.$router.push('/advance')
     }
-    this.queryAirline([flightNO, flightDate])
   },
   activated() {
     this.$nextTick(() => {