diff --git a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.html b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.html
index 99bebd6..2dd8cfa 100644
--- a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.html
+++ b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.html
@@ -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) = "inputEnter()">
+                    <input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()" id="inputerInfo">
                 </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,12 +26,13 @@
   
             <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)="selectChange()">
+                  <label for="aircrafttypegroupId">机型组：&nbsp;&nbsp;</label>
+                  <select  class="form-control" [(ngModel)]="filterItems.aircrafttypegroupId" (ngModelChange)="selectChange()" id="jgroup">
                       <option value=""></option>
-                      <option value="E">E-类飞机机型</option>
+                      <option *ngFor="let item of aircraftTypes" [value]="item.aircrafttypegroupId">{{item.aircrafttypegroupId}}</option>
+                      <!-- <option value="E">E-类飞机机型</option>
                       <option value="T">T-类飞机机型</option>
-                      <option value="G">G-类飞机机型</option>
+                      <option value="G">G-类飞机机型</option> -->
                   </select>
               </div>
             </div>
@@ -43,7 +44,7 @@
                     <thead>
                         <tr>
                             <th>序号</th>
-                            <!-- <th>机型代码</th>
+                            <th>机型代码</th>
                             <th>机型名称</th>
                             <th>飞机长度</th>
                             <th>翼展</th>
@@ -55,28 +56,27 @@
                             <th>机型组</th>
                             <th>CAA码</th>
                             <th>IATA码</th>
-                            <th>ICAO码</th> -->
-                            <th *ngFor="let airline_col of aircrafttype_lists">{{airline_col.COL_CN}}</th>
+                            <th>ICAO码</th>
+                            <!-- <th *ngFor="let airline_col of aircrafttype_lists">{{airline_col.COL_CN}}</th> -->
                         </tr>
                     </thead>
                     <tbody>
-                        <tr *ngFor="let airline_row of render_data;let i = index" (click)="selectRow(airline_row)"
-                            [ngClass]="{'selected':row_state['renderFlight']===airline_row['renderFlight']}">
+                        <tr *ngFor="let aircraftType of render_data;let i = index">
                             <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.aircrafttypegroupId}}</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>
