diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html
index 9a8a1a1..e54936f 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.html
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html
@@ -56,34 +56,50 @@
                 <label for="routeType">航线类别：&nbsp;&nbsp;</label>
                 <select  class="form-control" [(ngModel)]="filterItems.routeType" (ngModelChange)="selectChange()">
                     <option value=""></option>
-                    <!-- <option value="D">国内</option>
+                    <option value="D">国内</option>
                     <option value="I">国际</option>
                     <option value="M">混合</option>
-                    <option value="R">地区</option> -->
-                    <option *ngFor="let item of seasonals" [value]="item.routeType">{{item.routeType}}</option>
+                    <option value="R">地区</option>
+                    <!-- <option *ngFor="let item of seasonals" [value]="item.routeType">{{item.routeType}}</option> -->
                 </select>
             </div>
             <div class="input-container mr-4">
               <label for="flightTypeCode">航班类别：&nbsp;&nbsp;</label>
-              <select  class="form-control" (ngModelChange)="selectChange()" [(ngModel)]="filterItems.flightTypeCode">
+              <select  class="form-control" [(ngModel)]="filterItems.flightTypeCode" (ngModelChange)="selectChange()" >
                   <option value=""></option>
-                  <option *ngFor="let item of seasonals" [value]="item.flightTypeCode">{{item.flightTypeCode}}</option>
+                  <option value="P">客机</option>
+                  <option value="F">货机</option>
+                  <option value="B">专机</option>
+                  <option value="O">公务机</option>
+                  <option value="M">军机</option>
+                  <option value="X">其他</option>
+                  <!-- <option *ngFor="let item of seasonals" [value]="item.flightTypeCode">{{item.flightTypeCode}}</option> -->
               </select>
           </div>
           <div class="input-container mr-4">
               <label for="arriOrDept">到达/出发：&nbsp;&nbsp;</label>
-              <select  class="form-control" (ngModelChange)="selectChange()" [(ngModel)]="filterItems.arriOrDept">
+              <select  class="form-control" [(ngModel)]="filterItems.arriOrDept" (ngModelChange)="selectChange()">
                   <option value=""></option>
-                  <!-- <option value="A">到达</option>
-                  <option value="D">出发</option> -->
-                  <option *ngFor="let item of seasonals" [value]="item.arriOrDept">{{item.arriOrDept}}</option>
+                  <option value="A">到达</option>
+                  <option value="D">出发</option>
+                  <!-- <option *ngFor="let item of seasonals" [value]="item.arriOrDept">{{item.arriOrDept}}</option> -->
               </select>
           </div>
           <div class="input-container mr-4">
               <label for="flightTask">航班任务：&nbsp;&nbsp;</label>
-              <select  class="form-control" (ngModelChange)="selectChange()" [(ngModel)]="filterItems.flightTask">
+              <select  class="form-control" [(ngModel)]="filterItems.flightTask" (ngModelChange)="selectChange()">
                   <option value=""></option>
-                  <option *ngFor="let item of seasonals" [value]="item.flightTask">{{item.flightTask}}</option>
+                  <option value="S">正班</option>
+                  <option value="N">包机</option>
+                  <option value="E">急救</option>
+                  <option value="B">专机</option>
+                  <option value="G">通用</option>
+                  <option value="J">加班</option>
+                  <option value="M">军用</option>
+                  <option value="Q">补班</option>
+                  <option value="X">其他</option>
+                  <option value="A">计划外</option>
+                  <!-- <option *ngFor="let item of seasonals" [value]="item.flightTask">{{item.flightTask}}</option> -->
               </select>
           </div>
         </div>
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
index a043954..48e1afb 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
@@ -22,9 +22,9 @@ SEL_COL = '';   //选择列名
 
 public filterItems = {
     airlineId: '',    //航空公司
-    routeType: '',
+    routeType: '',  //航线类别
     flightTypeCode: '',  //航班类别
-    arriOrDept: '',
+    arriOrDept: '', //到达/出发
     flightTask: '',    //航班任务
 }
 
