基础数据查询二次优化修改

src/app/pages/basic-data/aircraft/aircraft.component.html

@@ -5,14 +5,7 @@
                 <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="">
                         <option value="">选择列名</option>
-                        <option value="aircraftNumber">飞机号</option>
-                        <option value="maxPassengers">最大乘客数</option>
-                        <option value="maxFreightWeight">最大货物重量</option>
-                        <option value="maxTakeoffWeight">最大起飞重量</option>
-                        <option value="maxAirbridges">最大廊桥数</option>
-                        <option value="aircraftOwnerCode">机主航空公司</option>
-                        <option value="airlineName">航空公司</option>
-                        <option value="aircraftTypeName">机型</option>
+                        <option *ngFor="let col of col_lists" [value]="col.col_code">{{col.col_chn}}</option>
                     </select>
                     <label class="radio-inline custom-radio nowrap mr-4">
                         <input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
@@ -24,12 +17,6 @@
                     </label>
                     <input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()" id="inputerInfo">
                 </div>
-                <div class="line-operator-right mb-3 col-xlg-4 col-mlg-4 col-xl-4 col-lg-1">
-                    <!-- <button type="button" class="btn btn-info mr-3">打印</button>
-                    <button type="button" class="btn btn-info mr-3">飞机登记</button>
-                    <button type="button" class="btn btn-info mr-3">定制查询</button> -->
-                    <!-- <button type="button" class="btn btn-info mr-3">刷新</button> -->
-                </div>
             </div>
   
             <div class="second-condition mb-3 row">
@@ -44,7 +31,7 @@
                 <label for="aircraftTypeCode">机型：&nbsp;&nbsp;</label>
                 <select  class="form-control" [(ngModel)]="filterItems.aircraftTypeCode" (ngModelChange)="selectChange()" id="jx">
                     <option value=""></option>
-                    <option *ngFor="let item of aircraftTypes" [value]="item.aircraftTypeCode">{{item.aircraftTypeName}}</option>
+                    <option *ngFor="let item of aircraftTypes" [value]="item.aircraftTypeCode">{{item.aircraftTypeCode}}</option>
                 </select>
             </div>
           </div>
@@ -64,7 +51,6 @@
                             <th>机主航空公司</th>
                             <th>航空公司</th>
                             <th>机型</th>
-                            <!-- <th *ngFor="let airline_col of aircraft_lists">{{airline_col.COL_CN}}</th> -->
                         </tr>
                     </thead>
                     <tbody>
@@ -77,9 +63,8 @@
                             <td>{{aircraft.maxTakeoffWeight}}</td>
                             <td>{{aircraft.maxAirbridges}}</td>
                             <td>{{aircraft.aircraftOwnerCode}}</td>
-                            <td>{{aircraft.airlineName}}</td>
-                            <td>{{aircraft.aircraftTypeName}}</td>
-                            <!-- <td *ngFor="let airline_col of aircraft_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td> -->
+                            <td>{{aircraft.airlineCode}}</td>
+                            <td>{{aircraft.aircraftTypeCode}}</td>
                         </tr>
                     </tbody>
                 </table>

src/app/pages/basic-data/aircraft/aircraft.component.ts

@@ -1,117 +1,102 @@
 import { Component, OnInit } from '@angular/core';
