主航班添加共享航班号

src/app/pages/main/main.component.html

@@ -209,19 +209,19 @@
             </div>
             <div #tabContainer class="airline-message" [ngClass]="{'tab-c': tabClose,'tab-o': !tabClose}">
                 <nz-tabset [nzTabPosition]="'top'" [nzType]="'card'" [nzShowPagination]="false">
-                    <nz-tab nzTitle="关联信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.related">
+                    <nz-tab nzTitle="关联信息" *ngIf="checkboxGroup.related">
                         <app-related-tab [flight]="row_state"></app-related-tab>
                     </nz-tab>
-                    <nz-tab nzTitle="详细信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.detail">
+                    <nz-tab nzTitle="详细信息" *ngIf="checkboxGroup.detail">
                         <app-detail-tab [flight]="row_state"></app-detail-tab>
                     </nz-tab>
-                    <nz-tab nzTitle="保障信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.guarantee">
+                    <nz-tab nzTitle="保障信息" *ngIf="checkboxGroup.guarantee">
                         <app-guarantee-tab></app-guarantee-tab>
                     </nz-tab>
-                    <nz-tab nzTitle="VIP信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.vip">
+                    <nz-tab nzTitle="VIP信息" *ngIf="checkboxGroup.vip">
                         <app-vip-tab></app-vip-tab>
                     </nz-tab>
-                    <nz-tab nzTitle="特服信息" (nzClick)="nzClick()" *ngIf="checkboxGroup.special">
+                    <nz-tab nzTitle="特服信息" *ngIf="checkboxGroup.special">
                         <app-special-tab></app-special-tab>
                     </nz-tab>
                 </nz-tabset>

src/app/pages/main/main.component.ts

@@ -141,7 +141,7 @@ export class MainComponent implements OnInit {
                 let data = JSON.parse(event as string);
                 if (data.topic === 'schd') {
                     let message = JSON.parse(data.message);
-                    // console.log(message);
+                    console.log(message);
                     //是否可以开始处理动态消息
                     if (this.canHandleDynamicMessage) {
                         this.dynamicMessageHandle(message);
@@ -150,7 +150,7 @@ export class MainComponent implements OnInit {
                     }
                 } else if (data.topic === 'msg') {
                     let message = JSON.parse(data.message);
-                    // console.log(message);
+                    console.log(message);
                     if (this.canHandleDynamicAlert) {
                         this.dynamicAlertHandle(message);
                     } else {
@@ -432,28 +432,6 @@ export class MainComponent implements OnInit {
             this.raw_data.push(message);
         }
 
-        //查找链接航班并将其组合成一条数据
-        // let combined_linked_data = this.dataHandle.findLinkFlights(this.raw_data);
-        // let combined_data = [];
-        // this.combined_data = [];
-        // combined_linked_data.forEach(element => {
-        //     let flights_item = this.dataHandle.flightsRenderTransfer(element, this.col_lists);
-        //     this.combined_data.push(flights_item);
-        // });
-        // this.combined_data.forEach(item => {
-        //     combined_data.push(this.dataHandle.basicDataTransHandle(item, this.airports, this.citys, this.airlines, this.flightStatus, this.flightTypes));
-        // })
-        // this.combined_data = combined_data;
-        // this.combined_data.forEach(element => {
-        //     element['ORDER'] = this.orderHandle.sequence(element);
-        // })
-        // this.combined_data = this.combined_data.sort(function (a, b) {
-        //     return (a['ORDER'] - b['ORDER']);
-        // })
-
-
-        // this.selectChange('dynamic');
-
         if (this.airlinesSelections.findIndex(airline => airline.airlineCodeIata === message['ALCD']) === -1) {
             let index = this.airlines.findIndex(val => val.airlineCodeIata === message['ALCD']);
             this.airlinesSelections.push(this.airlines[index]);
@@ -471,7 +449,7 @@ export class MainComponent implements OnInit {
     /**
      * 创建线程并执行
      */
-    public promise: Worker = new Worker('/adminweb/assets/web-worker-handle.js');
+    public promise: Worker = new Worker('/assets/web-worker-handle.js');
     creatWorkers() {
         let dynamicData = {
             raw_data: this.raw_data,
@@ -484,7 +462,7 @@ export class MainComponent implements OnInit {
         }
         this.promise.postMessage(dynamicData);
         this.promise.onmessage = function (e) {
-            // console.log('=====')
+            console.log('=====')
             this.combined_data = e.data;
             this.selectChange('dynamic');
             // this.promise.terminate();
@@ -878,7 +856,7 @@ export class MainComponent implements OnInit {
             })
         }, 500)
         // this.render_data = filterData;
-        this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
+        // this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
         this.operateSpinServiceService.hideSpin();
     }
 
@@ -1228,11 +1206,4 @@ export class MainComponent implements OnInit {
             }, 10)
         }
     }
-
-    /**
-     * tab项切换事件
-     */
-    nzClick() {
-    }
-
 }

src/app/pages/main/related-tab/related-tab.component.html

@@ -3,7 +3,7 @@
         <fieldset>
             <legend>共享航班代码</legend>
             <div>
-                <p>共享航班号：{{lines['renderFlight'].CSFT}}</p>
+                <p>共享航班号：{{lines['renderFlight'].MAFL}}</p>
             </div>
         </fieldset>
     </div>