样式布局调整、飞机优化及查找定位精确筛选

src/app/pages/basic-data/aircraft-type/aircraft-type.component.html

@@ -3,7 +3,7 @@
         <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 class="mr-4 form-control"  [(ngModel)]="SEL_COL" name="" id="">
                         <option value="">选择列名</option>
                     </select>
                     <label class="radio-inline custom-radio nowrap mr-4">
@@ -26,23 +26,15 @@
   
             <div class="second-condition mb-3 row">
               <div class="input-container mr-4">
-                <label for="">航空公司：&nbsp;&nbsp;</label>
-                <select  class="form-control" [(ngModel)]="filterItems.HK" (ngModelChange)="selectChange()">
-                    <option value=""></option>
-                    <option value="GH">海南航空公司</option>
-                    <option value="CH">国外航空公司</option>
-                </select>
+                  <label for="">机型组：&nbsp;&nbsp;</label>
+                  <select  class="form-control" [(ngModel)]="filterItems.ZZU" (ngModelChange)="selectChange()">
+                      <option value=""></option>
+                      <option value="E">E-类飞机机型</option>
+                      <option value="T">T-类飞机机型</option>
+                      <option value="G">G-类飞机机型</option>
+                  </select>
+              </div>
             </div>
-            <div class="input-container mr-4">
-                <label for="">机型：&nbsp;&nbsp;</label>
-                <select  class="form-control" [(ngModel)]="filterItems.JX" (ngModelChange)="selectChange()">
-                    <option value=""></option>
-                    <option value="A">A306</option>
-                    <option value="B">B252</option>
-                    <option value="C">C256</option>
-                </select>
-            </div>
-          </div>
         </div>
   
         <div class="airline-table">
@@ -51,14 +43,19 @@
                     <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>CAA码</th>
+                            <th>IATA码</th>
+                            <th>ICAO码</th> -->
                             <th *ngFor="let airline_col of aircrafttype_lists">{{airline_col.COL_CN}}</th>
                         </tr>
                     </thead>
@@ -67,13 +64,18 @@
                             [ngClass]="{'selected':row_state['renderFlight']===airline_row['renderFlight']}">
                             <td>{{i+1}}</td>
                             <!-- <td>{{airline_col.aircraftTypeCode}}</td>
+                            <td>{{airline_col.aircraftTypeName}}</td>
+                            <td>{{airline_col.aircraftLength}}</td>
+                            <td>{{airline_col.aircraftWidth}}</td>
+                            <td>{{airline_col.aircraftHeight}}</td>
                             <td>{{airline_col.maxPassengers}}</td>
                             <td>{{airline_col.maxFreightWeight}}</td>
                             <td>{{airline_col.maxTakeoffWeight}}</td>
                             <td>{{airline_col.maxAirbridges}}</td>
-                            <td>{{airline_col.chap}}</td>
                             <td>{{airline_col.aircrafttypegroupId}}</td>
-                            <td>{{airline_col.aircraftTypeName}}</td> -->
+                            <td>{{airline_col.aircraftTypeCodeCaa}}</td>
+                            <td>{{airline_col.aircraftTypeCodeIata}}</td>
+                            <td>{{airline_col.aircraftTypeCodeIcao}}</td> -->
                             <td *ngFor="let airline_col of aircrafttype_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td>
                         </tr>
                     </tbody>

src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts

@@ -5,10 +5,10 @@ import dateFormatter from '../../../utils/data-formatter';
 import { HttpParams } from '@angular/common/http';
 import * as $ from 'jquery';
 @Component({
-  selector: 'app-aircraft-type',
-  templateUrl: './aircraft-type.component.html',
-  styleUrls: ['./aircraft-type.component.scss']
-})
+    selector: 'app-aircraft-type',
+    templateUrl: './aircraft-type.component.html',
+    styleUrls: ['./aircraft-type.component.scss']
+  })
 export class AircraftTypeComponent implements OnInit {
 
   constructor(
@@ -32,19 +32,14 @@ FLT_POS = 1;    //过滤还是定位
 SEL_COL = '';   //选择列名
 
 public filterItems = {
-    HK: '',    //航空公司
-    JX: '',    //机型
+    ZZU: '',    //机型组
 }
 
 public formatter = {
-    'HK': {
-        'GH': '海南航空公司',
-        'CH': '国外航空公司'
-    },
-    'JX': {
-        'A': 'A306',
-        'B': 'B252',
-        "C": 'C256'
+    'ZZU': {
+        'E': 'E-类飞机机型',
+        'T': 'T-类飞机机型',
+        'G': 'G-类飞机机型'
     },
     'SODT': dateFormatter,
     'ESTT': dateFormatter,
@@ -103,35 +98,35 @@ ngOnInit() {
                     delete element['isLinked'];
                     row_flights['reaFlight'] = element;
 
-                    for (let i = 0; i < this.aircrafttype_lists.length; i++) {
-                        let key = this.aircrafttype_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);
+                        for (let i = 0; i < this.aircrafttype_lists.length; i++) {
+                            let key = this.aircrafttype_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]) ? (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]];
+                                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];
                             }
-                        } 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;
                     }
