添加基础数据查询路由页面

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

@@ -0,0 +1,3 @@
+<p>
+  aircraft-type works!
+</p>

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

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AircraftTypeComponent } from './aircraft-type.component';
+
+describe('AircraftTypeComponent', () => {
+  let component: AircraftTypeComponent;
+  let fixture: ComponentFixture<AircraftTypeComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AircraftTypeComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AircraftTypeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-aircraft-type',
+  templateUrl: './aircraft-type.component.html',
+  styleUrls: ['./aircraft-type.component.scss']
+})
+export class AircraftTypeComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

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

@@ -0,0 +1,3 @@
+<p>
+  aircraft works!
+</p>

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

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AircraftComponent } from './aircraft.component';
+
+describe('AircraftComponent', () => {
+  let component: AircraftComponent;
+  let fixture: ComponentFixture<AircraftComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AircraftComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AircraftComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-aircraft',
+  templateUrl: './aircraft.component.html',
+  styleUrls: ['./aircraft.component.scss']
+})
+export class AircraftComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

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

@@ -0,0 +1,3 @@
+<p>
+  airline works!
+</p>

src/app/pages/basic-data/airline/airline.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AirlineComponent } from './airline.component';
+
+describe('AirlineComponent', () => {
+  let component: AirlineComponent;
+  let fixture: ComponentFixture<AirlineComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AirlineComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AirlineComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-airline',
+  templateUrl: './airline.component.html',
+  styleUrls: ['./airline.component.scss']
+})
+export class AirlineComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

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

@@ -0,0 +1,3 @@
+<p>
+  airport works!
+</p>

src/app/pages/basic-data/airport/airport.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AirportComponent } from './airport.component';
+
+describe('AirportComponent', () => {
+  let component: AirportComponent;
+  let fixture: ComponentFixture<AirportComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AirportComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AirportComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-airport',
+  templateUrl: './airport.component.html',
+  styleUrls: ['./airport.component.scss']
+})
+export class AirportComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/pages/basic-data/basic-data-routing.module.ts

@@ -2,11 +2,78 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { BasicDataComponent } from './basic-data.component';
+import { CheckinGroupComponent } from './checkin-group/checkin-group.component';
+import { GateComponent } from './gate/gate.component';
+import { TerminalComponent } from './terminal/terminal.component';
+import { ChutComponent } from './chut/chut.component';
+import { StandComponent } from './stand/stand.component';
+import { CarouselComponent } from './carousel/carousel.component';
+import { CheckinDeskComponent } from './checkin-desk/checkin-desk.component';
+import { AirportComponent } from './airport/airport.component';
+import { CityComponent } from './city/city.component';
+import { AircraftTypeComponent } from './aircraft-type/aircraft-type.component';
+import { AircraftComponent } from './aircraft/aircraft.component';
+import { TerminalAreaComponent } from './terminal-area/terminal-area.component';
+import { AirlineComponent } from './airline/airline.component';
 
 const basicDataRoutes: Routes = [
     {
         path: '',
-        component: BasicDataComponent
+        component: BasicDataComponent,
+        children:[
+            {
+                path:'checkingroup',
+                component:CheckinGroupComponent
+            },
+            {
+                path:'gate',
+                component:GateComponent
+            },
+            {
+                path:'terminal',
+                component:TerminalComponent,
+            },
+            {
+                path:'chut',
+                component:ChutComponent
+            },
+            {
+                path:'stand',
+                component:StandComponent
+            },
+            {
+                path:'carousel',
+                component:CarouselComponent
+            },
+            {
+                path:'checkindesk',
+                component:CheckinDeskComponent
+            },
+            {
+                path:'airport',
+                component:AirportComponent
+            },
+            {
+                path:'city',
+                component:CityComponent
+            },
+            {
+                path:'aircrafttype',
+                component:AircraftTypeComponent
+            },
+            {
+                path:'aircraft',
+                component:AircraftComponent
+            },
+            {
+                path:'terminalarea',
+                component:TerminalAreaComponent
+            },
+            {
+                path:'airline',
+                component:AirlineComponent
+            }
+        ]
     }
 ]
 

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

