基础数据之行李转盘修改优化
This commit is contained in:
@@ -1,11 +1,12 @@
|
|||||||
<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=""
|
||||||
|
id="">
|
||||||
<option value="">选择列名</option>
|
<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>
|
</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">
|
||||||
@@ -15,7 +16,8 @@
|
|||||||
<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="inputerInfo">
|
<input class="form-control" [(ngModel)]="SEARCH" (ngModelChange)="resetPositionArray()" type="text"
|
||||||
|
(keyup.enter)="inputEnter()" id="inputerInfo">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -44,27 +46,30 @@
|
|||||||
</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>
|
||||||
</tr>
|
</table>
|
||||||
</thead>
|
</div>
|
||||||
<tbody>
|
<div class="table-body" #tableBody (scroll)="handleScroll($event)">
|
||||||
<tr *ngFor="let carousel of render_data;let i = index" (click)="selectRow(carousel)" [ngClass]="{'selected':row_state===carousel}">
|
<div class="list-view-phantom" [ngStyle]="{ 'height': wait_render_data.length * 42 + 'px' }"></div>
|
||||||
<td>{{i+1}}</td>
|
<table #tableContent id="table" class="table table-striped">
|
||||||
<td>{{carousel.carouselCode}}</td>
|
<tbody>
|
||||||
<td>{{carousel.carouselName}}</td>
|
<ng-container *ngFor="let carousel of render_data;last as isLast;index as i">
|
||||||
<td>{{carousel.terminalAreaName}}</td>
|
<tr *ngIf="setWidth(isLast)" (click)="selectRow(carousel)" [ngClass]="{'selected':getSelectedRow(carousel)}">
|
||||||
<td>{{carousel.carouselStatus}}</td>
|
<td style="min-width:55px">{{start+i+1}}</td>
|
||||||
</tr>
|
<td *ngFor="let col of render_col_lists" [ngStyle]="{'min-width':col.COL_WIDTH}">{{carousel[col.COL_CODE]}}</td>
|
||||||
</tbody>
|
</tr>
|
||||||
</table>
|
</ng-container>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,144 +1,221 @@
|
|||||||
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-carousel',
|
selector: 'app-carousel',
|
||||||
templateUrl: './carousel.component.html',
|
templateUrl: './carousel.component.html',
|
||||||
styleUrls: ['./carousel.component.scss']
|
styleUrls: ['../basic.scss']
|
||||||
})
|
})
|
||||||
export class CarouselComponent implements OnInit {
|
export class CarouselComponent 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: 'carouselCode', col_chn: '行李转盘代码' },
|
{ COL_CODE: 'carouselCode', COL_CN: '行李转盘代码', COL_WIDTH: "125px" },
|
||||||
{ col_code: 'carouselName', col_chn: '行李转盘名称' },
|
{ COL_CODE: 'carouselName', COL_CN: '行李转盘名称', COL_WIDTH: "125px" },
|
||||||
{ col_code: 'terminalAreaName', col_chn: '航站楼区域' },
|
{ COL_CODE: 'terminalAreaName', COL_CN: '航站楼区域', COL_WIDTH: "120px" },
|
||||||
{ col_code: 'carouselStatus', col_chn: '资源状态' },
|
{ COL_CODE: 'carouselStatus', 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 = {
|
||||||
terminalAreaCode: '',
|
terminalAreaCode: '',
|
||||||
carouselStatus: '',
|
carouselStatus: '',
|
||||||
}
|
}
|
||||||
terminalAreas: Array<any>; //所属航站楼区域
|
|
||||||
carousels: Array<any>;
|
|
||||||
|
|
||||||
public row_state: any = { renderFlight: {} };
|
public terminalAreas: Array<any>; //所属航站楼区域
|
||||||
|
public carousels: Array<any>;
|
||||||
|
|
||||||
|
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.terminalAreas = this.basicDataService.terminal_area;
|
window.onresize = function () {
|
||||||
|
this.calcVisibleCount();
|
||||||
|
}.bind(this)
|
||||||
|
|
||||||
this.carousels = this.basicDataService.carousel;
|
this.carousels = this.basicDataService.carousel;
|
||||||
this.render_data = this.basicDataService.carousel;
|
this.terminalAreas = this.basicDataService.terminal_area;
|
||||||
this.basicDataService.carousel_subject.subscribe(
|
|
||||||
data => {
|
if (this.terminalAreas && Array.isArray(this.terminalAreas)) {
|
||||||
this.carousels = data;
|
this.dataTransfer();
|
||||||
this.render_data = data;
|
} else {
|
||||||
//资源状态列表显示数据转换
|
this.basicDataService.carousel_subject.subscribe(
|
||||||
this.initCarouselStauts();
|
data => {
|
||||||
}
|
this.carousels = data;
|
||||||
);
|
|
||||||
this.basicDataService.terminal_area_subject.subscribe(
|
|
||||||
data => {
|
|
||||||
this.terminalAreas = data;
|
|
||||||
//航站楼区域数据转换处理
|
|
||||||
if(this.terminalAreas && this.terminalAreas.length > 0){
|
|
||||||
this.basicDataTransHandle();
|
|
||||||
}
|
}
|
||||||
}
|
)
|
||||||
);
|
this.basicDataService.terminal_area_subject.subscribe(
|
||||||
if(this.render_data){
|
data => {
|
||||||
//航站楼区域数据转换处理
|
this.terminalAreas = data;
|
||||||
this.basicDataTransHandle();
|
this.dataTransfer();
|
||||||
//资源状态列表显示数据转换
|
}
|
||||||
this.initCarouselStauts();
|
)
|
||||||
}
|
}
|
||||||
/**
|
|
||||||
* 固定表头
|
|
||||||
*/
|
|
||||||
var tableCont = document.querySelector('#table-container');
|
|
||||||
function scrollHandle() {
|
|
||||||
var scrollTop = this.scrollTop;
|
|
||||||
this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
|
|
||||||
}
|
|
||||||
tableCont.addEventListener('scroll', scrollHandle);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//航站楼区域数据转换处理
|
//航站楼区域数据转换处理
|
||||||
basicDataTransHandle() {
|
terminalAreaTransHandle(item) {
|
||||||
this.render_data.forEach(item => {
|
let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']);
|
||||||
let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']);
|
if (this.terminalAreas[terminalAreasLinkIndex]) {
|
||||||
if(this.terminalAreas[terminalAreasLinkIndex]){
|
item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName;
|
||||||
item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 选中某行
|
|
||||||
* @param i
|
|
||||||
*/
|
|
||||||
selectRow(i) {
|
|
||||||
this.row_state = i;
|
|
||||||
}
|
|
||||||
|
|
||||||
//输入框回车事件
|
|
||||||
inputEnter() {
|
|
||||||
if (this.FLT_POS === 1) {
|
|
||||||
this.selectChange()
|
|
||||||
} else {
|
|
||||||
this.inputPosition(this.render_data)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//资源状态列表显示数据转换
|
//资源状态列表显示数据转换
|
||||||
initCarouselStauts(){
|
initGateStatus(element) {
|
||||||
this.render_data.forEach(item =>{
|
if (element['gateStatus'] == '0') {
|
||||||
if(item['carouselStatus'] == '0'){
|
element['gateStatus'] = '可用'
|
||||||
item['carouselStatus'] = '可用';
|
} else if (element['gateStatus'] == '1') {
|
||||||
}else if(item['carouselStatus'] == '1'){
|
element['gateStatus'] = '在用'
|
||||||
item['carouselStatus'] = '在用';
|
} else if (element['gateStatus'] == '2') {
|
||||||
}else if(item['carouselStatus'] == '2'){
|
element['gateStatus'] = '锁定'
|
||||||
item['carouselStatus'] = '锁定';
|
} else if (element['gateStatus'] == '3') {
|
||||||
}else if(item['carouselStatus'] == '3'){
|
element['gateStatus'] = '禁用'
|
||||||
item['carouselStatus'] = '禁用';
|
} else if (element['gateStatus'] == '4') {
|
||||||
}else if(item['carouselStatus'] == '4'){
|
element['gateStatus'] = '预分'
|
||||||
item['carouselStatus'] = '预分';
|
}
|
||||||
}
|
}
|
||||||
return item['carouselStatus'];
|
|
||||||
|
/**
|
||||||
|
* 数据转换显示统一处理
|
||||||
|
*/
|
||||||
|
dataTransfer() {
|
||||||
|
this.carousels.forEach(item => {
|
||||||
|
this.terminalAreaTransHandle(item);
|
||||||
})
|
})
|
||||||
|
|
||||||
|
this.wait_render_data = this.carousels;
|
||||||
|
this.selectedFilterData = this.carousels;
|
||||||
|
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).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 carousel
|
||||||
|
*/
|
||||||
|
selectRow(carousel) {
|
||||||
|
this.row_state = carousel;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断当前行是否是选中的行,是则高亮
|
||||||
|
* @param carousel
|
||||||
|
*/
|
||||||
|
getSelectedRow(carousel) {
|
||||||
|
if (carousel.carouselCode === this.row_state.carouselCode) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 输入框回车事件
|
||||||
|
inputEnter() {
|
||||||
|
if (this.FLT_POS === 1) {
|
||||||
|
this.LAST_SEL_COL = this.SEL_COL;
|
||||||
|
this.LASTSEARCH = this.SEARCH;
|
||||||
|
this.operateSpinServiceService.showSpin();
|
||||||
|
this.inputFilter(this.selectedFilterData);
|
||||||
|
} else {
|
||||||
|
this.inputPosition(this.wait_render_data)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//下拉框选择筛选
|
//下拉框选择筛选
|
||||||
selectChange() {
|
selectChange() {
|
||||||
this.render_data = this.carousels.filter(item => {
|
this.operateSpinServiceService.showSpin();
|
||||||
if(item['carouselStatus'] == '可用'){
|
this.positionedArray = [];
|
||||||
item['carouselStatus'] = '0';
|
this.positionArrayIndex = 0;
|
||||||
}else if(item['carouselStatus'] == '在用'){
|
let filter_data = this.carousels.filter(item => {
|
||||||
item['carouselStatus'] = '1';
|
|
||||||
}else if(item['carouselStatus'] == '锁定'){
|
|
||||||
item['carouselStatus'] = '2';
|
|
||||||
}else if(item['carouselStatus'] == '禁用'){
|
|
||||||
item['carouselStatus'] = '3'
|
|
||||||
}else if(item['carouselStatus'] == '预分'){
|
|
||||||
item['carouselStatus'] = '4'
|
|
||||||
}
|
|
||||||
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 {
|
||||||
@@ -149,24 +226,42 @@ export class CarouselComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
return is_satis;
|
return is_satis;
|
||||||
})
|
})
|
||||||
//资源状态列表显示数据转换
|
this.selectedFilterData = filter_data;
|
||||||
this.initCarouselStauts();
|
|
||||||
|
|
||||||
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 carousel = this.wait_render_data[i];
|
||||||
|
if (carousel['carouselCode'] === this.row_state.carouselCode) {
|
||||||
|
this.row_state = carousel;
|
||||||
|
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 {
|
||||||
@@ -174,12 +269,12 @@ export class CarouselComponent 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 {
|
||||||
@@ -194,72 +289,174 @@ export class CarouselComponent 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 carousel = this.wait_render_data[i];
|
||||||
|
if (carousel['carouselCode'] === this.row_state.carouselCode) {
|
||||||
|
this.row_state = carousel;
|
||||||
|
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.carouselCode === fliterElement.carouselCode);
|
||||||
|
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.carouselCode === fliterElement.carouselCode);
|
||||||
|
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.carouselCode === filterElement.carouselCode);
|
||||||
|
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.carouselCode === filterElement.carouselCode);
|
||||||
|
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 (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");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!hasSearchData) {
|
||||||
|
alert("没有搜索到相关数据");
|
||||||
|
}
|
||||||
|
if (hasPositionedEle) {
|
||||||
|
const scrollTop = this.positionArrayIndex * this.trItemHeight
|
||||||
|
this.tableBody.nativeElement.scrollTop = scrollTop;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 重置定位数组
|
||||||
|
*/
|
||||||
|
resetPositionArray() {
|
||||||
|
this.positionedArray = [];
|
||||||
|
this.positionArrayIndex = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -175,15 +175,15 @@ export class GateComponent implements OnInit {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 选中某行
|
* 选中某行
|
||||||
* @param i
|
* @param gate
|
||||||
*/
|
*/
|
||||||
selectRow(i) {
|
selectRow(gate) {
|
||||||
this.row_state = i;
|
this.row_state = gate;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 判断当前行是否是选中的行,是则高亮
|
* 判断当前行是否是选中的行,是则高亮
|
||||||
* @param checkinGroup
|
* @param gate
|
||||||
*/
|
*/
|
||||||
getSelectedRow(gate) {
|
getSelectedRow(gate) {
|
||||||
if (gate.gateCode === this.row_state.gateCode) {
|
if (gate.gateCode === this.row_state.gateCode) {
|
||||||
|
|||||||
Reference in New Issue
Block a user