-                    row_flights['renderFlight'] = render_flight;
-                    row_flights['renderPreFlight'] = render_pre_flight;
-                    row_flights['renderReaFlight'] = render_rea_flight;
-                }
-                this.combined_data.push(row_flights)
+                    this.combined_data.push(row_flights)
             })
             this.render_data = this.combined_data
             this.changeDetectorRef.detectChanges();
         }
     )
-         /**
+        /**
          * 固定表头
          */
         var tableCont = document.querySelector('#table-container');
@@ -141,6 +136,7 @@ ngOnInit() {
         }
         tableCont.addEventListener('scroll',scrollHandle);
 }
+
 /**
  * 过滤及定位
  * @param filterItems
@@ -366,6 +362,6 @@ inputPosition(filterData) {
     let tr = $(".selected");
     let objTr = tr[0];
     $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
-    
+
     }
 }

src/app/pages/basic-data/aircraft/aircraft.component.html

@@ -3,7 +3,7 @@
         <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 class="mr-4 form-control" [(ngModel)]="SEL_COL" name="" id="">
                         <option value="">选择列名</option>
                     </select>
                     <label class="radio-inline custom-radio nowrap mr-4">
@@ -14,7 +14,7 @@
                         <input type="radio" [(ngModel)]="FLT_POS"  [value]="2" name="filter-position">
                         <span>查找定位</span>
                     </label>
-                    <input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputFliter()">
+                    <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>
@@ -26,30 +26,54 @@
   
             <div class="second-condition mb-3 row">
               <div class="input-container mr-4">
-                  <label for="">机型组：&nbsp;&nbsp;</label>
-                  <select  class="form-control" [(ngModel)]="filterItems.ZZU" (ngModelChange)="inputFliter()">
-                      <option value=""></option>
-                      <option value="E">E-类飞机机型</option>
-                      <option value="T">T-类飞机机型</option>
-                      <option value="G">G-类飞机机型</option>
-                  </select>
-              </div>
+                <label for="">航空公司：&nbsp;&nbsp;</label>
+                <select  class="form-control" [(ngModel)]="filterItems.HK" (ngModelChange)="selectChange()">
+                    <option value=""></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" [(ngModel)]="filterItems.JX" (ngModelChange)="selectChange()">
+                    <option value=""></option>
+                    <option value="A">A306</option>
+                    <option value="B">B252</option>
+                    <option value="C">C256</option>
+                </select>
+            </div>
+          </div>
         </div>
   
         <div class="airline-table">
-            <div class="table-container">
-                <table class="table table-bordered table-striped">
+            <div id="table-container" class="table-container">
+                <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 *ngFor="let airline_col of aircraft_lists">{{airline_col.COL_CN}}</th>
                         </tr>
                     </thead>
                     <tbody>
-                        <tr *ngFor="let airline_row of render_data;let i = index" (click)="selectRow(i)"
-                            [ngClass]="{'active':row_state===i}">
+                        <tr *ngFor="let airline_row of render_data;let i = index" (click)="selectRow(airline_row)"
+                            [ngClass]="{'selected':row_state['renderFlight']===airline_row['renderFlight']}">
                             <td>{{i+1}}</td>
+                            <!-- <td>{{airline_col.aircraftNumber}}</td>
+                            <td>{{airline_col.maxPassengers}}</td>
+                            <td>{{airline_col.maxFreightWeight}}</td>
+                            <td>{{airline_col.maxTakeoffWeight}}</td>
+                            <td>{{airline_col.maxAirbridges}}</td>
+                            <td>{{airline_col.aircraftOwnerCode}}</td>
+                            <td>{{airline_col.airlineCode}}</td>
+                            <td>{{airline_col.aircraftTypeCode}}</td> -->
                             <td *ngFor="let airline_col of aircraft_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td>
                         </tr>
                     </tbody>

src/app/pages/basic-data/aircraft/aircraft.component.scss

@@ -1,6 +1,7 @@
 .main-page {
     width: 100%;
-    height: calc(100% - 66px);
+    height: 100%;
+    overflow-y: scroll;
     padding: 15px 10px;
     background-color: #fff;
     .page-content {
@@ -31,15 +32,19 @@
                 // border: 1px solid #ccc;
                 width: 100%;
                 height: 700px;
-                overflow: scroll;
+                overflow: auto;
+                box-shadow: 0 0 1px .5px #ddd;
                 table{
                     width: max-content;
                     tr{
                         cursor: pointer;
-                        &.active{
+                        &.selected{
                             background: rgb(181, 215, 255);
                         }
                     }
+                    th{
+                        background-color: #ddd;
+                    }
                     th,td{
                         // border: none;
                         text-align: center;

src/app/pages/basic-data/aircraft/aircraft.component.ts

@@ -2,12 +2,14 @@ import { Component, OnInit } from '@angular/core';
 import { ChangeDetectorRef } from '@angular/core';
 import { HttpClientService } from '../../../services/http-client.service';
 import dateFormatter from '../../../utils/data-formatter';
+import { HttpParams } from '@angular/common/http';
+import * as $ from 'jquery';
 @Component({
-  selector: 'app-aircraft',
-  templateUrl: './aircraft.component.html',
-  styleUrls: ['./aircraft.component.scss']
-})
-export class AircraftComponent implements OnInit {
+    selector: 'app-aircraft',
+    templateUrl: './aircraft.component.html',
+    styleUrls: ['./aircraft.component.scss']
+  })
+  export class AircraftComponent implements OnInit {
 
   constructor(
     private httpCilent: HttpClientService,
@@ -22,22 +24,7 @@ public render_data: Array<object> = [];  //显示数据，即需要显示的数
 
 public aircraft_lists: Array<object>;    //列数据
 
-public row_state: number;
-
-public TOP_1 = 1000000000000;
-public TOP_2 = 2000000000000;
-public TOP_3 = 3000000000000;
-public TOP_4 = 4000000000000;
-public TOP_5 = 5000000000000;
-public TOP_6 = 6000000000000;
-public TOP_7 = 7000000000000;
-public TOP_8 = 8000000000000;
-public TOP_9 = 9000000000000;
-public TOP_10 = 10000000000000;
-public TOP_11 = 11000000000000;
-public TOP_12 = 12000000000000;
-public TOP_13 = 13000000000000;
-public TOP_14 = 14000000000000;
+public row_state: any = { renderFlight: {} };
 
 // 搜索条件
 SEARCH = '';    //手动输入条件
@@ -45,21 +32,25 @@ FLT_POS = 1;    //过滤还是定位
 SEL_COL = '';   //选择列名
 
 public filterItems = {
-    ZZU: '',    //机型组
+    HK: '',    //航空公司
+    JX: '',    //机型
 }
 
 public formatter = {
-    'ZZU': {
-        'E': 'E-类飞机机型',
-        'T': 'T-类飞机机型',
-        'G': 'G-类飞机机型'
+    'HK': {
+        'GH': '海南航空公司',
+        'CH': '国外航空公司'
+    },
+    'JX': {
+        'A': 'A306',
+        'B': 'B252',
+        "C": 'C256'
     },
     'SODT': dateFormatter,
     'ESTT': dateFormatter,
     'ACTT': dateFormatter
 }
 
-
 selectRow(i) {
     this.row_state = i;
     this.changeDetectorRef.detectChanges();
@@ -112,452 +103,270 @@ ngOnInit() {
                     delete element['isLinked'];
                     row_flights['reaFlight'] = element;
 
-                        for (let i = 0; i < this.aircraft_lists.length; i++) {
-                            let key = this.aircraft_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]];
-                                }
+                    for (let i = 0; i < this.aircraft_lists.length; i++) {
+                        let key = this.aircraft_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]) ? (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];
+                                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)
+                    row_flights['renderFlight'] = render_flight;
+                    row_flights['renderPreFlight'] = render_pre_flight;
+                    row_flights['renderReaFlight'] = render_rea_flight;
+                }
+                this.combined_data.push(row_flights)
             })
-
-            //排序
-            this.combined_data.forEach(element => {
-                element['ORDER'] = this.sequence(element)
-            })
-
-            this.combined_data.sort(function (a, b) {
-                return (a['ORDER'] - b['ORDER']);
-            })
-
             this.render_data = this.combined_data
-
             this.changeDetectorRef.detectChanges();
         }
     )
+         /**
+         * 固定表头
+         */
+        var tableCont = document.querySelector('#table-container');
+        function scrollHandle (){
+          var scrollTop = this.scrollTop;
+          this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
+        }
+        tableCont.addEventListener('scroll',scrollHandle);
 }
 
