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-02-19 15:57:47 +08:00
parent a5263a18fe
commit 3e542bb52c
8 changed files with 393 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/basic-data/checkin-group/checkin-group.component.html
+21 -15
View File
@@ -1,11 +1,11 @@
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="page-content" #pageContent>
<div class="search-filter mb-3" #searchFilter>
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
<select class="mr-4 form-control" [(ngModel)]="SEL_COL" name="" id="">
<select class="mr-4 form-control" [(ngModel)]="SEL_COL" (ngModelChange)="resetPositionArray()" name="" id="">
<option value="">选择列名</option>
<option *ngFor="let col of col_lists" [value]="col.col_code">{{col.col_chn}}</option>
<option *ngFor="let col of render_col_lists" [value]="col.COL_CODE">{{col.COL_CN}}</option>
</select>
<label class="radio-inline custom-radio nowrap mr-4">
<input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
@@ -15,31 +15,37 @@
<input type="radio" [(ngModel)]="FLT_POS" [value]="2" name="filter-position">
<span>查找定位</span>
</label>
<input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()" id="inputerInfo">
<input class="form-control" [(ngModel)]="SEARCH" (ngModelChange)="resetPositionArray()" type="text" (keyup.enter)="inputEnter()" id="inputerInfo">
</div>
</div>
</div>
<div class="airline-table">
<div id="table-container" class="table-container">
<table id="table" class="table table-bordered table-striped">
<div class="table-container" #tableContainer id="table-container">
<div class="table-head" #tableHead>
<table class="table">
<thead>
<tr>
<th>序号</th>
<th>值机岛代码</th>
<th>值机岛名称</th>
<th style="min-width:55px">序号</th>
<th *ngFor="let col of render_col_lists" [ngStyle]="{'min-width':col.COL_WIDTH}">{{col.COL_CN}}</th>
</tr>
</thead>
</table>
</div>
<div class="table-body" #tableBody (scroll)="handleScroll($event)">
<div class="list-view-phantom" [ngStyle]="{ 'height': wait_render_data.length * 42 + 'px' }"></div>
<table #tableContent id="table" class="table table-striped">
<tbody>
<tr *ngFor="let checkinGroup of render_data;let i = index" (click)="selectRow(checkinGroup)"
[ngClass]="{'selected':row_state===checkinGroup}">
<td>{{i+1}}</td>
<td>{{checkinGroup.checkinGroupCode}}</td>
<td>{{checkinGroup.checkinGroupName}}</td>
<ng-container *ngFor="let checkinGroup of render_data;last as isLast;index as i">
<tr *ngIf="setWidth(isLast)" (click)="selectRow(checkinGroup)" [ngClass]="{'selected':getSelectedRow(checkinGroup)}">
<td style="min-width:55px">{{start+i+1}}</td>
<td *ngFor="let col of render_col_lists" [ngStyle]="{'min-width':col.COL_WIDTH}">{{checkinGroup[col.COL_CODE]}}</td>
</tr>
</ng-container>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
src/app/pages/basic-data/checkin-group/checkin-group.component.scss
+65 -27
View File
@@ -1,11 +1,13 @@
.main-page {
position: relative;
width: 100%;
height: 100%;
overflow-y: scroll;
overflow-y: auto;
padding: 15px 10px;
background-color: #fff;
.page-content {
border: 1px solid #ccc;
height: 100%;
padding: 10px 20px;
.search-filter {
padding: 0 15px;
@@ -18,42 +20,78 @@
}
}
.airline-table{
.table-container{
// border: 1px solid #ccc;
.table-container {
display: inline-block;
// position: relative;
width: 100%;
height: 700px;
overflow: auto;
box-shadow: 0 0 1px .5px #ddd;
table{
// overflow-x: auto;
overflow-y: hidden;
box-shadow: 0 0 1px 0.5px #ddd;
.table-head {
overflow: hidden;
overflow-y: auto;
height: 42px;
table {
margin: 0;
width: max-content;
tr{
th {
border-bottom: none;
background-color: #ddd;
text-align: center;
color: rgb(0, 0, 255);
}
}
&::-webkit-scrollbar {
width: 15px;
height: 15px;
}
}
.table-body {
position: relative;
// height: 600px;
overflow: auto;
width: 100%;
.list-view-phantom {
position: absolute;
left: 0;
top: 0;
right: 0;
z-index: -1;
}
table {
left: 0;
right: 0;
top: 0;
position: absolute;
width: max-content;
tr {
cursor: pointer;
&.selected{
height: 42px;
&.selected {
background: rgb(181, 215, 255);
}
}
th{
background-color: #ddd;
color: rgb(0, 0, 255);
td {
border: 1px solid #dee2e6;
text-align: center
}
th,td{
// border: none;
text-align: center;
}
&::-webkit-scrollbar {
width: 15px;
height: 15px;
}
&::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
background: rgba(165, 207, 222, 1);
border-radius: 10px;
}
&::-webkit-scrollbar-track {
background: rgba(0, 0, 0, 0.06);
border-radius: 10px;
}
}
}
}
}
}
@media screen and (max-width: 991px) {
.line-operator-right {
text-align: left !important;
}
}
// @media screen and (min-width: 1200px){
// .line-operator-right{
// text-align: left;
// }
// }
src/app/pages/basic-data/checkin-group/checkin-group.component.ts
+253 -70
View File
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, ViewChild, Renderer2 } from '@angular/core';
import { BasicDataService } from '../../../services/basic-data-service';
import { ChangeDetectorRef } from '@angular/core';
import { OperateSpinServiceService } from '../../../services/operate-spin-service.service';
import * as $ from 'jquery';
@Component({
@@ -11,13 +11,16 @@ import * as $ from 'jquery';
export class CheckinGroupComponent implements OnInit {
constructor(
private renderer2: Renderer2,
private basicDataService: BasicDataService,
private changeDetectorRef: ChangeDetectorRef
) { }
private operateSpinServiceService: OperateSpinServiceService,
) {
this.operateSpinServiceService.showSpin();
}
public col_lists = [
{ col_code: 'checkinGroupCode', col_chn: '值机岛代码' },
{ col_code: 'checkinGroupName', col_chn: '值机岛名称' }
public render_col_lists: Array<object> = [
{ COL_CODE: 'checkinGroupCode', COL_CN: '值机岛代码', COL_WIDTH: "120px" },
{ COL_CODE: 'checkinGroupName', COL_CN: '值机岛名称', COL_WIDTH: "120px" }
]
// 搜索条件
@@ -25,43 +28,122 @@ export class CheckinGroupComponent implements OnInit {
FLT_POS = 1; //过滤还是定位
SEL_COL = ''; //选择列名
checkinGroups: Array<any> = [];
public checkinGroups: Array<any>;
public wait_render_data: Array<object> = [];
public render_data: Array<object> = []; //显示数据，即需要显示的数据
public row_state: any = {};
@ViewChild('pageContent') pageContent;
@ViewChild('searchFilter') searchFilter;
@ViewChild('tableContainer') tableContainer;
@ViewChild('tabContainer') tabContainer;
@ViewChild('tableHead') tableHead;
@ViewChild('tableBody') tableBody;
@ViewChild('tableContent') tableContent;
trItemHeight: number = 42;
start: number = 0;
end: number = 0;
visibleCount: number = 0;
scrollTop: number = 0;
ngOnInit() {
window.onresize = function () {
this.calcVisibleCount();
}.bind(this)
this.checkinGroups = this.basicDataService.checkin_group;
this.render_data = this.basicDataService.checkin_group;
// this.render_data = this.basicDataService.checkin_group;
if (this.checkinGroups && Array.isArray(this.checkinGroups)) {
this.wait_render_data = this.checkinGroups;
this.operateSpinServiceService.hideSpin();
this.calcVisibleCount();
} else {
this.basicDataService.checkin_group_subject.subscribe(
data => {
this.checkinGroups = data;
this.render_data = data;
this.wait_render_data = data;
this.operateSpinServiceService.hideSpin();
this.calcVisibleCount();
}
)
/**
* 固定表头
*/
var tableCont = document.querySelector('#table-container');
function scrollHandle() {
var scrollTop = this.scrollTop;
this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
}
tableCont.addEventListener('scroll', scrollHandle);
}
/**
* 选中某行
* @param i
* @param checkinGroup
*/
selectRow(i) {
this.row_state = i;
selectRow(checkinGroup) {
this.row_state = checkinGroup;
}
/**
* 设置动态设置单元格的宽度
* @param isLast
*/
setWidth(isLast) {
if (isLast) {
$(".table-body tbody>tr").eq(0).find('td').each((index, element) => {
$(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).innerWidth() + 'px');
})
if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) {
this.tableHead.nativeElement.style.overflowY = 'auto';
} else {
this.tableHead.nativeElement.style.overflowY = 'scroll';
}
}
return true;
}
/**
* 纵向滚动条滚动渲染数据
*/
handleScroll() {
const scrollTop = this.tableBody.nativeElement.scrollTop;
$(".table-head").scrollLeft($('.table-body').scrollLeft());
const fixedScrollTop = scrollTop - scrollTop % this.trItemHeight;
this.tableContent.nativeElement.style.webkitTransform = `translateY(${fixedScrollTop}px)`;
this.start = Math.floor(scrollTop / this.trItemHeight);
this.end = this.start + this.visibleCount;
this.render_data = this.wait_render_data.slice(this.start, this.end);
}
/**
* 计算可视区域数据的渲染
*/
calcVisibleCount() {
this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.pageContent.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 35 + 'px');
this.renderer2.setStyle(this.tableBody.nativeElement, 'height', this.tableContainer.nativeElement.offsetHeight - this.tableHead.nativeElement.offsetHeight + 'px');
this.visibleCount = Math.ceil(this.tableBody.nativeElement.clientHeight / this.trItemHeight);
const scrollTop = this.tableBody.nativeElement.scrollTop;
const fixedScrollTop = scrollTop - scrollTop % this.trItemHeight;
this.tableContent.nativeElement.style.transform = `translateY(${fixedScrollTop}px)`;
this.start = Math.floor(scrollTop / this.trItemHeight);
this.end = this.start + this.visibleCount;
this.render_data = this.wait_render_data.slice(this.start, this.end);
}
/**
* 判断当前行是否是选中的行,是则高亮
* @param checkinGroup
*/
getSelectedRow(checkinGroup) {
if (checkinGroup.checkinGroupCode === this.row_state.checkinGroupCode) {
return true;
} else {
return false;
}
}
//输入框回车事件
inputEnter() {
if (this.FLT_POS === 1) {
this.inputFilter(this.checkinGroups)
this.operateSpinServiceService.showSpin();
this.inputFilter(this.checkinGroups);
} else {
this.inputPosition(this.render_data)
}
@@ -73,7 +155,7 @@ export class CheckinGroupComponent implements OnInit {
if (this.SEARCH) {
if (this.SEL_COL) {
let sel_col = this.SEL_COL;
this.render_data = filterData.filter(item => {
filterData = filterData.filter(item => {
if (item[sel_col]) {
if (item[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
return true;
@@ -82,14 +164,13 @@ export class CheckinGroupComponent implements OnInit {
return false;
}
})
} else {
this.render_data = filterData.filter(item => {
filterData = filterData.filter(item => {
let is_satis = false;
let cols = this.col_lists;
let cols = this.render_col_lists;
for (let i = 0; i < cols.length; i++) {
if (item[cols[i].col_code]) {
if (item[cols[i].col_code].toString().match(new RegExp(this.SEARCH, 'i'))) {
if (item[cols[i]['COL_CODE']]) {
if (item[cols[i]['COL_CODE']].toString().match(new RegExp(this.SEARCH, 'i'))) {
is_satis = true;
break;
} else {
@@ -104,73 +185,175 @@ export class CheckinGroupComponent implements OnInit {
return is_satis;
})
}
} else {
this.render_data = filterData;
}
this.wait_render_data = filterData;
this.render_data = this.wait_render_data.slice(this.start, this.end);
let hasSelectedRow: boolean = false;
for (let i = 0; i < this.wait_render_data.length; i++) {
let checkinGroup = this.wait_render_data[i];
if (checkinGroup['checkinGroupCode'] === this.row_state.seasonflightId) {
this.row_state = checkinGroup;
hasSelectedRow = true;
break;
}
}
if (!hasSelectedRow) {
if (this.render_data.length > 0) {
this.row_state = this.render_data[0];
}
}
this.operateSpinServiceService.hideSpin();
}
positionArray: Array<any> = [];
positionedArray: Array<any> = [];
positionArrayIndex: number = 0;
//输入框定位
inputPosition(filterData) {
let transArray = []
let hasSearchData: boolean = false;
let hasPositionedEle: boolean = false;
if (this.SEL_COL) {
let sel_col = this.SEL_COL;
filterData.forEach(element => {
if (element[sel_col]) {
if (element[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
transArray.push(element)
for (let i = 0; i < filterData.length; i++) {
if (i === filterData.length - 1) {
this.positionedArray = [];
this.positionArrayIndex = 0;
}
let fliterElement = filterData[i];
if (fliterElement[sel_col]) {
if (fliterElement[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
let hasThisEle: boolean = false;
hasSearchData = true;
for (let k = 0; k < this.positionedArray.length; k++) {
let positionedElement = this.positionedArray[k];
let diffResult = (positionedElement.seasonflightId === fliterElement.seasonflightId);
if (diffResult) {
hasThisEle = true;
break;
} else {
continue;
}
};
if (!hasThisEle) {
hasPositionedEle = true;
this.row_state = fliterElement;
this.positionArrayIndex = i;
this.positionedArray.push(fliterElement);
break;
}
} else {
continue;
}
} else {
if (!this.SEARCH) {
transArray.push(element)
}
}
});
let hasThisEle: boolean = false;
hasSearchData = true;
for (let k = 0; k < this.positionedArray.length; k++) {
let positionedElement = this.positionedArray[k];
let diffResult = (positionedElement.seasonflightId === fliterElement.seasonflightId);
if (diffResult) {
hasThisEle = true;
break;
} else {
filterData.forEach(element => {
let cols = this.col_lists;
for (let i = 0; i < cols.length; i++) {
if (element[cols[i].col_code]) {
if (element[cols[i].col_code].toString().match(new RegExp(this.SEARCH, 'i'))) {
transArray.push(element)
continue;
}
};
if (!hasThisEle) {
hasPositionedEle = true;
this.row_state = fliterElement;
this.positionArrayIndex = i;
this.positionedArray.push(fliterElement);
break;
}
} else {
continue;
}
}
}
} else {
let cols = this.render_col_lists;
for (let i = 0; i < filterData.length; i++) {
if (i === filterData.length - 1) {
this.positionedArray = [];
this.positionArrayIndex = 0;
}
let positionIsOk: boolean = false;
let filterElement = filterData[i];
for (let j = 0; j < cols.length; j++) {
let elementCol = cols[j];
if (filterElement[elementCol['COL_CODE']]) {
if (filterElement[elementCol['COL_CODE']].toString().match(new RegExp(this.SEARCH, 'i'))) {
let hasThisEle: boolean = false;
hasSearchData = true;
for (let k = 0; k < this.positionedArray.length; k++) {
let positionedElement = this.positionedArray[k];
let diffResult = (positionedElement.seasonflightId === filterElement.seasonflightId);
if (diffResult) {
hasThisEle = true;
break;
} else {
continue;
}
};
if (!hasThisEle) {
hasPositionedEle = true;
positionIsOk = true;
this.row_state = filterElement;
this.positionArrayIndex = i;
this.positionedArray.push(filterElement);
}
break;
} else {
continue;
}
} else {
if (this.SEARCH) {
continue;
if (!this.SEARCH) {
let hasThisEle: boolean = false;
hasSearchData = true;
for (let k = 0; k < this.positionedArray.length; k++) {
let positionedElement = this.positionedArray[k];
let diffResult = (positionedElement.seasonflightId === filterElement.seasonflightId);
if (diffResult) {
hasThisEle = true;
break;
} else {
transArray.push(element)
continue;
}
};
if (!hasThisEle) {
hasPositionedEle = true;
positionIsOk = true;
this.row_state = filterElement;
this.positionArrayIndex = i;
this.positionedArray.push(filterElement);
}
break;
} else {
continue;
}
}
}
if (positionIsOk) {
break;
}
}
}
});
if (!hasSearchData) {
alert("没有搜索到相关数据");
}
if (hasPositionedEle) {
const scrollTop = this.positionArrayIndex * this.trItemHeight
this.tableBody.nativeElement.scrollTop = scrollTop;
}
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];
if (objTr) {
$("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
}
/**
* 重置定位数组
*/
resetPositionArray() {
this.positionedArray = [];
this.positionArrayIndex = 0;
}
}
src/app/pages/historical-data/historical-data.component.scss
+1 -1
View File
@@ -54,7 +54,7 @@
box-shadow: 0 0 1px 0.5px #ddd;
.table-head {
overflow: hidden;
overflow-y: scroll;
overflow-y: auto;
height: 42px;
table {
margin: 0;
src/app/pages/main/main.component.scss
+1 -1
View File
@@ -54,7 +54,7 @@
box-shadow: 0 0 1px 0.5px #ddd;
.table-head {
overflow: hidden;
overflow-y: scroll;
overflow-y: auto;
height: 42px;
table {
margin: 0;
src/app/pages/seasonal-plan/seasonal-plan.component.scss
+2 -1
View File
@@ -48,12 +48,13 @@
box-shadow: 0 0 1px 0.5px #ddd;
.table-head {
overflow: hidden;
overflow-y: scroll;
overflow-y: auto;
height: 42px;
table {
margin: 0;
width: max-content;
th {
border-bottom: none;
background-color: #ddd;
text-align: center;
color: rgb(0, 0, 255);
src/app/pages/seasonal-plan/seasonal-plan.component.ts
-72
View File
@@ -666,78 +666,6 @@ export class SeasonalPlanComponent implements OnInit {
const scrollTop = this.positionArrayIndex * this.trItemHeight
this.tableBody.nativeElement.scrollTop = scrollTop;
}
// let transArray = []
// if (this.SEL_COL) {
// let sel_col = this.SEL_COL;
// filterData.forEach(element => {
// if (element[sel_col]) {
// if (element[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
// transArray.push(element)
// }
// } else {
// if (!this.SEARCH) {
// transArray.push(element)
// }
// }
// });
// } else {
// filterData.forEach(element => {
// let cols = this.render_col_lists;
// for (let i = 0; i < cols.length; i++) {
// if (element[cols[i]['COL_CODE']]) {
// if (element[cols[i]['COL_CODE']].toString().match(new RegExp(this.SEARCH, 'i'))) {
// transArray.push(element)
// break;
// } else {
// continue;
// }
// } else {
// if (this.SEARCH) {
// continue;
// } else {
// transArray.push(element)
// break;
// }
// }
// }
// });
// }
// 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('没有搜索到相关数据');
// }
// let tr = $(".selected");
// let objTr = tr[0];
// if (objTr) {
// $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
// }
}
/**
src/app/services/basic-data-service.ts
+22 -22
View File
@@ -4,49 +4,49 @@ import { Subject, forkJoin, zip } from 'rxjs'
@Injectable()
export class BasicDataService {
public flightStatusDefinitions:Array<any> = [];
public flightStatusDefinitions:Array<any>;
public flightStatusDefinitions_subject = new Subject<any>();
public flightAgents:Array<any> = [];
public flightAgents:Array<any>;
public flightAgents_subject = new Subject<any>();
public flightTypes:Array<any> = [];
public flightTypes:Array<any>;
public flightTypes_subject = new Subject<any>();
public flightStatus:Array<any> = [];
public flightStatus:Array<any>;
public flightStatus_subject = new Subject<any>();
public checkin_group: Array<any> = [];
public checkin_group: Array<any>;
public checkin_group_subject = new Subject<any>();
public gate: Array<any> = [];
public gate: Array<any>;
public gate_subject = new Subject<any>();
public terminal: Array<any> = [];
public terminal: Array<any>;
public terminal_subject = new Subject<any>();
public chut: Array<any> = [];
public chut: Array<any>;
public chut_subject = new Subject<any>();
public stand: Array<any> = [];
public stand: Array<any>;
public stand_subject = new Subject<any>();
public standType: Array<any> = [];
public standType: Array<any>;
public standType_subject = new Subject<any>();
public carousel: Array<any> = [];
public carousel: Array<any>;
public carousel_subject = new Subject<any>();
public checkin_desk: Array<any> = [];
public checkin_desk: Array<any>;
public checkin_desk_subject = new Subject<any>();
public airport: Array<any> = [];
public airport: Array<any>;
public airport_subject = new Subject<any>();
public city: Array<any> = [];
public city: Array<any>;
public city_subject = new Subject<any>();
public aircraft_type: Array<any> = [];
public aircraft_type: Array<any>;
public aircraft_type_subject = new Subject<any>();
public aircraft: Array<any> = [];
public aircraft: Array<any>;
public aircraft_subject = new Subject<any>();
public terminal_area: Array<any> = [];
public terminal_area: Array<any>;
public terminal_area_subject = new Subject<any>();
public airline: Array<any> = [];
public airline: Array<any>;
public airline_subject = new Subject<any>();
public country: Array<any> = [];
public country: Array<any>;
public country_subject = new Subject<any>();
public aircraft_type_group: Array<any> = [];
public aircraft_type_group: Array<any>;
public aircraft_type_group_subject = new Subject<any>();
public airportgroup: Array<any> = [];
public airportgroup: Array<any>;
public airportgroup_subject = new Subject<any>();
public airlinegroup: Array<any> = [];
public airlinegroup: Array<any>;
public airlinegroup_subject = new Subject<any>();
constructor(