历史数据添加日期查询插件

angular.json

@@ -26,9 +26,9 @@
                             "src/favicon.ico",
                             "src/assets",
                             {
-                              "glob": "**/*",
+                                "glob": "**/*",
-                              "input": "./node_modules/@ant-design/icons-angular/src/inline-svg/",
+                                "input": "./node_modules/@ant-design/icons-angular/src/inline-svg/",
-                              "output": "/assets/"
+                                "output": "/assets/"
                             }
                         ],
                         "styles": [
@@ -43,7 +43,8 @@
                             "node_modules/bootstrap/dist/js/bootstrap.min.js",
                             "node_modules/ztree/js/jquery.ztree.core.min.js",
                             "node_modules/ztree/js/jquery.ztree.excheck.min.js",
-                             "node_modules/ztree/js/jquery.ztree.exhide.min.js"
+                            "node_modules/ztree/js/jquery.ztree.exhide.min.js",
+                            "node_modules/layui-laydate/dist/laydate.js"
                         ]
                     },
                     "configurations": {

package.json

@@ -24,6 +24,7 @@
     "core-js": "^2.5.4",
     "font-awesome": "^4.7.0",
     "jquery": "^3.3.1",
+    "layui-laydate": "^5.0.9",
     "ng-zorro-antd": "^1.8.0",
     "ngx-color-picker": "^7.0.1",
     "rxjs": "^6.0.0",

src/app/login/login.component.ts

@@ -43,7 +43,7 @@ export class LoginComponent implements OnInit {
                                 sessionStorage.setItem('userInfo', JSON.stringify(xhr.body));
                                 const toastCfg = new ToastConfig(ToastType.SUCCESS, '', '登录成功！', 3000);
                                 this.toastService.toast(toastCfg);
-                                this.router.navigate(['../app/main'], { relativeTo: this.route })
+                                this.router.navigate(['../app/main'], { relativeTo: this.route });
                             }
                         }
                     )

src/app/pages/historical-data/historical-data.component.html

@@ -76,6 +76,10 @@
                         <option *ngFor="let anget of flightAgents" [value]="anget.oGId">{{anget.flightAgentName}}</option>
                     </select>
                 </div>
+                <div class="input-container mr-4">
+                    <label for="">查询日期：&nbsp;&nbsp;</label>
+                    <input readonly style="background:transparent;cursor: pointer" type="text" id="selectDate" class="form-control">
+                </div>
             </div>
 
             <div class="third-condition row">

src/app/pages/historical-data/historical-data.component.ts

@@ -12,6 +12,7 @@ import { DynamicFlightOrder } from '../../utils/dynamic-flight-order';
 import { FlightsDataHandle } from '../../utils/flights-data-handle';
 
 import * as $ from 'jquery';