@@ -1,3 +0,0 @@
-<p>
-  basic-data works!
-</p>

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

@@ -2,8 +2,7 @@ import { Component, OnInit } from '@angular/core';
 
 @Component({
   selector: 'app-basic-data',
-  templateUrl: './basic-data.component.html',
-  styleUrls: ['./basic-data.component.scss']
+  template: '<router-outlet></router-outlet>'
 })
 export class BasicDataComponent implements OnInit {
 

src/app/pages/basic-data/basic-data.module.ts

@@ -2,12 +2,37 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { BasicDataComponent } from './basic-data.component';
 import { BasicDataRouting } from './basic-data-routing.module';
+import { CheckinGroupComponent } from './checkin-group/checkin-group.component';
+import { GateComponent } from './gate/gate.component';
+import { TerminalComponent } from './terminal/terminal.component';
+import { ChutComponent } from './chut/chut.component';
+import { StandComponent } from './stand/stand.component';
+import { CarouselComponent } from './carousel/carousel.component';
+import { CheckinDeskComponent } from './checkin-desk/checkin-desk.component';
+import { AirportComponent } from './airport/airport.component';
+import { CityComponent } from './city/city.component';
+import { AircraftTypeComponent } from './aircraft-type/aircraft-type.component';
+import { AircraftComponent } from './aircraft/aircraft.component';
+import { TerminalAreaComponent } from './terminal-area/terminal-area.component';
+import { AirlineComponent } from './airline/airline.component';
 
 @NgModule({
     imports: [
         CommonModule,
         BasicDataRouting
     ],
-    declarations: [BasicDataComponent]
+    declarations: [
+        BasicDataComponent, 
+        CheckinGroupComponent, 
+        GateComponent, TerminalComponent, 
+        ChutComponent, StandComponent, 
+        CarouselComponent, 
+        CheckinDeskComponent, 
+        AirportComponent, 
+        CityComponent, 
+        AircraftTypeComponent, 
+        AircraftComponent, 
+        TerminalAreaComponent, 
+        AirlineComponent]
 })
 export class BasicDataModule { }

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

@@ -0,0 +1,3 @@
+<p>
+  carousel works!
+</p>

src/app/pages/basic-data/carousel/carousel.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CarouselComponent } from './carousel.component';
+
+describe('CarouselComponent', () => {
+  let component: CarouselComponent;
+  let fixture: ComponentFixture<CarouselComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CarouselComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CarouselComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-carousel',
+  templateUrl: './carousel.component.html',
+  styleUrls: ['./carousel.component.scss']
+})
+export class CarouselComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

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

@@ -0,0 +1,3 @@
+<p>
+  checkin-desk works!
+</p>

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

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CheckinDeskComponent } from './checkin-desk.component';
+
+describe('CheckinDeskComponent', () => {
+  let component: CheckinDeskComponent;
+  let fixture: ComponentFixture<CheckinDeskComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CheckinDeskComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CheckinDeskComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-checkin-desk',
+  templateUrl: './checkin-desk.component.html',
+  styleUrls: ['./checkin-desk.component.scss']
+})
+export class CheckinDeskComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/pages/basic-data/checkin-group/checkin-group.component.html

@@ -0,0 +1,3 @@
+<p>
+  checkin-group works!
+</p>

src/app/pages/basic-data/checkin-group/checkin-group.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CheckinGroupComponent } from './checkin-group.component';
+
+describe('CheckinGroupComponent', () => {
+  let component: CheckinGroupComponent;
+  let fixture: ComponentFixture<CheckinGroupComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CheckinGroupComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CheckinGroupComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-checkin-group',
+  templateUrl: './checkin-group.component.html',
+  styleUrls: ['./checkin-group.component.scss']
+})
+export class CheckinGroupComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

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

@@ -0,0 +1,3 @@
+<p>
+  chut works!
+</p>

