From 19934a59f41ab829d682ad60274e3b9fb6fff436 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Fri, 21 Dec 2018 15:08:24 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=B9=B4=E4=BB=BD=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seasonal-plan.component.html              |   4 +
 .../seasonal-plan/seasonal-plan.component.ts  | 103 ++++++++++++++++--
 2 files changed, 96 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html
index 53bc224..d4082e0 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.html
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html
@@ -59,6 +59,10 @@
                   <option *ngFor="let item of flightTypes" [value]="item.flightTypeCode">{{item.flightTypeNameCn}}</option>
               </select>
           </div>
+          <div class="input-container mr-4">
+            <label for="startDate">查询年份：&nbsp;&nbsp;</label>
+            <input readonly type="text" id="startDate" class="form-control" style="background:transparent;cursor: pointer">
+          </div>
           <div class="input-container mr-4">
               <label for="arriOrDept">到达/出发：&nbsp;&nbsp;</label>
               <select  class="form-control" [(ngModel)]="filterItems.arriOrDept" (ngModelChange)="selectChange()">
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
index c2d0524..124e4a1 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
@@ -5,6 +5,8 @@ import { ChangeDetectorRef } from '@angular/core';
 import { ToastService } from '../../components/toast/toast.service';
 import { ToastConfig, ToastType } from '../../components/toast/toast-model';
 import * as $ from 'jquery';