+declare var laydate: any;
 
 @Component({
     selector: 'app-historical-data',
@@ -65,6 +66,33 @@ export class HistoricalDataComponent implements OnInit {
     }
 
     ngOnInit() {
+        laydate.render({
+            elem: '#selectDate',
+            showBottom: false,
+            value: new Date(new Date().getTime()),
+            format: 'yyyy-MM-dd',
+            done: (value) => {
+                this.operateSpinServiceService.showSpin();
+                this.httpCilent.post('/adminapi/hitFlightData/list', { hstFLightTime: value }).subscribe(
+                    data => {
+                        this.raw_data = data.body;
+                        //查找链接航班并将其组合成一条数据
+                        let combined_linked_data = this.dataHandle.findLinkFlights(this.raw_data);
+                        combined_linked_data.forEach(element => {
+                            let flights_item = this.dataHandle.flightsRenderTransfer(element, this.col_lists);
+                            this.combined_data.push(flights_item);
+                        });
+
+                        let combined_data = []
+                        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.doSequence(this.combined_data);
+                    })
+            }
+        });
+
 
         /* 获取用户设置 */
         this.httpCilent.get('/adminapi/settings/uisettings').subscribe(
@@ -78,7 +106,7 @@ export class HistoricalDataComponent implements OnInit {
             }
         )
         //获取航班动态信息
-        this.httpCilent.post('/adminapi/hitFlightData/list', { hstFLightTime: "2018-11-22" }).subscribe(
+        this.httpCilent.post('/adminapi/hitFlightData/list').subscribe(
             data => {
                 this.raw_data = data.body;
 

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

@@ -35,6 +35,7 @@ export class MainComponent implements OnInit {
         private toastService: ToastService,
         private websocketService: WebsocketService
     ) {
+        console.log(new Date().getTime());
         this.operateSpinServiceService.showSpin();
         this.changeDetectorRef.detach();
         this.router.events.pipe(
@@ -112,10 +113,12 @@ export class MainComponent implements OnInit {
             event => {
                 let data = JSON.parse(event as string);
                 if (data.topic === 'schd') {
+                    console.log(new Date().getTime());
                     let message = JSON.parse(data.message);
+                    console.log(message);
                     //是否可以开始处理动态消息
                     if (this.canHandleDynamicMessage) {
-                        this.dynamicMessageHandle(message)
+                        this.dynamicMessageHandle(message);
                     } else {
                         this.dynamicMessageArray.push(message);
                     }
@@ -204,6 +207,7 @@ export class MainComponent implements OnInit {
         tableCont.addEventListener('scroll', scrollHandle)
     }
 
+
     /**
      * 动态消息处理方法
      * @param message 
@@ -258,6 +262,8 @@ export class MainComponent implements OnInit {
             return (a['ORDER'] - b['ORDER']);
         })
         this.changeDetectorRef.detectChanges();
+        console.log(new Date().getTime());
+
     }
 
     /**
@@ -289,6 +295,7 @@ export class MainComponent implements OnInit {
     }
     dynamicAlertHandle(message) {
         let alertType = message.META.TYPE + '-' + message.META.STYP;
+        console.log(alertType)
         let index = this.airline_message_alert.findIndex(val => val['COL_CODE'] === alertType);
         if (index > -1) {
             let alertText = this.alertMessage[alertType]();
@@ -322,7 +329,8 @@ export class MainComponent implements OnInit {
         this.render_data = combined_data;
         this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
         this.changeDetectorRef.detectChanges();
-        this.operateSpinServiceService.hideSpin()
+        this.operateSpinServiceService.hideSpin();
+        console.log(new Date().getTime());
 
         //开始处理动态消息
         this.canHandleDynamicMessage = true;
@@ -371,6 +379,7 @@ export class MainComponent implements OnInit {
      * 输入框回车事件
      */
     inputEnter() {
+        console.log(new Date().getTime());
         if (this.FLT_POS === 1) {
             this.selectChange()
         } else {
@@ -557,7 +566,8 @@ export class MainComponent implements OnInit {
         this.render_data = filterData;
         this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
         this.changeDetectorRef.detectChanges();
-        this.operateSpinServiceService.hideSpin()
+        this.operateSpinServiceService.hideSpin();
+        console.log(new Date().getTime());
     }
 
     /**

src/app/services/basic-data-service.ts

@@ -4,45 +4,45 @@ import { Subject, forkJoin, zip } from 'rxjs'
 
 @Injectable()
 export class BasicDataService {
-    public flightAgents:Array<any>;
+    public flightAgents:Array<any> = [];
     public flightAgents_subject = new Subject<any>();
-    public flightTypes:Array<any>;
+    public flightTypes:Array<any> = [];
     public flightTypes_subject = new Subject<any>();
-    public flightStatus:Array<any>;
+    public flightStatus:Array<any> = [];
     public flightStatus_subject = new Subject<any>();
-    public checkin_group: Array<any>;
+    public checkin_group: Array<any> = [];
     public checkin_group_subject = new Subject<any>();
-    public gate: Array<any>;
+    public gate: Array<any> = [];
     public gate_subject = new Subject<any>();
-    public terminal: Array<any>;
+    public terminal: Array<any> = [];
     public terminal_subject = new Subject<any>();
-    public chut: Array<any>;
+    public chut: Array<any> = [];
     public chut_subject = new Subject<any>();
-    public stand: Array<any>;
+    public stand: Array<any> = [];
     public stand_subject = new Subject<any>();
-    public carousel: Array<any>;
+    public carousel: Array<any> = [];
     public carousel_subject = new Subject<any>();
-    public checkin_desk: Array<any>;
+    public checkin_desk: Array<any> = [];
     public checkin_desk_subject = new Subject<any>();
-    public airport: Array<any>;
+    public airport: Array<any> = [];
     public airport_subject = new Subject<any>();
-    public city: Array<any>;
+    public city: Array<any> = [];
     public city_subject = new Subject<any>();
-    public aircraft_type: Array<any>;
+    public aircraft_type: Array<any> = [];
     public aircraft_type_subject = new Subject<any>();
-    public aircraft: Array<any>;
+    public aircraft: Array<any> = [];
     public aircraft_subject = new Subject<any>();
-    public terminal_area: Array<any>;
+    public terminal_area: Array<any> = [];
     public terminal_area_subject = new Subject<any>();
-    public airline: Array<any>;
+    public airline: Array<any> = [];
     public airline_subject = new Subject<any>();
-    public country: Array<any>;
+    public country: Array<any> = [];
     public country_subject = new Subject<any>();
-    public aircraft_type_group: Array<any>;
+    public aircraft_type_group: Array<any> = [];
     public aircraft_type_group_subject = new Subject<any>();
-    public airportgroup: Array<any>;
+    public airportgroup: Array<any> = [];
     public airportgroup_subject = new Subject<any>();
-    public airlinegroup: Array<any>;
+    public airlinegroup: Array<any> = [];
     public airlinegroup_subject = new Subject<any>();
 
     constructor(

src/app/services/websocket.service.ts

@@ -17,6 +17,10 @@ export class WebsocketService {
         }
 
         this.websocket = new WebSocket(url);
+        setInterval(() => {
+            let msg = { "topic": "heart-beat", "message": "" };
+            this.websocket.send(JSON.stringify(msg));
+        }, 30000);
         return new Observable(ob => {
             this.websocket.onopen = () => {
                 console.log('websocket was connected...')

src/assets/theme/default/font/iconfont.svg

@@ -0,0 +1,45 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="laydate-icon" horiz-adv-x="1024" >
+  <font-face
+    font-family="laydate-icon"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="x" unicode="x" horiz-adv-x="1001"
+d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
+t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
+t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
+    
+
+    
+    <glyph glyph-name="youyou" unicode="&#58882;" d="M283.648 721.918976 340.873216 780.926976 740.352 383.997952 340.876288-12.925952 283.648 46.077952 619.52 383.997952Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zuozuo" unicode="&#58883;" d="M740.352 721.918976 683.126784 780.926976 283.648 383.997952 683.123712-12.925952 740.352 46.077952 404.48 383.997952Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xiayiye" unicode="&#58970;" d="M62.573 384.103l423.401 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.751-18.976-68.727 0l-39.753 39.753 0.269 0.246-385.655 385.661zM451.365 384.103l423.407 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.757-18.977-68.727 0l-39.762 39.754 0.273 0.249-385.662 385.661zM451.365 384.103z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xiayiye1" unicode="&#58971;" d="M948.066926 382.958838l-411.990051-412.24426c-18.47333-18.47333-48.417689-18.47333-66.875207 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L814.691135 383.088983 467.512212 730.269123c-18.466032 18.458735-18.466032 48.405526 0 66.873991 18.468465 18.464816 48.410391 18.464816 66.872774 0l38.682336-38.682336-0.261507-0.239614 375.259894-375.265975v0.003649m-378.312834 0L157.756743-29.285422c-18.47333-18.47333-48.415256-18.47333-66.872775 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L436.369787 383.088983 89.19208 730.269123c-18.4636 18.458735-18.4636 48.405526 0 66.873991 18.470898 18.464816 48.415256 18.464816 66.872774 0l38.692067-38.682336-0.266372-0.239614 375.267191-375.265975-0.004865 0.003649m0 0z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>

src/index.html

@@ -7,6 +7,7 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link rel="icon" type="image/x-icon" href="favicon.ico">
+    <link rel="stylesheet" href="./assets/theme/default/laydate.css?v=5.0.9" id="layuicss-laydate">
     <style>
         @-webkit-keyframes spin {
                 0% {