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

行李转盘优化及查找定位精确筛选

Browse Source
This commit is contained in:
714943302@qq.com
2018-11-19 09:41:42 +08:00
parent c0c805b49d
commit 81ebd5728e
4 changed files with 263 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/basic-data/carousel/carousel.component.html
+15 -7
View File
@@ -14,7 +14,7 @@
<input type="radio" [(ngModel)]="FLT_POS" [value]="2" name="filter-position">
<span>查找定位</span>
</label>
<input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputFliter()">
<input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()">
</div>
<div class="line-operator-right mb-3 col-xlg-4 col-mlg-4 col-xl-4 col-lg-1">
<!-- <button type="button" class="btn btn-info mr-3">行李转盘编辑</button>
@@ -26,7 +26,7 @@
<div class="second-condition mb-3 row">
<div class="input-container mr-4">
<label for="">所属航站楼区域：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.HZ" (ngModelChange)="inputFliter()">
<select class="form-control" [(ngModel)]="filterItems.HZ" (ngModelChange)="selectChange()">
<option value=""></option>
<option value="GH">国内区域</option>
<option value="CH">国际区域</option>
@@ -35,7 +35,7 @@
</div>
<div class="input-container mr-4">
<label for="">资源状态：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.ZY" (ngModelChange)="inputFliter()">
<select class="form-control" [(ngModel)]="filterItems.ZY" (ngModelChange)="selectChange()">
<option value=""></option>
<option value="K">可用</option>
<option value="R">不可用</option>
@@ -45,18 +45,26 @@
</div>
<div class="airline-table">
<div class="table-container">
<table class="table table-bordered table-striped">
<div id="table-container" class="table-container">
<table id="table" class="table table-bordered table-striped">
<thead>
<tr>
<th>序号</th>
<!-- <th>行李转盘代码</th>
<th>行李转盘名称</th>
<th>航站楼区域</th>
<th>资源状态</th> -->
<th *ngFor="let airline_col of carousel_lists">{{airline_col.COL_CN}}</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let airline_row of render_data;let i = index" (click)="selectRow(i)"
[ngClass]="{'active':row_state===i}">
<tr *ngFor="let airline_row of render_data;let i = index" (click)="selectRow(airline_row)"
[ngClass]="{'selected':row_state['renderFlight']===airline_row['renderFlight']}">
<td>{{i+1}}</td>
<!-- <td>{{airline_col.carouselCode}}</td>
<td>{{airline_col.carouselName}}</td>
<td>{{airline_col.terminalAreaCode}}</td>
<td>{{airline_col.carouselStatus}}</td> -->
<td *ngFor="let airline_col of carousel_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td>
</tr>
</tbody>
src/app/pages/basic-data/carousel/carousel.component.scss
+8 -3
View File
@@ -1,6 +1,7 @@
.main-page {
width: 100%;
height: calc(100% - 66px);
height: 100%;
overflow-y: scroll;
padding: 15px 10px;
background-color: #fff;
.page-content {
@@ -31,15 +32,19 @@
// border: 1px solid #ccc;
width: 100%;
height: 700px;
overflow: scroll;
overflow: auto;
box-shadow: 0 0 1px .5px #ddd;
table{
width: max-content;
tr{
cursor: pointer;
&.active{
&.selected{
background: rgb(181, 215, 255);
}
}
th{
background-color: #ddd;
}
th,td{
// border: none;
text-align: center;
src/app/pages/basic-data/carousel/carousel.component.ts
+236 -412
View File
@@ -2,6 +2,9 @@ import { Component, OnInit } from '@angular/core';
import { ChangeDetectorRef } from '@angular/core';
import { HttpClientService } from '../../../services/http-client.service';
import dateFormatter from '../../../utils/data-formatter';
import { HttpParams } from '@angular/common/http';
import * as $ from 'jquery';
@Component({
selector: 'app-carousel',
templateUrl: './carousel.component.html',
@@ -22,22 +25,7 @@ public render_data: Array<object> = []; //显示数据，即需要显示的数
public carousel_lists: Array<object>; //列数据
public row_state: number;
public TOP_1 = 1000000000000;
public TOP_2 = 2000000000000;
public TOP_3 = 3000000000000;
public TOP_4 = 4000000000000;
public TOP_5 = 5000000000000;
public TOP_6 = 6000000000000;
public TOP_7 = 7000000000000;
public TOP_8 = 8000000000000;
public TOP_9 = 9000000000000;
public TOP_10 = 10000000000000;
public TOP_11 = 11000000000000;
public TOP_12 = 12000000000000;
public TOP_13 = 13000000000000;
public TOP_14 = 14000000000000;
public row_state: any = { renderFlight: {} };
// 搜索条件
SEARCH = ''; //手动输入条件
@@ -65,7 +53,6 @@ public formatter = {
'ACTT': dateFormatter
}
selectRow(i) {
this.row_state = i;
this.changeDetectorRef.detectChanges();
@@ -111,11 +98,12 @@ ngOnInit() {
let key = this.carousel_lists[i]['COL_CODE']
render_flight[key] = typeof (this.formatter[key]) === 'function' ? this.formatter[key](row_flights['preFlight'][key], 1) : this.formatter[key] ? this.formatter[key][row_flights['preFlight'][key]] : row_flights['preFlight'][key];
}
row_flights['renderFlight'] = render_flight;if (element['isLinked']) {
row_flights['preFlight'] = element['linkFlight'];
delete element['linkFlight'];
delete element['isLinked'];
row_flights['reaFlight'] = element;
row_flights['renderFlight'] = render_flight;
if (element['isLinked']) {
row_flights['preFlight'] = element['linkFlight'];
delete element['linkFlight'];
delete element['isLinked'];
row_flights['reaFlight'] = element;
for (let i = 0; i < this.carousel_lists.length; i++) {
let key = this.carousel_lists[i]['COL_CODE']
@@ -141,428 +129,264 @@ ngOnInit() {
}
this.combined_data.push(row_flights)
})
//排序
this.combined_data.forEach(element => {
element['ORDER'] = this.sequence(element)
// element['ORDER'] = '+' + element['order']
})
this.combined_data.sort(function (a, b) {
return (a['ORDER'] - b['ORDER']);
})
// this.doSequence(this.combined_data);
this.render_data = this.combined_data
this.changeDetectorRef.detectChanges();
}
)
/**
* 固定表头
*/
var tableCont = document.querySelector('#table-container');
function scrollHandle (){
var scrollTop = this.scrollTop;
this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
}
tableCont.addEventListener('scroll',scrollHandle);
}
public sequence(flight) {
let dateTag: number = 10;
let dateToCompare = new Date().getTime();
if (!this.isCancled(flight) && !this.isDone(flight) && this.isDelayed(flight)) {
if (this.isLinked(flight)) {
if (this.getActualDatetime(flight['preFlight']) && !this.getActualDatetime(flight['reaFlight'])) {
dateToCompare = new Date(dateFormatter(this.getActualDatetime(flight['preFlight']))).getTime();
dateTag = this.TOP_1;
}
else {
dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
dateTag = this.TOP_2;
}
}
else {
dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
dateTag = this.TOP_3;
}
return dateToCompare + dateTag;
}
if (!this.isCancled(flight) && !this.isDone(flight) && this.isBoading(flight)) {
dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
dateTag = this.TOP_4;
return dateToCompare + dateTag;
}
if (!this.isCancled(flight) && !this.isDone(flight) && this.isFlying(flight) && !this.getActualDatetime(flight['preFlight'])) {
if (this.getEstimatedDatetime(flight['preFlight'])) {
dateToCompare = new Date(dateFormatter(this.getEstimatedDatetime(flight['preFlight']))).getTime();
} else {
dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['preFlight']))).getTime();
}
dateTag = this.TOP_5;
return dateToCompare + dateTag;
}
if (!this.isCancled(flight) && !this.isDone(flight) && this.isLinked(flight) && this.getActualDatetime(flight['preFlight']) && !this.getActualDatetime(flight['reaFlight'])) {
dateToCompare = new Date(dateFormatter(this.getActualDatetime(flight['preFlight']))).getTime();
dateTag = this.TOP_6;
return dateToCompare + dateTag;
}
if (!this.isCancled(flight) && !this.isDone(flight) && this.isDeptFlight(flight) && !this.startBoading(flight)) {
dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
dateTag = this.TOP_7;
return dateToCompare + dateTag;
}
if (!this.isCancled(flight) && this.isArriFlight(flight) && this.isDone(flight)) {
dateToCompare = new Date(dateFormatter(this.getActualDatetime(flight['preFlight']))).getTime();
dateTag = this.TOP_8;
return dateToCompare + dateTag;
}
if (!this.isCancled(flight) && !this.isDone(flight) && this.isOverBoading(flight)) {
dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
dateTag = this.TOP_9;
return dateToCompare + dateTag;
}
if (!this.isCancled(flight) && !this.isDone(flight) && !this.isFlying(flight)) {
if (this.isLinked(flight)) {
dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
dateTag = this.TOP_10;
} else if (this.isArriFlight(flight)) {
dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['preFlight']))).getTime();
dateTag = this.TOP_11;
}
return dateToCompare + dateTag;
}
if (!this.isCancled(flight) && this.isDone(flight) && (this.isLinked(flight) || this.isDeptFlight(flight))) {
dateToCompare = new Date(dateFormatter(this.getActualDatetime(flight['reaFlight']))).getTime();
dateTag = this.TOP_12;
return dateToCompare + dateTag;
}
if (this.isCancled(flight)) {
if (this.isDeptFlight(flight)) {
dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['reaFlight']))).getTime();
} else {
dateToCompare = new Date(dateFormatter(this.getScheduledDatetime(flight['preFlight']))).getTime();
}
/**
* 执行排序并渲染
*/
/* doSequence(sequenceData) {
sequenceData.forEach(element => {
element['ORDER'] = this.sequence(element);
})
dateTag = this.TOP_13;
return dateToCompare + dateTag;
}
return this.TOP_14
sequenceData.sort(function (a, b) {
return (a['ORDER'] - b['ORDER']);
})
this.render_data = sequenceData;
this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
this.changeDetectorRef.detectChanges();
} */
/**
* 过滤及定位
* @param filterItems
* @return
*/
//输入框回车事件
inputEnter() {
if (this.FLT_POS === 1) {
this.selectChange()
} else {
this.selectChange()
this.inputPosition(this.render_data)
}
}
inputFliter() {
let filterItems = this.filterItems;
let combined_data = this.combined_data;
//下拉框选择筛选
selectChange() {
let filter_data = [];
let sel_col = this.SEL_COL;
if (this.FLT_POS === 1) { //过滤
//手动输入框筛选
if(sel_col){
combined_data.forEach(item=>{
if(item['renderFlight'][sel_col]){
if (item['renderFlight'][sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
filter_data.push(Object.assign({}, item))
let filterItems = this.filterItems;
this.combined_data.forEach(item => {
filter_data.push(Object.assign({}, item));
})
//下拉框筛选
filter_data = filter_data.filter(item => {
if (item) {
let is_satis = true;
for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (item['preFlight'][key] === filterItems[key]) {
is_satis = true;
continue;
} else {
is_satis = false;
break;
}
}else{
if(!this.SEARCH){
filter_data.push(Object.assign({}, item))
}
}
return is_satis;
} else if (item) {
let is_satis = true;
for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (item['reaFlight'][key] === filterItems[key]) {
is_satis = true;
continue;
} else {
is_satis = false;
break;
}
}
}
return is_satis;
} else {
let pre_satis = true;
let rea_satis = true;
for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (item['preFlight'][key] === filterItems[key]) {
pre_satis = true;
continue;
} else {
pre_satis = false;
break;
}
}
}
for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (item['reaFlight'][key] === filterItems[key]) {
rea_satis = true;
continue;
} else {
rea_satis = false;
break;
}
}
}
if (pre_satis && !rea_satis) {
item['renderFlight'] = item['renderPreFlight'];
return pre_satis;
} else if (!pre_satis && rea_satis) {
item['renderFlight'] = item['renderReaFlight'];
return rea_satis;
} else if (pre_satis && rea_satis) {
return pre_satis && rea_satis;
} else {
return false;
}
}
})
if (this.FLT_POS === 1) {
this.inputFilter(filter_data);
} else {
this.render_data = filter_data;
this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
// this.inputPosition(this.render_data);
this.changeDetectorRef.detectChanges();
}
}
//输入框筛选
inputFilter(filterData) {
if (this.SEARCH) {
if (this.SEL_COL) {
let sel_col = this.SEL_COL;
filterData = filterData.filter(item => {
if (item['renderFlight'][sel_col]) {
if (item['renderFlight'][sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
return true;
}
} else {
if (this.SEARCH) {
return false;
} else {
return true;
}
}
})
}else{
combined_data.forEach(item => {
} else {
filterData = filterData.filter(item => {
let is_satis = false;
for (const key in item['renderFlight']) {
if (item['renderFlight'].hasOwnProperty(key)) {
if (item['renderFlight'][key]) {
if (item['renderFlight'][key].toString().match(new RegExp(this.SEARCH, 'i'))) {
filter_data.push(Object.assign({}, item))
is_satis = true;
break;
} else {
is_satis = false;
continue;
}
} else {
continue;
if (this.SEARCH) {
is_satis = false;
continue;
} else {
is_satis = true;
break;
}
}
} else {
continue;
}
}
return is_satis;
})
}
//下拉框筛选
filter_data = filter_data.filter(item => {
if (this.isArriFlight(item)) {
let is_satis = true;
for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (item['preFlight'][key] === filterItems[key]) {
is_satis = true;
continue;
} else {
is_satis = false;
break;
}
}
}
return is_satis;
} else if (this.isDeptFlight(item)) {
let is_satis = true;
for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (item['reaFlight'][key] === filterItems[key]) {
is_satis = true;
continue;
} else {
is_satis = false;
break;
}
}
}
return is_satis;
} else {
let pre_satis = true;
let rea_satis = true;
for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (item['preFlight'][key] === filterItems[key]) {
pre_satis = true;
continue;
} else {
pre_satis = false;
break;
}
}
}
for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (item['reaFlight'][key] === filterItems[key]) {
rea_satis = true;
continue;
} else {
rea_satis = false;
break;
}
}
}
if(pre_satis&&!rea_satis){
item['renderFlight'] = item['renderPreFlight'];
return pre_satis;
}else if(!pre_satis&&rea_satis){
item['renderFlight'] = item['renderReaFlight'];
return rea_satis;
}else if(pre_satis&&rea_satis){
return pre_satis&&rea_satis;
}else{
return false;
}
}
})
this.render_data = filter_data;
} else { //定位
}
this.render_data = filterData;
this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
this.changeDetectorRef.detectChanges();
}
/**
* 获取航班实际时间
* @param flight
* @return
*/
public getActualDatetime(flight) {
return flight['ACTT'];
}
positionArray: Array<any> = [];
positionArrayIndex: number = 0;
//输入框定位
inputPosition(filterData) {
let transArray = []
if (this.SEL_COL) {
let sel_col = this.SEL_COL;
filterData.forEach(element => {
if (element['renderFlight'][sel_col]) {
if (element['renderFlight'][sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
transArray.push(element)
}
} else {
if (!this.SEARCH) {
transArray.push(element)
}
}
});
} else {
filterData.forEach(element => {
for (const key in element['renderFlight']) {
if (element['renderFlight'].hasOwnProperty(key)) {
if (element['renderFlight'][key]) {
if (element['renderFlight'][key].toString().match(new RegExp(this.SEARCH, 'i'))) {
transArray.push(element)
break;
} else {
continue;
}
} else {
if (this.SEARCH) {
continue;
} else {
transArray.push(element)
break;
}
}
/**
* 获取航班预计时间
* @param flight
* @return
*/
public getEstimatedDatetime(flight) {
return flight['ESTT']
}
} else {
continue;
}
}
});
}
/**
* 获取航班计划时间
* @param flight
* @return
*/
public getScheduledDatetime(flight) {
return flight['SODT']
}
/**
* 判断航班是否是链接航班
* @param flight
* @return
*/
public isLinked(flight) {
if (flight['preFlight'] && flight['reaFlight']) {
return true
} else {
return false
}
}
/**
* 判断航班是否是纯离港航班
* @param flight
* @return
*/
public isDeptFlight(flight) {
if (!flight['preFlight'] && flight['reaFlight']) {
return true
} else {
return false
}
}
/**
* 判断航班是否是纯到港航班
* @param flight
* @return
*/
public isArriFlight(flight) {
if (flight['preFlight'] && !flight['reaFlight']) {
return true;
} else {
return false;
}
}
/**
* 判断航班是否已经前站起飞
* @param flight
* @return
*/
public isFlying(flight) {
if (this.isArriFlight(flight) || this.isLinked(flight)) {
if (flight['preFlight']['PADT']) {
return true;
} else {
return false;
}
} else {
return false;
}
}
/**
* 判断航班是否取消
* @param flight
* @return
*/
public isCancled(flight) {
if (this.isArriFlight(flight)) {
if (flight['preFlight']['CNCL']) {
return true;
} else {
return false;
}
} else if (this.isDeptFlight(flight)) {
if (flight['reaFlight']['CNCL']) {
return true;
} else {
return false;
}
} else {
return false;
}
}
/**
* 判断航班是否延误(只针对纯离港航班或链接航班中的离港航班)
* @param flight
* @return
*/
public isDelayed(flight) {
if (this.isDeptFlight(flight) || this.isLinked(flight)) {
if (flight['reaFlight']['DELY']) {
return true
} else {
return false
}
} else {
return false;
}
}
/**
* 判断航班是否已经执行完成
* @param flight
* @return
*/
public isDone(flight) {
if (this.isLinked(flight) || this.isDeptFlight(flight)) {
if (!this.getActualDatetime(flight['reaFlight'])) {
return false;
} else {
return true;
}
} else if (this.isArriFlight(flight)) {
if (!this.getActualDatetime(flight['preFlight'])) {
return false;
} else {
return true;
}
} else {
return false;
}
}
/**
* 判断航班是否开始登机
* @param flight
* @return
*/
public startBoading(flight) {
if (this.isLinked(flight) || this.isDeptFlight(flight)) {
if (!flight['reaFlight']['BOTM']) {
return false;
} else {
return true;
}
} else {
return false;
}
}
/**
* 判断航班是否正在登机中
* @param flight
* @return
*/
public isBoading(flight) {
if (this.isLinked(flight) || this.isDeptFlight(flight)) {
if (flight['reaFlight']['BOTM'] && !flight['reaFlight']['GCTM']) {
return true;
} else {
return false;
}
} else {
return false;
}
}
/**
* 判断航班是否登机结束
* @param flight
* @return
*/
public isOverBoading(flight) {
if (this.isLinked(flight) || this.isDeptFlight(flight)) {
if (!flight['GCTM']) {
return false;
} else {
return true;
}
} else {
return false;
}
}
if (transArray.length > 0) {
if (transArray.toString() == this.positionArray.toString()) {
this.positionArrayIndex++;
if (this.positionArrayIndex === this.positionArray.length) {
this.positionArrayIndex = 0;
}
this.row_state = this.positionArray[this.positionArrayIndex];
} else {
this.positionArray = transArray;
this.positionArrayIndex = 0;
this.row_state = this.positionArray[this.positionArrayIndex];
}
} else {
alert('没有搜索到相关数据');
}
this.changeDetectorRef.detectChanges();
let tr = $(".selected");
let objTr = tr[0];
$("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
}
}
src/app/pages/basic-data/chut/chut.component.html
+4
View File
@@ -30,6 +30,8 @@
<thead>
<tr>
<th>序号</th>
<!-- <th>行李传送带代码</th>
<th>行李传送带名称</th> -->
<th *ngFor="let airline_col of chut_lists">{{airline_col.COL_CN}}</th>
</tr>
</thead>
@@ -37,6 +39,8 @@
<tr *ngFor="let airline_row of render_data;let i = index" (click)="selectRow(airline_row)"
[ngClass]="{'selected':row_state['renderFlight']===airline_row['renderFlight']}">
<td>{{i+1}}</td>
<!-- <td>{{airline_col.chutCode}}</td>
<td>{{airline_col.chutName}}</td> -->
<td *ngFor="let airline_col of chut_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td>
</tr>
</tbody>