@@ -42,6 +42,102 @@ ngOnInit() {
             if(this.airlines && this.airlines.length > 0){//航空公司列表数据转换
                 this.basicDataTransHandle();
             }
+            this.render_data.forEach(element => {//航线类别列表显示数据转换
+                if (element['routeType'] == 'D') {
+                    element['routeType'] = '国内'
+                    return element['routeType'];
+                }
+                if(element['routeType'] == 'I'){
+                    element['routeType'] = '国际'
+                    return element['routeType'];
+                }
+                if(element['routeType'] == 'M'){
+                    element['routeType'] = '混合'
+                    return element['routeType'];
+                }
+                if(element['routeType'] = 'R'){
+                    element['routeType'] = '地区'
+                    return element['routeType'];
+                }
+            });
+            this.render_data.forEach(item => {//到达/出发列表显示数据转换
+                if(item['arriOrDept'] == 'A'){
+                    item['arriOrDept'] = '到达'
+                    return item['arriOrDept']
+                }
+                if(item['arriOrDept'] == 'D'){
+                    item['arriOrDept'] = '出发'
+                    return item['arriOrDept']
+                }
+            });
+            this.render_data.forEach(item => {//航班类别列表显示数据转换
+                if(item['flightTypeCode'] == 'P'){
+                    item['flightTypeCode'] = '客机'
+                    return item['flightTypeCode']
+                }
+                if(item['flightTypeCode'] == 'F'){
+                    item['flightTypeCode'] = '货机'
+                    return item['flightTypeCode']
+                }
+                if(item['flightTypeCode'] == 'B'){
+                    item['flightTypeCode'] = '专机'
+                    return item['flightTypeCode']
+                }
+                if(item['flightTypeCode'] == 'O'){
+                    item['flightTypeCode'] = '公务机'
+                    return item['flightTypeCode']
+                }
+                if(item['flightTypeCode'] == 'M'){
+                    item['flightTypeCode'] = '军机'
+                    return item['flightTypeCode']
+                }
+                if(item['flightTypeCode'] == 'X'){
+                    item['flightTypeCode'] = '其他'
+                    return item['flightTypeCode']
+                }
+            });
+            this.render_data.forEach(item => {//航班任务列表显示数据转换
+                if(item['flightTask'] == 'S'){
+                    item['flightTask'] = '正班'
+                    return item['flightTask']
+                }
+                if(item['flightTask'] == 'N'){
+                    item['flightTask'] = '包机'
+                    return item['flightTask']
+                }
+                if(item['flightTask'] == 'E'){
+                    item['flightTask'] = '急救'
+                    return item['flightTask']
+                }
+                if(item['flightTask'] == 'B'){
+                    item['flightTask'] = '专机'
+                    return item['flightTask']
+                }
+                if(item['flightTask'] == 'G'){
+                    item['flightTask'] = '通用'
+                    return item['flightTask']
+                }
+                if(item['flightTask'] == 'J'){
+                    item['flightTask'] = '加班'
+                    return item['flightTask']
+                }
+                if(item['flightTask'] == 'M'){
+                    item['flightTask'] = '军用'
+                    return item['flightTask']
+                }
+                if(item['flightTask'] == 'Q'){
+                    item['flightTask'] = '补班'
+                    return item['flightTask']
+                }
+                if(item['flightTask'] == 'X'){
+                    item['flightTask'] = '其他'
+                    return item['flightTask']
+                }
+                if(item['flightTask'] == 'A'){
+                    item['flightTask'] = '计划外'
+                    return item['flightTask']
+                }
+            });
         }
     )
     //航空公司
