消息处理修改方式及部分消息提示语修改

2019-01-18 10:58:44 +08:00
parent 4bfc263fa3
commit 81b360d52b
6 changed files with 127 additions and 143 deletions
@@ -1,4 +1,4 @@
-export default function (dynamicData) {
+export default function (dynamicData?) {
    if (typeof Object.assign != 'function') {
        // Must be writable: true, enumerable: false, configurable: true
        Object.defineProperty(Object, "assign", {
@@ -30,13 +30,38 @@ export default function (dynamicData) {
    }


-    let raw_data = dynamicData.raw_data,
+    let messageArray = dynamicData.message,
+        airlinesSelections = dynamicData.airlinesSelections,
+        flightTypeSelections = dynamicData.flightTypeSelections,
+        raw_data = dynamicData.raw_data,
        col_lists = dynamicData.col_lists,
        airports = dynamicData.airports,
        citys = dynamicData.citys,
        airlines = dynamicData.airlines,
        flightStatus = dynamicData.flightStatus,
        flightTypes = dynamicData.flightTypes
+
+
+    if (messageArray && Array.isArray(messageArray) && messageArray.length > 0) {
+        messageArray.forEach(message => {
+            let index = raw_data.findIndex(element => element['FLID'] === message.FLID);
+            if (index > -1) {
+                raw_data[index] = message;
+            } else {
+                raw_data.push(message);
+            }
+
+            if (airlinesSelections.findIndex(airline => airline.airlineCodeIata === message['ALCD']) === -1) {
+                let index = airlines.findIndex(val => val.airlineCodeIata === message['ALCD']);
+                airlinesSelections.push(airlines[index]);
+            }
+
+            if (flightTypeSelections.findIndex(flightType => flightType.flightTypeCode === message['FLTY']) === -1) {
+                let index = flightTypes.findIndex(val => val.flightTypeCode === message['FLTY']);
+                flightTypeSelections.push(flightTypes[index]);
+            }
+        })
+    }
    /**
     * 时间转换
     * @param dataString
@@ -1101,5 +1126,10 @@ export default function (dynamicData) {
        return (a['ORDER'] - b['ORDER']);
    })

-    return combined_data;
+    return {
+        "raw_data": raw_data,
+        "airlinesSelections": airlinesSelections,
+        "flightTypeSelections": flightTypeSelections,
+        "combined_data": combined_data,
+    };
 }