From d23e8b5d48cd1978d2b7d23bd7325db307e1b8ed Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Thu, 30 May 2019 10:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E8=BF=9B=E5=8D=95?=
=?UTF-8?q?=E5=87=BA=E6=8C=89=E8=AE=A1=E5=88=92=E6=97=B6=E9=97=B4=E6=8E=92?=
=?UTF-8?q?=E5=BA=8F?=
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 | 77 +++++++++++++++++++++++++-
src/app/utils/flight-order.ts | 9 +++
3 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html
index 1f5bad6..1255640 100644
--- a/src/app/pages/main/main.component.html
+++ b/src/app/pages/main/main.component.html
@@ -90,7 +90,9 @@
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index bda09c3..d7e3433 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -268,8 +268,8 @@ export class MainComponent implements OnInit {
})
//计算可视区域高度，渲染数据
- this.wait_render_data = combined_data;
- this.selectedFilterData = combined_data;
+ // this.wait_render_data = combined_data;
+ // this.selectedFilterData = combined_data;
this.selectChange('dynamic');
this.calcVisibleCount();
@@ -664,6 +664,14 @@ export class MainComponent implements OnInit {
is_satis = false;
break;
}
+ } else if (key === 'MVIN') {
+ if (item['preFlight'][key] == filterItems[key].split('_')[0]) {
+ is_satis = true;
+ continue;
+ } else {
+ is_satis = false;
+ break;
+ }
}
else {
if (item['preFlight'][key] == filterItems[key]) {
@@ -700,6 +708,14 @@ export class MainComponent implements OnInit {
is_satis = false;
break;
}
+ } else if (key === 'MVIN') {
+ if (item['reaFlight'][key] == filterItems[key].split('_')[0]) {
+ is_satis = true;
+ continue;
+ } else {
+ is_satis = false;
+ break;
+ }
}
else {
if (item['reaFlight'][key] == filterItems[key]) {
@@ -737,6 +753,14 @@ export class MainComponent implements OnInit {
pre_satis = false;
break;
}
+ } else if (key === 'MVIN') {
+ if (item['preFlight'][key] == filterItems[key].split('_')[0]) {
+ pre_satis = true;
+ continue;
+ } else {
+ pre_satis = false;
+ break;
+ }
}
else {
if (item['preFlight'][key] == filterItems[key]) {
@@ -770,6 +794,14 @@ export class MainComponent implements OnInit {
rea_satis = false;
break;
}
+ } else if (key === 'MVIN') {
+ if (item['reaFlight'][key] == filterItems[key].split('_')[0]) {
+ rea_satis = true;
+ continue;
+ } else {
+ rea_satis = false;
+ break;
+ }
}
else {
if (item['reaFlight'][key] == filterItems[key]) {
@@ -825,6 +857,14 @@ export class MainComponent implements OnInit {
is_satis = false;
break;
}
+ } else if (key === 'MVIN') {
+ if (item['preFlight'][key] == filterItems[key].split('_')[0]) {
+ is_satis = true;
+ continue;
+ } else {
+ is_satis = false;
+ break;
+ }
}
else {
if (item['preFlight'][key] == filterItems[key]) {
@@ -850,6 +890,14 @@ export class MainComponent implements OnInit {
is_satis = false;
break;
}
+ } else if (key === 'MVIN') {
+ if (item['reaFlight'][key] == filterItems[key].split('_')[0]) {
+ is_satis = true;
+ continue;
+ } else {
+ is_satis = false;
+ break;
+ }
}
else {
if (item['reaFlight'][key] == filterItems[key]) {
@@ -876,6 +924,14 @@ export class MainComponent implements OnInit {
pre_satis = false;
break;
}
+ } else if (key === 'MVIN') {
+ if (item['preFlight'][key] == filterItems[key].split('_')[0]) {
+ pre_satis = true;
+ continue;
+ } else {
+ pre_satis = false;
+ break;
+ }
}
else {
if (item['preFlight'][key] == filterItems[key]) {
@@ -898,6 +954,14 @@ export class MainComponent implements OnInit {
rea_satis = false;
break;
}
+ } else if (key === 'MVIN') {
+ if (item['reaFlight'][key] == filterItems[key].split('_')[0]) {
+ rea_satis = true;
+ continue;
+ } else {
+ rea_satis = false;
+ break;
+ }
}
else {
if (item['reaFlight'][key] == filterItems[key]) {
@@ -930,6 +994,15 @@ export class MainComponent implements OnInit {
})
}
+ if (filterItems['MVIN'].split('_').length > 1) {
+ filter_data.forEach(element => {
+ element['ORDER'] = this.orderHandle.singleSequence(element);
+ })
+ filter_data.sort(function (a, b) {
+ return (a['ORDER'] - b['ORDER']);
+ })
+ }
+
this.selectedFilterData = filter_data;
if (this.FLT_POS === 1) {
diff --git a/src/app/utils/flight-order.ts b/src/app/utils/flight-order.ts
index 3ba08e2..535f235 100644
--- a/src/app/utils/flight-order.ts
+++ b/src/app/utils/flight-order.ts
@@ -305,4 +305,13 @@ export class FlightOrder {
}
return this.TOP_14
}
+
+
+ /**
+ * 单进单出按计划时间排序
+ */
+ public singleSequence(flight){
+ var sodt = flight['renderFlight']['FLDT'] + ' ' + flight['renderFlight']['SODT'];
+ return new Date(sodt).getTime() + this.TOP_1
+ }
}
\ No newline at end of file