From 8575d56e9a73f5a9835299d3cb9f4307cbdc9abf Mon Sep 17 00:00:00 2001 From: zhouyuejun <505127606@qq.com> Date: Wed, 8 May 2019 09:44:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=88=AA=E7=8F=AD=E5=8A=A8=E6=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=97=A7=E7=99=BB=E6=9C=BA=E5=8F=A3=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/utils/transfer-render-handle.ts | 34 ++++++++++++++++++++++--- src/assets/web-worker-handle.js | 34 ++++++++++++++++++++++--- 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/src/app/utils/transfer-render-handle.ts b/src/app/utils/transfer-render-handle.ts index 1544d44..fdbd8b6 100644 --- a/src/app/utils/transfer-render-handle.ts +++ b/src/app/utils/transfer-render-handle.ts @@ -424,14 +424,40 @@ export class TransferRenderHandle { gate.push(flight['GTDT'][i]['GATE']); } let set = new Set(gate); - return Array.from(set).join(','); + let joinedGate = Array.from(set).join(','); + if (flight['LGTDT']) { + if (joinedGate == flight['LGTDT']) { + return joinedGate; + } else { + return joinedGate + '(' + flight['LGTDT'] + ')'; + } + } else { + return joinedGate; + } } else if (Object.prototype.toString.call(flight['GTDT']) === '[object Object]') { - return flight['GTDT']['GATE']; + if (flight['LGTDT']) { + if (flight['GTDT']['GATE'] == flight['LGTDT']) { + return flight['GTDT']['GATE']; + } else { + return flight['GTDT']['GATE'] + '(' + flight['LGTDT'] + ')'; + } + + } else { + return flight['GTDT']['GATE']; + } + } else { + if (flight['LGTDT']) { + return '(' + flight['LGTDT'] + ')'; + } else { + return ''; + } + } + } else { + if (flight['LGTDT']) { + return '(' + flight['LGTDT'] + ')'; } else { return ''; } - } else { - return ''; } } public padtFormatter(flight) { diff --git a/src/assets/web-worker-handle.js b/src/assets/web-worker-handle.js index c69834c..e9386ee 100644 --- a/src/assets/web-worker-handle.js +++ b/src/assets/web-worker-handle.js @@ -598,14 +598,40 @@ onmessage = function (dynamicData) { gate.push(flight['GTDT'][i]['GATE']); } let set = new Set(gate); - return Array.from(set).join(','); + let joinedGate = Array.from(set).join(','); + if (flight['LGTDT']) { + if (joinedGate == flight['LGTDT']) { + return joinedGate; + } else { + return joinedGate + '(' + flight['LGTDT'] + ')'; + } + } else { + return joinedGate; + } } else if (Object.prototype.toString.call(flight['GTDT']) === '[object Object]') { - return flight['GTDT']['GATE']; + if (flight['LGTDT']) { + if (flight['GTDT']['GATE'] == flight['LGTDT']) { + return flight['GTDT']['GATE']; + } else { + return flight['GTDT']['GATE'] + '(' + flight['LGTDT'] + ')'; + } + + } else { + return flight['GTDT']['GATE']; + } + } else { + if (flight['LGTDT']) { + return '(' + flight['LGTDT'] + ')'; + } else { + return ''; + } + } + } else { + if (flight['LGTDT']) { + return '(' + flight['LGTDT'] + ')'; } else { return ''; } - } else { - return ''; } }, 'PADT': function padtFormatter(flight) {