From 1147b3216cd61153bee3b2d19ab1fdbb797130c4 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Tue, 22 Jan 2019 10:17:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=88=AA=E7=8F=AD=E5=8F=B7=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BC=9A=E5=90=8C=E6=97=B6=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=A4=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/main/main.component.html |  2 +-
 src/app/pages/main/main.component.ts   | 37 ++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html
index 6279839..66fc39f 100644
--- a/src/app/pages/main/main.component.html
+++ b/src/app/pages/main/main.component.html
@@ -179,7 +179,7 @@
                     <table #tableContent id="table" class="table table-striped">
                         <tbody>
                             <tr *ngFor="let airline_row of render_data;let i = index" (click)="selectRow(airline_row)"
-                                [ngClass]="{'selected':row_state['renderFlight']['FLNO']===airline_row['renderFlight']['FLNO']}">
+                                [ngClass]="{'selected':getSelectedRow(airline_row)}">
                                 <td style="min-width:55px">{{start+i+1}}</td>
                                 <td style="min-width:120px">
                                     <img class="mr-2" *ngIf="getVipNotes(airline_row)" src="/adminweb/assets/images/important-notes/vip.png"
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index 7ee6a95..e4137a0 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -840,6 +840,43 @@ export class MainComponent implements OnInit {
         this.row_state = i;
     }
 
+    /**
+     * getSelectedRow(airline_row)
+     */
+    getSelectedRow(flight) {
+        if (flight['preFlight'] && !flight['reaFlight']) {
+            if (this.row_state['preFlight'] && !this.row_state['reaFlight']) {
+                if (flight['preFlight']['FLID'] === this.row_state['preFlight']['FLID']) {
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        } else if (!flight['preFlight'] && flight['reaFlight']) {
+            if (!this.row_state['preFlight'] && this.row_state['reaFlight']) {
+                if (flight['reaFlight']['FLID'] === this.row_state['reaFlight']['FLID']) {
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        }else{
+            if (this.row_state['preFlight'] && this.row_state['reaFlight']) {
+                if ((flight['preFlight']['FLID'] === this.row_state['preFlight']['FLID'])&&(flight['reaFlight']['FLID'] === this.row_state['reaFlight']['FLID'])) {
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+        }
+    }
+
     /**
      * 获取当前单元格颜色
      * @param col_CODE