-public sequence(flight) {
-  let dateTag: number = 10;
-  let dateToCompare = new Date().getTime();
-  if (!this.isCancled(flight) && !this.isDone(flight) && this.isDelayed(flight)) {
-      if (this.isLinked(flight)) {
-          if (this.getActualDatetime(flight['preFlight']) && !this.getActualDatetime(flight['reaFlight'])) {
-              dateToCompare = new Date(dateFormatter(this.getActualDatetime(flight['preFlight']))).getTime();
-              dateTag = this.TOP_1;
-          }
-          else {
-              dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
-              dateTag = this.TOP_2;
-          }
-      }
-      else {
-          dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
-          dateTag = this.TOP_3;
-      }
-      return dateToCompare + dateTag;
-  }
-  if (!this.isCancled(flight) && !this.isDone(flight) && this.isBoading(flight)) {
-      dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
-      dateTag = this.TOP_4;
-      return dateToCompare + dateTag;
-  }
-  if (!this.isCancled(flight) && !this.isDone(flight) && this.isFlying(flight) && !this.getActualDatetime(flight['preFlight'])) {
-      if (this.getEstimatedDatetime(flight['preFlight'])) {
-          dateToCompare = new Date(dateFormatter(this.getEstimatedDatetime(flight['preFlight']))).getTime();
-      } else {
-          dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['preFlight']))).getTime();
-      }
-      dateTag = this.TOP_5;
-      return dateToCompare + dateTag;
-  }
-  if (!this.isCancled(flight) && !this.isDone(flight) && this.isLinked(flight) && this.getActualDatetime(flight['preFlight']) && !this.getActualDatetime(flight['reaFlight'])) {
-      dateToCompare = new Date(dateFormatter(this.getActualDatetime(flight['preFlight']))).getTime();
-      dateTag = this.TOP_6;
-      return dateToCompare + dateTag;
-  }
-  if (!this.isCancled(flight) && !this.isDone(flight) && this.isDeptFlight(flight) && !this.startBoading(flight)) {
-      dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
-      dateTag = this.TOP_7;
-      return dateToCompare + dateTag;
-  }
-  if (!this.isCancled(flight) && this.isArriFlight(flight) && this.isDone(flight)) {
-      dateToCompare = new Date(dateFormatter(this.getActualDatetime(flight['preFlight']))).getTime();
-      dateTag = this.TOP_8;
-      return dateToCompare + dateTag;
-  }
-  if (!this.isCancled(flight) && !this.isDone(flight) && this.isOverBoading(flight)) {
-      dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
-      dateTag = this.TOP_9;
-      return dateToCompare + dateTag;
-  }
-  if (!this.isCancled(flight) && !this.isDone(flight) && !this.isFlying(flight)) {
-      if (this.isLinked(flight)) {
-          dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
-          dateTag = this.TOP_10;
-      } else if (this.isArriFlight(flight)) {
-          dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['preFlight']))).getTime();
-          dateTag = this.TOP_11;
-      }
-      return dateToCompare + dateTag;
-  }
-  if (!this.isCancled(flight) && this.isDone(flight) && (this.isLinked(flight) || this.isDeptFlight(flight))) {
-      dateToCompare = new Date(dateFormatter(this.getActualDatetime(flight['reaFlight']))).getTime();
-      dateTag = this.TOP_12;
-      return dateToCompare + dateTag;
-  }
-  if (this.isCancled(flight)) {
-      if (this.isDeptFlight(flight)) {
-          dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
-      } else {
-          dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['preFlight']))).getTime();
-      }
-
-      dateTag = this.TOP_13;
-      return dateToCompare + dateTag;
-  }
-  return this.TOP_14
+/**
+ * 过滤及定位
+ * @param filterItems
+ * @return
+ */
+//输入框回车事件
+inputEnter() {
+    if (this.FLT_POS === 1) {
+        this.selectChange()
+    } else {
+        this.selectChange()
+        this.inputPosition(this.render_data)
+    }
 }
 
