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

src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts

@@ -1,143 +1,107 @@
 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-checkin-desk',
-  templateUrl: './checkin-desk.component.html',
-  styleUrls: ['./checkin-desk.component.scss']
+    selector: 'app-checkin-desk',
+    templateUrl: './checkin-desk.component.html',
+    styleUrls: ['./checkin-desk.component.scss']
 })
 export class CheckinDeskComponent implements OnInit {
 
-  constructor(
-    private httpCilent: HttpClientService,
-    private basicDataService: BasicDataService
-) { }
+    constructor(
+        private basicDataService: BasicDataService
+    ) { }
 
-// 搜索条件
-SEARCH = '';    //手动输入条件
-FLT_POS = 1;    //过滤还是定位
-SEL_COL = '';   //选择列名
+    public col_lists = [
+        { col_code: 'checkindeskCode', col_chn: '值机柜台代码' },
+        { col_code: 'checkindeskName', col_chn: '值机柜台名称' },
+        { col_code: 'checkinGroupCode', col_chn: '值机岛' },
+        { col_code: 'chutCode', col_chn: '行李传送带' },
+        { col_code: 'terminalAreaCode', col_chn: '航站楼区域' },
+    ]
 
-//下拉框
-public filterItems = {
-    terminalAreaCode:'',
-    checkinGroupCode:'',
-    chutCode:'',
-}
+    // 搜索条件
+    SEARCH = '';    //手动输入条件
+    FLT_POS = 1;    //过滤还是定位
+    SEL_COL = '';   //选择列名
 
-checkinGroups : Array<any>; //值机岛
-terminalAreas : Array<any>; //所属航站楼区域
-chuts : Array<any>; //行李传送带
-checkinDesks : Array<any>;
-public row_state: any = { renderFlight: {} };
-public render_data: Array<object> = [];  //显示数据，即需要显示的数据
-public return_data: Array<object> = []; //下拉框显示数据
-ngOnInit() {
-    this.checkinDesks = this.basicDataService.checkin_desk;
-    this.basicDataService.checkin_desk_subject.subscribe(
-        data=>{
-            this.checkinDesks = data;
-            this.render_data = this.checkinDesks;
-            if(this.terminalAreas && this.terminalAreas.length>0){//所属航站楼区域数据转换处理
-                this.terminalAreasHandle();
+    //下拉框
+    public filterItems = {
+        terminalAreaCode: '',
+        checkinGroupCode: '',
+        chutCode: '',
+    }
+
+    checkinGroups: Array<any>; //值机岛
+    terminalAreas: Array<any>; //所属航站楼区域
+    chuts: Array<any>; //行李传送带
+    checkinDesks: Array<any>;
+    public row_state: any = { renderFlight: {} };
+    public render_data: Array<object> = [];  //显示数据，即需要显示的数据
+
+    ngOnInit() {
+        this.terminalAreas = this.basicDataService.terminal_area;
+        this.checkinGroups = this.basicDataService.checkin_group;
+        this.chuts = this.basicDataService.chut;
+        this.checkinDesks = this.basicDataService.checkin_desk;
+        this.render_data = this.basicDataService.checkin_desk;
+
+        this.basicDataService.checkin_desk_subject.subscribe(
+            data => {
+                this.checkinDesks = data;
+                this.render_data = data;
             }
-            if(this.checkinGroups && this.checkinGroups.length>0){//值机岛数据转换处理
-                this.checkinGroupsHandle();
+        )
+        this.basicDataService.terminal_area_subject.subscribe(
+            data => {
+                this.terminalAreas = data;
             }
-            if(this.checkinGroups && this.checkinGroups.length>0){//行李传送带数据转换处理
-                this.chutsHandle();
+        )
+        this.basicDataService.checkin_group_subject.subscribe(
+            data => {
+                this.checkinGroups = data;
             }
+        )
+        this.basicDataService.chut_subject.subscribe(
+            data => {
+                this.chuts = data;
+            }
+        )
+        /**
+         * 固定表头
+         */
+        var tableCont = document.querySelector('#table-container');
+        function scrollHandle() {
+            var scrollTop = this.scrollTop;
+            this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
         }
-    )
-    //所属航站楼区域
-    this.terminalAreas = this.basicDataService.terminal_area;
-    this.basicDataService.terminal_area_subject.subscribe(
-        data=>{
-            this.terminalAreas = data;
-        }
-    )
-    //值机岛
-    this.checkinGroups = this.basicDataService.checkin_group;
-    this.basicDataService.checkin_group_subject.subscribe(
-        data=>{
-            this.checkinGroups = data;
-        }
-    )
-    //行李传送带
-    this.chuts = this.basicDataService.chut;
-    this.basicDataService.chut_subject.subscribe(
-        data=>{
-            this.chuts = 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);
-}
 
-//所属航站楼区域数据转换处理
-terminalAreasHandle() {
-    this.render_data.forEach(item => {
-        let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']);
-        item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName;
-    })
-}
-
-//值机岛数据转换处理
-checkinGroupsHandle() {
-    this.render_data.forEach(item => {
-        let checkinGroupsLinkIndex = this.checkinGroups.findIndex(val => val.checkinGroupCode === item['checkinGroupCode']);
-        let checkinGroups = this.checkinGroups[checkinGroupsLinkIndex].checkinGroupName
-        if(checkinGroups !=null){
-            item['checkinGroupName'] = checkinGroups;
+    //输入框回车事件
+    inputEnter() {
+        if (this.FLT_POS === 1) {
+            this.selectChange()
+        } else {
+            this.inputPosition(this.render_data)
         }
-    })
-}
-
-//行李传送带数据转换处理
-chutsHandle() {
-    this.render_data.forEach(item => {
-        let chutsLinkIndex = this.chuts.findIndex(val => val.chutCode === item['chutCode']);
-        let chuts = this.chuts[chutsLinkIndex].chutName
-        if(chuts !=null && chuts !=""){
-            item['chutName'] = chuts;
-        }
-    })
-}
-
-/**
- * 选中某行
- * @param i 
- */
-selectRow(i) {
-    this.row_state = i;
-}
-
-//输入框回车事件
-inputEnter() {
-    if (this.FLT_POS === 1) {
-        this.inputFilter(this.checkinDesks)
-    } else {
-        this.inputFilter(this.checkinDesks)
-        this.inputPosition(this.checkinDesks)
     }
-}
 
-//下拉框选择筛选
-selectChange() {
-    this.return_data = this.checkinDesks.filter(item=>{
+    //下拉框选择筛选
+    selectChange() {
+        this.render_data = this.checkinDesks.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 {
@@ -147,36 +111,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 {
@@ -184,50 +148,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 {
@@ -241,31 +197,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");
+        }
+
     }
 }