From 0422cb83b03734feb6492b33ac39b11ad073e56b Mon Sep 17 00:00:00 2001 From: zhouyuejun <505127606@qq.com> Date: Wed, 20 Feb 2019 14:10:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E4=B9=8B?= =?UTF-8?q?=E8=A1=8C=E6=9D=8E=E8=BD=AC=E7=9B=98=E4=BF=AE=E6=94=B9=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carousel/carousel.component.html | 57 +- .../basic-data/carousel/carousel.component.ts | 495 ++++++++++++------ .../pages/basic-data/gate/gate.component.ts | 8 +- 3 files changed, 381 insertions(+), 179 deletions(-) diff --git a/src/app/pages/basic-data/carousel/carousel.component.html b/src/app/pages/basic-data/carousel/carousel.component.html index d7235fa..20f6097 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.html +++ b/src/app/pages/basic-data/carousel/carousel.component.html @@ -1,11 +1,12 @@
-
-
+
+
- - + - +
@@ -44,27 +46,30 @@
-
- - - - - - - - - - - - - - - - - - - -
序号行李转盘代码行李转盘名称航站楼区域资源状态
{{i+1}}{{carousel.carouselCode}}{{carousel.carouselName}}{{carousel.terminalAreaName}}{{carousel.carouselStatus}}
+
+
+ + + + + + + +
序号{{col.COL_CN}}
+
+
+
+ + + + + + + + + +
{{start+i+1}}{{carousel[col.COL_CODE]}}
+
diff --git a/src/app/pages/basic-data/carousel/carousel.component.ts b/src/app/pages/basic-data/carousel/carousel.component.ts index f4add6d..c4c8dfd 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.ts +++ b/src/app/pages/basic-data/carousel/carousel.component.ts @@ -1,144 +1,221 @@ -import { Component, OnInit } from '@angular/core'; -import { BasicDataService } from '../../../services/basic-data-service' -import { ChangeDetectorRef } from '@angular/core'; +import { Component, OnInit, ViewChild, Renderer2 } from '@angular/core'; +import { BasicDataService } from '../../../services/basic-data-service'; +import { OperateSpinServiceService } from '../../../services/operate-spin-service.service'; import * as $ from 'jquery'; @Component({ selector: 'app-carousel', templateUrl: './carousel.component.html', - styleUrls: ['./carousel.component.scss'] + styleUrls: ['../basic.scss'] }) export class CarouselComponent implements OnInit { constructor( + private renderer2: Renderer2, private basicDataService: BasicDataService, - private changeDetectorRef: ChangeDetectorRef - ) { } + private operateSpinServiceService: OperateSpinServiceService, + ) { + this.operateSpinServiceService.showSpin(); + } - public col_lists = [ - { col_code: 'carouselCode', col_chn: '行李转盘代码' }, - { col_code: 'carouselName', col_chn: '行李转盘名称' }, - { col_code: 'terminalAreaName', col_chn: '航站楼区域' }, - { col_code: 'carouselStatus', col_chn: '资源状态' }, + public render_col_lists = [ + { COL_CODE: 'carouselCode', COL_CN: '行李转盘代码', COL_WIDTH: "125px" }, + { COL_CODE: 'carouselName', COL_CN: '行李转盘名称', COL_WIDTH: "125px" }, + { COL_CODE: 'terminalAreaName', COL_CN: '航站楼区域', COL_WIDTH: "120px" }, + { COL_CODE: 'carouselStatus', COL_CN: '资源状态', COL_WIDTH: "120px" }, ] // 搜索条件 SEARCH = ''; //手动输入条件 + LASTSEARCH = ''; FLT_POS = 1; //过滤还是定位 SEL_COL = ''; //选择列名 + LAST_SEL_COL = ''; //下拉框 public filterItems = { terminalAreaCode: '', carouselStatus: '', } - terminalAreas: Array; //所属航站楼区域 - carousels: Array; - public row_state: any = { renderFlight: {} }; + public terminalAreas: Array; //所属航站楼区域 + public carousels: Array; + + public wait_render_data: Array = []; public render_data: Array = []; //显示数据，即需要显示的数据 + public selectedFilterData: Array = []; + + 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() { - this.terminalAreas = this.basicDataService.terminal_area; + window.onresize = function () { + this.calcVisibleCount(); + }.bind(this) + 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.initCarouselStauts(); - } - ); - this.basicDataService.terminal_area_subject.subscribe( - data => { - this.terminalAreas = data; - //航站楼区域数据转换处理 - if(this.terminalAreas && this.terminalAreas.length > 0){ - this.basicDataTransHandle(); + this.terminalAreas = this.basicDataService.terminal_area; + + if (this.terminalAreas && Array.isArray(this.terminalAreas)) { + this.dataTransfer(); + } else { + this.basicDataService.carousel_subject.subscribe( + data => { + this.carousels = data; } - } - ); - if(this.render_data){ - //航站楼区域数据转换处理 - this.basicDataTransHandle(); - //资源状态列表显示数据转换 - this.initCarouselStauts(); + ) + this.basicDataService.terminal_area_subject.subscribe( + data => { + this.terminalAreas = data; + this.dataTransfer(); + } + ) } - /** - * 固定表头 - */ - 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() { - this.render_data.forEach(item => { - let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']); - if(this.terminalAreas[terminalAreasLinkIndex]){ - 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) + terminalAreaTransHandle(item) { + let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']); + if (this.terminalAreas[terminalAreasLinkIndex]) { + item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName; } } //资源状态列表显示数据转换 - initCarouselStauts(){ - this.render_data.forEach(item =>{ - if(item['carouselStatus'] == '0'){ - item['carouselStatus'] = '可用'; - }else if(item['carouselStatus'] == '1'){ - item['carouselStatus'] = '在用'; - }else if(item['carouselStatus'] == '2'){ - item['carouselStatus'] = '锁定'; - }else if(item['carouselStatus'] == '3'){ - item['carouselStatus'] = '禁用'; - }else if(item['carouselStatus'] == '4'){ - item['carouselStatus'] = '预分'; - } - return item['carouselStatus']; + initGateStatus(element) { + if (element['gateStatus'] == '0') { + element['gateStatus'] = '可用' + } else if (element['gateStatus'] == '1') { + element['gateStatus'] = '在用' + } else if (element['gateStatus'] == '2') { + element['gateStatus'] = '锁定' + } else if (element['gateStatus'] == '3') { + element['gateStatus'] = '禁用' + } else if (element['gateStatus'] == '4') { + element['gateStatus'] = '预分' + } + } + + /** + * 数据转换显示统一处理 + */ + 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() { - this.render_data = this.carousels.filter(item => { - if(item['carouselStatus'] == '可用'){ - item['carouselStatus'] = '0'; - }else if(item['carouselStatus'] == '在用'){ - item['carouselStatus'] = '1'; - }else if(item['carouselStatus'] == '锁定'){ - item['carouselStatus'] = '2'; - }else if(item['carouselStatus'] == '禁用'){ - item['carouselStatus'] = '3' - }else if(item['carouselStatus'] == '预分'){ - item['carouselStatus'] = '4' - } + this.operateSpinServiceService.showSpin(); + this.positionedArray = []; + this.positionArrayIndex = 0; + let filter_data = this.carousels.filter(item => { let is_satis = true; for (const key in this.filterItems) { if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) { - if (item[key] == this.filterItems[key]) { + if (item[key] === this.filterItems[key]) { is_satis = true; continue; } else { @@ -149,24 +226,42 @@ export class CarouselComponent implements OnInit { } return is_satis; }) - //资源状态列表显示数据转换 - this.initCarouselStauts(); + this.selectedFilterData = filter_data; + + if (this.FLT_POS === 1) { - this.inputFilter(this.render_data); + this.inputFilter(filter_data); } 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) { - if (this.SEARCH) { - if (this.SEL_COL) { - let sel_col = this.SEL_COL; - this.render_data = filterData.filter(item => { + if (this.LASTSEARCH) { + if (this.LAST_SEL_COL) { + let sel_col = this.LAST_SEL_COL; + filterData = filterData.filter(item => { 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; } } else { @@ -174,12 +269,12 @@ export class CarouselComponent implements OnInit { } }) } else { - this.render_data = filterData.filter(item => { + filterData = filterData.filter(item => { let is_satis = false; - let cols = this.col_lists; + let cols = this.render_col_lists; for (let i = 0; i < cols.length; i++) { - if (item[cols[i].col_code]) { - if (item[cols[i].col_code].toString().match(new RegExp(this.SEARCH, 'i'))) { + if (item[cols[i]['COL_CODE']]) { + if (item[cols[i]['COL_CODE']].toString().match(new RegExp(this.LASTSEARCH, 'i'))) { is_satis = true; break; } else { @@ -194,72 +289,174 @@ export class CarouselComponent implements OnInit { return is_satis; }) } - } else { - this.render_data = filterData; } + this.wait_render_data = filterData; + this.render_data = this.wait_render_data.slice(this.start, this.end); + + let hasSelectedRow: boolean = false; + for (let i = 0; i < this.wait_render_data.length; i++) { + let 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 = []; + positionedArray: Array = []; positionArrayIndex: number = 0; //输入框定位 inputPosition(filterData) { - let transArray = [] + let hasSearchData: boolean = false; + let hasPositionedEle: boolean = false; if (this.SEL_COL) { let sel_col = this.SEL_COL; - filterData.forEach(element => { - if (element[sel_col]) { - if (element[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) { - transArray.push(element) + for (let i = 0; i < filterData.length; i++) { + if (i === filterData.length - 1) { + this.positionedArray = []; + this.positionArrayIndex = 0; + } + let fliterElement = filterData[i]; + if (fliterElement[sel_col]) { + if (fliterElement[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) { + let hasThisEle: boolean = false; + hasSearchData = true; + for (let k = 0; k < this.positionedArray.length; k++) { + let positionedElement = this.positionedArray[k]; + let diffResult = (positionedElement.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 { 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 { - 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) + let cols = this.render_col_lists; + for (let i = 0; i < filterData.length; i++) { + if (i === filterData.length - 1) { + this.positionedArray = []; + this.positionArrayIndex = 0; + } + let positionIsOk: boolean = false; + let filterElement = filterData[i]; + for (let j = 0; j < cols.length; j++) { + let elementCol = cols[j]; + if (filterElement[elementCol['COL_CODE']]) { + if (filterElement[elementCol['COL_CODE']].toString().match(new RegExp(this.SEARCH, 'i'))) { + let hasThisEle: boolean = false; + hasSearchData = true; + for (let k = 0; k < this.positionedArray.length; k++) { + let positionedElement = this.positionedArray[k]; + let diffResult = (positionedElement.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; } else { continue; } } else { - if (this.SEARCH) { - continue; - } else { - transArray.push(element) + if (!this.SEARCH) { + let hasThisEle: boolean = false; + hasSearchData = true; + for (let k = 0; k < this.positionedArray.length; k++) { + let positionedElement = this.positionedArray[k]; + let diffResult = (positionedElement.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; + } else { + continue; } } } - }); - } - if (transArray.length > 0) { - if (transArray.toString() == this.positionArray.toString()) { - this.positionArrayIndex++; - if (this.positionArrayIndex === this.positionArray.length) { - this.positionArrayIndex = 0; + if (positionIsOk) { + break; } - 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; } } diff --git a/src/app/pages/basic-data/gate/gate.component.ts b/src/app/pages/basic-data/gate/gate.component.ts index 446b5dd..1597861 100644 --- a/src/app/pages/basic-data/gate/gate.component.ts +++ b/src/app/pages/basic-data/gate/gate.component.ts @@ -175,15 +175,15 @@ export class GateComponent implements OnInit { /** * 选中某行 - * @param i + * @param gate */ - selectRow(i) { - this.row_state = i; + selectRow(gate) { + this.row_state = gate; } /** * 判断当前行是否是选中的行,是则高亮 - * @param checkinGroup + * @param gate */ getSelectedRow(gate) { if (gate.gateCode === this.row_state.gateCode) {