windy/airport-chengdu-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增单进单出按计划时间排序

Browse Source
This commit is contained in:
zhouyuejun
2019-05-30 10:28:59 +08:00
parent 7e2d84c443
commit d23e8b5d48
3 changed files with 86 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/main/main.component.html
+2
View File
@@ -90,7 +90,9 @@
<select [(ngModel)]="filterItems.MVIN" (ngModelChange)="selectChange('filter')" class="form-control"> <select [(ngModel)]="filterItems.MVIN" (ngModelChange)="selectChange('filter')" class="form-control">
<option value=""></option> <option value=""></option>
<option value="A">到达</option> <option value="A">到达</option>
<option value="A_SORT">到达(按计划时间排序)</option>
<option value="D">离港</option> <option value="D">离港</option>
<option value="D_SORT">离港(按计划时间排序)</option>
</select> </select>
</div> </div>
<div class="input-container mr-4"> <div class="input-container mr-4">
src/app/pages/main/main.component.ts
+75 -2
View File
@@ -268,8 +268,8 @@ export class MainComponent implements OnInit {
}) })
//计算可视区域高度，渲染数据 //计算可视区域高度，渲染数据
this.wait_render_data = combined_data; // this.wait_render_data = combined_data;
this.selectedFilterData = combined_data; // this.selectedFilterData = combined_data;
this.selectChange('dynamic'); this.selectChange('dynamic');
this.calcVisibleCount(); this.calcVisibleCount();
@@ -664,6 +664,14 @@ export class MainComponent implements OnInit {
is_satis = false; is_satis = false;
break; break;
} }
} else if (key === 'MVIN') {
if (item['preFlight'][key] == filterItems[key].split('_')[0]) {
is_satis = true;
continue;
} else {
is_satis = false;
break;
}
} }
else { else {
if (item['preFlight'][key] == filterItems[key]) { if (item['preFlight'][key] == filterItems[key]) {
@@ -700,6 +708,14 @@ export class MainComponent implements OnInit {
is_satis = false; is_satis = false;
break; break;
} }
} else if (key === 'MVIN') {
if (item['reaFlight'][key] == filterItems[key].split('_')[0]) {
is_satis = true;
continue;
} else {
is_satis = false;
break;
}
} }
else { else {
if (item['reaFlight'][key] == filterItems[key]) { if (item['reaFlight'][key] == filterItems[key]) {
@@ -737,6 +753,14 @@ export class MainComponent implements OnInit {
pre_satis = false; pre_satis = false;
break; break;
} }
} else if (key === 'MVIN') {
if (item['preFlight'][key] == filterItems[key].split('_')[0]) {
pre_satis = true;
continue;
} else {
pre_satis = false;
break;
}
} }
else { else {
if (item['preFlight'][key] == filterItems[key]) { if (item['preFlight'][key] == filterItems[key]) {
@@ -770,6 +794,14 @@ export class MainComponent implements OnInit {
rea_satis = false; rea_satis = false;
break; break;
} }
} else if (key === 'MVIN') {
if (item['reaFlight'][key] == filterItems[key].split('_')[0]) {
rea_satis = true;
continue;
} else {
rea_satis = false;
break;
}
} }
else { else {
if (item['reaFlight'][key] == filterItems[key]) { if (item['reaFlight'][key] == filterItems[key]) {
@@ -825,6 +857,14 @@ export class MainComponent implements OnInit {
is_satis = false; is_satis = false;
break; break;
} }
} else if (key === 'MVIN') {
if (item['preFlight'][key] == filterItems[key].split('_')[0]) {
is_satis = true;
continue;
} else {
is_satis = false;
break;
}
} }
else { else {
if (item['preFlight'][key] == filterItems[key]) { if (item['preFlight'][key] == filterItems[key]) {
@@ -850,6 +890,14 @@ export class MainComponent implements OnInit {
is_satis = false; is_satis = false;
break; break;
} }
} else if (key === 'MVIN') {
if (item['reaFlight'][key] == filterItems[key].split('_')[0]) {
is_satis = true;
continue;
} else {
is_satis = false;
break;
}
} }
else { else {
if (item['reaFlight'][key] == filterItems[key]) { if (item['reaFlight'][key] == filterItems[key]) {
@@ -876,6 +924,14 @@ export class MainComponent implements OnInit {
pre_satis = false; pre_satis = false;
break; break;
} }
} else if (key === 'MVIN') {
if (item['preFlight'][key] == filterItems[key].split('_')[0]) {
pre_satis = true;
continue;
} else {
pre_satis = false;
break;
}
} }
else { else {
if (item['preFlight'][key] == filterItems[key]) { if (item['preFlight'][key] == filterItems[key]) {
@@ -898,6 +954,14 @@ export class MainComponent implements OnInit {
rea_satis = false; rea_satis = false;
break; break;
} }
} else if (key === 'MVIN') {
if (item['reaFlight'][key] == filterItems[key].split('_')[0]) {
rea_satis = true;
continue;
} else {
rea_satis = false;
break;
}
} }
else { else {
if (item['reaFlight'][key] == filterItems[key]) { 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; this.selectedFilterData = filter_data;
if (this.FLT_POS === 1) { if (this.FLT_POS === 1) {
src/app/utils/flight-order.ts
+9
View File
@@ -305,4 +305,13 @@ export class FlightOrder {
} }
return this.TOP_14 return this.TOP_14
} }
/**
* 单进单出按计划时间排序
*/
public singleSequence(flight){
var sodt = flight['renderFlight']['FLDT'] + ' ' + flight['renderFlight']['SODT'];
return new Date(sodt).getTime() + this.TOP_1
}
} }