基础数据查询二次优化修改

This commit is contained in:
zhouyuejun
2018-12-04 18:16:01 +08:00
parent f46835b33b
commit 47d5d8b223
38 changed files with 2046 additions and 2682 deletions
@@ -5,11 +5,7 @@
<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="">
<option value="">选择列名</option>
<option value="standCode">机位代码</option>
<option value="standName">机位名称</option>
<option value="standType">机位类型</option>
<option value="standStatus">资源状态</option>
<option value="terminalAreaName">航站楼区域</option>
<option *ngFor="let col of col_lists" [value]="col.col_code">{{col.col_chn}}</option>
</select>
<label class="radio-inline custom-radio nowrap mr-4">
<input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
@@ -21,11 +17,6 @@
</label>
<input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()" id="inputerInfo">
</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>
<button type="button" class="btn btn-info mr-3">打印</button> -->
<!-- <button type="button" class="btn btn-info mr-3">刷新</button> -->
</div>
</div>
<div class="second-condition mb-3 row">
@@ -34,9 +25,6 @@
<select class="form-control" [(ngModel)]="filterItems.terminalAreaCode" (ngModelChange)="selectChange()" id="qy">
<option value=""></option>
<option *ngFor="let items of terminalAreas" [value]="items.terminalAreaCode">{{items.terminalAreaName}}</option>
<!-- <option value="GH">国内区域</option>
<option value="CH">国际区域</option>
<option value="QH">其他区域</option> -->
</select>
</div>
<div class="input-container mr-4">
@@ -77,7 +65,6 @@
<th>机位类型</th>
<th>资源状态</th>
<th>航站楼区域</th>
<!-- <th *ngFor="let airline_col of stand_lists">{{airline_col.COL_CN}}</th> -->
</tr>
</thead>
<tbody>
@@ -88,8 +75,7 @@
<td>{{stand.standName}}</td>
<td>{{stand.standType}}</td>
<td>{{stand.standStatus}}</td>
<td>{{stand.terminalAreaName}}</td>
<!-- <td *ngFor="let airline_col of stand_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td> -->
<td>{{stand.terminalAreaCode|terminalArea}}</td>
</tr>
</tbody>
</table>
+147 -282
View File
@@ -1,175 +1,93 @@
import { Component, OnInit } from '@angular/core';
import { HttpClientService } from '../../../services/http-client.service';
import { BasicDataService } from '../../basic-data-service'
import { HttpParams } from '@angular/common/http';
import { BasicDataService } from '../../basic-data-service';
import * as $ from 'jquery';
@Component({
selector: 'app-stand',
templateUrl: './stand.component.html',
styleUrls: ['./stand.component.scss']
selector: 'app-stand',
templateUrl: './stand.component.html',
styleUrls: ['./stand.component.scss']
})
export class StandComponent implements OnInit {
constructor(
private httpCilent: HttpClientService,
private basicDataService: BasicDataService
) { }
constructor(
private basicDataService: BasicDataService
) { }
// 搜索条件
SEARCH = ''; //手动输入条件
FLT_POS = 1; //过滤还是定位
SEL_COL = ''; //选择列名
public col_lists = [
{ col_code: 'standCode', col_chn: '机位代码' },
{ col_code: 'standName', col_chn: '机位名称' },
{ col_code: 'standType', col_chn: '机位类型' },
{ col_code: 'standStatus', col_chn: '资源状态' },
{ col_code: 'terminalAreaCode', col_chn: '航站楼区域' },
]
//下拉框
public filterItems = {
terminalAreaCode:'',
standType:'',
standStatus:'',
}
// 搜索条件
SEARCH = ''; //手动输入条件
FLT_POS = 1; //过滤还是定位
SEL_COL = ''; //选择列名
terminalAreas : Array<any>; //所属航站楼区域
stands : Array<any>;
public row_state: any = { renderFlight: {} };
public render_data: Array<object> = []; //显示数据,即需要显示的数据
public return_data: Array<object> = []; //下拉框显示数据
ngOnInit() {
this.stands = this.basicDataService.stand;
this.basicDataService.stand_subject.subscribe(
data=>{
this.stands = data;
this.render_data = this.stands;
if(this.terminalAreas && this.terminalAreas.length>0){//所属航站楼区域数据转换处理
this.terminalAreasHandle();
//下拉框
public filterItems = {
terminalAreaCode: '',
standType: '',
standStatus: '',
}
terminalAreas: Array<any>; //所属航站楼区域
stands: Array<any>;
public row_state: any = { renderFlight: {} };
public render_data: Array<object> = []; //显示数据,即需要显示的数据
ngOnInit() {
this.terminalAreas = this.basicDataService.terminal_area;
this.stands = this.basicDataService.stand;
this.render_data = this.basicDataService.stand;
this.basicDataService.stand_subject.subscribe(
data => {
this.stands = data;
this.render_data = data;
}
this.render_data.forEach(element => {//机位类型列表显示数据转换
if (element['standType'] == 'bridge') {
element['standType'] = '靠桥机位'
return element['standType'];
}
if(element['standType'] == 'remote'){
element['standType'] = '远机位'
return element['standType'];
}
if(element['standType'] == 'near'){
element['standType'] = '近机位'
return element['standType'];
}
if(element['standType'] == 'night'){
element['standType'] = '过夜机位'
return element['standType'];
}
if(element['standType'] == 'specific'){
element['standType'] = '专机位'
return element['standType'];
}
});
this.render_data.forEach(element => {//资源状态列表显示数据转换
if (element['standStatus'] == '0') {
element['standStatus'] = '可用'
return element['standStatus'];
}
if(element['standStatus'] == '1'){
element['standStatus'] = '在用'
return element['standStatus'];
}
if(element['standStatus'] == '2'){
element['standStatus'] = '锁定'
return element['standStatus'];
}
if(element['standStatus'] == '3'){
element['standStatus'] = '禁用'
return element['standStatus'];
}
if(element['standStatus'] == '4'){
element['standStatus'] = '预分'
return element['standStatus'];
}
});
)
this.basicDataService.terminal_area_subject.subscribe(
data => {
this.terminalAreas = data;
}
)
/**
* 固定表头
*/
var tableCont = document.querySelector('#table-container');
function scrollHandle() {
var scrollTop = this.scrollTop;
this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
}
)
//所属航站楼区域
this.terminalAreas = this.basicDataService.terminal_area;
this.basicDataService.terminal_area_subject.subscribe(
data=>{
this.terminalAreas = data;
tableCont.addEventListener('scroll', scrollHandle);
}
//输入框回车事件
inputEnter() {
if (this.FLT_POS === 1) {
this.selectChange()
} else {
this.inputPosition(this.render_data)
}
)
}
/**
* 固定表头
* 选中某行
* @param i
*/
var tableCont = document.querySelector('#table-container');
function scrollHandle (){
var scrollTop = this.scrollTop;
this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
selectRow(i) {
this.row_state = i;
}
tableCont.addEventListener('scroll',scrollHandle);
}
//所属航站楼区域数据转换处理
terminalAreasHandle() {
this.render_data.forEach(item => {
let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']);
item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName;
})
}
//输入框回车事件
inputEnter() {
if (this.FLT_POS === 1) {
this.inputFilter(this.stands)
} else {
this.inputFilter(this.stands)
this.inputPosition(this.stands)
}
}
/**
* 选中某行
* @param i
*/
selectRow(i) {
this.row_state = i;
}
//下拉框选择筛选
selectChange() {
this.return_data = this.stands.filter(item=>{
//下拉框选择筛选
selectChange() {
this.render_data = this.stands.filter(item => {
let is_satis = true;
//资源状态
if (item['standStatus'] == '可用') {
item['standStatus'] = '0'
}
if(item['standStatus'] == '在用'){
item['standStatus'] = '1'
}
if(item['standStatus'] == '锁定'){
item['standStatus'] = '2'
}
if(item['standStatus'] == '禁用'){
item['standStatus'] = '3'
}
if(item['standStatus'] == '预分'){
item['standStatus'] = '4'
}
//机位类型
if (item['standType'] == '靠桥机位') {
item['standType'] = 'bridge'
}
if(item['standType'] == '远机位'){
item['standType'] = 'remote'
}
if(item['standType'] == '近机位'){
item['standType'] = 'near'
}
if(item['standType'] == '过夜机位'){
item['standType'] = 'night'
}
if(item['standType'] == '专机位'){
item['standType'] = 'specific'
}
for (const key in this.filterItems) {
if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
if (item[key] === +this.filterItems[key] || item[key] === this.filterItems[key]) {
if (item[key] == this.filterItems[key]) {
is_satis = true;
continue;
} else {
@@ -179,80 +97,36 @@ selectChange() {
}
}
return is_satis;
})
this.return_data.forEach(element => { //机位类型列表显示数据转换
if (element['standType'] == 'bridge') {
element['standType'] = '靠桥机位'
return element['standType'];
}
if(element['standType'] == 'remote'){
element['standType'] = '远机位'
return element['standType'];
}
if(element['standType'] == 'near'){
element['standType'] = '近机位'
return element['standType'];
}
if(element['standType'] == 'night'){
element['standType'] = '过夜机位'
return element['standType'];
}
if(element['standType'] == 'specific'){
element['standType'] = '专机位'
return element['standType'];
}
});
this.return_data.forEach(element => { //资源状态列表显示数据转换
if (element['standStatus'] == '0') {
element['standStatus'] = '可用'
return element['standStatus'];
}
if(element['standStatus'] == '1'){
element['standStatus'] = '在用'
return element['standStatus'];
}
if(element['standStatus'] == '2'){
element['standStatus'] = '锁定'
return element['standStatus'];
}
if(element['standStatus'] == '3'){
element['standStatus'] = '禁用'
return element['standStatus'];
}
if(element['standStatus'] == '4'){
element['standStatus'] = '预分'
return element['standStatus'];
}
});
this.render_data = this.return_data;
}
//输入框筛选
inputFilter(filterData) {
if (this.SEARCH) {
if (this.SEL_COL) {
let sel_col = this.SEL_COL;
filterData = filterData.filter(item => {
if (item[sel_col]) {
if (item[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
return true;
}
} else {
if (this.SEARCH) {
return false;
} else {
return true;
}
}
})
})
if (this.FLT_POS === 1) {
this.inputFilter(this.render_data);
} else {
filterData = filterData.filter(item => {
let is_satis = false;
for (const key in item) {
if (item.hasOwnProperty(key)) {
if (item[key]) {
if (item[key].toString().match(new RegExp(this.SEARCH, 'i'))) {
this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
}
}
//输入框筛选
inputFilter(filterData) {
if (this.SEARCH) {
if (this.SEL_COL) {
let sel_col = this.SEL_COL;
this.render_data = filterData.filter(item => {
if (item[sel_col]) {
if (item[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
return true;
}
} else {
return false;
}
})
} else {
this.render_data = filterData.filter(item => {
let is_satis = false;
let cols = this.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'))) {
is_satis = true;
break;
} else {
@@ -260,50 +134,42 @@ inputFilter(filterData) {
continue;
}
} else {
if (this.SEARCH) {
is_satis = false;
continue;
} else {
is_satis = true;
break;
}
is_satis = false;
continue;
}
} else {
continue;
}
}
return is_satis;
})
return is_satis;
})
}
} else {
this.render_data = filterData;
}
}
this.render_data = filterData;
this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
}
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[sel_col]) {
if (element[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
transArray.push(element)
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[sel_col]) {
if (element[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
transArray.push(element)
}
} else {
if (!this.SEARCH) {
transArray.push(element)
}
}
} else {
if (!this.SEARCH) {
transArray.push(element)
}
}
});
} else {
filterData.forEach(element => {
for (const key in element) {
if (element.hasOwnProperty(key)) {
if (element[key]) {
if (element[key].toString().match(new RegExp(this.SEARCH, 'i'))) {
});
} 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)
break;
} else {
@@ -317,31 +183,30 @@ inputPosition(filterData) {
break;
}
}
} else {
continue;
}
}
});
}
});
}
if (transArray.length > 0) {
if (transArray.toString() == this.positionArray.toString()) {
this.positionArrayIndex++;
if (this.positionArrayIndex === this.positionArray.length) {
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];
}
this.row_state = this.positionArray[this.positionArrayIndex];
} else {
this.positionArray = transArray;
this.positionArrayIndex = 0;
this.row_state = this.positionArray[this.positionArrayIndex];
alert('没有搜索到相关数据');
}
} else {
alert('没有搜索到相关数据');
}
let tr = $(".selected");
let objTr = tr[0];
$("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
if (objTr) {
$("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
}
}
}