src/app/pages/basic-data/chut/chut.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ChutComponent } from './chut.component';
+
+describe('ChutComponent', () => {
+  let component: ChutComponent;
+  let fixture: ComponentFixture<ChutComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ChutComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ChutComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-chut',
+  templateUrl: './chut.component.html',
+  styleUrls: ['./chut.component.scss']
+})
+export class ChutComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

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

@@ -0,0 +1,3 @@
+<p>
+  city works!
+</p>

src/app/pages/basic-data/city/city.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CityComponent } from './city.component';
+
+describe('CityComponent', () => {
+  let component: CityComponent;
+  let fixture: ComponentFixture<CityComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CityComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CityComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-city',
+  templateUrl: './city.component.html',
+  styleUrls: ['./city.component.scss']
+})
+export class CityComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

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

@@ -0,0 +1,3 @@
+<p>
+  gate works!
+</p>

src/app/pages/basic-data/gate/gate.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { GateComponent } from './gate.component';
+
+describe('GateComponent', () => {
+  let component: GateComponent;
+  let fixture: ComponentFixture<GateComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ GateComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(GateComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-gate',
+  templateUrl: './gate.component.html',
+  styleUrls: ['./gate.component.scss']
+})
+export class GateComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

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

@@ -0,0 +1,3 @@
+<p>
+  stand works!
+</p>

src/app/pages/basic-data/stand/stand.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { StandComponent } from './stand.component';
+
+describe('StandComponent', () => {
+  let component: StandComponent;
+  let fixture: ComponentFixture<StandComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ StandComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(StandComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-stand',
+  templateUrl: './stand.component.html',
+  styleUrls: ['./stand.component.scss']
+})
+export class StandComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/pages/basic-data/terminal-area/terminal-area.component.html

@@ -0,0 +1,3 @@
+<p>
+  terminal-area works!
+</p>

src/app/pages/basic-data/terminal-area/terminal-area.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TerminalAreaComponent } from './terminal-area.component';
+
+describe('TerminalAreaComponent', () => {
+  let component: TerminalAreaComponent;
+  let fixture: ComponentFixture<TerminalAreaComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ TerminalAreaComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TerminalAreaComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/basic-data/terminal-area/terminal-area.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-terminal-area',
+  templateUrl: './terminal-area.component.html',
+  styleUrls: ['./terminal-area.component.scss']
+})
+export class TerminalAreaComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

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

@@ -0,0 +1,3 @@
+<p>
+  terminal works!
+</p>

src/app/pages/basic-data/terminal/terminal.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TerminalComponent } from './terminal.component';
+
+describe('TerminalComponent', () => {
+  let component: TerminalComponent;
+  let fixture: ComponentFixture<TerminalComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ TerminalComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TerminalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-terminal',
+  templateUrl: './terminal.component.html',
+  styleUrls: ['./terminal.component.scss']
+})
+export class TerminalComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/pages/main/main.component.html

@@ -7,11 +7,11 @@
                         <option value="">选择列名</option>
                     </select>
                     <label class="radio-inline custom-radio nowrap mr-4">
-                        <input type="radio" [(ngModel)]="filterItems.FLT_POS" value="1" name="filter-position">
+                        <input type="radio" [(ngModel)]="filterItems.FLT_POS" [value]="1" name="filter-position">
                         <span>过滤</span>
                     </label>
                     <label class="radio-inline custom-radio nowrap mr-4">
-                        <input type="radio" [(ngModel)]="filterItems.FLT_POS" value="2" name="filter-position">
+                        <input type="radio" [(ngModel)]="filterItems.FLT_POS" [value]="2" name="filter-position">
                         <span>查找定位</span>
                     </label>
                     <input class="form-control" [(ngModel)]="filterItems.SEARCH" type="text">

src/app/pages/main/main.component.ts

