From e291163951028d6e5974e9746b516ca9271f7851 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Thu, 22 Nov 2018 15:49:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=88=AA=E7=8F=AD=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic-data/airline/airline.component.ts   |  4 +-
 .../basic-data/airport/airport.component.ts   |  2 +-
 .../seasonal-plan.component.html              | 57 ++++++++++++++-----
 3 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/app/pages/basic-data/airline/airline.component.ts b/src/app/pages/basic-data/airline/airline.component.ts
index 114b9a2..03ecee3 100644
--- a/src/app/pages/basic-data/airline/airline.component.ts
+++ b/src/app/pages/basic-data/airline/airline.component.ts
@@ -54,7 +54,7 @@ inputEnter() {
         this.inputFilter(this.airlines)
     } else {
         this.inputFilter(this.airlines)
-        // this.inputPosition(this.render_data)
+        this.inputPosition(this.airlines)
     }
 }
 
@@ -62,7 +62,7 @@ inputEnter() {
 selectChange() {
     this.return_data = this.airlines.filter(item=>{
             let is_satis = true;
-            for (const key in this.filterItems) {debugger
+            for (const key in this.filterItems) {
                 if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
                     if (item[key] === this.filterItems[key]) {
                         is_satis = true;
diff --git a/src/app/pages/basic-data/airport/airport.component.ts b/src/app/pages/basic-data/airport/airport.component.ts
index d2530d8..daae285 100644
--- a/src/app/pages/basic-data/airport/airport.component.ts
+++ b/src/app/pages/basic-data/airport/airport.component.ts
@@ -55,7 +55,7 @@ inputEnter() {
         this.inputFilter(this.airports)
     } else {
         this.inputFilter(this.airports)
-        // this.inputPosition(this.render_data)
+        this.inputPosition(this.airports)
     }
 }
 
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html
index e5f75e3..c2ff158 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.html
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html
@@ -34,6 +34,7 @@
                   <option value="GH">国内区域</option>
                   <option value="CH">国际区域</option>
                   <option value="QT">其他区域</option>
+                  <!-- <option *ngFor="let item of seasonals" [value]="item.airlineId">{{item.airlineId}}</option> -->
               </select>
             </div>
             <div class="input-container mr-4">
@@ -42,24 +43,28 @@
                     <option value=""></option>
                     <option value="K">可用</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="">航班类别：&nbsp;&nbsp;</label>
+              <label for="flightTypeCode">航班类别：&nbsp;&nbsp;</label>
               <select  class="form-control" (ngModelChange)="selectChange()">
                   <option value=""></option>
+                  <!-- <option *ngFor="let item of seasonals" [value]="item.flightTypeCode">{{item.flightTypeCode}}</option> -->
               </select>
           </div>
           <div class="input-container mr-4">
-              <label for="">到达/出发：&nbsp;&nbsp;</label>
+              <label for="arriOrDept">到达/出发：&nbsp;&nbsp;</label>
               <select  class="form-control" (ngModelChange)="selectChange()">
                   <option value=""></option>
+                  <!-- <option *ngFor="let item of seasonals" [value]="item.arriOrDept">{{item.arriOrDept}}</option> -->
               </select>
           </div>
           <div class="input-container mr-4">
-              <label for="">航班任务：&nbsp;&nbsp;</label>
+              <label for="flightTask">航班任务：&nbsp;&nbsp;</label>
               <select  class="form-control" (ngModelChange)="selectChange()">
                   <option value=""></option>
+                  <!-- <option *ngFor="let item of seasonals" [value]="item.flightTask">{{item.flightTask}}</option> -->
               </select>
           </div>
         </div>
@@ -81,22 +86,48 @@
                   <thead>
                       <tr>
                           <th>序号</th>
-                          <!-- <th>登机门代码</th>
-                          <th>登机门名称</th>
-                          <th>航站楼区域</th>
-                          <th>资源状态</th> -->
-                          <th *ngFor="let airline_col of seasonal_lists">{{airline_col.COL_CN}}</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 airline_row of render_data;let i = index" (click)="selectRow(airline_row)"
                           [ngClass]="{'selected':row_state['renderFlight']===airline_row['renderFlight']}">
                           <td>{{i+1}}</td>
-                          <!-- <td>{{airline_col.gateCode}}</td>
-                          <td>{{airline_col.gateName}}</td>
-                          <td>{{airline_col.terminalAreaCode}}</td>
-                          <td>{{airline_col.gateStatus}}</td> -->
-                          <td *ngFor="let airline_col of seasonal_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td>
+                          <!-- <td>{{seasonal.flightNumber}}</td>
+                          <td>{{seasonal.seasonRecId}}</td>
+                          <td>{{seasonal.internationalCode}}</td>
+                          <td>{{seasonal.airlineId}}</td>
+                          <td>{{seasonal.routeType}}</td>
+                          <td>{{seasonal.flightTypeCode}}</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.aircraftTypeCode}}</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>