工具类抽取及历史数据处理

2018-12-15 17:04:16 +08:00
parent 595a3f38ab
commit 1e735059f8
52 changed files with 890 additions and 948 deletions
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service';
+import { BasicDataService } from '../../../services/basic-data-service';
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';
@Component({
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service';
+import { BasicDataService } from '../../../services/basic-data-service';
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';
@Component({
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service';
+import { BasicDataService } from '../../../services/basic-data-service';
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';
@Component({
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service';
+import { BasicDataService } from '../../../services/basic-data-service';
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service'
+import { BasicDataService } from '../../../services/basic-data-service'
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service';
+import { BasicDataService } from '../../../services/basic-data-service';
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';
@Component({
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service';
+import { BasicDataService } from '../../../services/basic-data-service';
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service'
+import { BasicDataService } from '../../../services/basic-data-service'
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ChangeDetectorRef } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service';
+import { BasicDataService } from '../../../services/basic-data-service';
 import * as $ from 'jquery';
@Component({
    selector: 'app-city',
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service'
+import { BasicDataService } from '../../../services/basic-data-service'
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';
@Component({
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service';
+import { BasicDataService } from '../../../services/basic-data-service';
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';
@Component({
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service';
+import { BasicDataService } from '../../../services/basic-data-service';
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';
@Component({
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { BasicDataService } from '../../basic-data-service'
+import { BasicDataService } from '../../../services/basic-data-service'
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';

@@ -3,23 +3,9 @@
        <div class="search-filter mb-3">
            <div class="first-condition row">
                <div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
-                  <select class="mr-4 form-control" [(ngModel)]="SEL_COL" name="" id="">
+                    <select [(ngModel)]="SEL_COL" class="mr-4 form-control" name="" id="">
                        <option value="">选择列名</option>
-                      <option value="">航班号</option>
-                      <option value="">飞机号</option>
-                      <option value="">航线</option>
-                      <option value="">前站起飞时间</option>
-                      <option value="">计划到达/出发</option>
-                      <option value="">预计到达/出发</option>
-                      <option value="">实际到达/出发</option>
-                      <option value="">机型</option>
-                      <option value="">停机位</option>
-                      <option value="">登机门</option>
-                      <option value="">商调完成</option>
-                      <option value="">值机打开</option>
-                      <option value="">值机关闭</option>
-                      <option value="">登机开始</option>
-                      <option value="">登机结束</option>
+                        <option *ngFor="let airline_col of render_col_lists" [value]="airline_col.COL_CODE">{{airline_col.COL_CN}}</option>
                    </select>
                    <label class="radio-inline custom-radio nowrap mr-4">
                        <input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
@@ -32,158 +18,129 @@
                    <input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter)="inputEnter()">
                </div>
                <div class="line-operator-right mb-3 col-xlg-4 col-mlg-4 col-xl-4 col-lg-1">
-                  <!-- <button type="button" class="btn btn-info mr-3">打印</button>
-                        <button type="button" class="btn btn-info mr-3">航班延误信息修订</button>-->
-                  <button type="button" class="btn btn-info mr-3">刷新</button>
+                    <button type="button" class="btn btn-info mr-3" (click)="refresh()">刷新</button>
                </div>
            </div>

            <div class="second-condition mb-3 row">
                <div class="input-container mr-4">
-            <label for="airlineId">航空公司：&nbsp;&nbsp;</label>
-            <select  class="form-control"  (ngModelChange)="selectChange()">
+                    <label for="">航空公司：&nbsp;&nbsp;</label>
+                    <select [(ngModel)]="filterItems.ALCD" (ngModelChange)="selectChange()" class="form-control">
                        <option value=""></option>
-                <!-- <option *ngFor="let item of airlines" [value]="item.airlineId">{{item.airlineName}}</option> -->
+                        <option *ngFor="let airline of airlinesSelections" [value]="airline.airlineCodeIata">{{airline.airlineName}}</option>
                    </select>
                </div>
                <div class="input-container mr-4">
-              <label for="routeType">航线类别：&nbsp;&nbsp;</label>
-              <select  class="form-control" [(ngModel)]="filterItems.TT" (ngModelChange)="selectChange()">
+                    <label for="">航线类别：&nbsp;&nbsp;</label>
+                    <select [(ngModel)]="filterItems.FLIN" (ngModelChange)="selectChange()" class="form-control">
                        <option value=""></option>
                        <option value="D">国内</option>
                        <option value="I">国际</option>
                        <option value="M">混合</option>
                        <option value="R">地区</option>
-                  <!-- <option *ngFor="let item of seasonals" [value]="item.routeType">{{item.routeType}}</option> -->
                    </select>
                </div>
                <div class="input-container mr-4">
-            <label for="flightTask">航班任务：&nbsp;&nbsp;</label>
-            <select  class="form-control" [(ngModel)]="filterItems.flightTask" (ngModelChange)="selectChange()">
+                    <label for="">航班类别：&nbsp;&nbsp;</label>
+                    <select [(ngModel)]="filterItems.FLTY" (ngModelChange)="selectChange()" class="form-control">
                        <option value=""></option>
-                <option value="S">正班</option>
-                <option value="N">包机</option>
-                <option value="E">急救</option>
-                <option value="B">专机</option>
-                <option value="G">通用</option>
-                <option value="J">加班</option>
-                <option value="M">军用</option>
-                <option value="Q">补班</option>
-                <option value="X">其他</option>
-                <option value="A">计划外</option>
-                <!-- <option *ngFor="let item of seasonals" [value]="item.flightTask">{{item.flightTask}}</option> -->
+                        <option *ngFor="let type of flightTypeSelections" [value]="type.flightTypeCode">{{type.flightTypeNameCn}}</option>
                    </select>
                </div>
                <div class="input-container mr-4">
-            <label for="arriOrDept">到达/出发：&nbsp;&nbsp;</label>
-            <select  class="form-control" [(ngModel)]="filterItems.arriOrDept" (ngModelChange)="selectChange()">
+                    <label for="">到达/出发：</label>
+                    <select [(ngModel)]="filterItems.MVIN" (ngModelChange)="selectChange()" class="form-control">
                        <option value=""></option>
                        <option value="A">到达</option>
-                <option value="D">出发</option>
-                <!-- <option *ngFor="let item of seasonals" [value]="item.arriOrDept">{{item.arriOrDept}}</option> -->
+                        <option value="D">离港</option>
                    </select>
                </div>
                <div class="input-container mr-4">
-            <label for="flightTypeCode">航班代理：&nbsp;&nbsp;</label>
-            <select  class="form-control" [(ngModel)]="filterItems.flightTypeCode" (ngModelChange)="selectChange()">
+                    <label for="">机坪代理：&nbsp;&nbsp;</label>
+                    <select [(ngModel)]="filterItems.FHAG" class="form-control">
                        <option value=""></option>
-                <option value="T">国航代理</option>
-                <option value="G">川航代理</option>
-                <!-- <option *ngFor="let item of seasonals" [value]="item.flightTypeCode">{{item.flightTypeCode}}</option> -->
+                        <option value="GH">国航代理</option>
+                        <option value="CH">川航代理</option>
                    </select>
                </div>
                <div class="input-container mr-4">
-            <label for="">异常状态：&nbsp;&nbsp;</label>
-            <select  class="form-control" (ngModelChange)="selectChange()">
+                    <label for="">旅客代理：&nbsp;&nbsp;</label>
+                    <select [(ngModel)]="filterItems.PHAG" class="form-control">
                        <option value=""></option>
-                <!-- <option *ngFor="let item of seasonals" [value]="item.arriOrDept">{{item.arriOrDept}}</option> -->
+                        <option value="GH">国航代理</option>
+                        <option value="CH">川航代理</option>
                    </select>
                </div>
-      </div>
-      <div class="third-condition row">
-        <label class="radio-inline custom-checkbox nowrap mr-4">
-            <input type="checkbox">
-            <span>航班关联信息</span>
-        </label>
-        <label class="radio-inline custom-checkbox nowrap mr-4">
-            <input type="checkbox">
-            <span>详细信息</span>
-        </label>
-        <label class="radio-inline custom-checkbox nowrap mr-4">
-            <input type="checkbox">
-            <span>保障信息</span>
-        </label>
-        <label class="radio-inline custom-checkbox nowrap mr-4">
-            <input type="checkbox">
-            <span>航班VIP信息</span>
-        </label>
-        <label class="radio-inline custom-checkbox nowrap mr-4">
-            <input type="checkbox">
-            <span>航班特服信息</span>
-        </label>
+                <div class="input-container mr-4">
+                    <label for="">维护代理：&nbsp;&nbsp;</label>
+                    <select [(ngModel)]="filterItems.MHAG" class="form-control">
+                        <option value=""></option>
+                        <option value="GH">国航代理</option>
+                        <option value="CH">川航代理</option>
+                    </select>
                </div>
            </div>

+            <div class="third-condition row">
+                <label class="radio-inline custom-checkbox nowrap mr-4">
+                    <input type="checkbox" [(ngModel)]="checkboxGroup.related" (ngModelChange)="checkboxChange()">
+                    <span>航班关联信息</span>
+                </label>
+                <label class="radio-inline custom-checkbox nowrap mr-4">
+                    <input type="checkbox" [(ngModel)]="checkboxGroup.detail" (ngModelChange)="checkboxChange()">
+                    <span>详细信息</span>
+                </label>
+                <!-- <label class="radio-inline custom-checkbox nowrap mr-4">
+                    <input type="checkbox" [(ngModel)]="checkboxGroup.vip" (ngModelChange)="checkboxChange()">
+                    <span>航班VIP信息</span>
+                </label>
+                <label class="radio-inline custom-checkbox nowrap mr-4">
+                    <input type="checkbox" [(ngModel)]="checkboxGroup.guarantee" (ngModelChange)="checkboxChange()">
+                    <span>保障信息</span>
+                </label>
+                <label class="radio-inline custom-checkbox nowrap">
+                    <input type="checkbox" [(ngModel)]="checkboxGroup.special" (ngModelChange)="checkboxChange()">
+                    <span>航班特服信息</span>
+                </label> -->
+            </div>
+        </div>
        <div class="airline-table">
-          <div id="table-container" class="table-container">
+            <div id="table-container" class="table-container" [ngClass]="{'table-c': !tabClose,'table-o': tabClose}">
                <table id="table" class="table table-bordered table-striped">
                    <thead>
                        <tr>
                            <th>序号</th>
-                          <!-- <th>航班号</th>
-                          <th>飞机号</th>
-                          <th>航线</th>
-                          <th>前站起飞时间</th>
-                          <th>计划到达/出发</th>
-                          <th>预计到达/出发</th>
-                          <th>实际到达/出发</th>
-                          <th>机型</th>
-                          <th>停机位</th>
-                          <th>登机门</th>
-                          <th>商调完成</th>
-                          <th>值机打开</th>
-                          <th>值机关闭</th>
-                          <th>登机开始</th>
-                          <th>登机结束</th>
-                          <th>航空公司</th>
-                          <th>航线类别</th>
-                          <th>航班任务</th>
-                          <th>到达/出发</th>
-                          <th>航班代理</th>
-                          <th>异常状态</th>-->
-                          <th *ngFor="let airline_col of historical_lists">{{airline_col.COL_CN}}</th>
+                            <th *ngFor="let airline_col of render_col_lists">{{airline_col.COL_CN}}</th>
                        </tr>
                    </thead>
                    <tbody>
-                      <tr *ngFor="let historical of render_data;let i = index" (click)="selectRow(historical)"
-                          [ngClass]="{'selected':row_state['renderFlight']===historical['renderFlight']}">
+                        <tr *ngFor="let airline_row of render_data;let i = index;last as isLast" (click)="selectRow(airline_row)"
+                            [ngClass]="{'selected':row_state['renderFlight']['FLNO']===airline_row['renderFlight']['FLNO']}">
                            <td>{{i+1}}</td>
-                          <!--<td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td>
-                          <td>{{historical.}}</td> -->
-                          <td *ngFor="let airline_col of historical_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{historical['renderFlight'][airline_col.COL_CODE]}}</td>
+                            <td *ngFor="let airline_col of render_col_lists" [ngClass]="getPosition(airline_col.COL_CODE,airline_row)">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td>
                        </tr>
                    </tbody>
                </table>
            </div>
+            <div class="airline-message" [ngClass]="{'tab-c': tabClose,'tab-o': !tabClose}">
+                <!-- <nz-tabset [nzTabPosition]="'top'" [nzType]="'card'" [nzShowPagination]="false">
+                    <nz-tab nzTitle="关联信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.related">
+                        <app-related-tab [flight]="row_state"></app-related-tab>
+                    </nz-tab>
+                    <nz-tab nzTitle="详细信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.detail">
+                        <app-detail-tab [flight]="row_state"></app-detail-tab>
+                    </nz-tab>
+                    <nz-tab nzTitle="保障信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.guarantee">
+                        <app-guarantee-tab></app-guarantee-tab>
+                    </nz-tab>
+                    <nz-tab nzTitle="VIP信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.vip">
+                        <app-vip-tab></app-vip-tab>
+                    </nz-tab>
+                    <nz-tab nzTitle="特服信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.special">
+                        <app-special-tab></app-special-tab>
+                    </nz-tab>
+                </nz-tabset> -->
+            </div>
        </div>
    </div>
 </div>
@@ -1,8 +1,16 @@
 import { Component, OnInit } from '@angular/core';
 import { ChangeDetectorRef } from '@angular/core';
+
+import { ToastService } from '../../components/toast/toast.service';
+import { ToastConfig, ToastType } from '../../components/toast/toast-model';
+
 import { HttpClientService } from '../../services/http-client.service';
-import dateFormatter from '../../utils/data-formatter';
-import { HttpParams } from '@angular/common/http';
+import { BasicDataService } from '../../services/basic-data-service';
+import { OperateSpinServiceService } from '../../services/operate-spin-service.service';
+
+import { DynamicFlightOrder } from '../../utils/dynamic-flight-order';
+import { FlightsDataHandle } from '../../utils/flights-data-handle';
+
 import * as $ from 'jquery';

@Component({
@@ -13,159 +21,200 @@ import * as $ from 'jquery';
 export class HistoricalDataComponent implements OnInit {

    constructor(
+        private basicDataService: BasicDataService,
+        private operateSpinServiceService: OperateSpinServiceService,
        private httpCilent: HttpClientService,
-    private changeDetectorRef: ChangeDetectorRef
-) { }
+        private toastService: ToastService,
+        private changeDetectorRef: ChangeDetectorRef,
+    ) {
+        this.operateSpinServiceService.showSpin();
+        this.changeDetectorRef.detach();
+    }
+    public orderHandle = new DynamicFlightOrder();
+    public dataHandle = new FlightsDataHandle();

-public raw_data: Array<object> = [];    //原始数据，即航班计划
+    public tabClose: boolean = true;

+    //各项基础数据
+    public flightTypes: Array<any>;
+    public terminals: Array<any>;
+    public flightStatus: Array<any>;
+    public airports: Array<any>;
+    public citys: Array<any>;
+    public airlines: Array<any>;
+
+    public airlinesSelections: Array<any> = [];
+    public flightTypeSelections: Array<any> = [];
+
+    public raw_data: Array<object> = [];    //原始数据，未经过任何转换和组合
    public combined_data: Array<object> = [];    //组合数据，即链接航班，显示信息等组合好之后的数据
-
    public render_data: Array<object> = [];  //显示数据，即需要显示的数据

-public historical_lists: Array<object>;    //列数据
+    public col_lists: Array<object>;    //列数据
+    public render_col_lists: Array<object>;

    public row_state: any = { renderFlight: {} };

-// 搜索条件
-SEARCH = '';    //手动输入条件
-FLT_POS = 1;    //过滤还是定位
-SEL_COL = '';   //选择列名
-
-public filterItems = {
-    TT: '',//航线类别
-    flightTask:'',//航班任务
-    arriOrDept:'',//到达/出发
-    flightTypeCode:''//航班代理
-}
-
-public formatter = {
-    'TT': {
-        'D': '国内'
-    },
-    'flightTask': {
-        'S': '正班'
-    },
-    'arriOrDept': {
-        'A': '到达'
-    },
-    'flightTypeCode': {
-        'T': '国航代理'
-    },
-    'SODT': dateFormatter,
-    'ESTT': dateFormatter,
-    'ACTT': dateFormatter
-}
-
-selectRow(i) {
-    this.row_state = i;
-    this.changeDetectorRef.detectChanges();
-}
-
-getColor(col_CODE) {
-    if (col_CODE === 'SODT') {
-        return 'skyblue'
-    } else {
-        return null
-    }
+    public checkboxGroup = {
+        'related': false,
+        'detail': false,
+        'vip': false,
+        'special': false,
+        'guarantee': false
    }

    ngOnInit() {
-    this.changeDetectorRef.detach();
-    /* 获取显示列 */
-    this.httpCilent.get('/assets/mock-data/historical-code.json').subscribe(
+
+        /* 获取用户设置 */
+        this.httpCilent.get('/adminapi/settings/uisettings').subscribe(
            data => {
-            data.sort(function (a, b) {
-                return (a['COL_ORDER'] - b['COL_ORDER']);
+                data.body.forEach(element => {
+                    if (element.groupCode === 'userSettingCol') {
+                        this.col_lists = JSON.parse(element.settingContent).allCols;
+                        this.render_col_lists = JSON.parse(element.settingContent).targetList;
+                    }
                })
-            this.historical_lists = data;
            }
        )
-    /* 获取历史数据信息 */
-    this.httpCilent.get('/assets/mock-data/historical-data.json').subscribe(
+        //获取航班动态信息
+        this.httpCilent.post('/adminapi/hitFlightData/list', { searchDate: new Date().getTime() }).subscribe(
            data => {
-            //解析数据
-            data.forEach(element => {
-                this.raw_data.push(JSON.parse(element.value));
+                this.raw_data = data.body;
+
+                //查找链接航班并将其组合成一条数据
+                let combined_linked_data = this.dataHandle.findLinkFlights(this.raw_data);
+                combined_linked_data.forEach(element => {
+                    let flights_item = this.dataHandle.flightsRenderTransfer(element, this.col_lists);
+                    this.combined_data.push(flights_item);
                });

-            let combined_linked_data = this.raw_data;
+                //从基础数据服务中拿出部分基础数据
+                this.flightTypes = this.basicDataService.flightTypes;
+                this.terminals = this.basicDataService.terminal;
+                this.flightStatus = this.basicDataService.flightStatus;
+                this.airlines = this.basicDataService.airline;
+                this.citys = this.basicDataService.city;
+                this.airports = this.basicDataService.airport;

-            combined_linked_data.forEach(element => {
-                let row_flights = {};
-                let render_flight = {};
-                let render_pre_flight = {};
-                let render_rea_flight = {};
-                row_flights['preFlight'] = element;
-
-                for (let i = 0; i < this.historical_lists.length; i++) {
-                    let key = this.historical_lists[i]['COL_CODE']
-                    render_flight[key] = typeof (this.formatter[key]) === 'function' ? this.formatter[key](row_flights['preFlight'][key], 1) : this.formatter[key] ? this.formatter[key][row_flights['preFlight'][key]] : row_flights['preFlight'][key];
-                }
-                row_flights['renderFlight'] = render_flight;
-                if (element['isLinked']) {
-                    row_flights['preFlight'] = element['linkFlight'];
-                    delete element['linkFlight'];
-                    delete element['isLinked'];
-                    row_flights['reaFlight'] = element;
-
-                    for (let i = 0; i < this.historical_lists.length; i++) {
-                        let key = this.historical_lists[i]['COL_CODE']
-                        if (this.formatter.hasOwnProperty(key)) {
-                            if (typeof (this.formatter[key]) === 'function') {
-                                render_flight[key] = (row_flights['preFlight'][key] === row_flights['reaFlight'][key]) ? (this.formatter[key](row_flights['preFlight'][key], 1)) : (this.formatter[key](row_flights['preFlight'][key], 1) + '/' + this.formatter[key](row_flights['reaFlight'][key], 1));
-                                render_pre_flight[key] = this.formatter[key](row_flights['preFlight'][key], 1);
-                                render_rea_flight[key] = this.formatter[key](row_flights['reaFlight'][key], 1);
-                            } else {
-                                render_flight[key] = (row_flights['preFlight'][key] === row_flights['reaFlight'][key]) ? (this.formatter[key][row_flights['preFlight'][key]]) : (this.formatter[key][row_flights['preFlight'][key]] + '/' + this.formatter[key][row_flights['reaFlight'][key]]);
-                                render_pre_flight[key] = this.formatter[key][row_flights['preFlight'][key]];
-                                render_rea_flight[key] = this.formatter[key][row_flights['reaFlight'][key]];
-                            }
-                        } else {
-                            render_flight[key] = (row_flights['preFlight'][key] === row_flights['reaFlight'][key]) ? (row_flights['preFlight'][key]) : (row_flights['preFlight'][key] + '/' + row_flights['reaFlight'][key]);
-                            render_pre_flight[key] = row_flights['preFlight'][key];
-                            render_rea_flight[key] = row_flights['reaFlight'][key];
-                        }
-                    }
-                    row_flights['renderFlight'] = render_flight;
-                    row_flights['renderPreFlight'] = render_pre_flight;
-                    row_flights['renderReaFlight'] = render_rea_flight;
-                }
-                this.combined_data.push(row_flights);
+                if (this.airports && this.airports.length > 0) {
+                    let combined_data = []
+                    this.combined_data.forEach(item => {
+                        combined_data.push(this.dataHandle.basicDataTransHandle(item, this.airports, this.citys, this.airlines, this.flightStatus, this.flightTypes));
                    })
-            //this.doSequence(this.combined_data);
-            this.render_data = this.combined_data
-            this.changeDetectorRef.detectChanges();
+                    this.combined_data = combined_data;
+                    this.doSequence(this.combined_data);
+                } else {
+                    this.basicDataService.flightTypes_subject.subscribe(
+                        val => this.flightTypes = val
+                    )
+                    this.basicDataService.terminal_subject.subscribe(
+                        val => this.terminals = val
+                    )
+                    this.basicDataService.flightStatus_subject.subscribe(
+                        val => this.flightStatus = val
+                    );
+                    this.basicDataService.airline_subject.subscribe(
+                        val => this.airlines = val
+                    );
+                    this.basicDataService.city_subject.subscribe(
+                        val => this.citys = val
+                    );
+                    this.basicDataService.airport_subject.subscribe(
+                        val => {
+                            this.airports = val;
+                            let combined_data = []
+                            this.combined_data.forEach(item => {
+                                combined_data.push(this.dataHandle.basicDataTransHandle(item, this.airports, this.citys, this.airlines, this.flightStatus, this.flightTypes));
+                            })
+                            this.combined_data = combined_data;
+                            this.doSequence(this.combined_data);
+                        }
+                    );
+                }
            }
        )
-        /**
-         * 固定表头
-         */
-        var tableCont = document.querySelector('#table-container');
+
+        //固定表头
+        var tableCont = document.querySelector('#table-container')
        function scrollHandle() {
            var scrollTop = this.scrollTop;
            this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
        }
-        tableCont.addEventListener('scroll',scrollHandle);
+        tableCont.addEventListener('scroll', scrollHandle)
    }

+    /**
+     * 数据组合完毕，执行排序、渲染以及动态信息处理
+     * @param combined_data 
+     */
+    doSequence(combined_data) {
+        this.raw_data.forEach(element => {
+            if (this.airlinesSelections.findIndex(airline => airline.airlineCodeIata === element['ALCD']) === -1) {
+                let index = this.airlines.findIndex(val => val.airlineCodeIata === element['ALCD']);
+                this.airlinesSelections.push(this.airlines[index]);
+            }
+            if (this.flightTypeSelections.findIndex(flightType => flightType.flightTypeCode === element['FLTY']) === -1) {
+                let index = this.flightTypes.findIndex(val => val.flightTypeCode === element['FLTY']);
+                this.flightTypeSelections.push(this.flightTypes[index]);
+            }
+        })
+
+        // combined_data.forEach(element => {
+        //     element['ORDER'] = this.orderHandle.sequence(element);
+        // })
+        // combined_data.sort(function (a, b) {
+        //     return (a['ORDER'] - b['ORDER']);
+        // })
+        this.render_data = combined_data;
+        this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
+        this.changeDetectorRef.detectChanges();
+        this.operateSpinServiceService.hideSpin()
+    }
+
+    /**
+     * 刷新
+     */
+    refresh() {
+        const toastCfg = new ToastConfig(ToastType.SUCCESS, '', '刷新成功！', 3000);
+        this.toastService.toast(toastCfg);
+    }
+
+
    /**
     * 过滤及定位
     * @param filterItems
     * @return
     */
-//输入框回车事件
+    SEARCH = '';    //手动输入条件
+    FLT_POS = 1;    //过滤还是定位
+    SEL_COL = '';   //选择列名
+    public filterItems = {
+        ALCD: '',    //航空公司
+        FLIN: '',    //航线类别
+        FLTY: '',    //航班类别
+        MVIN: '',    //到达/出发
+        FHAG: '',    //机坪代理
+        MHAG: '',    //维护代理
+        PHAG: '',    //旅客代理
+    }
+
+    /**
+     * 输入框回车事件
+     */
    inputEnter() {
        if (this.FLT_POS === 1) {
            this.selectChange()
        } else {
-        this.selectChange()
            this.inputPosition(this.render_data)
        }
    }

-//下拉框选择筛选
+    /**
+     * 下拉框选择筛选
+     */
    selectChange() {
+        this.operateSpinServiceService.showSpin();
+        setTimeout(() => {
            let filter_data = [];
            let filterItems = this.filterItems;
            this.combined_data.forEach(item => {
@@ -173,7 +222,7 @@ selectChange() {
            })
            //下拉框筛选
            filter_data = filter_data.filter(item => {
-        if (item) {
+                if (this.orderHandle.isArriFlight(item)) {
                    let is_satis = true;
                    for (const key in filterItems) {
                        if (filterItems.hasOwnProperty(key) && filterItems[key]) {
@@ -184,11 +233,10 @@ selectChange() {
                                is_satis = false;
                                break;
                            }
-
                        }
                    }
                    return is_satis;
-        } else if (item) {
+                } else if (this.orderHandle.isDeptFlight(item)) {
                    let is_satis = true;
                    for (const key in filterItems) {
                        if (filterItems.hasOwnProperty(key) && filterItems[key]) {
@@ -199,7 +247,6 @@ selectChange() {
                                is_satis = false;
                                break;
                            }
-
                        }
                    }
                    return is_satis;
@@ -215,7 +262,6 @@ selectChange() {
                                pre_satis = false;
                                break;
                            }
-
                        }
                    }
                    for (const key in filterItems) {
@@ -227,15 +273,18 @@ selectChange() {
                                rea_satis = false;
                                break;
                            }
-
                        }
                    }

                    if (pre_satis && !rea_satis) {
                        item['renderFlight'] = item['renderPreFlight'];
+                        delete item['reaFlight'];
+                        delete item['renderReaFlight'];
                        return pre_satis;
                    } else if (!pre_satis && rea_satis) {
                        item['renderFlight'] = item['renderReaFlight'];
+                        delete item['preFlight'];
+                        delete item['renderPreFlight'];
                        return rea_satis;
                    } else if (pre_satis && rea_satis) {
                        return pre_satis && rea_satis;
@@ -249,12 +298,15 @@ selectChange() {
            } else {
                this.render_data = filter_data;
                this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
-        // this.inputPosition(this.render_data);
                this.changeDetectorRef.detectChanges();
            }
+        }, 10)
    }

-//输入框筛选
+    /**
+     * 输入框筛选
+     * @param filterData 
+     */
    inputFilter(filterData) {
        if (this.SEARCH) {
            if (this.SEL_COL) {
@@ -265,21 +317,17 @@ inputFilter(filterData) {
                            return true;
                        }
                    } else {
-                    if (this.SEARCH) {
                        return false;
-                    } else {
-                        return true;
-                    }
                    }
                })

            } else {
                filterData = filterData.filter(item => {
                    let is_satis = false;
-                for (const key in item['renderFlight']) {
-                    if (item['renderFlight'].hasOwnProperty(key)) {
-                        if (item['renderFlight'][key]) {
-                            if (item['renderFlight'][key].toString().match(new RegExp(this.SEARCH, 'i'))) {
+                    let cols = this.col_lists;
+                    for (let i = 0; i < cols.length; i++) {
+                        if (item['renderFlight'][cols[i]['COL_CODE']]) {
+                            if (item['renderFlight'][cols[i]['COL_CODE']].toString().match(new RegExp(this.SEARCH, 'i'))) {
                                is_satis = true;
                                break;
                            } else {
@@ -287,16 +335,8 @@ inputFilter(filterData) {
                                continue;
                            }
                        } else {
-                            if (this.SEARCH) {
                            is_satis = false;
                            continue;
-                            } else {
-                                is_satis = true;
-                                break;
-                            }
-                        }
-                    } else {
-                        continue;
                        }
                    }
                    return is_satis;
@@ -306,11 +346,15 @@ inputFilter(filterData) {
        this.render_data = filterData;
        this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
        this.changeDetectorRef.detectChanges();
+        this.operateSpinServiceService.hideSpin()
    }

+    /**
+     * 输入框定位
+     */
    positionArray: Array<any> = [];
    positionArrayIndex: number = 0;
-//输入框定位
+
    inputPosition(filterData) {
        let transArray = []
        if (this.SEL_COL) {
@@ -328,10 +372,10 @@ inputPosition(filterData) {
            });
        } else {
            filterData.forEach(element => {
-            for (const key in element['renderFlight']) {
-                if (element['renderFlight'].hasOwnProperty(key)) {
-                    if (element['renderFlight'][key]) {
-                        if (element['renderFlight'][key].toString().match(new RegExp(this.SEARCH, 'i'))) {
+                let cols = this.col_lists;
+                for (let i = 0; i < cols.length; i++) {
+                    if (element['renderFlight'][cols[i]['COL_CODE']]) {
+                        if (element['renderFlight'][cols[i]['COL_CODE']].toString().match(new RegExp(this.SEARCH, 'i'))) {
                            transArray.push(element)
                            break;
                        } else {
@@ -345,10 +389,6 @@ inputPosition(filterData) {
                            break;
                        }
                    }
-
-                } else {
-                    continue;
-                }
                }
            });
        }
@@ -373,7 +413,63 @@ inputPosition(filterData) {

        let tr = $(".selected");
        let objTr = tr[0];
+        if (objTr) {
            $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
+        }

    }
+
+    /**
+     * 选中某行
+     * @param i 
+     */
+    selectRow(i) {
+        this.row_state = i;
+        this.changeDetectorRef.detectChanges();
+    }
+
+    /**
+     * 单元格内容居左居右
+     * @param col_CODE
+     * @param flight 
+     */
+    getPosition(col_CODE, flight) {
+        if (this.orderHandle.isDeptFlight(flight)) {
+            if (col_CODE === 'FLNO' || col_CODE === 'SODT' || col_CODE === 'ESTT' || col_CODE === 'ACTT') {
+                return 'text-right';
+            }
+        } else if (this.orderHandle.isLinked(flight)) {
+            if (col_CODE === 'SODT' || col_CODE === 'ESTT' || col_CODE === 'ACTT') {
+                if (!flight['renderPreFlight'][col_CODE] && flight['renderReaFlight'][col_CODE]) {
+                    return 'text-right';
+                }
+            }
+        }
+
+    }
+
+    /**
+     * 复选框勾选事件
+     */
+    checkboxChange() {
+        for (const key in this.checkboxGroup) {
+            if (this.checkboxGroup.hasOwnProperty(key)) {
+                if (this.checkboxGroup[key]) {
+                    this.tabClose = false;
+                    break;
+                } else {
+                    this.tabClose = true;
+                    continue;
+                }
+            }
+        }
+        this.changeDetectorRef.detectChanges()
+    }
+
+    /**
+     * tab项切换事件
+     */
+    nzClick() {
+        this.changeDetectorRef.detectChanges();
+    }
 }
@@ -1,13 +1,16 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { NgZorroAntdModule } from 'ng-zorro-antd'
 import { HistoricalDataComponent } from './historical-data.component';
 import { HistoricalDataRouting } from './historical-data-routing.module';
-import { FormsModule } from '@angular/forms';
+
@NgModule({
    imports: [
        CommonModule,
-        HistoricalDataRouting,
-        FormsModule
+        FormsModule,
+        NgZorroAntdModule,
+        HistoricalDataRouting
    ],
    declarations: [HistoricalDataComponent]
 })
@@ -5,16 +5,16 @@ import { ToastService } from '../../components/toast/toast.service';
 import { ToastConfig, ToastType } from '../../components/toast/toast-model';

 import { HttpClientService } from '../../services/http-client.service';
-import { BasicDataService } from '../basic-data-service';
-import { OperateSpinServiceService } from '../operate-spin-service.service';
+import { BasicDataService } from '../../services/basic-data-service';
+import { OperateSpinServiceService } from '../../services/operate-spin-service.service';
 import { WebsocketService } from '../../services/websocket.service';

-import { DynamicFlightOrder } from './utils/dynamic-flight-order';
-import { FlightsDataHandle } from './utils/flights-data-handle';
-import { CellColorHandle } from './utils/cell-color-handle';
-import { AlertMessageHandle } from './utils/alert-message-handle';
+import { DynamicFlightOrder } from '../../utils/dynamic-flight-order';
+import { FlightsDataHandle } from '../../utils/flights-data-handle';
+import { CellColorHandle } from '../../utils/cell-color-handle';
+import { AlertMessageHandle } from '../../utils/alert-message-handle';

-import dateFormatter from '../../utils/data-formatter';
+import dateFormatter from '../../utils/date-formatter';

 import * as $ from 'jquery';
@Component({
@@ -321,16 +321,7 @@ export class MainComponent implements OnInit {
     * 刷新
     */
    refresh() {
-        // let testss = this.render_data.reverse();
-        // let tstt = [];
-        // testss.forEach(element => {
-        //     tstt.push(Object.assign({}, element))
-        // })
-
-        // this.render_data = testss;
-        // this.changeDetectorRef.detectChanges();
-
-        const toastCfg = new ToastConfig(ToastType.SUCCESS, '', '登录成功！', 3000);
+        const toastCfg = new ToastConfig(ToastType.SUCCESS, '', '刷新成功！', 3000);
        this.toastService.toast(toastCfg);
    }

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Router, NavigationEnd, ActivatedRoute } from '@angular/router';
-import { BasicDataService } from './basic-data-service';
-import { OperateSpinServiceService } from './operate-spin-service.service';
+import { BasicDataService } from '../services/basic-data-service';
+import { OperateSpinServiceService } from '../services/operate-spin-service.service';
 import { HttpClientService } from '../services/http-client.service';

 import { ToastService } from '../components/toast/toast.service';
@@ -8,8 +8,8 @@ import { PagesRoutingModule } from './pages-routing.module';
 import { SidebarMenuModule } from '../components/sidebar-menu/sidebar-menu.module';
 import { BarMenuModule } from '../components/bar-menu/bar-menu.module';

-import { BasicDataService } from './basic-data-service';
-import { OperateSpinServiceService } from './operate-spin-service.service';
+import { BasicDataService } from '../services/basic-data-service';
+import { OperateSpinServiceService } from '../services/operate-spin-service.service';

@NgModule({
    imports: [
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { HttpClientService } from '../../services/http-client.service';
-import { BasicDataService } from '../basic-data-service';
+import { BasicDataService } from '../../services/basic-data-service';
 import { ChangeDetectorRef } from '@angular/core';
 import * as $ from 'jquery';
@Component({
@@ -1,5 +1,5 @@
 import { Pipe, PipeTransform, OnInit } from '@angular/core';
-import { BasicDataService } from '../../pages/basic-data-service';
+import { BasicDataService } from '../../services/basic-data-service';

@Pipe({
    name: 'terminalArea'
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { HttpClientService } from '../services/http-client.service';
+import { HttpClientService } from './http-client.service';
 import { Subject, forkJoin, zip } from 'rxjs'

@Injectable()
@@ -1,20 +0,0 @@
-/**
- * 登机桥显示转换
- */
-
-export default function (flight) {
-    if(flight['ABTM']){
-        if(Array.isArray(flight['ABTM'])&&flight['ABTM'].length>0){
-            let abdg = [];
-            for (let i = 0; i < flight['ABTM'].length; i++) {
-                abdg.push(flight['ABTM'][i]['ABDG']);
-            }
-            let set = new Set(abdg);
-            return Array.from(set).join(',');
-        }else{
-            return ''
-        }
-    }else{
-        return '';
-    }
-}
@@ -1,11 +0,0 @@
-/**
- * 实际到达/出发时间显示转换
- */
-import timeFormatter from './time-formatter';
-export default function (flight) {
-    if (flight['ACTT']) {
-        return timeFormatter(flight['ACTT']);
-    } else {
-        return '';
-    }
-}
@@ -1,20 +0,0 @@
-/**
- * 登机桥靠桥时间显示转换
- */
-import timeFormatter from './time-formatter';
-
-export default function (flight) {
-    if (flight['ABTM']) {
-        if (Array.isArray(flight['ABTM']) && flight['ABTM'].length > 0) {
-            for (let i = 0; i < flight['ABTM'].length; i++) {
-                if (flight['ABTM'][i]['ABOP'] === 'A') {
-                    return timeFormatter(flight['ABTM'][i]['AOTM']);
-                }
-            }
-        } else {
-            return '';
-        }
-    } else {
-        return '';
-    }
-}
@@ -1,20 +0,0 @@
-/**
- * 登机桥撤桥时间显示转换
- */
-import timeFormatter from './time-formatter';
-
-export default function (flight) {
-    if (flight['ABTM']) {
-        if (Array.isArray(flight['ABTM']) && flight['ABTM'].length > 0) {
-            for (let i = 0; i < flight['ABTM'].length; i++) {
-                if (flight['ABTM'][i]['ABOP'] === 'D') {
-                    return timeFormatter(flight['ABTM'][i]['AOTM']);
-                }
-            }
-        } else {
-            return '';
-        }
-    } else {
-        return '';
-    }
-}
@@ -1,20 +0,0 @@
-/**
- * 转盘号显示转换
- */
-
-export default function (flight) {
-    if (flight['CLDT']) {
-        if (Array.isArray(flight['CLDT']) && flight['CLDT'].length > 0) {
-            let belt = [];
-            for (let i = 0; i < flight['CLDT'].length; i++) {
-                belt.push(flight['CLDT'][i]['BELT']);
-            }
-            let set = new Set(belt);
-            return Array.from(set).join(',');
-        } else {
-            return '';
-        }
-    } else {
-        return '';
-    }
-}
@@ -1,13 +0,0 @@
-/**
- * 登机开始时间显示转换
- */
-import timeFormatter from './time-formatter';
-
-export default function (flight) {
-    if (flight['BOTM']) {
-        return timeFormatter(flight['BOTM']);
-    } else {
-        return '';
-    }
-
-}
@@ -1,15 +0,0 @@
-/**
- * 值机结束时间显示转换
- */
-import timeFormatter from './time-formatter';
-export default function(flight){
-    if(flight['CKDT']){
-        if(Array.isArray(flight['CKDT'])&&flight['CKDT'].length>0){
-            return timeFormatter(flight['CKDT'][0]['CCTM']);
-        }else{
-            return '';
-        }
-    }else{
-        return '';
-    }
-}
@@ -1,19 +0,0 @@
-/**
- * 值机柜台显示转换
- */
-export default function(flight){
-    if(flight['CKDT']){
-        if(Array.isArray(flight['CKDT'])&&flight['CKDT'].length>0){
-            let chkc = [];
-            for (let i = 0; i < flight['CKDT'].length; i++) {
-                chkc.push(flight['CKDT'][i]['CHKC']);
-            }
-            let set = new Set(chkc);
-            return Array.from(set).join(',');
-        }else{
-            return '';
-        }
-    }else{
-        return '';
-    }
-}
@@ -1,20 +0,0 @@
-/**
- * 下轮档时间显示转换
- */
-import timeFormatter from './time-formatter';
-
-export default function (flight) {
-    if (flight['CHOT']) {
-        if (Array.isArray(flight['CHOT']) && flight['CHOT'].length > 0) {
-            for (let i = 0; i < flight['CHOT'].length; i++) {
-                if (flight['CHOT'][i]['CHID'] === 'OFF') {
-                    return timeFormatter(flight['CHOT'][i]['CHTM']);
-                }
-            }
-        } else {
-            return '';
-        }
-    } else {
-        return '';
-    }
-}
@@ -1,20 +0,0 @@
-/**
- * 上轮档时间显示转换
- */
-import timeFormatter from './time-formatter';
-
-export default function (flight) {
-    if (flight['CHOT']) {
-        if (Array.isArray(flight['CHOT']) && flight['CHOT'].length > 0) {
-            for (let i = 0; i < flight['CHOT'].length; i++) {
-                if (flight['CHOT'][i]['CHID'] === 'ON') {
-                    return timeFormatter(flight['CHOT'][i]['CHTM']);
-                }
-            }
-        } else {
-            return '';
-        }
-    } else {
-        return '';
-    }
-}
@@ -1,19 +0,0 @@
-/**
- * 行李传送带号显示转换
- */
-export default function (flight) {
-    if(flight['CHDT']){
-        if(Array.isArray(flight['CHDT'])&&flight['CHDT'].length>0){
-            let chdt = [];
-            for (let i = 0; i < flight['CHDT'].length; i++) {
-                chdt.push(flight['CHDT'][i]['CHUT']);
-            }
-            let set = new Set(chdt);
-            return Array.from(set).join(',');
-        }else{
-            return '';
-        }
-    }else{
-        return '';
-    }
-}
@@ -1,15 +0,0 @@
-/**
- * 值机结束时间显示转换
- */
-import timeFormatter from './time-formatter';
-export default function (flight) {
-    if (flight['CKDT']) {
-        if (Array.isArray(flight['CKDT']) && flight['CKDT'].length > 0) {
-            return timeFormatter(flight['CKDT'][0]['COTM']);
-        } else {
-            return '';
-        }
-    } else {
-        return '';
-    }
-}
@@ -1,4 +1,4 @@
-import dateFormatter from '../../../utils/data-formatter';
+import dateFormatter from './date-formatter';
 export class DynamicFlightOrder {

    public TOP_1 = 1000000000000;
@@ -1,18 +0,0 @@
-/**
- * 航线显示转换
- */
-export default function(flight){
-    if(flight['ERUT']){
-        if(Array.isArray(flight['ERUT'])&&flight['ERUT'].length>0){
-            let erut = [];
-            for (let i = 0; i < flight['ERUT'].length; i++) {
-                erut.push(flight['ERUT'][i]['APCD']);
-            }
-            return erut.join(' - ');
-        }else{
-            return '';
-        }
-    }else{
-        return '';
-    }
-}
@@ -1,11 +0,0 @@
-/**
- * 预计到达/出发时间显示转换
- */
-import timeFormatter from './time-formatter';
-export default function (flight) {
-    if (flight['ESTT']) {
-        return timeFormatter(flight['ESTT']);
-    } else {
-        return '';
-    }
-}
@@ -1,52 +1,32 @@
-import gctmFormatter from '../../../utils/gctm-formatter';
-import botmFormatter from '../../../utils/botm-formatter';
-import abdgFormatter from '../../../utils/abdg-formatter';
-import aotm_aFormatter from '../../../utils/aotm_a-formatter';
-import aotm_dFormatter from '../../../utils/aotm_d-formatter';
-import beltFormatter from '../../../utils/belt-formatter';
-import chkcFormatter from '../../../utils/chkc-formatter';
-import cctmFormatter from '../../../utils/cctm-formatter';
-import cotmFormatter from '../../../utils/cotm-formatter';
-import chtmOnFormatter from '../../../utils/chtm_on-formatter';
-import chtmOffFormatter from '../../../utils/chtm_off-formatter';
-import laclFormatter from '../../../utils/lacl-formatter';
-import chutFormatter from '../../../utils/chut-formatter';
-import acttFormatter from '../../../utils/actt-formatter';
-import psstFormatter from '../../../utils/psst-formatter';
-import esttFormatter from '../../../utils/estt-formatter';
-import mvinFormatter from '../../../utils/mvin-formatter';
-import erutFormatter from '../../../utils/erut-formatter';
-import flinFormatter from '../../../utils/flin-formatter';
-import sodtFormatter from '../../../utils/sodt-formatter';
-import gateFormatter from '../../../utils/gate-formatter';
-import padtFormatter from '../../../utils/padt-formatter';
-
+import { TransferRenderHandle } from './transfer-render-handle';
 import { DynamicFlightOrder } from './dynamic-flight-order';

 export class FlightsDataHandle {
+    public transferHandle = new TransferRenderHandle();
+
    public formatter = {
-        'GCTM': gctmFormatter,
-        'BOTM': botmFormatter,
-        'ABDG': abdgFormatter,
-        'AOTM_A': aotm_aFormatter,
-        'AOTM_D': aotm_dFormatter,
-        'BELT': beltFormatter,
-        'CHKC': chkcFormatter,
-        'CCTM': cctmFormatter,
-        'COTM': cotmFormatter,
-        'CHTM_ON': chtmOnFormatter,
-        'CHTM_OFF': chtmOffFormatter,
-        'LACL': laclFormatter,
-        'CHUT': chutFormatter,
-        'ACTT': acttFormatter,
-        'PSST': psstFormatter,
-        'ESTT': esttFormatter,
-        'MVIN': mvinFormatter,
-        'ERUT': erutFormatter,
-        'FLIN': flinFormatter,
-        'SODT': sodtFormatter,
-        'GATE': gateFormatter,
-        'PADT': padtFormatter
+        'GCTM': this.transferHandle.gctmFormatter.bind(this.transferHandle),
+        'BOTM': this.transferHandle.botmFormatter.bind(this.transferHandle),
+        'ABDG': this.transferHandle.abdgFormatter.bind(this.transferHandle),
+        'AOTM_A': this.transferHandle.aotm_aFormatter.bind(this.transferHandle),
+        'AOTM_D': this.transferHandle.aotm_dFormatter.bind(this.transferHandle),
+        'BELT': this.transferHandle.beltFormatter.bind(this.transferHandle),
+        'CHKC': this.transferHandle.chkcFormatter.bind(this.transferHandle),
+        'CCTM': this.transferHandle.cctmFormatter.bind(this.transferHandle),
+        'COTM': this.transferHandle.cotmFormatter.bind(this.transferHandle),
+        'CHTM_ON': this.transferHandle.chtmOnFormatter.bind(this.transferHandle),
+        'CHTM_OFF': this.transferHandle.chtmOffFormatter.bind(this.transferHandle),
+        'LACL': this.transferHandle.laclFormatter.bind(this.transferHandle),
+        'CHUT': this.transferHandle.chutFormatter.bind(this.transferHandle),
+        'ACTT': this.transferHandle.acttFormatter.bind(this.transferHandle),
+        'PSST': this.transferHandle.psstFormatter.bind(this.transferHandle),
+        'ESTT': this.transferHandle.esttFormatter.bind(this.transferHandle),
+        'MVIN': this.transferHandle.mvinFormatter.bind(this.transferHandle),
+        'ERUT': this.transferHandle.erutFormatter.bind(this.transferHandle),
+        'FLIN': this.transferHandle.flinFormatter.bind(this.transferHandle),
+        'SODT': this.transferHandle.sodtFormatter.bind(this.transferHandle),
+        'GATE': this.transferHandle.gateFormatter.bind(this.transferHandle),
+        'PADT': this.transferHandle.padtFormatter.bind(this.transferHandle)
    }

    public orderHandle = new DynamicFlightOrder();
@@ -1,16 +0,0 @@
-/**
- * 航线类别显示转换
- */
-const flinChn = {
-    'D': '国内',
-    'I': '国际',
-    'M': '混合',
-    'R': '地区'
-}
-export default function (flight) {
-    if (flight['FLIN']) {
-        return flinChn[flight['FLIN']];
-    } else {
-        return '';
-    }
-}
@@ -1,20 +0,0 @@
-/**
- * 登机门显示转换
- */
-
-export default function (flight) {
-    if (flight['GTDT']) {
-        if (Array.isArray(flight['GTDT']) && flight['GTDT'].length > 0) {
-            let gate = [];
-            for (let i = 0; i < flight['GTDT'].length; i++) {
-                gate.push(flight['GTDT'][i]['GATE']);
-            }
-            let set = new Set(gate);
-            return Array.from(set).join(',');
-        } else {
-            return '';
-        }
-    } else {
-        return '';
-    }
-}
@@ -1,16 +0,0 @@
-/**
- * 登机结束时间显示转换
- */
-import timeFormatter from './time-formatter';
-
-export default function (flight) {
-    if (flight['GTDT']) {
-        if (Array.isArray(flight['GTDT']) && flight['GTDT'].length > 0) {
-            return timeFormatter(flight['GTDT'][0]['GCTM']);
-        } else {
-            return '';
-        }
-    } else {
-        return '';
-    }
-}
@@ -1,11 +0,0 @@
-/**
- * 最后通知时间显示转换
- */
-import timeFormatter from './time-formatter';
-export default function (flight) {
-    if (flight['LACL']) {
-        return timeFormatter(flight['LACL']);
-    } else {
-        return '';
-    }
-}
@@ -1,14 +0,0 @@
-/**
- * 到达/出发显示转换
- */
-export default function (flight) {
-    if (flight['MVIN']) {
-        if (flight['MVIN'] === 'A') {
-            return '到达';
-        } else if (flight['MVIN'] === 'D') {
-            return '出发';
-        }
-    } else {
-        return '';
-    }
-}
@@ -1,11 +0,0 @@
-/**
- * 前站起飞时间显示转换
- */
-import timeFormatter from './time-formatter';
-export default function (flight) {
-    if (flight['PADT']) {
-        return timeFormatter(flight['PADT']);
-    } else {
-        return '';
-    }
-}
@@ -1,19 +0,0 @@
-/**
- * 计划停机位显示转换
- */
-export default function(flight){
-    if(flight['PSDT']){
-        if(Array.isArray(flight['PSDT'])&&flight['PSDT'].length>0){
-            let chkc = [];
-            for (let i = 0; i < flight['PSDT'].length; i++) {
-                chkc.push(flight['PSDT'][i]['PSST']);
-            }
-            let set = new Set(chkc);
-            return Array.from(set).join(',');
-        }else{
-            return '';
-        }
-    }else{
-        return '';
-    }
-}
@@ -1,11 +0,0 @@
-/**
- * 计划到达/出发时间显示转换
- */
-import timeFormatter from './time-formatter';
-export default function (flight) {
-    if (flight['SODT']) {
-        return timeFormatter(flight['SODT']);
-    } else {
-        return '';
-    }
-}
@@ -0,0 +1,274 @@
+import timeFormatter from './time-formatter';
+export class TransferRenderHandle {
+
+    public gctmFormatter(flight) {
+        if (flight['GTDT']) {
+            if (Array.isArray(flight['GTDT']) && flight['GTDT'].length > 0) {
+                return timeFormatter(flight['GTDT'][0]['GCTM']);
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public botmFormatter(flight) {
+        if (flight['BOTM']) {
+            return timeFormatter(flight['BOTM']);
+        } else {
+            return '';
+        }
+    }
+    public abdgFormatter(flight) {
+        if (flight['ABTM']) {
+            if (Array.isArray(flight['ABTM']) && flight['ABTM'].length > 0) {
+                let abdg = [];
+                for (let i = 0; i < flight['ABTM'].length; i++) {
+                    abdg.push(flight['ABTM'][i]['ABDG']);
+                }
+                let set = new Set(abdg);
+                return Array.from(set).join(',');
+            } else {
+                return ''
+            }
+        } else {
+            return '';
+        }
+    }
+    public aotm_aFormatter(flight) {
+        if (flight['ABTM']) {
+            if (Array.isArray(flight['ABTM']) && flight['ABTM'].length > 0) {
+                for (let i = 0; i < flight['ABTM'].length; i++) {
+                    if (flight['ABTM'][i]['ABOP'] === 'A') {
+                        return timeFormatter(flight['ABTM'][i]['AOTM']);
+                    }
+                }
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public aotm_dFormatter(flight) {
+        if (flight['ABTM']) {
+            if (Array.isArray(flight['ABTM']) && flight['ABTM'].length > 0) {
+                for (let i = 0; i < flight['ABTM'].length; i++) {
+                    if (flight['ABTM'][i]['ABOP'] === 'D') {
+                        return timeFormatter(flight['ABTM'][i]['AOTM']);
+                    }
+                }
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public beltFormatter(flight) {
+        if (flight['CLDT']) {
+            if (Array.isArray(flight['CLDT']) && flight['CLDT'].length > 0) {
+                let belt = [];
+                for (let i = 0; i < flight['CLDT'].length; i++) {
+                    belt.push(flight['CLDT'][i]['BELT']);
+                }
+                let set = new Set(belt);
+                return Array.from(set).join(',');
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public chkcFormatter(flight) {
+        if (flight['CKDT']) {
+            if (Array.isArray(flight['CKDT']) && flight['CKDT'].length > 0) {
+                let chkc = [];
+                for (let i = 0; i < flight['CKDT'].length; i++) {
+                    chkc.push(flight['CKDT'][i]['CHKC']);
+                }
+                let set = new Set(chkc);
+                return Array.from(set).join(',');
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public cctmFormatter(flight) {
+        if (flight['CKDT']) {
+            if (Array.isArray(flight['CKDT']) && flight['CKDT'].length > 0) {
+                return timeFormatter(flight['CKDT'][0]['CCTM']);
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public cotmFormatter(flight) {
+        if (flight['CKDT']) {
+            if (Array.isArray(flight['CKDT']) && flight['CKDT'].length > 0) {
+                return timeFormatter(flight['CKDT'][0]['COTM']);
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public chtmOnFormatter(flight) {
+        if (flight['CHOT']) {
+            if (Array.isArray(flight['CHOT']) && flight['CHOT'].length > 0) {
+                for (let i = 0; i < flight['CHOT'].length; i++) {
+                    if (flight['CHOT'][i]['CHID'] === 'ON') {
+                        return timeFormatter(flight['CHOT'][i]['CHTM']);
+                    }
+                }
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public chtmOffFormatter(flight) {
+        if (flight['CHOT']) {
+            if (Array.isArray(flight['CHOT']) && flight['CHOT'].length > 0) {
+                for (let i = 0; i < flight['CHOT'].length; i++) {
+                    if (flight['CHOT'][i]['CHID'] === 'OFF') {
+                        return timeFormatter(flight['CHOT'][i]['CHTM']);
+                    }
+                }
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public laclFormatter(flight) {
+        if (flight['LACL']) {
+            return timeFormatter(flight['LACL']);
+        } else {
+            return '';
+        }
+    }
+    public chutFormatter(flight) {
+        if (flight['CHDT']) {
+            if (Array.isArray(flight['CHDT']) && flight['CHDT'].length > 0) {
+                let chdt = [];
+                for (let i = 0; i < flight['CHDT'].length; i++) {
+                    chdt.push(flight['CHDT'][i]['CHUT']);
+                }
+                let set = new Set(chdt);
+                return Array.from(set).join(',');
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public acttFormatter(flight) {
+        if (flight['ACTT']) {
+            return timeFormatter(flight['ACTT']);
+        } else {
+            return '';
+        }
+    }
+    public psstFormatter(flight) {
+        if (flight['PSDT']) {
+            if (Array.isArray(flight['PSDT']) && flight['PSDT'].length > 0) {
+                let chkc = [];
+                for (let i = 0; i < flight['PSDT'].length; i++) {
+                    chkc.push(flight['PSDT'][i]['PSST']);
+                }
+                let set = new Set(chkc);
+                return Array.from(set).join(',');
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public esttFormatter(flight) {
+        if (flight['ESTT']) {
+            return timeFormatter(flight['ESTT']);
+        } else {
+            return '';
+        }
+    }
+    public mvinFormatter(flight) {
+        if (flight['MVIN']) {
+            if (flight['MVIN'] === 'A') {
+                return '到达';
+            } else if (flight['MVIN'] === 'D') {
+                return '出发';
+            }
+        } else {
+            return '';
+        }
+    }
+    public erutFormatter(flight) {
+        if (flight['ERUT']) {
+            if (Array.isArray(flight['ERUT']) && flight['ERUT'].length > 0) {
+                let erut = [];
+                for (let i = 0; i < flight['ERUT'].length; i++) {
+                    erut.push(flight['ERUT'][i]['APCD']);
+                }
+                return erut.join(' - ');
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public flinFormatter(flight) {
+        const flinChn = {
+            'D': '国内',
+            'I': '国际',
+            'M': '混合',
+            'R': '地区'
+        }
+        if (flight['FLIN']) {
+            return flinChn[flight['FLIN']];
+        } else {
+            return '';
+        }
+    }
+    public sodtFormatter(flight) {
+        if (flight['SODT']) {
+            return timeFormatter(flight['SODT']);
+        } else {
+            return '';
+        }
+    }
+    public gateFormatter(flight) {
+        if (flight['GTDT']) {
+            if (Array.isArray(flight['GTDT']) && flight['GTDT'].length > 0) {
+                let gate = [];
+                for (let i = 0; i < flight['GTDT'].length; i++) {
+                    gate.push(flight['GTDT'][i]['GATE']);
+                }
+                let set = new Set(gate);
+                return Array.from(set).join(',');
+            } else {
+                return '';
+            }
+        } else {
+            return '';
+        }
+    }
+    public padtFormatter(flight) {
+        if (flight['PADT']) {
+            return timeFormatter(flight['PADT']);
+        } else {
+            return '';
+        }
+    }
+}