@@ -97,20 +193,186 @@ inputEnter() {
 //下拉框选择筛选
 selectChange() {
     this.return_data = this.seasonals.filter(item=>{
-            let is_satis = true;
-            for (const key in this.filterItems) {
-                if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
-                    if (item[key] === +this.filterItems[key] || item[key] === this.filterItems[key]) {
-                        is_satis = true;
-                        continue;
-                    }else {
-                        is_satis = false;
-                        break;
-                    }
+        let is_satis = true;
+        if(item['routeType'] == '国内'){
+            item['routeType'] = 'D'
+        }
+        if(item['routeType'] == '国际'){
+            item['routeType'] = 'I'
+        }
+        if(item['routeType'] == '混合'){
+            item['routeType'] = 'M'
+        }
+        if(item['routeType'] == '地区'){
+            item['routeType'] = 'R'
+        }
+        //到达/出发
+        if(item['arriOrDept'] == '到达'){
+            item['arriOrDept'] = 'A'
+        }
+        if(item['arriOrDept'] == '出发'){
+            item['arriOrDept'] = 'D'
+        }
+        //航班类别
+        if(item['flightTypeCode'] == '客机'){
+            item['flightTypeCode'] = 'P'
+        }
+        if(item['flightTypeCode'] == '货机'){
+            item['flightTypeCode'] = 'F'
+        }
+        if(item['flightTypeCode'] == '专机'){
+            item['flightTypeCode'] = 'B'
+        }
+        if(item['flightTypeCode'] == '公务机'){
+            item['flightTypeCode'] = 'O'
+        }
+        if(item['flightTypeCode'] == '军机'){
+            item['flightTypeCode'] = 'M'
+        }
+        if(item['flightTypeCode'] == '其他'){
+            item['flightTypeCode'] = 'X'
+        }
+        //航班任务
+        if(item['flightTask'] == '正班'){
+            item['flightTask'] = 'S'
+            return item['flightTask']
+        }
+        if(item['flightTask'] == '包机'){
+            item['flightTask'] = 'N'
+        }
+        if(item['flightTask'] == '急救'){
+            item['flightTask'] = 'E'
+        }
+        if(item['flightTask'] == '专机'){
+            item['flightTask'] = 'B'
+        }
+        if(item['flightTask'] == '通用'){
+            item['flightTask'] = 'G'
+        }
+        if(item['flightTask'] == '加班'){
+            item['flightTask'] = 'J'
+        }
+        if(item['flightTask'] == '军用'){
+            item['flightTask'] = 'M'
+        }
+        if(item['flightTask'] == '补班'){
+            item['flightTask'] = 'Q'
+        }
+        if(item['flightTask'] == '其他'){
+            item['flightTask'] = 'X'
+        }
+        if(item['flightTask'] == '计划外'){
+            item['flightTask'] = 'A'
+        }
+        for (const key in this.filterItems) {
+            if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
+                if (item[key] === +this.filterItems[key] || item[key] === this.filterItems[key]) {
+                    is_satis = true;
+                    continue;
+                }else {
+                    is_satis = false;
+                    break;
                 }
             }
-            return is_satis;
+        }
+        return is_satis;
     })
+    this.return_data.forEach(element => {//航线类别列表显示数据转换
+        if (element['routeType'] == 'D') {
+            element['routeType'] = '国内'
+            return element['routeType'];
+        }
+        if(element['routeType'] == 'I'){
+            element['routeType'] = '国际'
+            return element['routeType'];
+        }
+        if(element['routeType'] == 'M'){
+            element['routeType'] = '混合'
+            return element['routeType'];
+        }
+        if(element['routeType'] == 'R'){
+            element['routeType'] = '地区'
+            return element['routeType'];
+        }
+    });
+    this.return_data.forEach(item => {//到达/出发列表显示数据转换
+        if(item['arriOrDept'] == 'A'){
+            item['arriOrDept'] = '到达'
+            return item['arriOrDept']
+        }
+        if(item['arriOrDept'] == 'D'){
+            item['arriOrDept'] = '出发'
+            return item['arriOrDept']
+        }
+    });
+    this.return_data.forEach(item => {//航班类别列表显示数据转换
+        if(item['flightTypeCode'] == 'P'){
+            item['flightTypeCode'] = '客机'
+            return item['flightTypeCode']
+        }
+        if(item['flightTypeCode'] == 'F'){
+            item['flightTypeCode'] = '货机'
+            return item['flightTypeCode']
+        }
+        if(item['flightTypeCode'] == 'B'){
+            item['flightTypeCode'] = '专机'
+            return item['flightTypeCode']
+        }
+        if(item['flightTypeCode'] == 'O'){
+            item['flightTypeCode'] = '公务机'
+            return item['flightTypeCode']
+        }
+        if(item['flightTypeCode'] == 'M'){
+            item['flightTypeCode'] = '军机'
+            return item['flightTypeCode']
+        }
+        if(item['flightTypeCode'] == 'X'){
+            item['flightTypeCode'] = '其他'
+            return item['flightTypeCode']
+        }
+    });
+    this.return_data.forEach(item => {//航班任务列表显示数据转换
+        if(item['flightTask'] == 'S'){
+            item['flightTask'] = '正班'
+            return item['flightTask']
+        }
+        if(item['flightTask'] == 'N'){
+            item['flightTask'] = '包机'
+            return item['flightTask']
+        }
+        if(item['flightTask'] == 'E'){
+            item['flightTask'] = '急救'
+            return item['flightTask']
+        }
+        if(item['flightTask'] == 'B'){
+            item['flightTask'] = '专机'
+            return item['flightTask']
+        }
+        if(item['flightTask'] == 'G'){
+            item['flightTask'] = '通用'
+            return item['flightTask']
+        }
+        if(item['flightTask'] == 'J'){
+            item['flightTask'] = '加班'
+            return item['flightTask']
+        }
+        if(item['flightTask'] == 'M'){
+            item['flightTask'] = '军用'
+            return item['flightTask']
+        }
+        if(item['flightTask'] == 'Q'){
+            item['flightTask'] = '补班'
+            return item['flightTask']
+        }
+        if(item['flightTask'] == 'X'){
+            item['flightTask'] = '其他'
+            return item['flightTask']
+        }
+        if(item['flightTask'] == 'A'){
+            item['flightTask'] = '计划外'
+            return item['flightTask']
+        }
+    });
     this.render_data = this.return_data;
 }
 
@@ -227,6 +489,9 @@ inputPosition(filterData) {
     } else {
         alert('没有搜索到相关数据');
     }
+        let tr = $(".selected");
+        let objTr = tr[0];
+        $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
     }
 
 }