接口数据对接

2018-11-21 18:25:07 +08:00
parent afa2130c8d
commit 742d78e887
12 changed files with 669 additions and 1352 deletions
@@ -14,12 +14,12 @@
                         <input type="radio" [(ngModel)]="FLT_POS"  [value]="2" name="filter-position">
                         <span>查找定位</span>
                    </label>
-                    <input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()">
+                    <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" (click)="clearFiter()">刷新</button>
                </div>
            </div>
        </div>
@@ -30,18 +30,17 @@
                    <thead>
                        <tr>
                            <th>序号</th>
-                            <!-- <th>航站楼区域代码</th>
-                            <th>航站楼区域名称</th> -->
-                            <th *ngFor="let airline_col of terminalarea_lists">{{airline_col.COL_CN}}</th>
+                            <th>航站楼区域代码</th>
+                            <th>航站楼区域名称</th>
+                            <!-- <th *ngFor="let airline_col of terminalarea_lists">{{airline_col.COL_CN}}</th> -->
                        </tr>
                    </thead>
                    <tbody>
-                        <tr *ngFor="let airline_row of render_data;let i = index" (click)="selectRow(airline_row)"
-                            [ngClass]="{'selected':row_state['renderFlight']===airline_row['renderFlight']}">
+                        <tr *ngFor="let terminalArea of terminalAreas;let i = index">
                            <td>{{i+1}}</td>
-                            <!-- <td>{{airline_col.terminalAreaCode}}</td>
-                            <td>{{airline_col.terminalAreaName}}</td> -->
-                            <td *ngFor="let airline_col of terminalarea_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td>
+                            <td>{{terminalArea.terminalAreaCode}}</td>
+                            <td>{{terminalArea.terminalAreaName}}</td>
+                            <!-- <td *ngFor="let airline_col of terminalarea_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td> -->
                        </tr>
                    </tbody>
                </table>
@@ -1,7 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { ChangeDetectorRef } from '@angular/core';
 import { HttpClientService } from '../../../services/http-client.service';
-import dateFormatter from '../../../utils/data-formatter';
+import { BasicDataService } from '../../basic-data-service'
 import { HttpParams } from '@angular/common/http';
 import * as $ from 'jquery';
