航站视图-排序、颜色提示、滚动

src/views/newArrival/index.vue

@@ -138,7 +138,7 @@ export default {
     async getAirPortData (type = 1) {
       try {
         let res = null
-        res = this.TauthId ? await this.getQueryListAuth(this.TqueryId || SERVICE_ID.getAirpotId, {}, 1, 999, this.TauthId) : await this.getQueryList(SERVICE_ID.getAirpotId)
+        res = this.TauthId ? await this.getQueryListAuth(this.TqueryId || SERVICE_ID.getAirpotId, {}, 1, 9999, this.TauthId) : await this.getQueryList(SERVICE_ID.getAirpotId, {}, 1, 9999)
         if (Number(res.code) === 0) {
           this.AirportList = res.returnData;
           if (type && !this.formData.currentAirport) {

src/views/newDeparture/index.vue

@@ -143,7 +143,7 @@ export default {
     async getAirPortData (type = 1) {
       try {
         let res = null
-        res = this.TauthId ? await this.getQueryListAuth(this.TqueryId || SERVICE_ID.getAirpotId, {}, 1, 999, this.TauthId) : await this.getQueryList(SERVICE_ID.getAirpotId)
+        res = this.TauthId ? await this.getQueryListAuth(this.TqueryId || SERVICE_ID.getAirpotId, {}, 1, 9999, this.TauthId) : await this.getQueryList(SERVICE_ID.getAirpotId, {}, 1, 9999)
         if (Number(res.code) === 0) {
           this.AirportList = res.returnData;
           if (type && !this.formData.currentAirport) {

src/views/newQuery/components/table.vue

@@ -144,7 +144,8 @@ export default {
       tableCath: [],
       leaveCount: 0,
       arriveCount: 0,
-      checkPath: ['/newDeparture', '/newTransfer/in', '/newTransfer/out', '/newArrival']
+      checkPath: ['/newDeparture', '/newTransfer/in', '/newTransfer/out', '/newArrival'],
+      hasSetTableScroll: false,
     }
   },
   computed: {
@@ -195,6 +196,7 @@ export default {
         if (val.shouldReset) {
           this.$emit('update:shouldReset', true)
           await this.$nextTick()
+          this.hasSetTableScroll = false
         }
         this.load()
       },
@@ -340,10 +342,10 @@ export default {
             this.noMore = true
           }
           this.$emit('tableLoad', [...tableData])
-          setTimeout(() => {
-            this.initTableData(tableData)
-            this.loading = false
-          }, 100)
+          this.initTableData(tableData)
+          await this.$nextTick()
+          this.setTableScroll()
+          this.loading = false
         } else {
           throw new Error('获取表格数据失败')
         }
@@ -422,59 +424,53 @@ export default {
     },
     // 初始化表格
     initTableData (tableData) {
-      this.tableDataCopy = _.cloneDeep(tableData)
-      const datas = _.cloneDeep(this.tableColsCopy)
-      // const reqUts = [];
-      datas.forEach(async item => {
-        if (item.needGroup) {
-          this.tableGroups.push(item.columnName)
+      tableData.forEach(async row => {
+        if (row.needGroup) {
+          this.tableGroups.push(row.columnName)
         }
-        // if (item.listqueryTemplateID || item.listqueryTemplateID == 0) {
-        //   this.tableArrs.push(item.columnName);
-        //   if (!this.tableOptions[item.columnName]) {
-        //     this.tableOptions[item.columnName] = await this.getSelectData(item.listqueryTemplateID);
-        //   }
-        // }
       })
       const now = new Date()
       if (this.$route.path == '/newDeparture') {
         this.leaveCount = 0
         const nTableData = [...tableData]
-        const cData = nTableData.filter(item => Number(item['NO_BSM_number']) + Number(item['check_in_baggage_number']) > 0)
-        cData.forEach(item => {
-          const takeOffTime = item.actualTakeOffTime || item.scheduleTakeOffTime
-          if (takeOffTime && new Date(takeOffTime) < now) {
-            item.hasTakenOff = 'Y'
+        const cData = nTableData.filter(row => Number(row['NO_BSM_number']) + Number(row['check_in_baggage_number']) > 0)
+        cData.forEach(row => {
+          if (row.abnormalState === 'CAN') {
+            row.canceled = 'Y'
+          } else if (row.normalState === 'DEP' || row.actualTakeOffTime) {
+            row.hasTakenOff = 'Y'
             this.leaveCount++
           }
         })
-        this.tableData = _.orderBy([...cData], ["scheduleTakeOffTime", "normalState"], ["asc", "desc"]);
+        this.tableData = _.orderBy(cData, ['canceled', 'scheduleTakeOffTime', 'normalState'], ['desc', 'asc', 'desc']);
       }
       if (this.$route.path == '/newArrival') {
         this.arriveCount = 0
         const nTableData = [...tableData]
-        nTableData.forEach(item => {
-          const landingTime = item.actualLandInTime
-          if (landingTime && new Date(landingTime) < now) {
-            item.hasLanded = 'Y'
+        const cData = nTableData.filter(row => Number(row['NO_BSM_number']) + Number(row['check_in_baggage_number']) > 0)
+        cData.forEach(row => {
+          if (row.abnormalState === 'CAN') {
+            row.canceled = 'Y'
+          } else if (row.normalState === 'ARR' || row.actualLandInTime) {
+            row.hasLanded = 'Y'
             this.arriveCount++
           }
         })
-        this.tableData = _.orderBy(nTableData, ['actualLandInTime', 'normalState'], ['asc', 'desc'])
+        this.tableData = _.orderBy(cData, ['canceled', 'actualLandInTime', 'normalState'], ['desc', 'asc', 'desc'])
       }
       if (this.$route.path.startsWith('/newTransfer')) {
         this.leaveCount = 0
         const nTableData = [...tableData]
-        nTableData.forEach(item => {
-          if (item.departure_flights_leave_date && new Date(item.departure_flights_leave_date) < now) {
-            item.hasTakenOff = 'Y'
+        nTableData.forEach(row => {
+          if (row.departure_flights_leave_date && new Date(row.departure_flights_leave_date) < now) {
+            row.hasTakenOff = 'Y'
             this.leaveCount++
           }
         })
         this.tableData = _.orderBy(nTableData, ['departure_flights_leave_date', 'normalState'], ['asc', 'desc'])
       }
-      const dats = this.setTableFilters(this.tableData, this.tableDataFilters)
-      this.tableDataFilters = _.cloneDeep(dats)
+      const filters = this.setTableFilters(this.tableData, this.tableDataFilters)
+      this.tableDataFilters = _.cloneDeep(filters)
       this.tableGroup(this.tableData)
     },
     setTableFilters (tableData, filters) {
@@ -519,6 +515,27 @@ export default {
       this.spanArr = spanArr
       this.pos = pos
     },
+    setTableScroll() {
+      const count = Math.max(this.leaveCount, this.arriveCount)
+      if ( this.hasSetTableScroll || count === 0) {
+        return
+      }
+      const table = this.$refs['table'].$el
+      const scrollParent = table.querySelector('.el-table__body-wrapper')
+      if (scrollParent.scrollHeight <= scrollParent.offsetHeight) {
+        return
+      }
+      const lastRow = table.querySelectorAll('.el-table__body tr')[count - 1]
+      setTimeout(() => {
+        const scrollMid = lastRow.offsetTop + lastRow.offsetHeight - scrollParent.offsetHeight / 2
+        const scrollMax = scrollParent.scrollHeight - scrollParent.offsetHeight
+        if (scrollMid > 0) {
+          const scrollHeight = Math.min(scrollMid, scrollMax)
+          scrollParent.scrollTo(0, scrollHeight)
+        }
+      }, 0)
+      this.hasSetTableScroll = true
+    },
     popoverShowHandler (prop) {
       this.colShowFilter = prop
     },
@@ -615,7 +632,7 @@ export default {
     rowClass ({ row, rowIndex }) {
       const classes = []
       if (this.checkPath.includes(this.$route.path)) {
-        const { abnormalState, normalState } = row
+        const { abnormalState } = row
         if (abnormalState) {
           if (abnormalState == 'DLY') {
             classes.push('bgl-delayed')
@@ -624,11 +641,6 @@ export default {
             classes.push('bgl-canceled')
           }
         }
-        // if (normalState) {
-        //   if (normalState == 'DEP' || normalState == 'ARR') {
-        //     classes.push('bgl-hui')
-        //   }
-        // }
         if (row.hasTakenOff === 'Y' || row.hasLanded === 'Y') {
           classes.push('bgl-hui')
         }
@@ -697,7 +709,7 @@ export default {
         }
       })
       if (sameColumn && this.fromDataType(sameColumn.dataType) === 'datetime') {
-        return (cellValue ?? '').replace('T', ' ')
+        return (cellValue ?? '').replace('T', '\n')
       }
       return cellValue
     },
@@ -720,7 +732,7 @@ export default {
     .cell {
       color: #000;
       text-align: center;
-      white-space: nowrap;
+      white-space: pre-line;
       padding: 0;
       .el-tooltip {
         white-space: nowrap;
@@ -729,15 +741,15 @@ export default {
         line-height: 34px;
       }
     }
+    tr.bgl-hui td {
+      background: #d2d6df;
+    }
     tr.bgl-delayed td {
       background: #fcf0b1;
     }
     tr.bgl-canceled td {
       background: #f7babe;
     }
-    tr.bgl-hui td {
-      background: #d2d6df;
-    }
     .redBorder {
       position: relative;
       &::after {

src/views/newTransfer/index.vue

@@ -146,7 +146,7 @@ export default {
     async getAirPortData (type = 1) {
       try {
         let res = null
-        res = this.TauthId ? await this.getQueryListAuth(this.TqueryId || SERVICE_ID.getAirpotId, {}, 1, 999, this.TauthId) : await this.getQueryList(SERVICE_ID.getAirpotId)
+        res = this.TauthId ? await this.getQueryListAuth(this.TqueryId || SERVICE_ID.getAirpotId, {}, 1, 9999, this.TauthId) : await this.getQueryList(SERVICE_ID.getAirpotId, {}, 1, 9999)
         if (Number(res.code) === 0) {
           this.AirportList = res.returnData;
           if (type && !this.formData.currentAirport) {