-inputFliter() {
-    let filterItems = this.filterItems;
-    let combined_data = this.combined_data;
+//下拉框选择筛选
+selectChange() {
     let filter_data = [];
-
-    let sel_col = this.SEL_COL;
-
-    if (this.FLT_POS === 1) {  //过滤 
-        //手动输入框筛选
-        if(sel_col){
-            combined_data.forEach(item=>{
-                if(item['renderFlight'][sel_col]){
-                    if (item['renderFlight'][sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
-                        filter_data.push(Object.assign({}, item))
+    let filterItems = this.filterItems;
+    this.combined_data.forEach(item => {
+        filter_data.push(Object.assign({}, item));
+    })
+    //下拉框筛选
+    filter_data = filter_data.filter(item => {
+        if (item) {
+            let is_satis = true;
+            for (const key in filterItems) {
+                if (filterItems.hasOwnProperty(key) && filterItems[key]) {
+                    if (item['preFlight'][key] === filterItems[key]) {
+                        is_satis = true;
+                        continue;
+                    } else {
+                        is_satis = false;
+                        break;
                     }
-                }else{
-                    if(!this.SEARCH){
-                        filter_data.push(Object.assign({}, item))
+
+                }
+            }
+            return is_satis;
+        } else if (item) {
+            let is_satis = true;
+            for (const key in filterItems) {
+                if (filterItems.hasOwnProperty(key) && filterItems[key]) {
+                    if (item['reaFlight'][key] === filterItems[key]) {
+                        is_satis = true;
+                        continue;
+                    } else {
+                        is_satis = false;
+                        break;
+                    }
+
+                }
+            }
+            return is_satis;
+        } else {
+            let pre_satis = true;
+            let rea_satis = true;
+            for (const key in filterItems) {
+                if (filterItems.hasOwnProperty(key) && filterItems[key]) {
+                    if (item['preFlight'][key] === filterItems[key]) {
+                        pre_satis = true;
+                        continue;
+                    } else {
+                        pre_satis = false;
+                        break;
+                    }
+
+                }
+            }
+            for (const key in filterItems) {
+                if (filterItems.hasOwnProperty(key) && filterItems[key]) {
+                    if (item['reaFlight'][key] === filterItems[key]) {
+                        rea_satis = true;
+                        continue;
+                    } else {
+                        rea_satis = false;
+                        break;
+                    }
+
+                }
+            }
+
+            if (pre_satis && !rea_satis) {
+                item['renderFlight'] = item['renderPreFlight'];
+                return pre_satis;
+            } else if (!pre_satis && rea_satis) {
+                item['renderFlight'] = item['renderReaFlight'];
+                return rea_satis;
+            } else if (pre_satis && rea_satis) {
+                return pre_satis && rea_satis;
+            } else {
+                return false;
+            }
+        }
+    })
+    if (this.FLT_POS === 1) {
+        this.inputFilter(filter_data);
+    } 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();
+    }
+}
+
+//输入框筛选
+inputFilter(filterData) {
+    if (this.SEARCH) {
+        if (this.SEL_COL) {
+            let sel_col = this.SEL_COL;
+            filterData = filterData.filter(item => {
+                if (item['renderFlight'][sel_col]) {
+                    if (item['renderFlight'][sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
+                        return true;
+                    }
+                } else {
+                    if (this.SEARCH) {
+                        return false;
+                    } else {
+                        return true;
                     }
                 }
             })
-        }else{
-            combined_data.forEach(item => {
+
+        } 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'))) {
-                                filter_data.push(Object.assign({}, item))
+                                is_satis = true;
                                 break;
+                            } else {
+                                is_satis = false;
+                                continue;
                             }
                         } else {
-                            continue;
+                            if (this.SEARCH) {
+                                is_satis = false;
+                                continue;
+                            } else {
+                                is_satis = true;
+                                break;
+                            }
                         }
+                    } else {
+                        continue;
                     }
                 }
+                return is_satis;
             })
         }
-
-        //下拉框筛选
-        filter_data = filter_data.filter(item => {
-            if (this.isArriFlight(item)) {
-                let is_satis = true;
-                for (const key in filterItems) {
-                    if (filterItems.hasOwnProperty(key) && filterItems[key]) {
-                        if (item['preFlight'][key] === filterItems[key]) {
-                            is_satis = true;
-                            continue;
-                        } else {
-                            is_satis = false;
-                            break;
-                        }
-
-                    }
-                }
-                return is_satis;
-            } else if (this.isDeptFlight(item)) {
-                let is_satis = true;
-                for (const key in filterItems) {
-                    if (filterItems.hasOwnProperty(key) && filterItems[key]) {
-                        if (item['reaFlight'][key] === filterItems[key]) {
-                            is_satis = true;
-                            continue;
-                        } else {
-                            is_satis = false;
-                            break;
-                        }
-
-                    }
-                }
-                return is_satis;
-            } else {
-                let pre_satis = true;
-                let rea_satis = true;
-                for (const key in filterItems) {
-                    if (filterItems.hasOwnProperty(key) && filterItems[key]) {
-                        if (item['preFlight'][key] === filterItems[key]) {
-                            pre_satis = true;
-                            continue;
-                        } else {
-                            pre_satis = false;
-                            break;
-                        }
-
-                    }
-                }
-                for (const key in filterItems) {
-                    if (filterItems.hasOwnProperty(key) && filterItems[key]) {
-                        if (item['reaFlight'][key] === filterItems[key]) {
-                            rea_satis = true;
-                            continue;
-                        } else {
-                            rea_satis = false;
-                            break;
-                        }
-
-                    }
-                }
-
-                if(pre_satis&&!rea_satis){
-                    item['renderFlight'] = item['renderPreFlight'];
-                    return pre_satis;
-                }else if(!pre_satis&&rea_satis){
-                    item['renderFlight'] = item['renderReaFlight'];
-                    return rea_satis;
-                }else if(pre_satis&&rea_satis){
-                    return pre_satis&&rea_satis;
-                }else{
-                    return false;
-                }
-            }
-        })
-
-        this.render_data = filter_data;
-
-    } else {    //定位
-
     }
-
+    this.render_data = filterData;
+    this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
     this.changeDetectorRef.detectChanges();
 }
 
+positionArray: Array<any> = [];
+positionArrayIndex: number = 0;
+//输入框定位
+inputPosition(filterData) {
+    let transArray = []
+    if (this.SEL_COL) {
+        let sel_col = this.SEL_COL;
+        filterData.forEach(element => {
+            if (element['renderFlight'][sel_col]) {
+                if (element['renderFlight'][sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
+                    transArray.push(element)
+                }
+            } else {
+                if (!this.SEARCH) {
+                    transArray.push(element)
+                }
+            }
+        });
+    } 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'))) {
+                            transArray.push(element)
+                            break;
+                        } else {
+                            continue;
+                        }
+                    } else {
+                        if (this.SEARCH) {
+                            continue;
+                        } else {
+                            transArray.push(element)
+                            break;
+                        }
+                    }
 
-/**
-     * 获取航班实际时间
-     * @param flight 
-     * @return
-     */
-    public getActualDatetime(flight) {
-      return flight['ACTT'];
-  }
+                } else {
+                    continue;
+                }
+            }
+        });
+    }
 
