Browse Source

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

chenjun 2 years ago
parent
commit
a173116862

+ 26 - 5
src/views/baggageManagement/components/departure/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-31 11:09:27
+ * @LastEditTime: 2022-06-09 16:42:57
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -365,6 +365,9 @@ export default {
           label: '中转进行李'
         }
       ],
+      tableDataSortRules: {
+        flightCanceled: 'ascending'
+      },
       AirportList: [],
       loopEvent: null,
       leaveCount: 0,
@@ -406,7 +409,10 @@ export default {
     },
     tableRowClassName({ row, rowIndex }) {
       if (row.flightStatus === 'DLY') {
-        return 'bgl-huang'
+        return 'bgl-delayed'
+      }
+      if (row.flightStatus === 'CAN') {
+        return 'bgl-canceled'
       }
       if (row.hasTakenOff === 0) {
         if (rowIndex === this.leaveCount - 1) {
@@ -466,6 +472,7 @@ export default {
           this.leaveCount++
         }
         item['landingNumber'] = item['loadNumber']
+        item['flightCanceled'] = item['flightStatus'] === 'CAN' ? 1 : 0
         this.baggageCount = this.baggageCount + item.preLoad
       })
       this.tableData = this._.sortBy(tableData, ['hasTakenOff', 'PlanDepartureTime'])
@@ -673,11 +680,25 @@ export default {
           }
         }
       }
-      tr.bgl-huang td {
+      tr.bgl-delayed td {
         background: #fcf0b1;
       }
-      td.cell-warning {
-        background: orange !important;
+      tr.bgl-canceled td {
+        background: #f7babe;
+      }
+      td.cell-tounLoad {
+        background: #facaa0 !important;
+        position: relative;
+        &::after {
+          content: '';
+          display: block;
+          width: 100%;
+          height: 100%;
+          position: absolute;
+          top: 0;
+          left: 0;
+          border: 2px dashed #f58c31;
+        }
       }
     }
   }

+ 2 - 2
src/views/baggageManagement/mixins/terminal.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-03-04 11:41:55
- * @LastEditTime: 2022-05-30 17:25:40
+ * @LastEditTime: 2022-06-09 16:24:07
  * @LastEditors: your name
  * @Description: 航站视图通用部分
  * have a nice day!
@@ -219,7 +219,7 @@ export default {
         }
       }
       if (column.property === 'tounLoad' && row[column.property]) {
-        classes.push('cell-warning')
+        classes.push('cell-tounLoad')
       }
       return classes.join(' ')
     },