+                            <td>{{aircraftType.aircraftTypeCode}}</td>
+                            <td>{{aircraftType.aircraftTypeName}}</td>
+                            <td>{{aircraftType.aircraftLength}}</td>
+                            <td>{{aircraftType.aircraftWidth}}</td>
+                            <td>{{aircraftType.aircraftHeight}}</td>
+                            <td>{{aircraftType.maxPassengers}}</td>
+                            <td>{{aircraftType.maxFreightWeight}}</td>
+                            <td>{{aircraftType.maxTakeoffWeight}}</td>
+                            <td>{{aircraftType.maxAirbridges}}</td>
+                            <td>{{aircraftType.aircrafttypegroupId}}</td>
+                            <td>{{aircraftType.aircraftTypeCodeCaa}}</td>
+                            <td>{{aircraftType.aircraftTypeCodeIata}}</td>
+                            <td>{{aircraftType.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>
                 </table>
diff --git a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts
index 8da9868..26adbb0 100644
--- a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts
+++ b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts
@@ -1,7 +1,6 @@
 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 { BasicDataService } from '../../basic-data-service'
 import { HttpParams } from '@angular/common/http';
 import * as $ from 'jquery';
 @Component({
@@ -13,233 +12,70 @@ export class AircraftTypeComponent implements OnInit {
 
   constructor(
     private httpCilent: HttpClientService,
-    private changeDetectorRef: ChangeDetectorRef
+    private basicDataService: BasicDataService
 ) { }
 
-public raw_data: Array<object> = [];    //原始数据，即航班计划
-
-public combined_data: Array<object> = [];    //组合数据，即链接航班，显示信息等组合好之后的数据
-
-public render_data: Array<object> = [];  //显示数据，即需要显示的数据
-
-public aircrafttype_lists: Array<object>;    //列数据
-
-public row_state: any = { renderFlight: {} };
-
 // 搜索条件
 SEARCH = '';    //手动输入条件
 FLT_POS = 1;    //过滤还是定位
 SEL_COL = '';   //选择列名
 
+//下拉框
 public filterItems = {
-    ZZU: '',    //机型组
-}
-
-public formatter = {
-    'ZZU': {
-        'E': 'E-类飞机机型',
-        'T': 'T-类飞机机型',
-        'G': 'G-类飞机机型'
-    },
-    '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
-    }
+    aircrafttypegroupId:'',
 }
 
+aircraftTypes : Array<any>;
+public row_state: any = { renderFlight: {} };
+public render_data: Array<object> = [];  //显示数据，即需要显示的数据
+public return_data: Array<object> = []; //下拉框显示数据
 ngOnInit() {
-    this.changeDetectorRef.detach();
-    /* 获取显示列 */
-    this.httpCilent.get('/assets/mock-data/aircraft-type-code.json').subscribe(
-        data => {
-            data.sort(function (a, b) {
-                return (a['COL_ORDER'] - b['COL_ORDER']);
-            })
-            this.aircrafttype_lists = data;
+    this.aircraftTypes = this.basicDataService.aircraft_type;
+    this.basicDataService.aircraft_type_subject.subscribe(
+        data=>{
+            this.aircraftTypes = data;
+            this.render_data = this.aircraftTypes;
         }
     )
-    /* 获取机型信息 */
-    this.httpCilent.get('/assets/mock-data/aircraft-type-data.json').subscribe(
-        data => {
-            //解析数据
-            data.forEach(element => {
-                this.raw_data.push(JSON.parse(element.value));
-            });
-
-            let combined_linked_data = this.raw_data
-
-            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.aircrafttype_lists.length; i++) {
-                    let key = this.aircrafttype_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.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]) ? (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)
-            })
-            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);
+    /**
+     * 固定表头
+     */
+    var tableCont = document.querySelector('#table-container');
+    function scrollHandle (){
+      var scrollTop = this.scrollTop;
+      this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
+    }
+    tableCont.addEventListener('scroll',scrollHandle);
 }
 
-/**
- * 过滤及定位
- * @param filterItems
- * @return
- */
-//输入框回车事件
+///输入框回车事件
 inputEnter() {
     if (this.FLT_POS === 1) {
-        this.selectChange()
+        this.inputFilter(this.aircraftTypes)
     } else {
-        this.selectChange()
-        this.inputPosition(this.render_data)
+        this.inputFilter(this.aircraftTypes)
+        // this.inputPosition(this.render_data)
     }
 }
 
 //下拉框选择筛选
 selectChange() {
-    let filter_data = [];
-    let filterItems = this.filterItems;
-    this.combined_data.forEach(item => {
-        filter_data.push(Object.assign({}, item));
-    })
-    //下拉框筛选
-    filter_data = filter_data.filter(item => {
-        if (item) {
+    this.return_data = this.aircraftTypes.filter(item=>{
             let is_satis = true;
-            for (const key in filterItems) {
-                if (filterItems.hasOwnProperty(key) && filterItems[key]) {
-                    if (item['preFlight'][key] === filterItems[key]) {
+            for (const key in this.filterItems) {
+                if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
+                    if (item[key] === this.filterItems[key]) {
                         is_satis = true;
                         continue;
                     } else {
                         is_satis = false;
                         break;
                     }
-
                 }
             }
             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();
-    }
+    this.render_data = this.return_data;
 }
 
 //输入框筛选
@@ -248,8 +84,8 @@ inputFilter(filterData) {
         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'))) {
+                if (item[sel_col]) {
+                    if (item[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
                         return true;
                     }
                 } else {
@@ -264,10 +100,10 @@ inputFilter(filterData) {
         } 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'))) {
+                for (const key in item) {
+                    if (item.hasOwnProperty(key)) {
+                        if (item[key]) {
+                            if (item[key].toString().match(new RegExp(this.SEARCH, 'i'))) {
                                 is_satis = true;
                                 break;
                             } else {
@@ -293,7 +129,6 @@ inputFilter(filterData) {
     }
     this.render_data = filterData;
     this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
-    this.changeDetectorRef.detectChanges();
 }
 
 positionArray: Array<any> = [];
@@ -304,8 +139,8 @@ inputPosition(filterData) {
     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'))) {
+            if (element[sel_col]) {
+                if (element[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
                     transArray.push(element)
                 }
             } else {
@@ -316,10 +151,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'))) {
+            for (const key in element) {
+                if (element.hasOwnProperty(key)) {
+                    if (element[key]) {
+                        if (element[key].toString().match(new RegExp(this.SEARCH, 'i'))) {
                             transArray.push(element)
                             break;
                         } else {
@@ -356,12 +191,5 @@ inputPosition(filterData) {
     } else {
         alert('没有搜索到相关数据');
     }
-
-    this.changeDetectorRef.detectChanges();
-
-    let tr = $(".selected");
-    let objTr = tr[0];
-    $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
-
     }
 }