-  /**
-   * 获取航班预计时间
-   * @param flight
-   * @return
-   */
-  public getEstimatedDatetime(flight) {
-      return flight['ESTT']
-  }
+    if (transArray.length > 0) {
+        if (transArray.toString() == this.positionArray.toString()) {
+            this.positionArrayIndex++;
+            if (this.positionArrayIndex === this.positionArray.length) {
+                this.positionArrayIndex = 0;
+            }
+            this.row_state = this.positionArray[this.positionArrayIndex];
+        } else {
+            this.positionArray = transArray;
+            this.positionArrayIndex = 0;
+            this.row_state = this.positionArray[this.positionArrayIndex];
+        }
+    } else {
+        alert('没有搜索到相关数据');
+    }
 
-  /**
-   * 获取航班计划时间
-   * @param flight
-   * @return
-   */
-  public getScheduledDatetime(flight) {
-      return flight['SODT']
-  }
-
-
-  /**
-   * 判断航班是否是链接航班
-   * @param flight
-   * @return
-   */
-  public isLinked(flight) {
-      if (flight['preFlight'] && flight['reaFlight']) {
-          return true
-      } else {
-          return false
-      }
-  }
-
-  /**
-   * 判断航班是否是纯离港航班
-   * @param flight
-   * @return
-   */
-  public isDeptFlight(flight) {
-      if (!flight['preFlight'] && flight['reaFlight']) {
-          return true
-      } else {
-          return false
-      }
-
-  }
-
-  /**
-   * 判断航班是否是纯到港航班
-   * @param flight
-   * @return
-   */
-  public isArriFlight(flight) {
-      if (flight['preFlight'] && !flight['reaFlight']) {
-          return true;
-      } else {
-          return false;
-      }
-  }
-
-  /**
-   * 判断航班是否已经前站起飞
-   * @param flight
-   * @return
-   */
-  public isFlying(flight) {
-      if (this.isArriFlight(flight) || this.isLinked(flight)) {
-          if (flight['preFlight']['PADT']) {
-              return true;
-          } else {
-              return false;
-          }
-      } else {
-          return false;
-      }
-  }
-
-
-  /**
-   * 判断航班是否取消
-   * @param flight 
-   * @return
-   */
-  public isCancled(flight) {
-      if (this.isArriFlight(flight)) {
-          if (flight['preFlight']['CNCL']) {
-              return true;
-          } else {
-              return false;
-          }
-      } else if (this.isDeptFlight(flight)) {
-          if (flight['reaFlight']['CNCL']) {
-              return true;
-          } else {
-              return false;
-          }
-      } else {
-          return false;
-      }
-  }
-
-  /**
-   * 判断航班是否延误(只针对纯离港航班或链接航班中的离港航班)
-   * @param flight 
-   * @return
-   */
-  public isDelayed(flight) {
-      if (this.isDeptFlight(flight) || this.isLinked(flight)) {
-          if (flight['reaFlight']['DELY']) {
-              return true
-          } else {
-              return false
-          }
-      } else {
-          return false;
-      }
-  }
-
-  /**
-   * 判断航班是否已经执行完成
-   * @param flight
-   * @return
-   */
-  public isDone(flight) {
-      if (this.isLinked(flight) || this.isDeptFlight(flight)) {
-          if (!this.getActualDatetime(flight['reaFlight'])) {
-              return false;
-          } else {
-              return true;
-          }
-      } else if (this.isArriFlight(flight)) {
-          if (!this.getActualDatetime(flight['preFlight'])) {
-              return false;
-          } else {
-              return true;
-          }
-      } else {
-          return false;
-      }
-  }
-
-  /**
-   * 判断航班是否开始登机
-   * @param flight
-   * @return
-   */
-  public startBoading(flight) {
-      if (this.isLinked(flight) || this.isDeptFlight(flight)) {
-          if (!flight['reaFlight']['BOTM']) {
-              return false;
-          } else {
-              return true;
-          }
-      } else {
-          return false;
-      }
-
-  }
-
-  /**
-   * 判断航班是否正在登机中
-   * @param flight
-   * @return
-   */
-  public isBoading(flight) {
-      if (this.isLinked(flight) || this.isDeptFlight(flight)) {
-          if (flight['reaFlight']['BOTM'] && !flight['reaFlight']['GCTM']) {
-              return true;
-          } else {
-              return false;
-          }
-      } else {
-          return false;
-      }
-  }
-
-
-  /**
-   * 判断航班是否登机结束
-   * @param flight
-   * @return
-   */
-  public isOverBoading(flight) {
-      if (this.isLinked(flight) || this.isDeptFlight(flight)) {
-          if (!flight['GCTM']) {
-              return false;
-          } else {
-              return true;
-          }
-      } else {
-          return false;
-      }
-  }
+    this.changeDetectorRef.detectChanges();
 
