From 209f14d3d6d2733a34c163d1e3b66a57d822a80a Mon Sep 17 00:00:00 2001 From: zhouyuejun <505127606@qq.com> Date: Wed, 20 Feb 2019 16:00:35 +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=E5=9C=BA=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96=E5=92=8C?= =?UTF-8?q?=E5=90=84=E6=A8=A1=E5=9D=97=E8=A1=A8=E6=A0=BC=E5=AF=B9=E9=BD=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic-data/airport/airport.component.html | 129 +++-- .../basic-data/airport/airport.component.scss | 59 --- .../basic-data/airport/airport.component.ts | 468 +++++++++++++----- .../basic-data/carousel/carousel.component.ts | 2 +- .../checkin-desk/checkin-desk.component.ts | 2 +- .../checkin-group/checkin-group.component.ts | 2 +- .../pages/basic-data/chut/chut.component.ts | 2 +- .../pages/basic-data/gate/gate.component.ts | 2 +- .../pages/basic-data/stand/stand.component.ts | 2 +- .../basic-data/terminal/terminal.component.ts | 2 +- .../historical-data.component.ts | 2 +- src/app/pages/main/main.component.ts | 2 +- .../seasonal-plan/seasonal-plan.component.ts | 2 +- 13 files changed, 411 insertions(+), 265 deletions(-) delete mode 100644 src/app/pages/basic-data/airport/airport.component.scss diff --git a/src/app/pages/basic-data/airport/airport.component.html b/src/app/pages/basic-data/airport/airport.component.html index d69f1b4..76664d6 100644 --- a/src/app/pages/basic-data/airport/airport.component.html +++ b/src/app/pages/basic-data/airport/airport.component.html @@ -1,78 +1,71 @@
-
-
-
-
- + + - -
-
+ +
+
-
-
- - -
-
- - -
+
+
+ + +
+
+ + +
+
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
序号机场代码机场中文名中文简称机场英文名英文简称IATA码CAA码ICAO码机场集团所在城市
{{i+1}}{{airport.airportCode}}{{airport.airportNameChn}}{{airport.briefNameChn}}{{airport.airportNameEng}}{{airport.briefNameEng}}{{airport.airportCodeIata}}{{airport.airportCodeCaa}}{{airport.airportCodeIcao}}{{airport.airportGroupName}}{{airport.cityNameChn}}
-
-
- +
+
+
+ + + + + + + +
序号{{col.COL_CN}}
+
+
+
+ + + + + + + + + +
{{start+i+1}}{{airport[col.COL_CODE]}}
+
+
+
+ \ No newline at end of file diff --git a/src/app/pages/basic-data/airport/airport.component.scss b/src/app/pages/basic-data/airport/airport.component.scss deleted file mode 100644 index 2804efa..0000000 --- a/src/app/pages/basic-data/airport/airport.component.scss +++ /dev/null @@ -1,59 +0,0 @@ -.main-page { - width: 100%; - height: 100%; - overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; - .page-content { - border: 1px solid #ccc; - padding: 10px 20px; - .search-filter { - padding: 0 15px; - .input-container { - padding: 0; - > .form-control { - width: 180px; - display: inline-block; - } - } - } - .airline-table{ - .table-container{ - // border: 1px solid #ccc; - width: 100%; - height: 700px; - overflow: auto; - box-shadow: 0 0 1px .5px #ddd; - table{ - width: max-content; - tr{ - cursor: pointer; - &.selected{ - background: rgb(181, 215, 255); - } - } - th{ - background-color: #ddd; - color: rgb(0, 0, 255); - } - th,td{ - // border: none; - text-align: center; - } - } - } - } - } -} - -@media screen and (max-width: 991px) { - .line-operator-right { - text-align: left !important; - } -} - -// @media screen and (min-width: 1200px){ -// .line-operator-right{ -// text-align: left; -// } -// } diff --git a/src/app/pages/basic-data/airport/airport.component.ts b/src/app/pages/basic-data/airport/airport.component.ts index 72f3617..3184bf7 100644 --- a/src/app/pages/basic-data/airport/airport.component.ts +++ b/src/app/pages/basic-data/airport/airport.component.ts @@ -1,37 +1,42 @@ -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-airport', templateUrl: './airport.component.html', - styleUrls: ['./airport.component.scss'] + styleUrls: ['../basic.scss'] }) export class AirportComponent implements OnInit { constructor( + private renderer2: Renderer2, private basicDataService: BasicDataService, - private changeDetectorRef: ChangeDetectorRef - ) { } + private operateSpinServiceService: OperateSpinServiceService, + ) { + this.operateSpinServiceService.showSpin(); + } - public col_lists = [ - { col_code: 'airportCode', col_chn: '机场代码' }, - { col_code: 'airportNameChn', col_chn: '机场中文名' }, - { col_code: 'briefNameChn', col_chn: '中文简称' }, - { col_code: 'airportNameEng', col_chn: '机场英文名' }, - { col_code: 'briefNameEng', col_chn: '英文简称' }, - { col_code: 'airportCodeIata', col_chn: 'IATA码' }, - { col_code: 'airportCodeCaa', col_chn: 'CAA码' }, - { col_code: 'airportCodeIcao', col_chn: 'ICAO码' }, - { col_code: 'airportGroupName', col_chn: '机场集团' }, - { col_code: 'cityNameChn', col_chn: '所在城市' }, + public render_col_lists = [ + { COL_CODE: 'airportCode', COL_CN: '机场代码', COL_WIDTH: "85px" }, + { COL_CODE: 'airportNameChn', COL_CN: '机场中文名', COL_WIDTH: "200px" }, + { COL_CODE: 'briefNameChn', COL_CN: '中文简称', COL_WIDTH: "85px" }, + { COL_CODE: 'airportNameEng', COL_CN: '机场英文名', COL_WIDTH: "180px" }, + { COL_CODE: 'briefNameEng', COL_CN: '英文简称', COL_WIDTH: "120px" }, + { COL_CODE: 'airportCodeIata', COL_CN: 'IATA码', COL_WIDTH: "85px" }, + { COL_CODE: 'airportCodeCaa', COL_CN: 'CAA码', COL_WIDTH: "85px" }, + { COL_CODE: 'airportCodeIcao', COL_CN: 'ICAO码', COL_WIDTH: "85px" }, + { COL_CODE: 'airportGroupName', COL_CN: '机场集团', COL_WIDTH: "120px" }, + { COL_CODE: 'cityNameChn', COL_CN: '所在城市', COL_WIDTH: "120px" }, ] // 搜索条件 SEARCH = ''; //手动输入条件 + LASTSEARCH = ''; FLT_POS = 1; //过滤还是定位 SEL_COL = ''; //选择列名 + LAST_SEL_COL = ''; //下拉框 public filterItems = { @@ -39,100 +44,185 @@ export class AirportComponent implements OnInit { cityId: '', } - airportgroups: Array; //机场集团 - citys: Array; //城市 - airports: Array; - public row_state: any = { renderFlight: {} }; + public airportgroups: Array; //机场集团 + public citys: Array; //城市 + public airports: 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.airportgroups = this.basicDataService.airportgroup; - this.citys = this.basicDataService.city; + window.onresize = function () { + this.calcVisibleCount(); + }.bind(this) + this.airports = this.basicDataService.airport; - this.render_data = this.basicDataService.airport; - this.basicDataService.airport_subject.subscribe( - data => { - this.airports = data; - this.render_data = data; - if(this.citys && this.citys.length > 0){//城市数据列表转换处理 - this.basicDataTransHandle(); + this.citys = this.basicDataService.city; + this.airportgroups = this.basicDataService.airportgroup; + + if (this.airportgroups && Array.isArray(this.airportgroups)) { + this.dataTransfer(); + } else { + this.basicDataService.airport_subject.subscribe( + data => { + this.airports = data; } - } - ) - this.basicDataService.city_subject.subscribe( - data => { - this.citys = data; - } - ) - this.basicDataService.airportgroup_subject.subscribe( - data => { - this.airportgroups = data - if(this.airportgroups && this.airportgroups.length > 0){//机场集团数据列表转换处理 - this.airportgroupsHandle(); + ) + this.basicDataService.city_subject.subscribe( + data => { + this.citys = data; } - } - ) - if(this.render_data){ - //城市数据转换处理 - this.basicDataTransHandle(); - //机场集团数据转换处理 - this.airportgroupsHandle(); + ) + this.basicDataService.airportgroup_subject.subscribe( + data => { + this.airportgroups = 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); } //机场集团数据转换处理 - airportgroupsHandle() { - this.render_data.forEach(item => { - let airportgroupsLinkIndex = this.airportgroups.findIndex(val => val.airportGroupId === item['airportGroupId']); - if(this.airportgroups[airportgroupsLinkIndex]){ - item['airportGroupName'] = this.airportgroups[airportgroupsLinkIndex].airportGroupName; - } - }) + airportGroupsTransHandle(item) { + let airportgroupsLinkIndex = this.airportgroups.findIndex(val => val.airportGroupId === item['airportGroupId']); + if (this.airportgroups[airportgroupsLinkIndex]) { + item['airportGroupName'] = this.airportgroups[airportgroupsLinkIndex].airportGroupName; + } } //城市数据转换处理 - basicDataTransHandle() { - this.render_data.forEach(item => { - let citysLinkIndex = this.citys.findIndex(val => val.cityId === item['cityId']); - if(this.citys[citysLinkIndex]){ - item['cityNameChn'] = this.citys[citysLinkIndex].cityNameChn; - } + citysTransHandle(item) { + let citysLinkIndex = this.citys.findIndex(val => val.cityId === item['cityId']); + if (this.citys[citysLinkIndex]) { + item['cityNameChn'] = this.citys[citysLinkIndex].cityNameChn; + } + } + + /** + * 数据转换显示统一处理 + */ + dataTransfer() { + this.airports.forEach(item => { + this.airportGroupsTransHandle(item); + this.citysTransHandle(item); }) + + this.wait_render_data = this.airports; + this.selectedFilterData = this.airports; + 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).outerWidth() + '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 i + * @param airport */ - selectRow(i) { - this.row_state = i; + selectRow(airport) { + this.row_state = airport; + } + + /** + * 判断当前行是否是选中的行,是则高亮 + * @param airport + */ + getSelectedRow(airport) { + if (airport.airportCodeIata === this.row_state.airportCodeIata) { + return true; + } else { + return false; + } } //输入框回车事件 inputEnter() { if (this.FLT_POS === 1) { - this.selectChange() + this.LAST_SEL_COL = this.SEL_COL; + this.LASTSEARCH = this.SEARCH; + this.operateSpinServiceService.showSpin(); + this.inputFilter(this.selectedFilterData); } else { - this.inputPosition(this.render_data) + this.inputPosition(this.wait_render_data) } } //下拉框选择筛选 selectChange() { - this.render_data = this.airports.filter(item => { + this.operateSpinServiceService.showSpin(); + this.positionedArray = []; + this.positionArrayIndex = 0; + let filter_data = this.airports.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 { @@ -143,21 +233,41 @@ export class AirportComponent implements OnInit { } return is_satis; }) + 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 airport = this.wait_render_data[i]; + if (airport['airportCodeIata'] === this.row_state.airportCodeIata) { + this.row_state = airport; + 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 { @@ -165,12 +275,12 @@ export class AirportComponent 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 { @@ -185,72 +295,174 @@ export class AirportComponent 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 airport = this.wait_render_data[i]; + if (airport['airportCodeIata'] === this.row_state.airportCodeIata) { + this.row_state = airport; + 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.airportCodeIata === fliterElement.airportCodeIata); + 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.airportCodeIata === fliterElement.airportCodeIata); + 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.airportCodeIata === filterElement.airportCodeIata); + 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.airportCodeIata === filterElement.airportCodeIata); + 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 (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('没有搜索到相关数据'); + if (!hasSearchData) { + alert("没有搜索到相关数据"); } - this.changeDetectorRef.detectChanges(); - let tr = $(".selected"); - let objTr = tr[0]; - if (objTr) { - $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow"); + 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/carousel/carousel.component.ts b/src/app/pages/basic-data/carousel/carousel.component.ts index c4c8dfd..e56cf0a 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.ts +++ b/src/app/pages/basic-data/carousel/carousel.component.ts @@ -134,7 +134,7 @@ export class CarouselComponent implements OnInit { 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'); + $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px'); }) if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { this.tableHead.nativeElement.style.overflowY = 'auto'; diff --git a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts index e5bdf49..f4e2cc2 100644 --- a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts +++ b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts @@ -152,7 +152,7 @@ export class CheckinDeskComponent implements OnInit { 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'); + $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px'); }) if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { this.tableHead.nativeElement.style.overflowY = 'auto'; diff --git a/src/app/pages/basic-data/checkin-group/checkin-group.component.ts b/src/app/pages/basic-data/checkin-group/checkin-group.component.ts index 324eec2..5d39323 100644 --- a/src/app/pages/basic-data/checkin-group/checkin-group.component.ts +++ b/src/app/pages/basic-data/checkin-group/checkin-group.component.ts @@ -86,7 +86,7 @@ export class CheckinGroupComponent implements OnInit { 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'); + $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px'); }) if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { this.tableHead.nativeElement.style.overflowY = 'auto'; diff --git a/src/app/pages/basic-data/chut/chut.component.ts b/src/app/pages/basic-data/chut/chut.component.ts index 9a9c5a3..c146cc2 100644 --- a/src/app/pages/basic-data/chut/chut.component.ts +++ b/src/app/pages/basic-data/chut/chut.component.ts @@ -85,7 +85,7 @@ export class ChutComponent implements OnInit { 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'); + $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px'); }) if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { this.tableHead.nativeElement.style.overflowY = 'auto'; diff --git a/src/app/pages/basic-data/gate/gate.component.ts b/src/app/pages/basic-data/gate/gate.component.ts index 1597861..513a047 100644 --- a/src/app/pages/basic-data/gate/gate.component.ts +++ b/src/app/pages/basic-data/gate/gate.component.ts @@ -133,7 +133,7 @@ export class GateComponent implements OnInit { 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'); + $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px'); }) if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { this.tableHead.nativeElement.style.overflowY = 'auto'; diff --git a/src/app/pages/basic-data/stand/stand.component.ts b/src/app/pages/basic-data/stand/stand.component.ts index 5901d13..ea3ae74 100644 --- a/src/app/pages/basic-data/stand/stand.component.ts +++ b/src/app/pages/basic-data/stand/stand.component.ts @@ -137,7 +137,7 @@ export class StandComponent implements OnInit { 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'); + $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px'); }) if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { this.tableHead.nativeElement.style.overflowY = 'auto'; diff --git a/src/app/pages/basic-data/terminal/terminal.component.ts b/src/app/pages/basic-data/terminal/terminal.component.ts index 4dd5b37..0ded021 100644 --- a/src/app/pages/basic-data/terminal/terminal.component.ts +++ b/src/app/pages/basic-data/terminal/terminal.component.ts @@ -85,7 +85,7 @@ export class TerminalComponent implements OnInit { 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'); + $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px'); }) if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { this.tableHead.nativeElement.style.overflowY = 'auto'; diff --git a/src/app/pages/historical-data/historical-data.component.ts b/src/app/pages/historical-data/historical-data.component.ts index f964e04..6cfe2f7 100644 --- a/src/app/pages/historical-data/historical-data.component.ts +++ b/src/app/pages/historical-data/historical-data.component.ts @@ -229,7 +229,7 @@ export class HistoricalDataComponent implements OnInit { 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'); + $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px'); }) if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { this.tableHead.nativeElement.style.overflowY = 'auto'; diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts index 6ea5967..1bd8094 100644 --- a/src/app/pages/main/main.component.ts +++ b/src/app/pages/main/main.component.ts @@ -293,7 +293,7 @@ export class MainComponent implements OnInit { 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'); + $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px'); }) if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { this.tableHead.nativeElement.style.overflowY = 'auto'; diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts index f1016f9..0b42f49 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts +++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts @@ -316,7 +316,7 @@ export class SeasonalPlanComponent implements OnInit { 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'); + $(".table-head table thead tr").eq(0).find('th').eq(index).attr('width', $(element).outerWidth() + 'px'); }) if (this.tableBody.nativeElement.scrollHeight <= (this.tableBody.nativeElement.innerHeight || this.tableBody.nativeElement.clientHeight)) { this.tableHead.nativeElement.style.overflowY = 'auto';