@Component({
@@ -13,154 +12,71 @@ export class TerminalAreaComponent implements OnInit {

  constructor(
    private httpCilent: HttpClientService,
-    private changeDetectorRef: ChangeDetectorRef
+    private basicDataService: BasicDataService
 ) { }

-public raw_data: Array<object> = [];    //原始数据，即航班计划
-
-public combined_data: Array<object> = [];    //组合数据，即链接航班，显示信息等组合好之后的数据
-
-public render_data: Array<object> = [];  //显示数据，即需要显示的数据
-
-public terminalarea_lists: Array<object>;    //列数据
-
-public row_state: any = { renderFlight: {} };
-
 // 搜索条件
 SEARCH = '';    //手动输入条件
 FLT_POS = 1;    //过滤还是定位
 SEL_COL = '';   //选择列名

-public filterItems = {
-    
-}
-
-public formatter = {
-    'SODT': dateFormatter,
-    'ESTT': dateFormatter,
-    'ACTT': dateFormatter
-}
-
-selectRow(i) {
-    this.row_state = i;
-    this.changeDetectorRef.detectChanges();
-}
-
-getColor(col_CODE) {
-    if (col_CODE === 'SODT') {
-        return 'skyblue'
-    } else {
-        return null
-    }
-}
-
+terminalAreas : Array<any>;
+public row_state: any = { renderFlight: {} };
+public render_data: Array<object> = [];  //显示数据，即需要显示的数据
 ngOnInit() {
-    this.changeDetectorRef.detach();
-    /* 获取显示列 */
-    this.httpCilent.get('/assets/mock-data/terminal-area-code.json').subscribe(
-        data => {
-            data.sort(function (a, b) {
-                return (a['COL_ORDER'] - b['COL_ORDER']);
-            })
-            this.terminalarea_lists = data;
+    this.terminalAreas = this.basicDataService.terminal_area;
+    this.basicDataService.terminal_area_subject.subscribe(
+        data=>{
+            this.terminalAreas = data;
+            this.render_data = this.terminalAreas;
        }
    )
-    /* 获取航站楼区域信息 */
-    this.httpCilent.get('/assets/mock-data/terminal-area-data.json').subscribe(
-        data => {
-            //解析数据
-            data.forEach(element => {
-                this.raw_data.push(JSON.parse(element.value));
-            });
-
-            let combined_linked_data = this.raw_data
-
-            combined_linked_data.forEach(element => {
-                let row_flights = {};
-                let render_flight = {};
-                let render_pre_flight = {};
-                let render_rea_flight = {};
-                row_flights['preFlight'] = element;
-
-                for (let i = 0; i < this.terminalarea_lists.length; i++) {
-                    let key = this.terminalarea_lists[i]['COL_CODE']
-                    render_flight[key] = typeof (this.formatter[key]) === 'function' ? this.formatter[key](row_flights['preFlight'][key], 1) : this.formatter[key] ? this.formatter[key][row_flights['preFlight'][key]] : row_flights['preFlight'][key];
-                }
-                row_flights['renderFlight'] = render_flight;
-                if (element['isLinked']) {
-                    row_flights['preFlight'] = element['linkFlight'];
-                    delete element['linkFlight'];
-                    delete element['isLinked'];
-                    row_flights['reaFlight'] = element;
-
-                    for (let i = 0; i < this.terminalarea_lists.length; i++) {
-                        let key = this.terminalarea_lists[i]['COL_CODE']
-                        if (this.formatter.hasOwnProperty(key)) {
-                            if (typeof (this.formatter[key]) === 'function') {
-                                render_flight[key] = (row_flights['preFlight'][key] === row_flights['reaFlight'][key]) ? (this.formatter[key](row_flights['preFlight'][key], 1)) : (this.formatter[key](row_flights['preFlight'][key], 1) + '/' + this.formatter[key](row_flights['reaFlight'][key], 1));
-                                render_pre_flight[key] = this.formatter[key](row_flights['preFlight'][key], 1);
-                                render_rea_flight[key] = this.formatter[key](row_flights['reaFlight'][key], 1);
-                            } else {
-                                render_flight[key] = (row_flights['preFlight'][key] === row_flights['reaFlight'][key]) ? (this.formatter[key][row_flights['preFlight'][key]]) : (this.formatter[key][row_flights['preFlight'][key]] + '/' + this.formatter[key][row_flights['reaFlight'][key]]);
-                                render_pre_flight[key] = this.formatter[key][row_flights['preFlight'][key]];
-                                render_rea_flight[key] = this.formatter[key][row_flights['reaFlight'][key]];
-                            }
-                        } else {
-                            render_flight[key] = (row_flights['preFlight'][key] === row_flights['reaFlight'][key]) ? (row_flights['preFlight'][key]) : (row_flights['preFlight'][key] + '/' + row_flights['reaFlight'][key]);
-                            render_pre_flight[key] = row_flights['preFlight'][key];
-                            render_rea_flight[key] = row_flights['reaFlight'][key];
-                        }
-                    }
-                    row_flights['renderFlight'] = render_flight;
-                    row_flights['renderPreFlight'] = render_pre_flight;
-                    row_flights['renderReaFlight'] = render_rea_flight;
-                }
-                this.combined_data.push(row_flights)
-            })
-            this.render_data = this.combined_data
-            this.changeDetectorRef.detectChanges();
-        }
-    )
-        /**
-         * 固定表头
-         */
-        var tableCont = document.querySelector('#table-container');
-        function scrollHandle (){
-          var scrollTop = this.scrollTop;
-          this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
-        }
-        tableCont.addEventListener('scroll',scrollHandle);
-
-    }
    /**
- * 过滤及定位
- * @param filterItems
- * @return
- */
+     * 固定表头
+     */
+    var tableCont = document.querySelector('#table-container');
+    function scrollHandle (){
+      var scrollTop = this.scrollTop;
+      this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
+    }
+    tableCont.addEventListener('scroll',scrollHandle);
+}
+
+//刷新
+clearFiter(){
+    $("#inputerInfo").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.selectChange()
+} else {
+    this.selectChange()
+    this.inputPosition(this.render_data)
+}
 }

 //下拉框选择筛选
 selectChange() {
    let filter_data = [];
-    let filterItems = this.filterItems;
-    this.combined_data.forEach(item => {
+    let filterterminalAreas = 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.terminalAreas = filter_data;
+        this.row_state = this.terminalAreas.length > 0 ? this.terminalAreas[0] : { renderFlight: {} };
+    }
    //下拉框筛选
    filter_data = filter_data.filter(item => {
        if (item) {
            let is_satis = true;
-            for (const key in filterItems) {
-                if (filterItems.hasOwnProperty(key) && filterItems[key]) {
-                    if (item['preFlight'][key] === filterItems[key]) {
+            for (const key in filterterminalAreas) {
+                if (filterterminalAreas.hasOwnProperty(key) && filterterminalAreas[key]) {
+                    if (item[key] === filterterminalAreas[key]) {
                        is_satis = true;
                        continue;
                    } else {
@@ -173,9 +89,9 @@ selectChange() {
            return is_satis;
        } else if (item) {
            let is_satis = true;
-            for (const key in filterItems) {
-                if (filterItems.hasOwnProperty(key) && filterItems[key]) {
-                    if (item['reaFlight'][key] === filterItems[key]) {
+            for (const key in filterterminalAreas) {
+                if (filterterminalAreas.hasOwnProperty(key) && filterterminalAreas[key]) {
+                    if (item[key] === filterterminalAreas[key]) {
                        is_satis = true;
                        continue;
                    } else {
@@ -189,9 +105,9 @@ selectChange() {
        } else {
            let pre_satis = true;
            let rea_satis = true;
-            for (const key in filterItems) {
-                if (filterItems.hasOwnProperty(key) && filterItems[key]) {
-                    if (item['preFlight'][key] === filterItems[key]) {
+            for (const key in filterterminalAreas) {
+                if (filterterminalAreas.hasOwnProperty(key) && filterterminalAreas[key]) {
+                    if (item[key] === filterterminalAreas[key]) {
                        pre_satis = true;
                        continue;
                    } else {
@@ -201,9 +117,9 @@ selectChange() {

                }
            }
-            for (const key in filterItems) {
-                if (filterItems.hasOwnProperty(key) && filterItems[key]) {
-                    if (item['reaFlight'][key] === filterItems[key]) {
+            for (const key in filterterminalAreas) {
+                if (filterterminalAreas.hasOwnProperty(key) && filterterminalAreas[key]) {
+                    if (item[key] === filterterminalAreas[key]) {
                        rea_satis = true;
                        continue;
                    } else {
@@ -215,10 +131,10 @@ selectChange() {
            }

            if (pre_satis && !rea_satis) {
-                item['renderFlight'] = item['renderPreFlight'];
+                item = item;
                return pre_satis;
            } else if (!pre_satis && rea_satis) {
-                item['renderFlight'] = item['renderReaFlight'];
+                item = item;
                return rea_satis;
            } else if (pre_satis && rea_satis) {
                return pre_satis && rea_satis;
@@ -227,24 +143,16 @@ selectChange() {
            }
        }
    })
-    if (this.FLT_POS === 1) {
-        this.inputFilter(filter_data);
-    } else {
-        this.render_data = filter_data;
-        this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
-        // this.inputPosition(this.render_data);
-        this.changeDetectorRef.detectChanges();
    }
-}

-//输入框筛选
-inputFilter(filterData) {
+    //输入框筛选
+    inputFilter(filterData) {
    if (this.SEARCH) {
        if (this.SEL_COL) {
            let sel_col = this.SEL_COL;
            filterData = filterData.filter(item => {
-                if (item['renderFlight'][sel_col]) {
-                    if (item['renderFlight'][sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
+                if (item[sel_col]) {
+                    if (item[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
                        return true;
                    }
                } else {
@@ -259,10 +167,10 @@ inputFilter(filterData) {
        } else {
            filterData = filterData.filter(item => {
                let is_satis = false;
-                for (const key in item['renderFlight']) {
-                    if (item['renderFlight'].hasOwnProperty(key)) {
-                        if (item['renderFlight'][key]) {
-                            if (item['renderFlight'][key].toString().match(new RegExp(this.SEARCH, 'i'))) {
+                for (const key in item) {
+                    if (item.hasOwnProperty(key)) {
+                        if (item[key]) {
+                            if (item[key].toString().match(new RegExp(this.SEARCH, 'i'))) {
                                is_satis = true;
                                break;
                            } else {
@@ -286,21 +194,20 @@ inputFilter(filterData) {
            })
        }
    }
-    this.render_data = filterData;
-    this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
-    this.changeDetectorRef.detectChanges();
-}
+    this.terminalAreas = filterData;
+    this.row_state = this.terminalAreas.length > 0 ? this.terminalAreas[0] : { renderFlight: {} };
+    }

-positionArray: Array<any> = [];
-positionArrayIndex: number = 0;
-//输入框定位
-inputPosition(filterData) {
+    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['renderFlight'][sel_col]) {
-                if (element['renderFlight'][sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
+            if (element[sel_col]) {
+                if (element[sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
                    transArray.push(element)
                }
            } else {
@@ -311,10 +218,10 @@ inputPosition(filterData) {
        });
    } else {
        filterData.forEach(element => {
-            for (const key in element['renderFlight']) {
-                if (element['renderFlight'].hasOwnProperty(key)) {
-                    if (element['renderFlight'][key]) {
-                        if (element['renderFlight'][key].toString().match(new RegExp(this.SEARCH, 'i'))) {
+            for (const key in element) {
+                if (element.hasOwnProperty(key)) {
+                    if (element[key]) {
+                        if (element[key].toString().match(new RegExp(this.SEARCH, 'i'))) {
                            transArray.push(element)
                            break;
                        } else {
@@ -351,12 +258,5 @@ inputPosition(filterData) {
    } else {
        alert('没有搜索到相关数据');
    }
-
-    this.changeDetectorRef.detectChanges();
-
-    let tr = $(".selected");
-    let objTr = tr[0];
-    $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
-
    }
 }