From 9216708c9d08b721a4889450bef32fe73ac77973 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Wed, 28 Nov 2018 09:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=9D=8E=E8=BD=AC=E7=9B=98-=E8=88=AA?=
 =?UTF-8?q?=E7=AB=99=E6=A5=BC=E5=8C=BA=E5=9F=9F=E6=95=B0=E6=8D=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/basic-data/carousel/carousel.component.html |  8 ++++----
 .../pages/basic-data/carousel/carousel.component.ts   | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/basic-data/carousel/carousel.component.html b/src/app/pages/basic-data/carousel/carousel.component.html
index 53e9005..3014171 100644
--- a/src/app/pages/basic-data/carousel/carousel.component.html
+++ b/src/app/pages/basic-data/carousel/carousel.component.html
@@ -7,7 +7,7 @@
                             <option value="">选择列名</option>
                             <option value="carouselCode">行李转盘代码</option>
                             <option value="carouselName">行李转盘名称</option>
-                            <option value="terminalAreaCode">航站楼区域</option>
+                            <option value="terminalAreaName">航站楼区域</option>
                             <option value="carouselStatus">资源状态</option>
                     </select>
                     <label class="radio-inline custom-radio nowrap mr-4">
@@ -23,7 +23,7 @@
               <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> -->
               </div>
           </div>
 
@@ -32,7 +32,7 @@
               <label for="terminalAreaCode">所属航站楼区域：&nbsp;&nbsp;</label>
               <select  class="form-control" [(ngModel)]="filterItems.terminalAreaCode" (ngModelChange)="selectChange()" id="qy">
                    <option value=""></option>
-                   <option *ngFor="let item of terminalAreas" [value]="item.terminalAreaName" >{{item.terminalAreaName}}</option>
+                   <option *ngFor="let item of terminalAreas" [value]="item.terminalAreaCode" >{{item.terminalAreaName}}</option>
                    <!-- <option value="GH">国内区域</option>
                    <option value="CH">国际区域</option>
                    <option value="QT">其他区域</option> -->
@@ -69,7 +69,7 @@
                           <td>{{i+1}}</td>
                           <td>{{carousel.carouselCode}}</td>
                           <td>{{carousel.carouselName}}</td>
-                          <td>{{carousel.terminalAreaCode}}</td>
+                          <td>{{carousel.terminalAreaName}}</td>
                           <td>{{carousel.carouselStatus}}</td>
                           <!-- <td *ngFor="let airline_col of carousel_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td> -->
                       </tr>
diff --git a/src/app/pages/basic-data/carousel/carousel.component.ts b/src/app/pages/basic-data/carousel/carousel.component.ts
index 6e2057c..7c793e1 100644
--- a/src/app/pages/basic-data/carousel/carousel.component.ts
+++ b/src/app/pages/basic-data/carousel/carousel.component.ts
@@ -36,6 +36,9 @@ ngOnInit() {
         data=>{
             this.carousels = data;
             this.render_data = this.carousels;
+            if(this.terminalAreas && this.terminalAreas.length > 0){//所属航站楼区域数据显示处理
+                this.terminalAreasHandle();
+            }
         }
     )
     //所属航站楼区域
@@ -56,6 +59,14 @@ ngOnInit() {
     tableCont.addEventListener('scroll',scrollHandle);
 }
 
+//所属航站楼区域数据转换处理
+terminalAreasHandle() {
+    this.render_data.forEach(item => {
+        let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']);
+        item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName;
+    })
+}
+
 /**
  * 选中某行
  * @param i