diff --git a/src/app/pages/basic-data/checkin-group/checkin-group.component.html b/src/app/pages/basic-data/checkin-group/checkin-group.component.html
index bb70a50..19e7f40 100644
--- a/src/app/pages/basic-data/checkin-group/checkin-group.component.html
+++ b/src/app/pages/basic-data/checkin-group/checkin-group.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) = "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>
@@ -25,8 +25,8 @@
       </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>
@@ -34,8 +34,8 @@
                       </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']['FLNO']===airline_row['renderFlight']['FLNO']}">
                           <td>{{i+1}}</td>
                           <td *ngFor="let airline_col of col_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td>
                       </tr>
diff --git a/src/app/pages/basic-data/checkin-group/checkin-group.component.scss b/src/app/pages/basic-data/checkin-group/checkin-group.component.scss
index cf17098..dba3c39 100644
--- a/src/app/pages/basic-data/checkin-group/checkin-group.component.scss
+++ b/src/app/pages/basic-data/checkin-group/checkin-group.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;
diff --git a/src/app/pages/basic-data/checkin-group/checkin-group.component.ts b/src/app/pages/basic-data/checkin-group/checkin-group.component.ts
index 12d9d3e..b46a891 100644
--- a/src/app/pages/basic-data/checkin-group/checkin-group.component.ts
+++ b/src/app/pages/basic-data/checkin-group/checkin-group.component.ts
@@ -2,6 +2,8 @@ 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-checkin-group',
   templateUrl: './checkin-group.component.html',
@@ -22,8 +24,7 @@ public render_data: Array<object> = [];  //显示数据，即需要显示的数
 
 public col_lists: Array<object>;    //列数据
 
-public row_state: number;
-
+public row_state: any = { renderFlight: {} };
 
 public TOP_1 = 1000000000000;
 public TOP_2 = 2000000000000;
@@ -55,7 +56,6 @@ public formatter = {
     'ACTT': dateFormatter
 }
 
-
 selectRow(i) {
     this.row_state = i;
     this.changeDetectorRef.detectChanges();
@@ -131,225 +131,344 @@ ngOnInit() {
                 }
                 this.combined_data.push(row_flights)
             })
-
-            //排序
-            this.combined_data.forEach(element => {
-                element['ORDER'] = this.sequence(element)
-                // element['ORDER'] = '+' + element['order']
-            })
-
-            this.combined_data.sort(function (a, b) {
-                return (a['ORDER'] - b['ORDER']);
-            })
-
-            this.render_data = this.combined_data
-
-            this.changeDetectorRef.detectChanges();
+            this.doSequence(this.combined_data);
         }
     )
+        /**
+         * 固定表头
+         */
+        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;
+    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
   }
-  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
+/**
+ * 执行排序并渲染
+ */
+doSequence(sequenceData) {
+    sequenceData.forEach(element => {
+        element['ORDER'] = this.sequence(element);
+    })
+
+    sequenceData.sort(function (a, b) {
+        return (a['ORDER'] - b['ORDER']);
+    })
+
+    this.render_data = sequenceData;
+    this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
+    this.changeDetectorRef.detectChanges();
 }
 
-inputFliter() {
-    let filterItems = this.filterItems;
-    let combined_data = this.combined_data;
+/**
+ * 过滤及定位
+ * @param filterItems
+ * @return
+ */
+//输入框回车事件
+inputEnter() {
+    if (this.FLT_POS === 1) {
+        this.selectChange()
+    } else {
+        this.selectChange()
+        this.inputPosition(this.render_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 (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;
                     }
-                }else{
-                    if(!this.SEARCH){
-                        filter_data.push(Object.assign({}, item))
+
+                }
+            }
+            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;
+            }
+        }
+    })
+    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;
             })
         }
+    }
+    this.render_data = filterData;
+    this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
+    this.changeDetectorRef.detectChanges();
+}
 
-        //下拉框筛选
-        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;
-                        }
-
-                    }
+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)
                 }
-                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;
+                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;
+                        }
+                    }
 
-        this.render_data = filter_data;
-
-    } else {    //定位
+                } else {
+                    continue;
+                }
+            }
+        });
+    }
 
+    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('没有搜索到相关数据');
     }
 
     this.changeDetectorRef.detectChanges();
+
+    let tr = $(".selected");
+    let objTr = tr[0];
+    $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
 }
 
 /**