-import { HttpClientService } from '../../../services/http-client.service';
-import { BasicDataService } from '../../basic-data-service'
-import { HttpParams } from '@angular/common/http';
+import { BasicDataService } from '../../basic-data-service';
+
 import * as $ from 'jquery';
 @Component({
     selector: 'app-aircraft',
     templateUrl: './aircraft.component.html',
     styleUrls: ['./aircraft.component.scss']
-  })
-  export class AircraftComponent implements OnInit {
+})
+export class AircraftComponent implements OnInit {
 
-  constructor(
-    private httpCilent: HttpClientService,
-    private basicDataService: BasicDataService
-) { }
+    constructor(
+        private basicDataService: BasicDataService
+    ) { }
 
-// 搜索条件
-SEARCH = '';    //手动输入条件
-FLT_POS = 1;    //过滤还是定位
-SEL_COL = '';   //选择列名
+    public col_lists = [
+        { col_code: 'aircraftNumber', col_chn: '飞机号' },
+        { col_code: 'maxPassengers', col_chn: '最大乘客数' },
+        { col_code: 'maxFreightWeight', col_chn: '最大货物重量' },
+        { col_code: 'maxTakeoffWeight', col_chn: '最大起飞重量' },
+        { col_code: 'maxAirbridges', col_chn: '最大廊桥数' },
+        { col_code: 'aircraftOwnerCode', col_chn: '机主航空公司' },
+        { col_code: 'airlineCode', col_chn: '航空公司' },
+        { col_code: 'aircraftTypeCode', col_chn: '机型' }
+    ]
 
-//下拉框
-public filterItems = {
-    airlineCode:'',
-    aircraftTypeCode:'',
-}
-airlines : Array<any>; //航空公司
-aircraftTypes : Array<any>; //机型
-aircrafts : Array<any>;
-public row_state: any = { renderFlight: {} };
-public render_data: Array<object> = [];  //显示数据，即需要显示的数据
-public return_data: Array<object> = []; //下拉框显示数据
+    // 搜索条件
+    SEARCH = '';    //手动输入条件
+    FLT_POS = 1;    //过滤还是定位
+    SEL_COL = '';   //选择列名
 
-ngOnInit() {
-    this.aircrafts = this.basicDataService.aircraft;
-    this.basicDataService.aircraft_subject.subscribe(
-        data=>{
-            this.aircrafts = data;
-            this.render_data = this.aircrafts;
-            if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换
-                this.basicDataTransHandle();
+    //下拉框
+    public filterItems = {
+        airlineCode: '',
+        aircraftTypeCode: '',
+    }
+    airlines: Array<any>; //航空公司
+    aircraftTypes: Array<any>; //机型
+    aircrafts: Array<any>;
+    public row_state: any = { renderFlight: {} };
+    public render_data: Array<object> = [];  //显示数据，即需要显示的数据
+
+    ngOnInit() {
+        this.airlines = this.basicDataService.airline;
+        this.aircraftTypes = this.basicDataService.aircraft_type;
+        this.aircrafts = this.basicDataService.aircraft;
+        this.render_data = this.basicDataService.aircraft;
+        this.basicDataService.aircraft_subject.subscribe(
+            data => {
+                this.aircrafts = data;
+                this.render_data = data;
             }
-            if(this.airlines && this.airlines.length > 0){//航空公司数据处理
-                this.basicDataAirlinesHandle();
+        )
+        this.basicDataService.airline_subject.subscribe(
+            data => {
+                this.airlines = data;
             }
+        )
+        this.basicDataService.aircraft_type_subject.subscribe(
+            data => {
+                this.aircraftTypes = data;
+            }
+        )
+
+        /**
+         * 固定表头
+         */
+        var tableCont = document.querySelector('#table-container');
+        function scrollHandle() {
+            var scrollTop = this.scrollTop;
+            this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
         }
-    )
-    //航空公司
-    this.airlines = this.basicDataService.airline;
-    this.basicDataService.airline_subject.subscribe(
-        data=>{
-            this.airlines = data;
-        }
-    )
-    //机型
-    this.aircraftTypes = this.basicDataService.aircraft_type;
-    this.basicDataService.aircraft_type_subject.subscribe(
-        data=>{
-            this.aircraftTypes = data;
-        }
-    )
-    
+        tableCont.addEventListener('scroll', scrollHandle);
+    }
+
     /**
-     * 固定表头
+     * 选中某行
+     * @param i 
      */
-    var tableCont = document.querySelector('#table-container');
-    function scrollHandle (){
-      var scrollTop = this.scrollTop;
-      this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
+    selectRow(i) {
+        this.row_state = i;
     }
-    tableCont.addEventListener('scroll',scrollHandle);
-}
 
-basicDataTransHandle() {
-    this.render_data.forEach(item => {
-        //机型数据转换处理
-        let aircraftTypesLinkIndex = this.aircraftTypes.findIndex(val => val.aircraftTypeCode === item['aircraftTypeCode']);
-        item['aircraftTypeName'] = this.aircraftTypes[aircraftTypesLinkIndex].aircraftTypeName;
-    })
-}
-
-basicDataAirlinesHandle() {
-    this.render_data.forEach(item => {
-        //航空公司数据处理
-        let airlinesLinkIndex = this.airlines.findIndex(val => val.airlineCode === item['airlineCode']);
-        item['airlineName'] = this.airlines[airlinesLinkIndex].airlineName;
-    })
-}
-/**
- * 选中某行
- * @param i 
- */
-selectRow(i) {
-    this.row_state = i;
-}
-
-//输入框回车事件
-inputEnter() {
-    if (this.FLT_POS === 1) {
-        this.inputFilter(this.aircrafts)
-    } else {
-        this.inputFilter(this.aircrafts)
-        this.inputPosition(this.aircrafts)
+    //输入框回车事件
+    inputEnter() {
+        if (this.FLT_POS === 1) {
+            this.selectChange()
+        } else {
+            this.inputPosition(this.render_data)
+        }
     }
-}
 
-//下拉框选择筛选
-selectChange() {
-    this.return_data = this.aircrafts.filter(item=>{
+    //下拉框选择筛选
+    selectChange() {
+        this.render_data = this.aircrafts.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 {
@@ -121,36 +106,36 @@ selectChange() {
                 }
             }
             return is_satis;
-    })
-    this.render_data = this.return_data;
-}
-
-//输入框筛选
-inputFilter(filterData) {
-    if (this.SEARCH) {
-        if (this.SEL_COL) {
-            let sel_col = this.SEL_COL;
-            filterData = filterData.filter(item => {
-                if (item[sel_col]) {
-                    if (item[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
-                        return true;
-                    }
-                } else {
-                    if (this.SEARCH) {
-                        return false;
-                    } else {
-                        return true;
-                    }
-                }
-            })
-
+        })
+        if (this.FLT_POS === 1) {
+            this.inputFilter(this.render_data);
         } else {
-            filterData = filterData.filter(item => {
-                let is_satis = false;
-                for (const key in item) {
-                    if (item.hasOwnProperty(key)) {
-                        if (item[key]) {
-                            if (item[key].toString().match(new RegExp(this.SEARCH, 'i'))) {
+            this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
+        }
+    }
+
+    //输入框筛选
+    inputFilter(filterData) {
+        if (this.SEARCH) {
+            if (this.SEL_COL) {
+                let sel_col = this.SEL_COL;
+                this.render_data = filterData.filter(item => {
+                    if (item[sel_col]) {
+                        if (item[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
+                            return true;
+                        }
+                    } else {
+                        return false;
+                    }
+                })
+
+            } else {
+                this.render_data = filterData.filter(item => {
+                    let is_satis = false;
+                    let cols = this.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'))) {
                                 is_satis = true;
                                 break;
                             } else {
@@ -158,50 +143,42 @@ inputFilter(filterData) {
                                 continue;
                             }
                         } else {
-                            if (this.SEARCH) {
-                                is_satis = false;
-                                continue;
-                            } else {
-                                is_satis = true;
-                                break;
-                            }
+                            is_satis = false;
+                            continue;
                         }
-                    } else {
-                        continue;
                     }
-                }
-                return is_satis;
-            })
+                    return is_satis;
+                })
+            }
+        } else {
+            this.render_data = filterData;
         }
     }
-    this.render_data = filterData;
-    this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
-}
 
-positionArray: Array<any> = [];
-positionArrayIndex: number = 0;
-//输入框定位
-inputPosition(filterData) {
-    let transArray = []
-    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)
+    positionArray: Array<any> = [];
+    positionArrayIndex: number = 0;
+    //输入框定位
+    inputPosition(filterData) {
+        let transArray = []
+        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)
+                    }
+                } else {
+                    if (!this.SEARCH) {
+                        transArray.push(element)
+                    }
                 }
-            } else {
-                if (!this.SEARCH) {
-                    transArray.push(element)
-                }
-            }
-        });
-    } else {
-        filterData.forEach(element => {
-            for (const key in element) {
-                if (element.hasOwnProperty(key)) {
-                    if (element[key]) {
-                        if (element[key].toString().match(new RegExp(this.SEARCH, 'i'))) {
+            });
+        } 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)
                             break;
                         } else {
@@ -215,31 +192,30 @@ inputPosition(filterData) {
                             break;
                         }
                     }
-
-                } else {
-                    continue;
                 }
-            }
-        });
-    }
+            });
+        }
 
-    if (transArray.length > 0) {
-        if (transArray.toString() == this.positionArray.toString()) {
-            this.positionArrayIndex++;
-            if (this.positionArrayIndex === this.positionArray.length) {
+        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];
             }
-            this.row_state = this.positionArray[this.positionArrayIndex];
         } else {
-            this.positionArray = transArray;
-            this.positionArrayIndex = 0;
-            this.row_state = this.positionArray[this.positionArrayIndex];
+            alert('没有搜索到相关数据');
         }
-    } else {
-        alert('没有搜索到相关数据');
-    }
         let tr = $(".selected");
         let objTr = tr[0];
-        $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
+        if (objTr) {
+            $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
+        }
+
     }
 }