From abbe9cfc22b5b677cd42c4d3eecaac6542b007a3 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Wed, 2 Jan 2019 14:20:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/main/main.component.ts | 13 +++++++++++++
 src/app/utils/flights-data-handle.ts |  8 +++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index da01c93..ec67006 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -112,6 +112,12 @@ export class MainComponent implements OnInit {
     @ViewChild('searchFilter') searchFilter;
     @ViewChild('tableContainer') tableContainer;
 
+    trItemHeight: number = 42;
+    start: number = 0;
+    end: number = 0;
+    visibleCount: number = 0;
+    scrollTop: number = 0;
+
 
     ngOnInit() {
         this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.mainPage.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 55 + 'px');
@@ -362,6 +368,13 @@ export class MainComponent implements OnInit {
         combined_data.sort(function (a, b) {
             return (a['ORDER'] - b['ORDER']);
         })
+
+        // this.visibleCount = Math.ceil(this.tableContainer.nativeElement.clientHeight / this.trItemHeight);
+        // this.start = 0;
+        // this.end = this.start + this.visibleCount;
+        // this.render_data = this.combined_data.slice(this.start,this.end);
+
+
         this.render_data = combined_data;
         this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
         this.selectChange();
diff --git a/src/app/utils/flights-data-handle.ts b/src/app/utils/flights-data-handle.ts
index 5908774..11b4b77 100644
--- a/src/app/utils/flights-data-handle.ts
+++ b/src/app/utils/flights-data-handle.ts
@@ -143,7 +143,8 @@ export class FlightsDataHandle {
                 flights_item['renderFlight'] = Object.assign({}, render_flight);
             }
         } catch (error) {
-            alert('数据有误，处理失败，请检查数据');
+            console.log('数据有误，处理失败，请检查数据');
+            console.log(item);
             throw error;
         } finally {
             return flights_item;
@@ -250,7 +251,8 @@ export class FlightsDataHandle {
                 item['renderReaFlight']['FLTY'] = flightTypes.find(val => val.flightTypeCode === item['renderReaFlight']['FLTY']).flightTypeNameCn;
             }
         } catch (error) {
-            alert('数据有误，处理失败，请检查数据');
+            console.log('基础数据转换有误，处理失败，请检查数据');
+            console.log(item);
             throw error;
         } finally {
             return item;
@@ -633,7 +635,7 @@ export class FlightsDataHandle {
                 }
             }
         } catch (error) {
-            alert('航班号为：' + message.FLNO + ' - 消息有误，处理失败，请检查消息数据');
+            console.log('航班号为：' + message.FLNO + ' - 消息有误，处理失败，请检查消息数据');
             throw error;
         } finally {
             return {