From 5bc984da34285d3338b4c52939c2aa0931fc224f Mon Sep 17 00:00:00 2001 From: zhouyuejun <505127606@qq.com> Date: Wed, 20 Feb 2019 14:45:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E4=B9=8B?= =?UTF-8?q?=E6=9C=BA=E4=BD=8D=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic-data/stand/stand.component.html | 116 ++-- .../pages/basic-data/stand/stand.component.ts | 503 ++++++++++++------ 2 files changed, 401 insertions(+), 218 deletions(-) diff --git a/src/app/pages/basic-data/stand/stand.component.html b/src/app/pages/basic-data/stand/stand.component.html index d2fea81..145e3d3 100644 --- a/src/app/pages/basic-data/stand/stand.component.html +++ b/src/app/pages/basic-data/stand/stand.component.html @@ -1,42 +1,44 @@
-
-
-
-
- + + - -
-
- -
-
- - + +
-
+ +
+
+ + +
+
- -
-
+
+
- @@ -45,36 +47,36 @@ +
-
-
+
-
-
- - - - - - - - - - - - - - - - - - - - - -
序号机位代码机位名称机位类型资源状态航站楼区域
{{i+1}}{{stand.standCode}}{{stand.standName}}{{stand.standTypeDesc}}{{stand.standStatus}}{{stand.terminalAreaName}}
-
-
-
+
+
+
+ + + + + + + +
序号{{col.COL_CN}}
+
+
+
+ + + + + + + + + +
{{start+i+1}}{{stand[col.COL_CODE]}}
+
+
+
+ \ No newline at end of file diff --git a/src/app/pages/basic-data/stand/stand.component.ts b/src/app/pages/basic-data/stand/stand.component.ts index fd53a01..5901d13 100644 --- a/src/app/pages/basic-data/stand/stand.component.ts +++ b/src/app/pages/basic-data/stand/stand.component.ts @@ -1,31 +1,36 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild, Renderer2 } from '@angular/core'; import { BasicDataService } from '../../../services/basic-data-service'; -import { ChangeDetectorRef } from '@angular/core'; +import { OperateSpinServiceService } from '../../../services/operate-spin-service.service'; import * as $ from 'jquery'; @Component({ selector: 'app-stand', templateUrl: './stand.component.html', - styleUrls: ['./stand.component.scss'] + styleUrls: ['../basic.scss'] }) export class StandComponent implements OnInit { constructor( + private renderer2: Renderer2, private basicDataService: BasicDataService, - private changeDetectorRef: ChangeDetectorRef - ) { } + private operateSpinServiceService: OperateSpinServiceService, + ) { + this.operateSpinServiceService.showSpin(); + } - public col_lists = [ - { col_code: 'standCode', col_chn: '机位代码' }, - { col_code: 'standName', col_chn: '机位名称' }, - { col_code: 'standTypeDesc', col_chn: '机位类型' }, - { col_code: 'standStatus', col_chn: '资源状态' }, - { col_code: 'terminalAreaName', col_chn: '航站楼区域' }, + public render_col_lists = [ + { COL_CODE: 'standCode', COL_CN: '机位代码', COL_WIDTH: "120px" }, + { COL_CODE: 'standName', COL_CN: '机位名称', COL_WIDTH: "150px" }, + { COL_CODE: 'standTypeDesc', COL_CN: '机位类型', COL_WIDTH: "130px" }, + { COL_CODE: 'standStatus', COL_CN: '资源状态', COL_WIDTH: "120px" }, + { COL_CODE: 'terminalAreaName', COL_CN: '航站楼区域', COL_WIDTH: "120px" }, ] // 搜索条件 SEARCH = ''; //手动输入条件 + LASTSEARCH = ''; FLT_POS = 1; //过滤还是定位 SEL_COL = ''; //选择列名 + LAST_SEL_COL = ''; //下拉框 public filterItems = { @@ -34,133 +39,187 @@ export class StandComponent implements OnInit { standStatus: '', } - terminalAreas: Array; //所属航站楼区域 - standTypes: Array; //停机位类别 - stands: Array; - public row_state: any = { renderFlight: {} }; + public terminalAreas: Array; //所属航站楼区域 + public standTypes: Array; //停机位类别 + public stands: 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.stands = this.basicDataService.stand; this.standTypes = this.basicDataService.standType; - this.render_data = this.basicDataService.stand; - this.basicDataService.stand_subject.subscribe( - data => { - this.stands = data; - this.render_data = data; - this.initStandStatus();//资源状态列表显示数据转换 - } - ) - this.basicDataService.terminal_area_subject.subscribe( - data => { - this.terminalAreas = data; - //航站楼区域数据转换处理 - if(this.terminalAreas && this.terminalAreas.length > 0){ - this.terminalAreasHandle(); + this.terminalAreas = this.basicDataService.terminal_area; + + if (this.terminalAreas && Array.isArray(this.terminalAreas)) { + this.dataTransfer(); + } else { + this.basicDataService.stand_subject.subscribe( + data => { + this.stands = data; } - } - ) - this.basicDataService.standType_subject.subscribe( - data => { - this.standTypes = data; - //停机位类别 - if(this.standTypes && this.standTypes.length > 0){ - this.standTypesHandle(); + ) + this.basicDataService.standType_subject.subscribe( + data => { + this.standTypes = data; } - } - ) - if(this.render_data){ - //航站楼区域数据转换处理 - this.terminalAreasHandle(); - //停机位类别数据转换处理 - this.standTypesHandle(); - //资源状态列表显示数据转换 - this.initStandStatus(); + ) + 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); } //航站楼区域数据转换处理 - terminalAreasHandle() { - 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; - } - }) + terminalAreaTransHandle(item) { + let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']); + if (this.terminalAreas[terminalAreasLinkIndex]) { + item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName; + } } //停机位类别数据转换处理 - standTypesHandle() { - this.render_data.forEach(item => { - let standTypesLinkIndex = this.standTypes.findIndex(val => val.standType === item['standType']); - if(this.standTypes[standTypesLinkIndex]){ - item['standTypeDesc'] = this.standTypes[standTypesLinkIndex].standTypeDesc; - } - }) - } - - //输入框回车事件 - inputEnter() { - if (this.FLT_POS === 1) { - this.selectChange() - } else { - this.inputPosition(this.render_data) + standTypesHandle(item) { + let standTypesLinkIndex = this.standTypes.findIndex(val => val.standType === item['standType']); + if (this.standTypes[standTypesLinkIndex]) { + item['standTypeDesc'] = this.standTypes[standTypesLinkIndex].standTypeDesc; } } /** - * 选中某行 - * @param i + * 数据转换显示统一处理 */ - selectRow(i) { - this.row_state = i; + dataTransfer() { + this.stands.forEach(item => { + this.terminalAreaTransHandle(item); + this.standTypesHandle(item); + }) + + this.wait_render_data = this.stands; + this.selectedFilterData = this.stands; + this.calcVisibleCount(); + + //默认选中第一条 + if (this.render_data.length > 0) { + this.row_state = this.render_data[0]; + } + this.operateSpinServiceService.hideSpin(); } - //资源状态列表显示数据转换 - initStandStatus(){ - this.render_data.forEach(element => { - if (element['standStatus'] == '0') { - element['standStatus'] = '可用' - }else if(element['standStatus'] == '1'){ - element['standStatus'] = '在用' - }else if(element['standStatus'] == '2'){ - element['standStatus'] = '锁定' - }else if(element['standStatus'] == '3'){ - element['standStatus'] = '禁用' - }else if(element['standStatus'] == '4'){ - element['standStatus'] = '预分' + + /** + * 设置动态设置单元格的宽度 + * @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 element['standStatus']; - }); + } + 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 stand + */ + selectRow(stand) { + this.row_state = stand; + } + + /** + * 判断当前行是否是选中的行,是则高亮 + * @param stand + */ + getSelectedRow(stand) { + if (stand.standCode === this.row_state.standCode) { + 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.stands.filter(item => { - if (item['standStatus'] == '可用') { - item['standStatus'] = '0' - }else if(item['standStatus'] == '在用'){ - item['standStatus'] = '1' - }else if(item['standStatus'] == '锁定'){ - item['standStatus'] = '2' - }else if(item['standStatus'] == '禁用'){ - item['standStatus'] = '3' - }else if(item['standStatus'] == '预分'){ - item['standStatus'] = '4' - } + this.operateSpinServiceService.showSpin(); + this.positionedArray = []; + this.positionArrayIndex = 0; + let filter_data = this.stands.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 { @@ -171,22 +230,41 @@ export class StandComponent implements OnInit { } return is_satis; }) - this.initStandStatus(); //资源状态列表显示数据转换 + 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 stand = this.wait_render_data[i]; + if (stand['standCode'] === this.row_state.standCode) { + this.row_state = stand; + 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 { @@ -194,12 +272,12 @@ export class StandComponent 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 { @@ -214,72 +292,175 @@ export class StandComponent 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 stand = this.wait_render_data[i]; + if (stand['standCode'] === this.row_state.standCode) { + this.row_state = stand; + 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.standCode === fliterElement.standCode); + 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.standCode === fliterElement.standCode); + 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.standCode === filterElement.standCode); + 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.standCode === filterElement.standCode); + 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; + } }