diff --git a/src/app/pages/system-management/personal-settings/personal-settings.component.ts b/src/app/pages/system-management/personal-settings/personal-settings.component.ts index 5e61071..e2c7daf 100644 --- a/src/app/pages/system-management/personal-settings/personal-settings.component.ts +++ b/src/app/pages/system-management/personal-settings/personal-settings.component.ts @@ -78,6 +78,7 @@ export class PersonalSettingsComponent implements OnInit { { "COL_CODE": "PADT", "COL_CN": "前站起飞时间", "COL_ORDER": "29", "COL_WIDTH": "85px" }, { "COL_CODE": "CSFT", "COL_CN": "共享航班号", "COL_ORDER": "30", "COL_WIDTH": "85px" }, { "COL_CODE": "STND", "COL_CN": "当前机位", "COL_ORDER": "31", "COL_WIDTH": "85px" }, + { "COL_CODE": "FLDT", "COL_CN": "航班日期", "COL_ORDER": "32", "COL_WIDTH": "85px" }, ] /* 备注:实际数据中,把原始数据录入到临时变量中,方便取消按钮,重置数据 diff --git a/src/app/utils/date-with-notime-formatter.ts b/src/app/utils/date-with-notime-formatter.ts new file mode 100644 index 0000000..f66b173 --- /dev/null +++ b/src/app/utils/date-with-notime-formatter.ts @@ -0,0 +1,36 @@ +/** + * 日期转换 + * @param dataString 需要转换成日期的字符串 + */ +export default function (dataString) { + const monthToNumber = { + JAN: '01', + FEB: '02', + MAR: '03', + APR: '04', + MAY: '05', + JUN: '06', + JUL: '07', + AUG: '08', + SEP: '09', + OCT: '10', + NOV: '11', + DEC: '12', + } + if (!dataString || dataString.length < 11) { + return dataString ? dataString : ''; + } + if (!dataString.substring(7)) { + return dataString ? dataString : ''; + } + if (!monthToNumber.hasOwnProperty(dataString.substring(2, 5).toUpperCase())) { + return dataString ? dataString : ''; + } + + let year = "20" + dataString.substring(5, 7); + let month = monthToNumber[dataString.substring(2, 5).toUpperCase()]; + let day = dataString.substring(0, 2); + let hour = dataString.substring(7, 9); + let min = dataString.substring(9, 11); + return year + '-' + month + '-' + day +} \ No newline at end of file diff --git a/src/app/utils/flights-data-handle.ts b/src/app/utils/flights-data-handle.ts index fb9842e..047d5cd 100644 --- a/src/app/utils/flights-data-handle.ts +++ b/src/app/utils/flights-data-handle.ts @@ -26,7 +26,8 @@ export class FlightsDataHandle { 'FLIN': this.transferHandle.flinFormatter.bind(this.transferHandle), 'SODT': this.transferHandle.sodtFormatter.bind(this.transferHandle), 'GATE': this.transferHandle.gateFormatter.bind(this.transferHandle), - 'PADT': this.transferHandle.padtFormatter.bind(this.transferHandle) + 'PADT': this.transferHandle.padtFormatter.bind(this.transferHandle), + 'FLDT':this.transferHandle.fldtFormatter.bind(this.transferHandle) } public orderHandle = new DynamicFlightOrder(); diff --git a/src/app/utils/transfer-render-handle.ts b/src/app/utils/transfer-render-handle.ts index 7bebef2..c17f205 100644 --- a/src/app/utils/transfer-render-handle.ts +++ b/src/app/utils/transfer-render-handle.ts @@ -1,6 +1,6 @@ import timeFormatter from './time-formatter'; +import dateWithNotimeFormatter from './date-with-notime-formatter'; export class TransferRenderHandle { - public gctmFormatter(flight) { if (flight['GTDT']) { if (Array.isArray(flight['GTDT']) && flight['GTDT'].length > 0) { @@ -271,4 +271,11 @@ export class TransferRenderHandle { return ''; } } + public fldtFormatter(flight){ + if (flight['SODT']) { + return dateWithNotimeFormatter(flight['SODT']); + } else { + return ''; + } + } } \ No newline at end of file