@@ -50,7 +50,7 @@ export class MainComponent implements OnInit {
 
     public filterItems = {
         SEARCH: '',  //手动输入条件
-        FLT_POS:'1', //过滤还是定位
+        FLT_POS: 1,  //过滤还是定位
         ALCD: '',    //航空公司
         FLIN: '',    //航线类别
         FLTY: '',    //航班类别
@@ -140,7 +140,7 @@ export class MainComponent implements OnInit {
 
                         for (let i = 0; i < this.col_lists.length; i++) {
                             let key = this.col_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];
+                            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;
 
@@ -148,7 +148,7 @@ export class MainComponent implements OnInit {
                         row_flights['reaFlight'] = element;
                         for (let i = 0; i < this.col_lists.length; i++) {
                             let key = this.col_lists[i]['COL_CODE']
-                            render_flight[key] = typeof (this.formatter[key]) === 'function' ? this.formatter[key](row_flights['reaFlight'][key],1) : this.formatter[key] ? this.formatter[key][row_flights['reaFlight'][key]] : row_flights['reaFlight'][key];
+                            render_flight[key] = typeof (this.formatter[key]) === 'function' ? this.formatter[key](row_flights['reaFlight'][key], 1) : this.formatter[key] ? this.formatter[key][row_flights['reaFlight'][key]] : row_flights['reaFlight'][key];
                         }
                         row_flights['renderFlight'] = render_flight;
 
@@ -162,9 +162,9 @@ export class MainComponent implements OnInit {
                             let key = this.col_lists[i]['COL_CODE']
                             if (this.formatter.hasOwnProperty(key)) {
                                 if (typeof (this.formatter[key]) === 'function') {
-                                    render_flight[key] = 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);
+                                    render_flight[key] = 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] = 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]];
@@ -201,6 +201,26 @@ export class MainComponent implements OnInit {
     }
 
 
+    /**
+     * 过滤机定位
+     * @param filterItems
+     * @return
+     */
+
+    fliter(filterItems, render_data) {
+        if(filterItems.FLT_POS===1){
+            //过滤
+        }else{
+            //定位
+        }
+    }
+
+
+
+
+
+
+
     /**
      * 行排序规则方法
      * @param flight 

src/app/pages/pages.component.ts

@@ -39,8 +39,99 @@ export class PagesComponent implements OnInit {
             "name": "基础数据",
             "icon": 'fa-database',
             "isExpend": false,
-            "isActive": false,
-            "path": "/app/basic"
+            "children":[
+                {
+                    "name": "值机岛",
+                    "icon": "fa-eercast",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/checkingroup"
+                },
+                {
+                    "name": "登机门",
+                    "icon": "fa-h-square",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/gate"
+                },
+                {
+                    "name": "航站楼",
+                    "icon": "fa-wpexplorer",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/terminal"
+                },
+                {
+                    "name": "行李传送带",
+                    "icon": "fa-ils",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/chut"
+                },
+                {
+                    "name": "行李转盘",
+                    "icon": "fa-connectdevelop",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/carousel"
+                },
+                {
+                    "name": "机位",
+                    "icon": "fa-exchange",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/stand"
+                },
+                {
+                    "name": "值机柜台",
+                    "icon": "fa-desktop",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/checkindesk"
+                },
+                {
+                    "name": "机场",
+                    "icon": "fa-fighter-jet",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/airport"
+                },
+                {
+                    "name": "城市",
+                    "icon": "fa-globe",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/city"
+                },
+                {
+                    "name": "机型",
+                    "icon": "fa-file-text-o",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/aircrafttype"
+                },
+                {
+                    "name": "飞机",
+                    "icon": "fa-plane",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/aircraft"
+                },
+                {
+                    "name": "航站楼区域",
+                    "icon": "fa-area-chart",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/terminalarea"
+                },
+                {
+                    "name": "航空公司",
+                    "icon": "fa-building-o",
+                    "isExpend": false,
+                    "isActive": false,
+                    "path": "/app/basic/airline"
+                },
+            ]
         },
         {
             "name": "系统管理",

src/app/theme/scss/base.scss

@@ -6,6 +6,7 @@ body {
     font-size: 14px !important;
     font-family: "Roboto", sans-serif !important;
     background-color: #1190d6 !important;
+    // color: rgb(0, 0, 0) !important;
 }
 /*添加手形*/
 a[href],