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