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-20 16:00:35 +08:00
parent 6b318f6faa
commit 209f14d3d6
13 changed files with 411 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/basic-data/airport/airport.component.html
+61 -68
View File
@@ -1,78 +1,71 @@
<div class="main-page"> <div class="main-page">
<div class="page-content"> <div class="page-content" #pageContent>
<div class="search-filter mb-3"> <div class="search-filter mb-3" #searchFilter>
<div class="first-condition row"> <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"> <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=""
<option value="">选择列名</option> id="">
<option *ngFor="let col of col_lists" [value]="col.col_code">{{col.col_chn}}</option> <option value="">选择列名</option>
<option *ngFor="let col of render_col_lists" [value]="col.COL_CODE">{{col.COL_CN}}</option>
</select> </select>
<label class="radio-inline custom-radio nowrap mr-4"> <label class="radio-inline custom-radio nowrap mr-4">
<input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position"> <input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
<span>过滤</span> <span>过滤</span>
</label> </label>
<label class="radio-inline custom-radio nowrap mr-4"> <label class="radio-inline custom-radio nowrap mr-4">
<input type="radio" [(ngModel)]="FLT_POS" [value]="2" name="filter-position"> <input type="radio" [(ngModel)]="FLT_POS" [value]="2" name="filter-position">
<span>查找定位</span> <span>查找定位</span>
</label> </label>
<input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()" id="inputInfo"> <input class="form-control" [(ngModel)]="SEARCH" (ngModelChange)="resetPositionArray()" type="text"
</div> (keyup.enter)="inputEnter()" id="inputInfo">
</div> </div>
</div>
<div class="second-condition mb-3 row"> <div class="second-condition mb-3 row">
<div class="input-container mr-4"> <div class="input-container mr-4">
<label for="airportGroupId">机场集团：&nbsp;&nbsp;</label> <label for="airportGroupId">机场集团：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.airportGroupId" (ngModelChange)="selectChange()" id="jt"> <select class="form-control" [(ngModel)]="filterItems.airportGroupId" (ngModelChange)="selectChange()"
<option value=""></option> id="jt">
<option *ngFor="let item of airportgroups" [value]="item.airportGroupId">{{item.airportGroupName}}</option> <option value=""></option>
</select> <option *ngFor="let item of airportgroups" [value]="item.airportGroupId">{{item.airportGroupName}}</option>
</div> </select>
<div class="input-container mr-4"> </div>
<label for="cityId">城市：&nbsp;&nbsp;</label> <div class="input-container mr-4">
<select class="form-control" [(ngModel)]="filterItems.cityId" (ngModelChange)="selectChange()" id="city"> <label for="cityId">城市：&nbsp;&nbsp;</label>
<option value=""></option> <select class="form-control" [(ngModel)]="filterItems.cityId" (ngModelChange)="selectChange()" id="city">
<option *ngFor="let item of citys" [value]="item.cityId">{{item.cityNameChn}}</option> <option value=""></option>
</select> <option *ngFor="let item of citys" [value]="item.cityId">{{item.cityNameChn}}</option>
</div> </select>
</div>
</div>
</div> </div>
</div>
<div class="airline-table"> <div class="airline-table">
<div id="table-container" class="table-container"> <div #tableContainer id="table-container" class="table-container">
<table id="table" class="table table-bordered table-striped"> <div class="table-head" #tableHead>
<thead> <table class="table">
<tr> <thead>
<th>序号</th> <tr>
<th>机场代码</th> <th style="min-width:55px">序号</th>
<th>机场中文名</th> <th *ngFor="let col of render_col_lists" [ngStyle]="{'min-width':col.COL_WIDTH}">{{col.COL_CN}}</th>
<th>中文简称</th> </tr>
<th>机场英文名</th> </thead>
<th>英文简称</th> </table>
<th>IATA码</th> </div>
<th>CAA码</th> <div class="table-body" #tableBody (scroll)="handleScroll($event)">
<th>ICAO码</th> <div class="list-view-phantom" [ngStyle]="{ 'height': wait_render_data.length * 42 + 'px' }"></div>
<th>机场集团</th> <table #tableContent id="table" class="table table-striped">
<th>所在城市</th> <tbody>
</tr> <ng-container *ngFor="let airport of render_data;last as isLast;index as i">
</thead> <tr *ngIf="setWidth(isLast)" (click)="selectRow(airport)" [ngClass]="{'selected':getSelectedRow(airport)}">
<tbody> <td style="min-width:55px">{{start+i+1}}</td>
<tr *ngFor="let airport of render_data;let i = index" (click)="selectRow(airport)" <td *ngFor="let col of render_col_lists" [ngStyle]="{'min-width':col.COL_WIDTH}">{{airport[col.COL_CODE]}}</td>
[ngClass]="{'selected':row_state===airport}"> </tr>
<td>{{i+1}}</td> </ng-container>
<td>{{airport.airportCode}}</td> </tbody>
<td>{{airport.airportNameChn}}</td> </table>
<td>{{airport.briefNameChn}}</td> </div>
<td>{{airport.airportNameEng}}</td> </div>
<td>{{airport.briefNameEng}}</td> </div>
<td>{{airport.airportCodeIata}}</td> </div>
<td>{{airport.airportCodeCaa}}</td>
<td>{{airport.airportCodeIcao}}</td>
<td>{{airport.airportGroupName}}</td>
<td>{{airport.cityNameChn}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div> </div>
src/app/pages/basic-data/airport/airport.component.scss
-59
View File
@@ -1,59 +0,0 @@
.main-page {
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 15px 10px;
background-color: #fff;
.page-content {
border: 1px solid #ccc;
padding: 10px 20px;
.search-filter {
padding: 0 15px;
.input-container {
padding: 0;
> .form-control {
width: 180px;
display: inline-block;
}
}
}
.airline-table{
.table-container{
// border: 1px solid #ccc;
width: 100%;
height: 700px;
overflow: auto;
box-shadow: 0 0 1px .5px #ddd;
table{
width: max-content;
tr{
cursor: pointer;
&.selected{
background: rgb(181, 215, 255);
}
}
th{
background-color: #ddd;
color: rgb(0, 0, 255);
}
th,td{
// border: none;
text-align: center;
}
}
}
}
}
}
@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/airport/airport.component.ts
+340 -128
View File
@@ -1,37 +1,42 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit, ViewChild, Renderer2 } from '@angular/core';
import { BasicDataService } from '../../../services/basic-data-service'; import { BasicDataService } from '../../../services/basic-data-service';
import { ChangeDetectorRef } from '@angular/core'; import { OperateSpinServiceService } from '../../../services/operate-spin-service.service';
import * as $ from 'jquery'; import * as $ from 'jquery';
@Component({ @Component({
selector: 'app-airport', selector: 'app-airport',
templateUrl: './airport.component.html', templateUrl: './airport.component.html',
styleUrls: ['./airport.component.scss'] styleUrls: ['../basic.scss']
}) })
export class AirportComponent implements OnInit { export class AirportComponent implements OnInit {
constructor( constructor(
private renderer2: Renderer2,
private basicDataService: BasicDataService, private basicDataService: BasicDataService,
private changeDetectorRef: ChangeDetectorRef private operateSpinServiceService: OperateSpinServiceService,
) { } ) {
this.operateSpinServiceService.showSpin();
}
public col_lists = [ public render_col_lists = [
{ col_code: 'airportCode', col_chn: '机场代码' }, { COL_CODE: 'airportCode', COL_CN: '机场代码', COL_WIDTH: "85px" },
{ col_code: 'airportNameChn', col_chn: '机场中文名' }, { COL_CODE: 'airportNameChn', COL_CN: '机场中文名', COL_WIDTH: "200px" },
{ col_code: 'briefNameChn', col_chn: '中文简称' }, { COL_CODE: 'briefNameChn', COL_CN: '中文简称', COL_WIDTH: "85px" },
{ col_code: 'airportNameEng', col_chn: '机场英文名' }, { COL_CODE: 'airportNameEng', COL_CN: '机场英文名', COL_WIDTH: "180px" },
{ col_code: 'briefNameEng', col_chn: '英文简称' }, { COL_CODE: 'briefNameEng', COL_CN: '英文简称', COL_WIDTH: "120px" },
{ col_code: 'airportCodeIata', col_chn: 'IATA码' }, { COL_CODE: 'airportCodeIata', COL_CN: 'IATA码', COL_WIDTH: "85px" },
{ col_code: 'airportCodeCaa', col_chn: 'CAA码' }, { COL_CODE: 'airportCodeCaa', COL_CN: 'CAA码', COL_WIDTH: "85px" },
{ col_code: 'airportCodeIcao', col_chn: 'ICAO码' }, { COL_CODE: 'airportCodeIcao', COL_CN: 'ICAO码', COL_WIDTH: "85px" },
{ col_code: 'airportGroupName', col_chn: '机场集团' }, { COL_CODE: 'airportGroupName', COL_CN: '机场集团', COL_WIDTH: "120px" },
{ col_code: 'cityNameChn', col_chn: '所在城市' }, { COL_CODE: 'cityNameChn', COL_CN: '所在城市', COL_WIDTH: "120px" },
] ]
// 搜索条件 // 搜索条件
SEARCH = ''; //手动输入条件 SEARCH = ''; //手动输入条件
LASTSEARCH = '';
FLT_POS = 1; //过滤还是定位 FLT_POS = 1; //过滤还是定位
SEL_COL = ''; //选择列名 SEL_COL = ''; //选择列名
LAST_SEL_COL = '';
//下拉框 //下拉框
public filterItems = { public filterItems = {
@@ -39,100 +44,185 @@ export class AirportComponent implements OnInit {
cityId: '', cityId: '',
} }
airportgroups: Array<any>; //机场集团 public airportgroups: Array<any>; //机场集团
citys: Array<any>; //城市 public citys: Array<any>; //城市
airports: Array<any>; public airports: Array<any>;
public row_state: any = { renderFlight: {} };
public wait_render_data: Array<object> = [];
public render_data: Array<object> = []; //显示数据，即需要显示的数据 public render_data: Array<object> = []; //显示数据，即需要显示的数据
public selectedFilterData: Array<object> = [];
public row_state: any = {};
@ViewChild('pageContent') pageContent;
@ViewChild('searchFilter') searchFilter;
@ViewChild('tableContainer') tableContainer;
@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() { ngOnInit() {
this.airportgroups = this.basicDataService.airportgroup; window.onresize = function () {
this.citys = this.basicDataService.city; this.calcVisibleCount();
}.bind(this)
this.airports = this.basicDataService.airport; this.airports = this.basicDataService.airport;
this.render_data = this.basicDataService.airport; this.citys = this.basicDataService.city;
this.basicDataService.airport_subject.subscribe( this.airportgroups = this.basicDataService.airportgroup;
data => {
this.airports = data; if (this.airportgroups && Array.isArray(this.airportgroups)) {
this.render_data = data; this.dataTransfer();
if(this.citys && this.citys.length > 0){//城市数据列表转换处理 } else {
this.basicDataTransHandle(); this.basicDataService.airport_subject.subscribe(
data => {
this.airports = data;
} }
} )
) this.basicDataService.city_subject.subscribe(
this.basicDataService.city_subject.subscribe( data => {
data => { this.citys = data;
this.citys = data;
}
)
this.basicDataService.airportgroup_subject.subscribe(
data => {
this.airportgroups = data
if(this.airportgroups && this.airportgroups.length > 0){//机场集团数据列表转换处理
this.airportgroupsHandle();
} }
} )
) this.basicDataService.airportgroup_subject.subscribe(
if(this.render_data){ data => {
//城市数据转换处理 this.airportgroups = data;
this.basicDataTransHandle(); this.dataTransfer();
//机场集团数据转换处理 }
this.airportgroupsHandle(); )
} }
/**
* 固定表头
*/
var tableCont = document.querySelector('#table-container');
function scrollHandle() {
var scrollTop = this.scrollTop;
this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
}
tableCont.addEventListener('scroll', scrollHandle);
} }
//机场集团数据转换处理 //机场集团数据转换处理
airportgroupsHandle() { airportGroupsTransHandle(item) {
this.render_data.forEach(item => { let airportgroupsLinkIndex = this.airportgroups.findIndex(val => val.airportGroupId === item['airportGroupId']);
let airportgroupsLinkIndex = this.airportgroups.findIndex(val => val.airportGroupId === item['airportGroupId']); if (this.airportgroups[airportgroupsLinkIndex]) {
if(this.airportgroups[airportgroupsLinkIndex]){ item['airportGroupName'] = this.airportgroups[airportgroupsLinkIndex].airportGroupName;
item['airportGroupName'] = this.airportgroups[airportgroupsLinkIndex].airportGroupName; }
}
})
} }
//城市数据转换处理 //城市数据转换处理
basicDataTransHandle() { citysTransHandle(item) {
this.render_data.forEach(item => { let citysLinkIndex = this.citys.findIndex(val => val.cityId === item['cityId']);
let citysLinkIndex = this.citys.findIndex(val => val.cityId === item['cityId']); if (this.citys[citysLinkIndex]) {
if(this.citys[citysLinkIndex]){ item['cityNameChn'] = this.citys[citysLinkIndex].cityNameChn;
item['cityNameChn'] = this.citys[citysLinkIndex].cityNameChn; }
} }
/**
* 数据转换显示统一处理
*/
dataTransfer() {
this.airports.forEach(item => {
this.airportGroupsTransHandle(item);
this.citysTransHandle(item);
}) })
this.wait_render_data = this.airports;
this.selectedFilterData = this.airports;
this.calcVisibleCount();
//默认选中第一条
if (this.render_data.length > 0) {
this.row_state = this.render_data[0];
}
this.operateSpinServiceService.hideSpin();
}
/**
* 设置动态设置单元格的宽度
* @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).outerWidth() + '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 i * @param airport
*/ */
selectRow(i) { selectRow(airport) {
this.row_state = i; this.row_state = airport;
}
/**
* 判断当前行是否是选中的行,是则高亮
* @param airport
*/
getSelectedRow(airport) {
if (airport.airportCodeIata === this.row_state.airportCodeIata) {
return true;
} else {
return false;
}
} }
//输入框回车事件 //输入框回车事件
inputEnter() { inputEnter() {
if (this.FLT_POS === 1) { if (this.FLT_POS === 1) {
this.selectChange() this.LAST_SEL_COL = this.SEL_COL;
this.LASTSEARCH = this.SEARCH;
this.operateSpinServiceService.showSpin();
this.inputFilter(this.selectedFilterData);
} else { } else {
this.inputPosition(this.render_data) this.inputPosition(this.wait_render_data)
} }
} }
//下拉框选择筛选 //下拉框选择筛选
selectChange() { selectChange() {
this.render_data = this.airports.filter(item => { this.operateSpinServiceService.showSpin();
this.positionedArray = [];
this.positionArrayIndex = 0;
let filter_data = this.airports.filter(item => {
let is_satis = true; let is_satis = true;
for (const key in this.filterItems) { for (const key in this.filterItems) {
if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) { if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
if (item[key] == this.filterItems[key]) { if (item[key] === this.filterItems[key]) {
is_satis = true; is_satis = true;
continue; continue;
} else { } else {
@@ -143,21 +233,41 @@ export class AirportComponent implements OnInit {
} }
return is_satis; return is_satis;
}) })
this.selectedFilterData = filter_data;
if (this.FLT_POS === 1) { if (this.FLT_POS === 1) {
this.inputFilter(this.render_data); this.inputFilter(filter_data);
} else { } else {
this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} }; this.wait_render_data = filter_data;
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 airport = this.wait_render_data[i];
if (airport['airportCodeIata'] === this.row_state.airportCodeIata) {
this.row_state = airport;
hasSelectedRow = true;
break;
}
}
if (!hasSelectedRow) {
if (this.render_data.length > 0) {
this.row_state = this.render_data[0];
}
}
this.operateSpinServiceService.hideSpin();
} }
} }
//输入框筛选 //输入框筛选
inputFilter(filterData) { inputFilter(filterData) {
if (this.SEARCH) { if (this.LASTSEARCH) {
if (this.SEL_COL) { if (this.LAST_SEL_COL) {
let sel_col = this.SEL_COL; let sel_col = this.LAST_SEL_COL;
this.render_data = filterData.filter(item => { filterData = filterData.filter(item => {
if (item[sel_col]) { if (item[sel_col]) {
if (item[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) { if (item[sel_col].toString().match(new RegExp(this.LASTSEARCH, 'i'))) {
return true; return true;
} }
} else { } else {
@@ -165,12 +275,12 @@ export class AirportComponent implements OnInit {
} }
}) })
} else { } else {
this.render_data = filterData.filter(item => { filterData = filterData.filter(item => {
let is_satis = false; let is_satis = false;
let cols = this.col_lists; let cols = this.render_col_lists;
for (let i = 0; i < cols.length; i++) { for (let i = 0; i < cols.length; i++) {
if (item[cols[i].col_code]) { 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']].toString().match(new RegExp(this.LASTSEARCH, 'i'))) {
is_satis = true; is_satis = true;
break; break;
} else { } else {
@@ -185,72 +295,174 @@ export class AirportComponent implements OnInit {
return is_satis; 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 airport = this.wait_render_data[i];
if (airport['airportCodeIata'] === this.row_state.airportCodeIata) {
this.row_state = airport;
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; positionArrayIndex: number = 0;
//输入框定位 //输入框定位
inputPosition(filterData) { inputPosition(filterData) {
let transArray = [] let hasSearchData: boolean = false;
let hasPositionedEle: boolean = false;
if (this.SEL_COL) { if (this.SEL_COL) {
let sel_col = this.SEL_COL; let sel_col = this.SEL_COL;
filterData.forEach(element => { for (let i = 0; i < filterData.length; i++) {
if (element[sel_col]) { if (i === filterData.length - 1) {
if (element[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) { this.positionedArray = [];
transArray.push(element) 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.airportCodeIata === fliterElement.airportCodeIata);
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 { } else {
if (!this.SEARCH) { 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.airportCodeIata === fliterElement.airportCodeIata);
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 { } else {
filterData.forEach(element => { let cols = this.render_col_lists;
let cols = this.col_lists; for (let i = 0; i < filterData.length; i++) {
for (let i = 0; i < cols.length; i++) { if (i === filterData.length - 1) {
if (element[cols[i].col_code]) { this.positionedArray = [];
if (element[cols[i].col_code].toString().match(new RegExp(this.SEARCH, 'i'))) { this.positionArrayIndex = 0;
transArray.push(element) }
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.airportCodeIata === filterElement.airportCodeIata);
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; break;
} else { } else {
continue; continue;
} }
} else { } else {
if (this.SEARCH) { if (!this.SEARCH) {
continue; let hasThisEle: boolean = false;
} else { hasSearchData = true;
transArray.push(element) for (let k = 0; k < this.positionedArray.length; k++) {
let positionedElement = this.positionedArray[k];
let diffResult = (positionedElement.airportCodeIata === filterElement.airportCodeIata);
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; break;
} else {
continue;
} }
} }
} }
}); if (positionIsOk) {
break;
}
}
} }
if (transArray.length > 0) { if (!hasSearchData) {
if (transArray.toString() == this.positionArray.toString()) { alert("没有搜索到相关数据");
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(); if (hasPositionedEle) {
let tr = $(".selected"); const scrollTop = this.positionArrayIndex * this.trItemHeight
let objTr = tr[0]; this.tableBody.nativeElement.scrollTop = scrollTop;
if (objTr) {
$("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
} }
} }
/**
* 重置定位数组
*/
resetPositionArray() {
this.positionedArray = [];
this.positionArrayIndex = 0;
}
} }
src/app/pages/basic-data/carousel/carousel.component.ts
+1 -1
View File
@@ -134,7 +134,7 @@ export class CarouselComponent implements OnInit {
setWidth(isLast) { setWidth(isLast) {
if (isLast) { if (isLast) {
$(".table-body tbody>tr").eq(0).find('td').each((index, element) => { $(".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'); $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px');
}) })
if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) {
this.tableHead.nativeElement.style.overflowY = 'auto'; this.tableHead.nativeElement.style.overflowY = 'auto';
src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts
+1 -1
View File
@@ -152,7 +152,7 @@ export class CheckinDeskComponent implements OnInit {
setWidth(isLast) { setWidth(isLast) {
if (isLast) { if (isLast) {
$(".table-body tbody>tr").eq(0).find('td').each((index, element) => { $(".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'); $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px');
}) })
if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) {
this.tableHead.nativeElement.style.overflowY = 'auto'; this.tableHead.nativeElement.style.overflowY = 'auto';
src/app/pages/basic-data/checkin-group/checkin-group.component.ts
+1 -1
View File
@@ -86,7 +86,7 @@ export class CheckinGroupComponent implements OnInit {
setWidth(isLast) { setWidth(isLast) {
if (isLast) { if (isLast) {
$(".table-body tbody>tr").eq(0).find('td').each((index, element) => { $(".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'); $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px');
}) })
if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) {
this.tableHead.nativeElement.style.overflowY = 'auto'; this.tableHead.nativeElement.style.overflowY = 'auto';
src/app/pages/basic-data/chut/chut.component.ts
+1 -1
View File
@@ -85,7 +85,7 @@ export class ChutComponent implements OnInit {
setWidth(isLast) { setWidth(isLast) {
if (isLast) { if (isLast) {
$(".table-body tbody>tr").eq(0).find('td').each((index, element) => { $(".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'); $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px');
}) })
if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) {
this.tableHead.nativeElement.style.overflowY = 'auto'; this.tableHead.nativeElement.style.overflowY = 'auto';
src/app/pages/basic-data/gate/gate.component.ts
+1 -1
View File
@@ -133,7 +133,7 @@ export class GateComponent implements OnInit {
setWidth(isLast) { setWidth(isLast) {
if (isLast) { if (isLast) {
$(".table-body tbody>tr").eq(0).find('td').each((index, element) => { $(".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'); $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px');
}) })
if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) {
this.tableHead.nativeElement.style.overflowY = 'auto'; this.tableHead.nativeElement.style.overflowY = 'auto';
src/app/pages/basic-data/stand/stand.component.ts
+1 -1
View File
@@ -137,7 +137,7 @@ export class StandComponent implements OnInit {
setWidth(isLast) { setWidth(isLast) {
if (isLast) { if (isLast) {
$(".table-body tbody>tr").eq(0).find('td').each((index, element) => { $(".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'); $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px');
}) })
if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) {
this.tableHead.nativeElement.style.overflowY = 'auto'; this.tableHead.nativeElement.style.overflowY = 'auto';
src/app/pages/basic-data/terminal/terminal.component.ts
+1 -1
View File
@@ -85,7 +85,7 @@ export class TerminalComponent implements OnInit {
setWidth(isLast) { setWidth(isLast) {
if (isLast) { if (isLast) {
$(".table-body tbody>tr").eq(0).find('td').each((index, element) => { $(".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'); $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px');
}) })
if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) {
this.tableHead.nativeElement.style.overflowY = 'auto'; this.tableHead.nativeElement.style.overflowY = 'auto';
src/app/pages/historical-data/historical-data.component.ts
+1 -1
View File
@@ -229,7 +229,7 @@ export class HistoricalDataComponent implements OnInit {
setWidth(isLast) { setWidth(isLast) {
if (isLast) { if (isLast) {
$(".table-body tbody>tr").eq(0).find('td').each((index, element) => { $(".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'); $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px');
}) })
if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) {
this.tableHead.nativeElement.style.overflowY = 'auto'; this.tableHead.nativeElement.style.overflowY = 'auto';
src/app/pages/main/main.component.ts
+1 -1
View File
@@ -293,7 +293,7 @@ export class MainComponent implements OnInit {
setWidth(isLast) { setWidth(isLast) {
if (isLast) { if (isLast) {
$(".table-body tbody>tr").eq(0).find('td').each((index, element) => { $(".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'); $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px');
}) })
if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) {
this.tableHead.nativeElement.style.overflowY = 'auto'; this.tableHead.nativeElement.style.overflowY = 'auto';
src/app/pages/seasonal-plan/seasonal-plan.component.ts
+1 -1
View File
@@ -316,7 +316,7 @@ export class SeasonalPlanComponent implements OnInit {
setWidth(isLast) { setWidth(isLast) {
if (isLast) { if (isLast) {
$(".table-body tbody>tr").eq(0).find('td').each((index, element) => { $(".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'); $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px');
}) })
if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) {
this.tableHead.nativeElement.style.overflowY = 'auto'; this.tableHead.nativeElement.style.overflowY = 'auto';