+    let tr = $(".selected");
+    let objTr = tr[0];
+    $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
 
+    }
 }

src/assets/mock-data/aircraft-code.json

@@ -1,67 +1,42 @@
 [
     {
         "COL_CODE":"FLNO",
-        "COL_CN":"机型代码",
+        "COL_CN":"飞机号",
         "COL_ORDER":"1"
     },
     {
         "COL_CODE":"ALCD",
-        "COL_CN":"机型名称",
+        "COL_CN":"最大乘客数",
         "COL_ORDER":"2"
     },
     {
         "COL_CODE":"HZ",
-        "COL_CN":"飞机长度",
+        "COL_CN":"最大货物重量",
         "COL_ORDER":"3"
     },
     {
         "COL_CODE":"ZY",
-        "COL_CN":"翼展",
+        "COL_CN":"最大起飞重量",
         "COL_ORDER":"4"
     },
     {
         "COL_CODE":"LQ",
-        "COL_CN":"机身高度",
+        "COL_CN":"最大廊桥数",
         "COL_ORDER":"5"
     },
     {
         "COL_CODE":"ZJ",
-        "COL_CN":"最大乘客数",
+        "COL_CN":"机主航空公司",
         "COL_ORDER":"6"
     },
     {
         "COL_CODE":"HK",
-        "COL_CN":"最大货物重量",
+        "COL_CN":"航空公司",
         "COL_ORDER":"7"
     },
     {
         "COL_CODE":"JX",
-        "COL_CN":"最大起飞重量",
+        "COL_CN":"机型",
         "COL_ORDER":"8"
-    },
-    {
-        "COL_CODE":"ZDLQS",
-        "COL_CN":"最大廊桥数",
-        "COL_ORDER":"9"
-    },
-    {
-        "COL_CODE":"ZZU",
-        "COL_CN":"机型组",
-        "COL_ORDER":"10"
-    },
-    {
-        "COL_CODE":"CAA",
-        "COL_CN":"CAA码",
-        "COL_ORDER":"11"
-    },
-    {
-        "COL_CODE":"IATA",
-        "COL_CN":"IATA码",
-        "COL_ORDER":"12"
-    },
-    {
-        "COL_CODE":"ICAO",
-        "COL_CN":"ICAO码",
-        "COL_ORDER":"13"
     }
 ]

