From 46a514eac90966dfc800e0b10dbd73c8b04a2fb2 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Fri, 31 May 2019 19:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=88=AA=E7=8F=AD=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E8=88=AA=E7=A9=BA=E5=85=AC=E5=8F=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/utils/flights-data-handle.ts | 15 ++++++++++++---
 src/assets/web-worker-handle.js      | 21 +++++++++++++++++----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/app/utils/flights-data-handle.ts b/src/app/utils/flights-data-handle.ts
index 2259c0c..bc363cd 100644
--- a/src/app/utils/flights-data-handle.ts
+++ b/src/app/utils/flights-data-handle.ts
@@ -213,7 +213,6 @@ export class FlightsDataHandle {
             }
         } catch (error) {
             console.log('数据有误，处理失败，请检查数据');
-            throw error;
         } finally {
             return flights_item;
         }
@@ -290,8 +289,18 @@ export class FlightsDataHandle {
             }
             //航空公司处理
             try {
-                let airlineLinkIndex = airlines.findIndex(val => val.airlineCode === item['renderFlight']['ALCD']);
-                item['renderFlight']['ALCD'] = airlines[airlineLinkIndex].airlineName;
+                let linkAlcdArray = item['renderFlight']['ALCD'].split(' / ');
+                let handleAlcdArray = [];
+                if (linkAlcdArray.length > 1) {
+                    for(let i = 0;i<linkAlcdArray.length;i++){
+                        let airlineLinkIndex = airlines.findIndex(val => val.airlineCode === linkAlcdArray[i]);
+                        handleAlcdArray.push(airlines[airlineLinkIndex].airlineName)
+                    }
+                    item['renderFlight']['ALCD'] = handleAlcdArray.join(' / ');
+                } else {
+                    let airlineLinkIndex = airlines.findIndex(val => val.airlineCode === item['renderFlight']['ALCD']);
+                    item['renderFlight']['ALCD'] = airlines[airlineLinkIndex].airlineName;
+                }
             } catch (error) {
                 console.log("基础数据航空公司错误，处理失败，请检查数据 -- 链接航班")
             }
diff --git a/src/assets/web-worker-handle.js b/src/assets/web-worker-handle.js
index 1d5c3f0..f19d565 100644
--- a/src/assets/web-worker-handle.js
+++ b/src/assets/web-worker-handle.js
@@ -1127,7 +1127,6 @@ onmessage = function (dynamicData) {
             }
         } catch (error) {
             console.log('数据有误，处理失败，请检查数据');
-            throw error;
         } finally {
             combined_data.push(flights_item);
         }
@@ -1158,6 +1157,7 @@ onmessage = function (dynamicData) {
                             erutChnArray.push(erutCodeArray[i]);
                         }
                     } catch (error) {
+                        console.log('单进单出航班航线处理失败！');
                         erutChnArray.push(erutCodeArray[i]);
                     }
                 }
@@ -1189,14 +1189,26 @@ onmessage = function (dynamicData) {
                             erutLinkChnArray.push(erutLinkCodeArray[i]);
                         }
                     } catch (error) {
+                        console.log('链接航班航线处理失败！');
                         erutLinkChnArray.push(erutLinkCodeArray[i]);
                     }
                 }
                 item['renderFlight']['ERUTCHN'] = erutLinkAirportArray.join(' - ');
                 item['renderFlight']['ERUT'] = erutLinkChnArray.join(' - ');
                 //航空公司处理
-                let airlineLinkIndex = airlines.findIndex(val => val.airlineCode === item['renderFlight']['ALCD']);
-                item['renderFlight']['ALCD'] = airlines[airlineLinkIndex].airlineName;
+                let linkAlcdArray = item['renderFlight']['ALCD'].split(' / ');
+                let handleAlcdArray = [];
+                if (linkAlcdArray.length > 1) {
+                    for(let i = 0;i<linkAlcdArray.length;i++){
+                        let airlineLinkIndex = airlines.findIndex(val => val.airlineCode === linkAlcdArray[i]);
+                        handleAlcdArray.push(airlines[airlineLinkIndex].airlineName)
+                    }
+                    item['renderFlight']['ALCD'] = handleAlcdArray.join(' / ');
+                } else {
+                    let airlineLinkIndex = airlines.findIndex(val => val.airlineCode === item['renderFlight']['ALCD']);
+                    item['renderFlight']['ALCD'] = airlines[airlineLinkIndex].airlineName;
+                }
+
                 //运营状态处理
                 let ftssLinkCodeArray = item['renderFlight']['FTSS'].split(' / ');
                 let ftssLinkChnArray = [];
@@ -1231,6 +1243,7 @@ onmessage = function (dynamicData) {
                             erutPreChnArray.push(erutPreCodeArray[i]);
                         }
                     } catch (error) {
+                        console.log('到港航班航线处理失败！');
                         erutPreChnArray.push(erutPreCodeArray[i]);
                     }
                 }
@@ -1263,6 +1276,7 @@ onmessage = function (dynamicData) {
                             erutReaChnArray.push(erutReaCodeArray[i]);
                         }
                     } catch (error) {
+                        console.log('离港航班航线处理失败！');
                         erutReaChnArray.push(erutReaCodeArray[i]);
                     }
                 }
@@ -1278,7 +1292,6 @@ onmessage = function (dynamicData) {
             }
         } catch (error) {
             console.log('基础数据转换有误，处理失败，请检查数据');
-            throw error;
         } finally {
             coustom_data.push(item)
         }