+import { format } from 'util';
+declare var laydate: any;
 @Component({
   selector: 'app-seasonal-plan',
   templateUrl: './seasonal-plan.component.html',
@@ -68,20 +70,14 @@ export class SeasonalPlanComponent implements OnInit {
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
     public return_data: Array<object> = []; //下拉框显示数据
     ngOnInit() {
+        this.laydateYear();
         /* 获取季度计划信息 */
-        this.httpCilent.get('/adminapi/schedule/flightSchdSeasons').subscribe(
+        var value = new Date(new Date().getTime());
+        var subValue = format(value).substring(11,15); //时间截取到年份
+        this.httpCilent.get('/adminapi/schedule/flightSchdSeasons',{startDate: subValue}).subscribe(
             data => {
                 this.seasonals = data.body;
                 this.render_data = this.seasonals;
-                if(this.airlines && this.airlines.length > 0){//航空公司列表数据转换
-                    this.basicDataTransHandle();
-                }
-                if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换
-                    this.aircraftTypesHandle();
-                }
-                if(this.flightTypes && this.flightTypes.length > 0){//航班类别列表数据转换
-                    this.flightTypesHandle();
-                }
                 this.render_data.forEach(element => {//航线类别列表显示数据转换
                     if (element['routeType'] == 'D') {
                         element['routeType'] = '国内'
@@ -117,6 +113,9 @@ export class SeasonalPlanComponent implements OnInit {
         this.basicDataService.airline_subject.subscribe(
             data=>{
                 this.airlines = data;
+                if(this.airlines && this.airlines.length > 0){//航空公司列表数据转换
+                    this.irlinesHandle();
+                }
             }
         )
         //机型
@@ -124,6 +123,9 @@ export class SeasonalPlanComponent implements OnInit {
         this.basicDataService.aircraft_type_subject.subscribe(
             data => {
                 this.aircraftTypes = data;
+                if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换
+                    this.aircraftTypesHandle();
+                }
             }
         )
         //航班类别
@@ -131,6 +133,9 @@ export class SeasonalPlanComponent implements OnInit {
         this.basicDataService.flightTypes_subject.subscribe(
             data=> {
                 this.flightTypes = data;
+                if(this.flightTypes && this.flightTypes.length > 0){//航班类别列表数据转换
+                    this.flightTypesHandle();
+                }
             }
         )
         /**
@@ -144,7 +149,7 @@ export class SeasonalPlanComponent implements OnInit {
         tableCont.addEventListener('scroll',scrollHandle);
     }
     //航空公司名称数据转换处理
-    basicDataTransHandle() {
+    irlinesHandle() {
         this.render_data.forEach(item => {
             let airlineLinkIndex = this.airlines.findIndex(val => val.airlineId === item['airlineId']);
             if(this.airlines[airlineLinkIndex]){
@@ -173,6 +178,82 @@ export class SeasonalPlanComponent implements OnInit {
         })
     }
 
+    //选择年份
+    laydateYear(){
+        laydate.render({
+            elem: '#startDate',
+            showBottom: true,
+            value: new Date(new Date().getTime()),
+            type: 'year',
+            //  format: 'yyyy',
+            done: (value) => {
+                this.httpCilent.get('/adminapi/schedule/flightSchdSeasons', { startDate: value }).subscribe(
+                    data => {
+                        this.seasonals = data.body;
+                        this.render_data = this.seasonals;
+                        if(this.airlines && this.airlines.length > 0){//航空公司列表数据转换
+                            this.irlinesHandle();
+                        }
+                        if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换
+                            this.aircraftTypesHandle();
+                        }
+                        if(this.flightTypes && this.flightTypes.length > 0){//航班类别列表数据转换
+                            this.flightTypesHandle();
+                        }
+                        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.airlines = this.basicDataService.airline;
+                this.basicDataService.airline_subject.subscribe(
+                    data=>{
+                        this.airlines = data;
+                    }
+                )
+                //机型
+                this.aircraftTypes = this.basicDataService.aircraft_type;
+                this.basicDataService.aircraft_type_subject.subscribe(
+                    data => {
+                        this.aircraftTypes = data;
+                    }
+                )
+                //航班类别
+                this.flightTypes = this.basicDataService.flightTypes;
+                this.basicDataService.flightTypes_subject.subscribe(
+                    data=> {
+                        this.flightTypes = data;
+                    }
+                )
+            }
+        });
+    }
+
     /**
      * 复选框勾选事件
      */

From b75d0dcfc1bff46246887a86f1975dc86f5fa08d Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Fri, 21 Dec 2018 15:35:13 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B9=B4=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seasonal-plan.component.html              | 254 ++++++++----------
 .../seasonal-plan/seasonal-plan.component.ts  |   7 +-
 2 files changed, 115 insertions(+), 146 deletions(-)

diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html
index d4082e0..5a0ba8d 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.html
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html
@@ -2,10 +2,10 @@
   <div class="page-content">
       <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">
+               <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="">
-                      <option value="">选择列名</option>
-                      <option *ngFor="let col of col_lists" [value]="col.col_code">{{col.col_chn}}</option>
+                        <option value="">选择列名</option>
+                        <option *ngFor="let col of col_lists" [value]="col.col_code">{{col.col_chn}}</option>
                   </select>
                   <label class="radio-inline custom-radio nowrap mr-4">
                         <input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
@@ -16,154 +16,122 @@
                         <span>查找定位</span>
                     </label>
                     <input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()">
-              </div>
-              <div class="line-operator-right mb-3 col-xlg-4 col-mlg-4 col-xl-4 col-lg-1">
-                  <!-- <button type="button" class="btn btn-info mr-3">打印</button>
-                  <button type="button" class="btn btn-info mr-3">航班季度</button>
-                  <button type="button" class="btn btn-info mr-3">季度计划发布</button>
-                  <button type="button" class="btn btn-info mr-3">刷新数据</button>
-                  <button type="button" class="btn btn-info mr-3">季度计划维护</button> -->
-                  <button type="button" class="btn btn-info mr-3" (click)="refresh()">刷新</button>
-              </div>
+               </div>
+               <div class="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" (click)="refresh()">刷新</button>
+               </div>
           </div>
 
           <div class="second-condition mb-3 row">
-            <div class="input-container mr-4">
-              <label for="airlineId">航空公司：&nbsp;&nbsp;</label>
-              <select  class="form-control" [(ngModel)]="filterItems.airlineId" (ngModelChange)="selectChange()">
-                  <option value=""></option>
-                  <option *ngFor="let item of airlines" [value]="item.airlineId">{{item.airlineName}}</option>
-              </select>
-            </div>
-            <div class="input-container mr-4">
-                <label for="routeType">航线类别：&nbsp;&nbsp;</label>
-                <select  class="form-control" [(ngModel)]="filterItems.routeType" (ngModelChange)="selectChange()">
-                    <option value=""></option>
-                    <option value="D">国内</option>
-                    <option value="I">国际</option>
-                    <option value="M">混合</option>
-                    <option value="R">地区</option>
-                    <!-- <option *ngFor="let item of seasonals" [value]="item.routeType">{{item.routeType}}</option> -->
-                </select>
-            </div>
-            <div class="input-container mr-4">
-              <label for="flightTypeCode">航班类别：&nbsp;&nbsp;</label>
-              <select  class="form-control" [(ngModel)]="filterItems.flightTypeCode" (ngModelChange)="selectChange()" >
-                  <option value=""></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 flightTypes" [value]="item.flightTypeCode">{{item.flightTypeNameCn}}</option>
-              </select>
+                <div class="input-container mr-4">
+                    <label for="airlineId">航空公司：&nbsp;&nbsp;</label>
+                    <select  class="form-control" [(ngModel)]="filterItems.airlineId" (ngModelChange)="selectChange()">
+                        <option value=""></option>
+                        <option *ngFor="let item of airlines" [value]="item.airlineId">{{item.airlineName}}</option>
+                    </select>
+                </div>
+                <div class="input-container mr-4">
+                    <label for="routeType">航线类别：&nbsp;&nbsp;</label>
+                    <select  class="form-control" [(ngModel)]="filterItems.routeType" (ngModelChange)="selectChange()">
+                        <option value=""></option>
+                        <option value="D">国内</option>
+                        <option value="I">国际</option>
+                        <option value="M">混合</option>
+                        <option value="R">地区</option>
+                    </select>
+                </div>
+                <div class="input-container mr-4">
+                    <label for="flightTypeCode">航班类别：&nbsp;&nbsp;</label>
+                    <select  class="form-control" [(ngModel)]="filterItems.flightTypeCode" (ngModelChange)="selectChange()" >
+                        <option value=""></option>
+                        <option *ngFor="let item of flightTypes" [value]="item.flightTypeCode">{{item.flightTypeNameCn}}</option>
+                    </select>
+                </div>
+                <div class="input-container mr-4">
+                    <label for="startDate">查询年份：&nbsp;&nbsp;</label>
+                    <input readonly type="text" id="startDate" class="form-control" style="background:transparent;cursor: pointer">
+                </div>
+                <div class="input-container mr-4">
+                    <label for="arriOrDept">到达/出发：&nbsp;&nbsp;</label>
+                    <select  class="form-control" [(ngModel)]="filterItems.arriOrDept" (ngModelChange)="selectChange()">
+                        <option value=""></option>
+                        <option value="A">到达</option>
+                        <option value="D">出发</option>
+                    </select>
+                </div>
           </div>
-          <div class="input-container mr-4">
-            <label for="startDate">查询年份：&nbsp;&nbsp;</label>
-            <input readonly type="text" id="startDate" class="form-control" style="background:transparent;cursor: pointer">
+          <div class="third-condition row">
+                <label class="radio-inline custom-checkbox nowrap mr-4">
+                    <input type="checkbox" [(ngModel)]="checkboxGroup.related" (ngModelChange)="checkboxChange()">
+                    <span>航班关联信息</span>
+                </label>
+                <label class="radio-inline custom-checkbox nowrap mr-4">
+                    <input type="checkbox" [(ngModel)]="checkboxGroup.detail" (ngModelChange)="checkboxChange()">
+                    <span>详细信息</span>
+                </label>
           </div>
-          <div class="input-container mr-4">
-              <label for="arriOrDept">到达/出发：&nbsp;&nbsp;</label>
-              <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> -->
-              </select>
-          </div>
-         <!--  <div class="input-container mr-4">
-              <label for="flightTask">航班任务：&nbsp;&nbsp;</label>
-              <select  class="form-control" [(ngModel)]="filterItems.flightTask" (ngModelChange)="selectChange()">
-                  <option value=""></option>
-                  <option value="S">正班</option>
-                  <option value="N">包机</option>
-                  <option value="E">急救</option>
-                  <option value="B">专机</option>
-                  <option value="G">通用</option>
-                  <option value="J">加班</option>
-                  <option value="M">军用</option>
-                  <option value="Q">补班</option>
-                  <option value="X">其他</option>
-                  <option value="A">计划外</option>
-                  <option *ngFor="let item of seasonals" [value]="item.flightTask">{{item.flightTask}}</option>
-              </select>
-          </div> -->
-        </div>
-        <div class="third-condition row">
-          <label class="radio-inline custom-checkbox nowrap mr-4">
-              <input type="checkbox" [(ngModel)]="checkboxGroup.related" (ngModelChange)="checkboxChange()">
-              <span>航班关联信息</span>
-          </label>
-          <label class="radio-inline custom-checkbox nowrap mr-4">
-              <input type="checkbox" [(ngModel)]="checkboxGroup.detail" (ngModelChange)="checkboxChange()">
-              <span>详细信息</span>
-          </label>
-      </div>
       </div>
 
       <div class="airline-table">
-          <div id="table-container" class="table-container" [ngClass]="{'table-c': !tabClose,'table-o': tabClose}">
-                <table id="table" class="table table-bordered table-striped">
-                  <thead>
-                      <tr>
-                          <th>序号</th>
-                          <th>航班号</th>
-                          <th>航班季度</th>
-                          <th>国际代码</th>
-                          <th>航空公司</th>
-                          <th>航线类别</th>
-                          <th>航班类别</th>
-                          <!-- <th>航班任务</th> -->
-                          <th>运营日</th>
-                          <th>开始日期</th>
-                          <th>结束日期</th>
-                          <th>航线</th>
-                          <th>进/出港</th>
-                          <th>到达时间</th>
-                          <th>出发时间</th>
-                          <th>机型</th>
-                          <th>飞行距离(千米)</th>
-                          <th>飞行时间(分钟)</th>
-                          <!-- <th *ngFor="let seasonal of seasonal_lists">{{seasonal.COL_CN}}</th> -->
-                      </tr>
-                  </thead>
-                  <tbody>
-                      <tr *ngFor="let seasonal of render_data;let i = index" (click)="selectRow(seasonal)"
-                          [ngClass]="{'selected':row_state===seasonal}">
-                          <td>{{i+1}}</td>
-                          <td>{{seasonal.flightNumber}}</td>
-                          <td>{{seasonal.seasonRecId}}</td>
-                          <td>{{seasonal.internationalCode}}</td>
-                          <td>{{seasonal.airlineChnName}}</td>
-                          <td>{{seasonal.routeType}}</td>
-                          <td>{{seasonal.flightTypeNameCn}}</td>
-                          <!-- <td>{{seasonal.flightTask}}</td> -->
-                          <td>{{seasonal.operationDays}}</td>
-                          <td>{{seasonal.startDate}}</td>
-                          <td>{{seasonal.endDate}}</td>
-                          <td>{{seasonal.startAirport}}</td>
-                          <td>{{seasonal.arriOrDept}}</td>
-                          <td>{{seasonal.arrivalTime}}</td>
-                          <td>{{seasonal.departureTime}}</td>
-                          <td>{{seasonal.aircraftTypeName}}</td>
-                          <td>{{seasonal.flyingDistance}}</td>
-                          <td>{{seasonal.flyingTime}}</td>
-                         <!--  <td *ngFor="let seasonal of seasonal_lists" [ngStyle]="{'background-color':getColor(seasonal.COL_CODE)}">{{airline_row['renderFlight'][seasonal.COL_CODE]}}</td> -->
-                      </tr>
-                  </tbody>
-              </table>
-          </div>
-          <div class="airline-message" [ngClass]="{'tab-c': tabClose,'tab-o': !tabClose}">
-            <nz-tabset [nzTabPosition]="'top'" [nzType]="'card'" [nzShowPagination]="false">
-                <nz-tab nzTitle="关联信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.related">
-                    <app-related-tab [flight]="row_state"></app-related-tab>
-                </nz-tab>
-                <nz-tab nzTitle="详细信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.detail">
-                    <app-detail-tab [flight]="row_state"></app-detail-tab>
-                </nz-tab>
-            </nz-tabset>
-        </div>
+            <div id="table-container" class="table-container" [ngClass]="{'table-c': !tabClose,'table-o': tabClose}">
+                    <table id="table" class="table table-bordered table-striped">
+                        <thead>
+                            <tr>
+                                <th>序号</th>
+                                <th>航班号</th>
+                                <th>航班季度</th>
+                                <th>国际代码</th>
+                                <th>航空公司</th>
+                                <th>航线类别</th>
+                                <th>航班类别</th>
+                                <!-- <th>航班任务</th> -->
+                                <th>运营日</th>
+                                <th>开始日期</th>
+                                <th>结束日期</th>
+                                <th>航线</th>
+                                <th>进/出港</th>
+                                <th>到达时间</th>
+                                <th>出发时间</th>
+                                <th>机型</th>
+                                <th>飞行距离(千米)</th>
+                                <th>飞行时间(分钟)</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr *ngFor="let seasonal of render_data;let i = index" (click)="selectRow(seasonal)"
+                                [ngClass]="{'selected':row_state===seasonal}">
+                                <td>{{i+1}}</td>
+                                <td>{{seasonal.flightNumber}}</td>
+                                <td>{{seasonal.seasonRecId}}</td>
+                                <td>{{seasonal.internationalCode}}</td>
+                                <td>{{seasonal.airlineChnName}}</td>
+                                <td>{{seasonal.routeType}}</td>
+                                <td>{{seasonal.flightTypeNameCn}}</td>
+                                <!-- <td>{{seasonal.flightTask}}</td> -->
+                                <td>{{seasonal.operationDays}}</td>
+                                <td>{{seasonal.startDate}}</td>
+                                <td>{{seasonal.endDate}}</td>
+                                <td>{{seasonal.startAirport}}</td>
+                                <td>{{seasonal.arriOrDept}}</td>
+                                <td>{{seasonal.arrivalTime}}</td>
+                                <td>{{seasonal.departureTime}}</td>
+                                <td>{{seasonal.aircraftTypeName}}</td>
+                                <td>{{seasonal.flyingDistance}}</td>
+                                <td>{{seasonal.flyingTime}}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+            </div>
+            <div class="airline-message" [ngClass]="{'tab-c': tabClose,'tab-o': !tabClose}">
+                <nz-tabset [nzTabPosition]="'top'" [nzType]="'card'" [nzShowPagination]="false">
+                    <nz-tab nzTitle="关联信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.related">
+                        <app-related-tab [flight]="row_state"></app-related-tab>
+                    </nz-tab>
+                    <nz-tab nzTitle="详细信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.detail">
+                        <app-detail-tab [flight]="row_state"></app-detail-tab>
+                    </nz-tab>
+                </nz-tabset>
+            </div>
       </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
index 124e4a1..3629b2d 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
@@ -70,6 +70,7 @@ export class SeasonalPlanComponent implements OnInit {
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
     public return_data: Array<object> = []; //下拉框显示数据
     ngOnInit() {
+        //选择年份
         this.laydateYear();
         /* 获取季度计划信息 */
         var value = new Date(new Date().getTime());
@@ -114,7 +115,7 @@ export class SeasonalPlanComponent implements OnInit {
             data=>{
                 this.airlines = data;
                 if(this.airlines && this.airlines.length > 0){//航空公司列表数据转换
-                    this.irlinesHandle();
+                    this.airlinesHandle();
                 }
             }
         )
@@ -149,7 +150,7 @@ export class SeasonalPlanComponent implements OnInit {
         tableCont.addEventListener('scroll',scrollHandle);
     }
     //航空公司名称数据转换处理
-    irlinesHandle() {
+    airlinesHandle() {
         this.render_data.forEach(item => {
             let airlineLinkIndex = this.airlines.findIndex(val => val.airlineId === item['airlineId']);
             if(this.airlines[airlineLinkIndex]){
@@ -192,7 +193,7 @@ export class SeasonalPlanComponent implements OnInit {
                         this.seasonals = data.body;
                         this.render_data = this.seasonals;
                         if(this.airlines && this.airlines.length > 0){//航空公司列表数据转换
-                            this.irlinesHandle();
+                            this.airlinesHandle();
                         }
                         if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换
                             this.aircraftTypesHandle();

From cff0ebd5618138a4e11ae3ffc8af66ce928ff4f4 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Mon, 24 Dec 2018 10:18:28 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=A3=E5=BA=A6?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/seasonal-plan/seasonal-plan.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
index 3629b2d..b18f66a 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
@@ -43,7 +43,7 @@ export class SeasonalPlanComponent implements OnInit {
         { col_code: 'arriOrDept', col_chn: '进/出港' },
         { col_code: 'arrivalTime', col_chn: '到达时间' },
         { col_code: 'departureTime', col_chn: '出发时间' },
-        { col_code: 'aircraftTypeCode', col_chn: '机型' },
+        { col_code: 'aircraftTypeName', col_chn: '机型' },
         { col_code: 'flyingDistance', col_chn: '飞行距离(千米)' },
         { col_code: 'flyingTime', col_chn: '飞行时间(分钟)' },
     ]

From 5165822bed115e2a7b7dc093bb264b5cc67a1623 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Mon, 24 Dec 2018 14:07:12 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=81=9C=E6=9C=BA=E4=BD=8D=E7=B1=BB=E5=88=AB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic-data/stand/stand.component.html     | 55 +++++++++----------
 .../pages/basic-data/stand/stand.component.ts | 31 +++++++++--
 src/app/services/basic-data-service.ts        |  7 +++
 3 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/src/app/pages/basic-data/stand/stand.component.html b/src/app/pages/basic-data/stand/stand.component.html
index fb4e0db..ee773b9 100644
--- a/src/app/pages/basic-data/stand/stand.component.html
+++ b/src/app/pages/basic-data/stand/stand.component.html
@@ -25,43 +25,38 @@
                             <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()" id="inputerInfo">
+                    <input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()">
               </div>
           </div>
 
           <div class="second-condition mb-3 row">
             <div class="input-container mr-4">
-              <label for="terminalAreaCode">所属航站楼区域：&nbsp;&nbsp;</label>
-              <select  class="form-control" [(ngModel)]="filterItems.terminalAreaCode" (ngModelChange)="selectChange()" id="qy">
-                  <option value=""></option>
-                  <option *ngFor="let items of terminalAreas" [value]="items.terminalAreaCode">{{items.terminalAreaName}}</option>
-              </select>
-          </div>
-          <div class="input-container mr-4">
-              <label for="standType">机位类型：&nbsp;&nbsp;</label>
-              <select  class="form-control" [(ngModel)]="filterItems.standType" (ngModelChange)="selectChange()" id="jtype">
+                <label for="terminalAreaCode">所属航站楼区域：&nbsp;&nbsp;</label>
+                <select  class="form-control" [(ngModel)]="filterItems.terminalAreaCode" (ngModelChange)="selectChange()">
                     <option value=""></option>
-                    <option value="bridge">靠桥机位</option>
-                    <option value="remote">远机位</option>
-                    <option value="near">近机位</option>
-                    <option value="night">过夜机位</option>
-                    <option value="specific">专机位</option>
-                    <!-- <option *ngFor="let items of stands" [value]="items.standType">{{items.standType}}</option> -->
-              </select>
-          </div>
-          <div class="input-container mr-4">
-                <label for="standStatus">资源状态：&nbsp;&nbsp;</label>
-                <select  class="form-control" [(ngModel)]="filterItems.standStatus" (ngModelChange)="selectChange()" id="zystatus">
-                    <option value=""></option>
-                    <!-- <option *ngFor="let items of stands" [value]="items.standStatus">{{items.standStatus}}</option> -->
-                    <option value="0">可用</option>
-                    <option value="1">在用</option>
-                    <option value="2">锁定</option>
-                    <option value="3">禁用</option>
-                    <option value="4">预分</option>
+                    <option *ngFor="let items of terminalAreas" [value]="items.terminalAreaCode">{{items.terminalAreaName}}</option>
                 </select>
+            </div>
+            <div class="input-container mr-4">
+                    <label for="standType">机位类型：&nbsp;&nbsp;</label>
+                    <select  class="form-control" [(ngModel)]="filterItems.standType" (ngModelChange)="selectChange()">
+                        <option value=""></option>
+                        <option *ngFor="let items of standTypes" [value]="items.standType">{{items.standTypeDesc}}</option>
+                    </select>
+            </div>
+            <div class="input-container mr-4">
+                    <label for="standStatus">资源状态：&nbsp;&nbsp;</label>
+                    <select  class="form-control" [(ngModel)]="filterItems.standStatus" (ngModelChange)="selectChange()">
+                        <option value=""></option>
+                        <!-- <option *ngFor="let items of stands" [value]="items.standStatus">{{items.standStatus}}</option> -->
+                        <option value="0">可用</option>
+                        <option value="1">在用</option>
+                        <option value="2">锁定</option>
+                        <option value="3">禁用</option>
+                        <option value="4">预分</option>
+                    </select>
+            </div>
           </div>
-        </div>
       </div>
 
       <div class="airline-table">
@@ -83,7 +78,7 @@
                           <td>{{i+1}}</td>
                           <td>{{stand.standCode}}</td>
                           <td>{{stand.standName}}</td>
-                          <td>{{stand.standType}}</td>
+                          <td>{{stand.standTypeDesc}}</td>
                           <td>{{stand.standStatus}}</td>
                           <td>{{stand.terminalAreaName}}</td>
                       </tr>
diff --git a/src/app/pages/basic-data/stand/stand.component.ts b/src/app/pages/basic-data/stand/stand.component.ts
index 0f05c12..63f433a 100644
--- a/src/app/pages/basic-data/stand/stand.component.ts
+++ b/src/app/pages/basic-data/stand/stand.component.ts
@@ -17,7 +17,7 @@ export class StandComponent implements OnInit {
     public col_lists = [
         { col_code: 'standCode', col_chn: '机位代码' },
         { col_code: 'standName', col_chn: '机位名称' },
-        { col_code: 'standType', col_chn: '机位类型' },
+        { col_code: 'standTypeDesc', col_chn: '机位类型' },
         { col_code: 'standStatus', col_chn: '资源状态' },
         { col_code: 'terminalAreaName', col_chn: '航站楼区域' },
     ]
@@ -35,6 +35,7 @@ export class StandComponent implements OnInit {
     }
 
     terminalAreas: Array<any>; //所属航站楼区域
+    standTypes: Array<any>; //停机位类别
     stands: Array<any>;
     public row_state: any = { renderFlight: {} };
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
@@ -42,6 +43,7 @@ export class StandComponent implements OnInit {
     ngOnInit() {
         this.terminalAreas = this.basicDataService.terminal_area;
         this.stands = this.basicDataService.stand;
+        this.standTypes = this.basicDataService.standType;
         this.render_data = this.basicDataService.stand;
         this.basicDataService.stand_subject.subscribe(
             data => {
@@ -54,13 +56,23 @@ export class StandComponent implements OnInit {
                 this.terminalAreas = data;
                 //航站楼区域数据转换处理
                 if(this.terminalAreas && this.terminalAreas.length > 0){
-                    this.basicDataTransHandle();
+                    this.terminalAreasHandle();
+                }
+            }
+        )
+        this.basicDataService.standType_subject.subscribe(
+            data => {
+                //停机位类别
+                if(this.standTypes && this.standTypes.length > 0){
+                    this.standTypesHandle();
                 }
             }
         )
-        //航站楼区域数据转换处理
         if(this.render_data){
-            this.basicDataTransHandle();
+            //航站楼区域数据转换处理
+            this.terminalAreasHandle();
+            //停机位类别数据转换处理
+            this.standTypesHandle();
         }
         /**
          * 固定表头
@@ -74,7 +86,7 @@ export class StandComponent implements OnInit {
     }
 
     //航站楼区域数据转换处理
-    basicDataTransHandle() {
+    terminalAreasHandle() {
         this.render_data.forEach(item => {
             let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']);
             if(this.terminalAreas[terminalAreasLinkIndex]){
@@ -82,6 +94,15 @@ export class StandComponent implements OnInit {
             }
         })
     }
+    //停机位类别数据转换处理
+    standTypesHandle() {
+        this.render_data.forEach(item => {
+            let standTypesLinkIndex = this.standTypes.findIndex(val => val.standType === item['standType']);
+            if(this.standTypes[standTypesLinkIndex]){
+                item['standTypeDesc'] = this.standTypes[standTypesLinkIndex].standTypeDesc;
+            }
+        })
+    }
 
     //输入框回车事件
     inputEnter() {
diff --git a/src/app/services/basic-data-service.ts b/src/app/services/basic-data-service.ts
index f8f7a74..81fcc46 100644
--- a/src/app/services/basic-data-service.ts
+++ b/src/app/services/basic-data-service.ts
@@ -20,6 +20,8 @@ export class BasicDataService {
     public chut_subject = new Subject<any>();
     public stand: Array<any> = [];
     public stand_subject = new Subject<any>();
+    public standType: Array<any> = [];
+    public standType_subject = new Subject<any>();
     public carousel: Array<any> = [];
     public carousel_subject = new Subject<any>();
     public checkin_desk: Array<any> = [];
@@ -58,6 +60,7 @@ export class BasicDataService {
         let terminalHttp = this.httpClient.get('/adminapi/basicdata/ormsTerminals');
         let chutHttp = this.httpClient.get('/adminapi/basicdata/ormsChuts');
         let standHttp = this.httpClient.get('/adminapi/basicdata/ormsStands');
+        let standTypeHttp = this.httpClient.get('/adminapi/basicdata/ormsStandTypes');
         let carouselHttp = this.httpClient.get('/adminapi/basicdata/ormsCarousels');
         let checkinDeskHttp = this.httpClient.get('/adminapi/basicdata/ormsCheckindesks');
         let airportHttp = this.httpClient.get('/adminapi/basicdata/sysAirports');
@@ -79,6 +82,7 @@ export class BasicDataService {
             terminalHttp,
             chutHttp,
             standHttp,
+            standTypeHttp,
             carouselHttp,
             checkinDeskHttp,
             airportHttp,
@@ -101,6 +105,7 @@ export class BasicDataService {
                 terminalRes,
                 chutRes,
                 standRes,
+                standTypesRes,
                 carouselRes,
                 checkinDeskRes,
                 airportRes,
@@ -130,6 +135,8 @@ export class BasicDataService {
                 this.chut_subject.next(chutRes.body);
                 this.stand = standRes.body;
                 this.stand_subject.next(standRes.body);
+                this.standType = standTypesRes.body;
+                this.standType_subject.next(standTypesRes.body);
                 this.carousel = carouselRes.body;
                 this.carousel_subject.next(carouselRes.body);
                 this.checkin_desk = checkinDeskRes.body;

From 74a2280ceab0db5e0f52675e2480d9db37caec98 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Mon, 24 Dec 2018 15:56:36 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=9D=A2=E5=8C=85?=
 =?UTF-8?q?=E5=B1=91=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aircraft-type.component.html              | 14 ++-----------
 .../aircraft-type.component.scss              | 21 +++----------------
 .../aircraft/aircraft.component.html          | 14 ++-----------
 .../aircraft/aircraft.component.scss          | 21 +++----------------
 .../basic-data/airline/airline.component.html | 14 ++-----------
 .../basic-data/airline/airline.component.scss | 21 +++----------------
 .../basic-data/airport/airport.component.html | 14 ++-----------
 .../basic-data/airport/airport.component.scss | 21 +++----------------
 .../carousel/carousel.component.html          | 14 ++-----------
 .../carousel/carousel.component.scss          | 21 +++----------------
 .../checkin-desk/checkin-desk.component.html  | 14 ++-----------
 .../checkin-desk/checkin-desk.component.scss  | 21 +++----------------
 .../checkin-group.component.html              | 14 ++-----------
 .../checkin-group.component.scss              | 21 +++----------------
 .../pages/basic-data/chut/chut.component.html | 14 ++-----------
 .../pages/basic-data/chut/chut.component.scss | 21 +++----------------
 .../pages/basic-data/city/city.component.html | 14 ++-----------
 .../pages/basic-data/city/city.component.scss | 21 +++----------------
 .../pages/basic-data/gate/gate.component.html | 14 ++-----------
 .../pages/basic-data/gate/gate.component.scss | 21 +++----------------
 .../basic-data/stand/stand.component.html     | 14 ++-----------
 .../basic-data/stand/stand.component.scss     | 21 +++----------------
 .../terminal-area.component.html              | 14 ++-----------
 .../terminal-area.component.scss              | 21 +++----------------
 .../terminal/terminal.component.html          | 14 ++-----------
 .../terminal/terminal.component.scss          | 21 +++----------------
 26 files changed, 65 insertions(+), 390 deletions(-)

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 056bb52..df95f75 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
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-  <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                机型
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-  </div>   
-  <div class="page-content breadcrumb-main-content card">
+<div class="main-page">
+  <div class="page-content">
         <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">
diff --git a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.scss b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.scss
index 86a6e49..2804efa 100644
--- a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.scss
+++ b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.scss
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {
diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.html b/src/app/pages/basic-data/aircraft/aircraft.component.html
index 8cb5f27..848dfc7 100644
--- a/src/app/pages/basic-data/aircraft/aircraft.component.html
+++ b/src/app/pages/basic-data/aircraft/aircraft.component.html
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-  <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                飞机
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-  </div>   
-  <div class="page-content breadcrumb-main-content card">
+<div class="main-page">
+  <div class="page-content">
         <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">
diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.scss b/src/app/pages/basic-data/aircraft/aircraft.component.scss
index 86a6e49..2804efa 100644
--- a/src/app/pages/basic-data/aircraft/aircraft.component.scss
+++ b/src/app/pages/basic-data/aircraft/aircraft.component.scss
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {
diff --git a/src/app/pages/basic-data/airline/airline.component.html b/src/app/pages/basic-data/airline/airline.component.html
index ca7f2d7..5e3b9c6 100644
--- a/src/app/pages/basic-data/airline/airline.component.html
+++ b/src/app/pages/basic-data/airline/airline.component.html
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-  <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                航空公司
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-  </div>   
-  <div class="page-content breadcrumb-main-content card">
+<div class="main-page">
+  <div class="page-content">
         <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">
diff --git a/src/app/pages/basic-data/airline/airline.component.scss b/src/app/pages/basic-data/airline/airline.component.scss
index 86a6e49..2804efa 100644
--- a/src/app/pages/basic-data/airline/airline.component.scss
+++ b/src/app/pages/basic-data/airline/airline.component.scss
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {
diff --git a/src/app/pages/basic-data/airport/airport.component.html b/src/app/pages/basic-data/airport/airport.component.html
index 364bbc4..d69f1b4 100644
--- a/src/app/pages/basic-data/airport/airport.component.html
+++ b/src/app/pages/basic-data/airport/airport.component.html
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-  <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                机场
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-  </div>   
-  <div class="page-content breadcrumb-main-content card">
+<div class="main-page">
+  <div class="page-content">
       <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">
diff --git a/src/app/pages/basic-data/airport/airport.component.scss b/src/app/pages/basic-data/airport/airport.component.scss
index 86a6e49..2804efa 100644
--- a/src/app/pages/basic-data/airport/airport.component.scss
+++ b/src/app/pages/basic-data/airport/airport.component.scss
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {
diff --git a/src/app/pages/basic-data/carousel/carousel.component.html b/src/app/pages/basic-data/carousel/carousel.component.html
index 289ce0e..d7235fa 100644
--- a/src/app/pages/basic-data/carousel/carousel.component.html
+++ b/src/app/pages/basic-data/carousel/carousel.component.html
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-  <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                行李转盘
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-  </div>   
-  <div class="page-content breadcrumb-main-content card">
+<div class="main-page">
+  <div class="page-content">
         <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">
diff --git a/src/app/pages/basic-data/carousel/carousel.component.scss b/src/app/pages/basic-data/carousel/carousel.component.scss
index 86a6e49..2804efa 100644
--- a/src/app/pages/basic-data/carousel/carousel.component.scss
+++ b/src/app/pages/basic-data/carousel/carousel.component.scss
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {
diff --git a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html
index 683d45f..c08f2c9 100644
--- a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html
+++ b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-  <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                值机柜台
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-  </div>   
-  <div class="page-content breadcrumb-main-content card">
+<div class="main-page">
+  <div class="page-content">
       <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">
diff --git a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.scss b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.scss
index 86a6e49..2804efa 100644
--- a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.scss
+++ b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.scss
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {
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 5160ba0..3361d2e 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
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-  <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                值机岛
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-  </div>   
-  <div class="page-content breadcrumb-main-content card">
+<div class="main-page">
+  <div class="page-content">
       <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">
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 86a6e49..2804efa 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
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {
diff --git a/src/app/pages/basic-data/chut/chut.component.html b/src/app/pages/basic-data/chut/chut.component.html
index ec80b46..173f29e 100644
--- a/src/app/pages/basic-data/chut/chut.component.html
+++ b/src/app/pages/basic-data/chut/chut.component.html
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-  <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                行李传送带
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-  </div>   
-  <div class="page-content breadcrumb-main-content card">
+<div class="main-page">
+  <div class="page-content">
       <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">
diff --git a/src/app/pages/basic-data/chut/chut.component.scss b/src/app/pages/basic-data/chut/chut.component.scss
index 86a6e49..2804efa 100644
--- a/src/app/pages/basic-data/chut/chut.component.scss
+++ b/src/app/pages/basic-data/chut/chut.component.scss
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {
diff --git a/src/app/pages/basic-data/city/city.component.html b/src/app/pages/basic-data/city/city.component.html
index 145deb4..f5b7e0e 100644
--- a/src/app/pages/basic-data/city/city.component.html
+++ b/src/app/pages/basic-data/city/city.component.html
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-  <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                城市
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-  </div>   
-  <div class="page-content breadcrumb-main-content card">
+<div class="main-page">
+  <div class="page-content">
         <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">
diff --git a/src/app/pages/basic-data/city/city.component.scss b/src/app/pages/basic-data/city/city.component.scss
index 86a6e49..2804efa 100644
--- a/src/app/pages/basic-data/city/city.component.scss
+++ b/src/app/pages/basic-data/city/city.component.scss
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {
diff --git a/src/app/pages/basic-data/gate/gate.component.html b/src/app/pages/basic-data/gate/gate.component.html
index 8d8d146..509a73d 100644
--- a/src/app/pages/basic-data/gate/gate.component.html
+++ b/src/app/pages/basic-data/gate/gate.component.html
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-    <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                登机门
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-    </div>  
-    <div class="page-content breadcrumb-main-content card">
+<div class="main-page">
+    <div class="page-content">
         <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">
diff --git a/src/app/pages/basic-data/gate/gate.component.scss b/src/app/pages/basic-data/gate/gate.component.scss
index 86a6e49..2804efa 100644
--- a/src/app/pages/basic-data/gate/gate.component.scss
+++ b/src/app/pages/basic-data/gate/gate.component.scss
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {
diff --git a/src/app/pages/basic-data/stand/stand.component.html b/src/app/pages/basic-data/stand/stand.component.html
index ee773b9..d2fea81 100644
--- a/src/app/pages/basic-data/stand/stand.component.html
+++ b/src/app/pages/basic-data/stand/stand.component.html
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-  <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                机位
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-  </div>   
-  <div class="page-content breadcrumb-main-content card">
+<div class="main-page">
+  <div class="page-content">
       <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">
diff --git a/src/app/pages/basic-data/stand/stand.component.scss b/src/app/pages/basic-data/stand/stand.component.scss
index 86a6e49..2804efa 100644
--- a/src/app/pages/basic-data/stand/stand.component.scss
+++ b/src/app/pages/basic-data/stand/stand.component.scss
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {
diff --git a/src/app/pages/basic-data/terminal-area/terminal-area.component.html b/src/app/pages/basic-data/terminal-area/terminal-area.component.html
index 279e638..bc88a3f 100644
--- a/src/app/pages/basic-data/terminal-area/terminal-area.component.html
+++ b/src/app/pages/basic-data/terminal-area/terminal-area.component.html
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-  <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                航站楼区域
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-  </div>   
-  <div class="page-content breadcrumb-main-content card">
+<div class="main-page"> 
+  <div class="page-content">
         <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">
diff --git a/src/app/pages/basic-data/terminal-area/terminal-area.component.scss b/src/app/pages/basic-data/terminal-area/terminal-area.component.scss
index 86a6e49..2804efa 100644
--- a/src/app/pages/basic-data/terminal-area/terminal-area.component.scss
+++ b/src/app/pages/basic-data/terminal-area/terminal-area.component.scss
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {
diff --git a/src/app/pages/basic-data/terminal/terminal.component.html b/src/app/pages/basic-data/terminal/terminal.component.html
index 17d4403..ea59d66 100644
--- a/src/app/pages/basic-data/terminal/terminal.component.html
+++ b/src/app/pages/basic-data/terminal/terminal.component.html
@@ -1,15 +1,5 @@
-<div class="main-page breadcrumb-main-content">
-  <div class="navigation">
-        <nz-breadcrumb>
-            <nz-breadcrumb-item>
-                航站楼
-            </nz-breadcrumb-item>
-            <nz-breadcrumb-item>
-                列表
-            </nz-breadcrumb-item>
-        </nz-breadcrumb>
-  </div>   
-  <div class="page-content breadcrumb-main-content card">
+<div class="main-page">
+  <div class="page-content">
       <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">
diff --git a/src/app/pages/basic-data/terminal/terminal.component.scss b/src/app/pages/basic-data/terminal/terminal.component.scss
index 86a6e49..2804efa 100644
--- a/src/app/pages/basic-data/terminal/terminal.component.scss
+++ b/src/app/pages/basic-data/terminal/terminal.component.scss
@@ -2,13 +2,11 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 10px 20px 20px;
-    background-color: #f0f0f0;
+    padding: 15px 10px;
+    background-color: #fff;
     .page-content {
         border: 1px solid #ccc;
-        // padding: 10px 20px;
-        // overflow-y: scroll;
-        // height: 100%;
+        padding: 10px 20px;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -46,19 +44,6 @@
             }
         }
     }
-    .navigation{
-        padding-bottom: 10px;
-    }
-    .breadcrumb-main-container {
-        padding: 20px 20px;
-        background-color: #f0f0f0;
-    }
-    .card{
-        background: #fff;
-        padding: 20px;
-        box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
-        border-radius: 0;
-    }
 }
 
 @media screen and (max-width: 991px) {

From a284d643a6eee65d38fc5f828cfc3f1da37fb92e Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Mon, 24 Dec 2018 16:45:13 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=A3=E5=BA=A6?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=B8=8E=E6=9C=BA=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/basic-data/stand/stand.component.ts      | 1 +
 src/app/pages/seasonal-plan/seasonal-plan.component.ts | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/app/pages/basic-data/stand/stand.component.ts b/src/app/pages/basic-data/stand/stand.component.ts
index 63f433a..0968a01 100644
--- a/src/app/pages/basic-data/stand/stand.component.ts
+++ b/src/app/pages/basic-data/stand/stand.component.ts
@@ -62,6 +62,7 @@ export class StandComponent implements OnInit {
         )
         this.basicDataService.standType_subject.subscribe(
             data => {
+                this.standTypes = data;
                 //停机位类别
                 if(this.standTypes && this.standTypes.length > 0){
                     this.standTypesHandle();
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
index b18f66a..9451db8 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
@@ -79,6 +79,9 @@ export class SeasonalPlanComponent implements OnInit {
             data => {
                 this.seasonals = data.body;
                 this.render_data = this.seasonals;
+                this.airlinesHandle();  //航空公司
+                this.aircraftTypesHandle();  //机型
+                this.flightTypesHandle();  //航班类别
                 this.render_data.forEach(element => {//航线类别列表显示数据转换
                     if (element['routeType'] == 'D') {
                         element['routeType'] = '国内'

From 54fd21b56cdcbb1906738cefa5d5153cb10548c8 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Mon, 24 Dec 2018 17:35:08 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6=E8=87=AA=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E7=AD=89=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seasonal-plan/seasonal-plan.component.html | 15 ++++++++-------
 .../seasonal-plan/seasonal-plan.component.scss | 13 +++++++++++--
 .../seasonal-plan/seasonal-plan.component.ts   | 18 +++++++++++++++++-
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html
index 5a0ba8d..9a6efea 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.html
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html
@@ -1,6 +1,6 @@
-<div class="main-page">
+<div class="main-page" #mainPage>
   <div class="page-content">
-      <div class="search-filter mb-3">
+      <div class="search-filter mb-3" #searchFilter>
           <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="">
@@ -17,12 +17,13 @@
                     </label>
                     <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" (click)="refresh()">刷新</button>
+               <div class="line-operator-right mb-3 col-xlg-4 col-mlg-4 col-xl-4 col-lg-2">
+                    <button type="button" class="btn btn-info mr-2" (click)="toggleFilter()">{{filterClose?'展开':'关闭'}}</button>
+                     <button type="button" class="btn btn-info mr-2" (click)="refresh()">刷新</button>
                </div>
           </div>
 
-          <div class="second-condition mb-3 row">
+          <div class="second-condition mb-3 row" [ngClass]="{'filterClose-c':filterClose,'filterClose-o':!filterClose}">
                 <div class="input-container mr-4">
                     <label for="airlineId">航空公司：&nbsp;&nbsp;</label>
                     <select  class="form-control" [(ngModel)]="filterItems.airlineId" (ngModelChange)="selectChange()">
@@ -60,7 +61,7 @@
                     </select>
                 </div>
           </div>
-          <div class="third-condition row">
+          <div class="third-condition row" [ngClass]="{'filterClose-c':filterClose,'filterClose-o':!filterClose}">
                 <label class="radio-inline custom-checkbox nowrap mr-4">
                     <input type="checkbox" [(ngModel)]="checkboxGroup.related" (ngModelChange)="checkboxChange()">
                     <span>航班关联信息</span>
@@ -73,7 +74,7 @@
       </div>
 
       <div class="airline-table">
-            <div id="table-container" class="table-container" [ngClass]="{'table-c': !tabClose,'table-o': tabClose}">
+            <div #tableContainer id="table-container" class="table-container" [ngClass]="{'table-c': !tabClose,'table-o': tabClose}">
                     <table id="table" class="table table-bordered table-striped">
                         <thead>
                             <tr>
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.scss b/src/app/pages/seasonal-plan/seasonal-plan.component.scss
index ae76ea7..8111a88 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.scss
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.scss
@@ -20,6 +20,9 @@
                     }
                 }
             }
+            .second-condition,.third-condition{
+                display: none;
+            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -27,6 +30,12 @@
                     display: inline-block;
                 }
             }
+            .filterClose-c{
+                display: none;
+            }
+            .filterClose-o{
+                display: flex;
+            }
         }
         .airline-table{
             .table-container{
@@ -48,10 +57,10 @@
                         background-color: #ddd;
                         color: rgb(0, 0, 255);
                     }
-                    /* th,td{
+                    th,td{
                         // border: none;
                         text-align: center;
-                    } */
+                    }
                 }
                 &::-webkit-scrollbar {
                     width: 15px;
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
index 9451db8..1180096 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit ,ViewChild,Renderer2 } from '@angular/core';
 import { HttpClientService } from '../../services/http-client.service';
 import { BasicDataService } from '../../services/basic-data-service';
 import { ChangeDetectorRef } from '@angular/core';
@@ -15,6 +15,7 @@ declare var laydate: any;
 export class SeasonalPlanComponent implements OnInit {
 
     constructor(
+        private renderer2: Renderer2,
         private httpCilent: HttpClientService,
         private basicDataService: BasicDataService,
         private toastService: ToastService,
@@ -69,9 +70,17 @@ export class SeasonalPlanComponent implements OnInit {
     public row_state: any = { renderFlight: {} };
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
     public return_data: Array<object> = []; //下拉框显示数据
+
+    @ViewChild('mainPage') mainPage;
+    @ViewChild('searchFilter') searchFilter;
+    @ViewChild('tableContainer') tableContainer;
     ngOnInit() {
         //选择年份
         this.laydateYear();
+        this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.mainPage.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 55 + 'px');
+        window.onresize = function () {
+            this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.mainPage.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 55 + 'px');
+        }.bind(this)
         /* 获取季度计划信息 */
         var value = new Date(new Date().getTime());
         var subValue = format(value).substring(11,15); //时间截取到年份
@@ -258,6 +267,13 @@ export class SeasonalPlanComponent implements OnInit {
         });
     }
 
+    public filterClose: boolean = true;
+    //点击展开切换操作
+    toggleFilter() {
+        this.filterClose = !this.filterClose;
+        this.changeDetectorRef.detectChanges();
+    }
+
     /**
      * 复选框勾选事件
      */