From 4b1baa98765a06f502763ac6538525e0dbf37e61 Mon Sep 17 00:00:00 2001 From: "714943302@qq.com" Date: Thu, 22 Nov 2018 13:57:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E3=80=81=E9=A3=9E=E6=9C=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aircraft-type/aircraft-type.component.ts | 2 +- .../aircraft/aircraft.component.html | 22 +-- .../basic-data/aircraft/aircraft.component.ts | 125 ++++-------------- 3 files changed, 42 insertions(+), 107 deletions(-) diff --git a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts index 26adbb0..48e0df2 100644 --- a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts +++ b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts @@ -54,7 +54,7 @@ inputEnter() { this.inputFilter(this.aircraftTypes) } else { this.inputFilter(this.aircraftTypes) - // this.inputPosition(this.render_data) + this.inputPosition(this.aircraftTypes) } } diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.html b/src/app/pages/basic-data/aircraft/aircraft.component.html index 50fd68f..8d9c182 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.html +++ b/src/app/pages/basic-data/aircraft/aircraft.component.html @@ -20,26 +20,28 @@ - +
- - - - + +
- - - + +
@@ -63,7 +65,7 @@ - + {{i+1}} {{aircraft.aircraftNumber}} {{aircraft.maxPassengers}} diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.ts b/src/app/pages/basic-data/aircraft/aircraft.component.ts index 889e4cf..866846b 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.ts +++ b/src/app/pages/basic-data/aircraft/aircraft.component.ts @@ -20,9 +20,17 @@ SEARCH = ''; //手动输入条件 FLT_POS = 1; //过滤还是定位 SEL_COL = ''; //选择列名 +//下拉框 +public filterItems = { + airlineCode:'', + aircraftTypeCode:'', +} + aircrafts : Array; public row_state: any = { renderFlight: {} }; public render_data: Array = []; //显示数据，即需要显示的数据 +public return_data: Array = []; //下拉框显示数据 + ngOnInit() { this.aircrafts = this.basicDataService.aircraft; this.basicDataService.aircraft_subject.subscribe( @@ -42,113 +50,38 @@ ngOnInit() { tableCont.addEventListener('scroll',scrollHandle); } -//刷新 -clearFiter(){ - $("#inputerInfo").val(""); //清空过滤或查找定位文本框 - $("#airlineCompany").val(""); //清空航空公司 - $("#jx").val(""); //清空机型 - this.ngOnInit(); -} //输入框回车事件 inputEnter() { -if (this.FLT_POS === 1) { - this.selectChange() -} else { - this.selectChange() - this.inputPosition(this.render_data) -} + if (this.FLT_POS === 1) { + this.inputFilter(this.aircrafts) + } else { + this.inputFilter(this.aircrafts) + this.inputPosition(this.aircrafts) + } } //下拉框选择筛选 selectChange() { - let filter_data = []; - let filteraircrafts = this.render_data; - this.render_data.forEach(item => { - filter_data.push(Object.assign({}, item)); - }) - if (this.FLT_POS === 1) { - this.inputFilter(filter_data); - } else { - this.aircrafts = filter_data; - this.row_state = this.aircrafts.length > 0 ? this.aircrafts[0] : { renderFlight: {} }; - } - //下拉框筛选 - filter_data = filter_data.filter(item => { - if (item) { + this.return_data = this.aircrafts.filter(item=>{ let is_satis = true; - for (const key in filteraircrafts) { - if (filteraircrafts.hasOwnProperty(key) && filteraircrafts[key]) { - if (item[key] === filteraircrafts[key]) { + for (const key in this.filterItems) { + if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) { + if (item[key] === this.filterItems[key]) { is_satis = true; continue; } else { is_satis = false; break; } - } } return is_satis; - } else if (item) { - let is_satis = true; - for (const key in filteraircrafts) { - if (filteraircrafts.hasOwnProperty(key) && filteraircrafts[key]) { - if (item[key] === filteraircrafts[key]) { - is_satis = true; - continue; - } else { - is_satis = false; - break; - } - - } - } - return is_satis; - } else { - let pre_satis = true; - let rea_satis = true; - for (const key in filteraircrafts) { - if (filteraircrafts.hasOwnProperty(key) && filteraircrafts[key]) { - if (item[key] === filteraircrafts[key]) { - pre_satis = true; - continue; - } else { - pre_satis = false; - break; - } - - } - } - for (const key in filteraircrafts) { - if (filteraircrafts.hasOwnProperty(key) && filteraircrafts[key]) { - if (item[key] === filteraircrafts[key]) { - rea_satis = true; - continue; - } else { - rea_satis = false; - break; - } - - } - } - - if (pre_satis && !rea_satis) { - item = item; - return pre_satis; - } else if (!pre_satis && rea_satis) { - item = item; - return rea_satis; - } else if (pre_satis && rea_satis) { - return pre_satis && rea_satis; - } else { - return false; - } - } }) - } + this.render_data = this.return_data; +} - //输入框筛选 - inputFilter(filterData) { +//输入框筛选 +inputFilter(filterData) { if (this.SEARCH) { if (this.SEL_COL) { let sel_col = this.SEL_COL; @@ -196,14 +129,14 @@ selectChange() { }) } } - this.aircrafts = filterData; - this.row_state = this.aircrafts.length > 0 ? this.aircrafts[0] : { renderFlight: {} }; - } + this.render_data = filterData; + this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} }; +} - positionArray: Array = []; - positionArrayIndex: number = 0; - //输入框定位 - inputPosition(filterData) { +positionArray: Array = []; +positionArrayIndex: number = 0; +//输入框定位 +inputPosition(filterData) { let transArray = [] if (this.SEL_COL) { let sel_col = this.SEL_COL;