From 26332c174e8e62e7e2cd5b17fe8089b9135a8b8a Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 30 Mar 2018 15:04:04 +0800
Subject: [PATCH] 增加 省市区 查询条件

---
 src/app/routes/report/report.component.ts |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/routes/report/report.component.ts b/src/app/routes/report/report.component.ts
index 64d1127..9d540ff 100644
--- a/src/app/routes/report/report.component.ts
+++ b/src/app/routes/report/report.component.ts
@@ -2,7 +2,6 @@
 import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {Component, OnInit, Injector} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
-import {ActivatedRoute} from '@angular/router';
 import * as echarts from 'echarts';
 import * as $ from 'jquery';
 
@@ -69,7 +68,6 @@
   constructor(
     public injector: Injector,
     public http: HttpClient,
-    public activeRoute: ActivatedRoute,
     public msgSrv: NzMessageService
   ) {
     for (let index = 0; index < 30; index++) {
@@ -78,7 +76,9 @@
   }
 
   ngOnInit() {
-    this.activeRoute.queryParams.subscribe(params => {
+    const params = JSON.parse(sessionStorage.getItem("queryParams"));
+    if (!!params) {
+      localStorage.removeItem("queryParams");
       const items = this.items = JSON.parse(params.items);
       const timeType = params.type;
       this.http.get(environment.SERVER_BASH_URL + 'report/compare', {params: params}).subscribe((res: any) => {
@@ -136,6 +136,10 @@
           }
         }
       });
-    });
+      
+    } else {
+      this.msgSrv.error("������������������������������������");
+      setTimeout("window.close();",1000);
+    }
   }
 }

--
Gitblit v1.8.0