|
|
@@ -575,15 +575,9 @@ export default {
|
|
|
this.baggageCount = this.baggageCount + item.preLoad;
|
|
|
});
|
|
|
this.tableData = this._.sortBy(tableData, [
|
|
|
- "FlightDate",
|
|
|
- "PlanDepartureTime",
|
|
|
+ "PreFlightNO",
|
|
|
+ "PreFlightDate",
|
|
|
]);
|
|
|
- this.tableData.forEach((res) => {
|
|
|
- res = {
|
|
|
- arrivalInfo: res,
|
|
|
- departureInfo: res,
|
|
|
- };
|
|
|
- });
|
|
|
// this.setTableFilters();
|
|
|
// this.toOrderNum(this.baggageCount);
|
|
|
// setInterval(() => {
|
|
|
@@ -643,16 +637,25 @@ export default {
|
|
|
tableSpanMethod({ row, column, rowIndex, columnIndex }) {
|
|
|
if (
|
|
|
[
|
|
|
- "FlightNO",
|
|
|
- "FlightDate",
|
|
|
- "PlanLandingTime",
|
|
|
- "PlanDepartureApt",
|
|
|
+ "PreFlightNO",
|
|
|
+ "PreFlightDate",
|
|
|
+ "PreAirport",
|
|
|
+ "ActualLandingTime",
|
|
|
"LandingBuild",
|
|
|
"Carousel",
|
|
|
"StandForLanding",
|
|
|
- "positionDistribution",
|
|
|
- "expect_load",
|
|
|
- "loadflight",
|
|
|
+ "inTransferBaggageCount",
|
|
|
+ "inTransferredBaggageCount",
|
|
|
+ "FlightNO",
|
|
|
+ "FlightDate",
|
|
|
+ "ActualDepartureTime",
|
|
|
+ "TargetAirport",
|
|
|
+ "DepartureBuild",
|
|
|
+ "BordingGate",
|
|
|
+ "StandForDepartrue",
|
|
|
+ "outTransferBaggageCount",
|
|
|
+ "outTransferredBaggageCount",
|
|
|
+ "timeDifference",
|
|
|
].includes(column["property"])
|
|
|
) {
|
|
|
const _row = this.spanArr[rowIndex];
|
