From 4e0f2c7438e23f9c3755f80c1690816a3cbb230b Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Tue, 6 Nov 2018 09:41:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E8=A1=8C=E6=8E=92?=
=?UTF-8?q?=E5=BA=8F=EF=BC=88=E5=BE=85=E4=BC=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
angular.json | 2 +-
src/app/pages/main/main.component.html | 9 +-
src/app/pages/main/main.component.scss | 6 +-
src/app/pages/main/main.component.ts | 256 +-
src/app/pages/main/main.module.ts | 2 +
src/app/pipes/data-formatter.pipe.ts | 75 +
src/app/pipes/pipes.module.ts | 14 +
src/app/utils/arri-dept.ts | 9 +
src/app/utils/data-formatter.ts | 40 +
src/app/utils/flight-type.ts | 11 +
src/app/utils/get-cookie.ts | 5 +-
src/app/utils/route-type.ts | 11 +
src/assets/mock-data/airline-col_code.json | 42 +-
src/assets/mock-data/airline-data.json | 3950 ++++++++++----------
14 files changed, 2418 insertions(+), 2014 deletions(-)
create mode 100644 src/app/pipes/data-formatter.pipe.ts
create mode 100644 src/app/pipes/pipes.module.ts
create mode 100644 src/app/utils/arri-dept.ts
create mode 100644 src/app/utils/data-formatter.ts
create mode 100644 src/app/utils/flight-type.ts
create mode 100644 src/app/utils/route-type.ts
diff --git a/angular.json b/angular.json
index 07bc6fe..6023160 100644
--- a/angular.json
+++ b/angular.json
@@ -17,7 +17,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
- "outputPath": "dist/gzzn-admin",
+ "outputPath": "dist/cd-airport",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html
index 472d1af..9c7ae85 100644
--- a/src/app/pages/main/main.component.html
+++ b/src/app/pages/main/main.component.html
@@ -106,17 +106,20 @@
-
+
| 序号 |
+ 重要提示 |
{{airline_col.COL_CN}} |
-
+
| {{i+1}} |
- {{airline_row[airline_col.COL_CODE]}} |
+ |
+ {{airline_col.COL_CODE|dataFormatter:airline_row}} |
diff --git a/src/app/pages/main/main.component.scss b/src/app/pages/main/main.component.scss
index fa34e9b..cf17098 100644
--- a/src/app/pages/main/main.component.scss
+++ b/src/app/pages/main/main.component.scss
@@ -28,12 +28,12 @@
}
.airline-table{
.table-container{
- border: 1px solid #ccc;
+ // border: 1px solid #ccc;
width: 100%;
height: 700px;
overflow: scroll;
table{
- width: auto;
+ width: max-content;
tr{
cursor: pointer;
&.active{
@@ -41,7 +41,7 @@
}
}
th,td{
- border: none;
+ // border: none;
text-align: center;
}
}
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index 1bde3ed..d7801b6 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -2,6 +2,11 @@ import { Component, OnInit } from '@angular/core';
import { HttpClientService } from '../../services/http-client.service';
+import dateFormatter from '../../utils/data-formatter';
+import routeType from '../../utils/route-type';
+import flightType from '../../utils/flight-type';
+import arriDept from '../../utils/arri-dept';
+
@Component({
selector: 'app-main',
templateUrl: './main.component.html',
@@ -13,12 +18,30 @@ export class MainComponent implements OnInit {
public airline_color: Array