src/assets/mock-data/aircraft-data.json

@@ -1,7 +1,7 @@
 [
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"B\"}",
         "offset": 1988,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -9,7 +9,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"T\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"CH\", \"JX\": \"C\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -17,7 +17,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"G\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"CH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -25,7 +25,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"T\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"C\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -33,7 +33,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"CH\", \"JX\": \"B\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -41,7 +41,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"G\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -49,7 +49,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"CH\", \"JX\": \"B\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -57,7 +57,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"G\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"C\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -65,7 +65,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -73,7 +73,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -81,7 +81,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -89,7 +89,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -97,7 +97,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -105,7 +105,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -113,7 +113,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -121,7 +121,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -129,7 +129,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -137,7 +137,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -145,7 +145,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -153,7 +153,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -161,7 +161,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,

src/assets/mock-data/aircraft-type-code.json

@@ -1,42 +1,67 @@
 [
     {
         "COL_CODE":"FLNO",
-        "COL_CN":"飞机号",
+        "COL_CN":"机型代码",
         "COL_ORDER":"1"
     },
     {
         "COL_CODE":"ALCD",
-        "COL_CN":"最大乘客数",
+        "COL_CN":"机型名称",
         "COL_ORDER":"2"
     },
     {
         "COL_CODE":"HZ",
-        "COL_CN":"最大货物重量",
+        "COL_CN":"飞机长度",
         "COL_ORDER":"3"
     },
     {
         "COL_CODE":"ZY",
-        "COL_CN":"最大起飞重量",
+        "COL_CN":"翼展",
         "COL_ORDER":"4"
     },
     {
         "COL_CODE":"LQ",
-        "COL_CN":"最大廊桥数",
+        "COL_CN":"机身高度",
         "COL_ORDER":"5"
     },
     {
         "COL_CODE":"ZJ",
-        "COL_CN":"机主航空公司",
+        "COL_CN":"最大乘客数",
         "COL_ORDER":"6"
     },
     {
         "COL_CODE":"HK",
-        "COL_CN":"航空公司",
+        "COL_CN":"最大货物重量",
         "COL_ORDER":"7"
     },
     {
         "COL_CODE":"JX",
-        "COL_CN":"机型",
+        "COL_CN":"最大起飞重量",
         "COL_ORDER":"8"
+    },
+    {
+        "COL_CODE":"ZDLQS",
+        "COL_CN":"最大廊桥数",
+        "COL_ORDER":"9"
+    },
+    {
+        "COL_CODE":"ZZU",
+        "COL_CN":"机型组",
+        "COL_ORDER":"10"
+    },
+    {
+        "COL_CODE":"CAA",
+        "COL_CN":"CAA码",
+        "COL_ORDER":"11"
+    },
+    {
+        "COL_CODE":"IATA",
+        "COL_CN":"IATA码",
+        "COL_ORDER":"12"
+    },
+    {
+        "COL_CODE":"ICAO",
+        "COL_CN":"ICAO码",
+        "COL_ORDER":"13"
     }
-]
+]

src/assets/mock-data/aircraft-type-data.json

@@ -1,7 +1,7 @@
 [
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"B\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1988,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -9,7 +9,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"CH\", \"JX\": \"C\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"T\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -17,7 +17,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"CH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"G\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -25,7 +25,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"C\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"T\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -33,7 +33,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"CH\", \"JX\": \"B\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -41,7 +41,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"G\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -49,7 +49,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"CH\", \"JX\": \"B\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -57,7 +57,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"C\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"G\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -65,7 +65,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -73,7 +73,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -81,7 +81,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -89,7 +89,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -97,7 +97,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -105,7 +105,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -113,7 +113,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -121,7 +121,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -129,7 +129,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -137,7 +137,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -145,7 +145,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -153,7 +153,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -161,7 +161,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
+        "value": "{\"ALCD\": \"ADFKJDNL\", \"FLNO\": \"AN28\", \"HZ\": \"12.68\", \"ZY\": \"0.0\", \"LQ\": \"236\", \"ZJ\": \"9999\", \"HK\": \"88888\",\"JX\": \"2222000\",\"ZDLQS\": \"666\",\"ZZU\": \"E\",\"CAA\": \"CAA000\",\"IATA\": \"AN8552\",\"ICAO\": \"AN285\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,