基础数据查询二次优化修改
This commit is contained in:
zhouyuejun
@@ -1,84 +1,71 @@
|
||||
<div class="main-page">
|
||||
<div class="page-content">
|
||||
<div class="search-filter mb-3">
|
||||
<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="page-content">
|
||||
<div class="search-filter mb-3">
|
||||
<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="">
|
||||
<option value="">选择列名</option>
|
||||
<option value="carouselCode">行李转盘代码</option>
|
||||
<option value="carouselName">行李转盘名称</option>
|
||||
<option value="terminalAreaName">航站楼区域</option>
|
||||
<option value="carouselStatus">资源状态</option>
|
||||
<option value="">选择列名</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">
|
||||
<span>过滤</span>
|
||||
<input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
|
||||
<span>过滤</span>
|
||||
</label>
|
||||
<label class="radio-inline custom-radio nowrap mr-4">
|
||||
<input type="radio" [(ngModel)]="FLT_POS" [value]="2" name="filter-position">
|
||||
<span>查找定位</span>
|
||||
<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">
|
||||
</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>
|
||||
<input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter)="inputEnter()" id="inputerInfo">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="second-condition mb-3 row">
|
||||
<div class="input-container mr-4">
|
||||
<label for="terminalAreaCode">所属航站楼区域： </label>
|
||||
<select class="form-control" [(ngModel)]="filterItems.terminalAreaCode" (ngModelChange)="selectChange()" id="qy">
|
||||
<option value=""></option>
|
||||
<option *ngFor="let item of terminalAreas" [value]="item.terminalAreaCode" >{{item.terminalAreaName}}</option>
|
||||
<!-- <option value="GH">国内区域</option>
|
||||
<option value="CH">国际区域</option>
|
||||
<option value="QT">其他区域</option> -->
|
||||
</select>
|
||||
</div>
|
||||
<div class="input-container mr-4">
|
||||
<label for="carouselStatus">资源状态： </label>
|
||||
<select class="form-control" [(ngModel)]="filterItems.carouselStatus" (ngModelChange)="selectChange()" id="zy">
|
||||
<option value=""></option>
|
||||
<!-- <option *ngFor="let item of carousels" [value]="item.carouselStatus" >{{item.carouselStatus}}</option> -->
|
||||
<option value="0">可用</option>
|
||||
<option value="1">在用</option>
|
||||
<option value="2">锁定</option>
|
||||
<option value="3">禁用</option>
|
||||
<option value="4">预分</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="second-condition mb-3 row">
|
||||
<div class="input-container mr-4">
|
||||
<label for="terminalAreaCode">所属航站楼区域： </label>
|
||||
<select class="form-control" [(ngModel)]="filterItems.terminalAreaCode" (ngModelChange)="selectChange()"
|
||||
id="qy">
|
||||
<option value=""></option>
|
||||
<option *ngFor="let item of terminalAreas" [value]="item.terminalAreaCode">{{item.terminalAreaName}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="input-container mr-4">
|
||||
<label for="carouselStatus">资源状态： </label>
|
||||
<select class="form-control" [(ngModel)]="filterItems.carouselStatus" (ngModelChange)="selectChange()"
|
||||
id="zy">
|
||||
<option value=""></option>
|
||||
<option value="0">可用</option>
|
||||
<option value="1">在用</option>
|
||||
<option value="2">锁定</option>
|
||||
<option value="3">禁用</option>
|
||||
<option value="4">预分</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="airline-table">
|
||||
<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 carousel of render_data;let i = index" (click)="selectRow(carousel)"
|
||||
[ngClass]="{'selected':row_state===carousel}">
|
||||
<td>{{i+1}}</td>
|
||||
<td>{{carousel.carouselCode}}</td>
|
||||
<td>{{carousel.carouselName}}</td>
|
||||
<td>{{carousel.terminalAreaName}}</td>
|
||||
<td>{{carousel.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>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="airline-table">
|
||||
<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>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr *ngFor="let carousel of render_data;let i = index" (click)="selectRow(carousel)" [ngClass]="{'selected':row_state===carousel}">
|
||||
<td>{{i+1}}</td>
|
||||
<td>{{carousel.carouselCode}}</td>
|
||||
<td>{{carousel.carouselName}}</td>
|
||||
<td>{{carousel.terminalAreaCode|terminalArea}}</td>
|
||||
<td>{{carousel.carouselStatus}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,134 +1,91 @@
|
||||
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 * as $ from 'jquery';
|
||||
|
||||
@Component({
|
||||
selector: 'app-carousel',
|
||||
templateUrl: './carousel.component.html',
|
||||
styleUrls: ['./carousel.component.scss']
|
||||
selector: 'app-carousel',
|
||||
templateUrl: './carousel.component.html',
|
||||
styleUrls: ['./carousel.component.scss']
|
||||
})
|
||||
export class CarouselComponent implements OnInit {
|
||||
|
||||
constructor(
|
||||
private httpCilent: HttpClientService,
|
||||
private basicDataService: BasicDataService
|
||||
) { }
|
||||
constructor(
|
||||
private basicDataService: BasicDataService
|
||||
) { }
|
||||
|
||||
// 搜索条件
|
||||
SEARCH = ''; //手动输入条件
|
||||
FLT_POS = 1; //过滤还是定位
|
||||
SEL_COL = ''; //选择列名
|
||||
//下拉框
|
||||
public filterItems = {
|
||||
terminalAreaCode:'',
|
||||
carouselStatus:'',
|
||||
}
|
||||
terminalAreas:Array<any>; //所属航站楼区域
|
||||
carousels:Array<any>;
|
||||
public row_state: any = { renderFlight: {} };
|
||||
public render_data: Array<object> = []; //显示数据，即需要显示的数据
|
||||
public return_data: Array<object> = []; //下拉框显示数据
|
||||
ngOnInit() {
|
||||
this.carousels = this.basicDataService.carousel;
|
||||
this.basicDataService.carousel_subject.subscribe(
|
||||
data=>{
|
||||
this.carousels = data;
|
||||
this.render_data = this.carousels;
|
||||
if(this.terminalAreas && this.terminalAreas.length > 0){//所属航站楼区域数据显示处理
|
||||
this.terminalAreasHandle();
|
||||
public col_lists = [
|
||||
{ col_code: 'carouselCode', col_chn: '行李转盘代码' },
|
||||
{ col_code: 'carouselName', col_chn: '行李转盘名称' },
|
||||
{ col_code: 'terminalAreaCode', col_chn: '航站楼区域' },
|
||||
{ col_code: 'carouselStatus', col_chn: '资源状态' },
|
||||
]
|
||||
|
||||
// 搜索条件
|
||||
SEARCH = ''; //手动输入条件
|
||||
FLT_POS = 1; //过滤还是定位
|
||||
SEL_COL = ''; //选择列名
|
||||
|
||||
//下拉框
|
||||
public filterItems = {
|
||||
terminalAreaCode: '',
|
||||
carouselStatus: '',
|
||||
}
|
||||
terminalAreas: Array<any>; //所属航站楼区域
|
||||
carousels: Array<any>;
|
||||
|
||||
public row_state: any = { renderFlight: {} };
|
||||
public render_data: Array<object> = []; //显示数据，即需要显示的数据
|
||||
|
||||
ngOnInit() {
|
||||
this.terminalAreas = this.basicDataService.terminal_area;
|
||||
this.carousels = this.basicDataService.carousel;
|
||||
this.render_data = this.basicDataService.carousel;
|
||||
this.basicDataService.carousel_subject.subscribe(
|
||||
data => {
|
||||
this.carousels = data;
|
||||
this.render_data = data;
|
||||
}
|
||||
this.render_data.forEach(element => {//资源状态列表显示数据转换
|
||||
if (element['carouselStatus'] == '0') {
|
||||
element['carouselStatus'] = '可用'
|
||||
return element['carouselStatus'];
|
||||
}
|
||||
if(element['carouselStatus'] == '1'){
|
||||
element['carouselStatus'] = '在用'
|
||||
return element['carouselStatus'];
|
||||
}
|
||||
if(element['carouselStatus'] == '2'){
|
||||
element['carouselStatus'] = '锁定'
|
||||
return element['carouselStatus'];
|
||||
}
|
||||
if(element['carouselStatus'] == '3'){
|
||||
element['carouselStatus'] = '禁用'
|
||||
return element['carouselStatus'];
|
||||
}
|
||||
if(element['carouselStatus'] == '4'){
|
||||
element['carouselStatus'] = '预分'
|
||||
return element['carouselStatus'];
|
||||
}
|
||||
});
|
||||
);
|
||||
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);
|
||||
}
|
||||
|
||||
/**
|
||||
* 固定表头
|
||||
* 选中某行
|
||||
* @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;
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 选中某行
|
||||
* @param i
|
||||
*/
|
||||
selectRow(i) {
|
||||
this.row_state = i;
|
||||
}
|
||||
|
||||
//输入框回车事件
|
||||
inputEnter() {
|
||||
if (this.FLT_POS === 1) {
|
||||
this.inputFilter(this.carousels)
|
||||
} else {
|
||||
this.inputFilter(this.carousels)
|
||||
this.inputPosition(this.carousels)
|
||||
//输入框回车事件
|
||||
inputEnter() {
|
||||
if (this.FLT_POS === 1) {
|
||||
this.selectChange()
|
||||
} else {
|
||||
this.inputPosition(this.render_data)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//下拉框选择筛选
|
||||
selectChange() {
|
||||
this.return_data = this.carousels.filter(item=>{
|
||||
//下拉框选择筛选
|
||||
selectChange() {
|
||||
this.render_data = this.carousels.filter(item => {
|
||||
let is_satis = true;
|
||||
if (item['carouselStatus'] == '可用') {
|
||||
item['carouselStatus'] = '0'
|
||||
}
|
||||
if(item['carouselStatus'] == '在用'){
|
||||
item['carouselStatus'] = '1'
|
||||
}
|
||||
if(item['carouselStatus'] == '锁定'){
|
||||
item['carouselStatus'] = '2'
|
||||
}
|
||||
if(item['carouselStatus'] == '禁用'){
|
||||
item['carouselStatus'] = '3'
|
||||
}
|
||||
if(item['carouselStatus'] == '预分'){
|
||||
item['carouselStatus'] = '4'
|
||||
}
|
||||
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 {
|
||||
@@ -138,58 +95,37 @@ selectChange() {
|
||||
}
|
||||
}
|
||||
return is_satis;
|
||||
})
|
||||
this.return_data.forEach(element => {//资源状态列表显示数据转换
|
||||
if (element['carouselStatus'] == '0') {
|
||||
element['carouselStatus'] = '可用'
|
||||
return element['carouselStatus'];
|
||||
}
|
||||
if(element['carouselStatus'] == '1'){
|
||||
element['carouselStatus'] = '在用'
|
||||
return element['carouselStatus'];
|
||||
}
|
||||
if(element['carouselStatus'] == '2'){
|
||||
element['carouselStatus'] = '锁定'
|
||||
return element['carouselStatus'];
|
||||
}
|
||||
if(element['carouselStatus'] == '3'){
|
||||
element['carouselStatus'] = '禁用'
|
||||
return element['carouselStatus'];
|
||||
}
|
||||
if(element['carouselStatus'] == '4'){
|
||||
element['carouselStatus'] = '预分'
|
||||
return element['carouselStatus'];
|
||||
}
|
||||
});
|
||||
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 {
|
||||
@@ -197,50 +133,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 {
|
||||
@@ -254,31 +182,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");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user