From cda5fb65b13bb9e8cfbd67e529c991620f0b3aa6 Mon Sep 17 00:00:00 2001 From: "714943302@qq.com" Date: Mon, 17 Dec 2018 17:55:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A3=E5=BA=A6?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/seasonal-plan/seasonal-plan.component.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts index b89a092..b061e3f 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts +++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts @@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { HttpClientService } from '../../services/http-client.service'; import { BasicDataService } from '../basic-data-service'; import { ChangeDetectorRef } from '@angular/core'; +import { ToastService } from '../../components/toast/toast.service'; +import { ToastConfig, ToastType } from '../../components/toast/toast-model'; import * as $ from 'jquery'; @Component({ selector: 'app-seasonal-plan', @@ -13,6 +15,7 @@ export class SeasonalPlanComponent implements OnInit { constructor( private httpCilent: HttpClientService, private basicDataService: BasicDataService, + private toastService: ToastService, private changeDetectorRef: ChangeDetectorRef ) { } @@ -245,7 +248,8 @@ export class SeasonalPlanComponent implements OnInit { * 刷新 */ refresh() { - this.render_data.reverse(); + const toastCfg = new ToastConfig(ToastType.SUCCESS, '', '刷新成功!', 3000); + this.toastService.toast(toastCfg); } /** From 8cbea4d402eb7a42d5b484a14508c78e9b55fc57 Mon Sep 17 00:00:00 2001 From: "714943302@qq.com" Date: Tue, 18 Dec 2018 17:42:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=A3=E5=BA=A6?= =?UTF-8?q?=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail-tab/detail-tab.component.html | 4 +- .../seasonal-plan.component.html | 18 +- .../seasonal-plan/seasonal-plan.component.ts | 213 ++---------------- 3 files changed, 35 insertions(+), 200 deletions(-) diff --git a/src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html b/src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html index b33a141..98c36cd 100644 --- a/src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html +++ b/src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html @@ -6,8 +6,8 @@

{{flight.internationalCode}}

{{flight.airlineChnName}}

{{flight.routeType}}

-

{{flight.flightTypeCode}}

-

{{flight.flightTask}}

+

{{flight.flightTypeNameCn}}

+

{{flight.operationDays}}

{{flight.startDate}}

{{flight.endDate}}

diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html index 23e6cc4..53bc224 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan.component.html +++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html @@ -50,13 +50,13 @@
@@ -68,7 +68,7 @@
-
+ + -
+ -->