fengxiang
2018-06-05 d4fd81a5e4853e8e6c1f507d0765b478ceff8219
延长弹出 超时弹窗的晃动时间
2 files modified
15 ■■■■ changed files
src/app/core/net/default.interceptor.ts 2 ●●● patch | view | raw | blame | history
src/app/routes/reports/query/query.component.ts 13 ●●●● patch | view | raw | blame | history
src/app/core/net/default.interceptor.ts
@@ -23,7 +23,7 @@
export class DefaultInterceptor implements HttpInterceptor {
    private unLoginHandle: Subject<HttpErrorResponse> = new Subject<HttpErrorResponse>();
    constructor(private injector: Injector) {
         this.unLoginHandle.debounceTime(100).subscribe(event => {
         this.unLoginHandle.debounceTime(800).subscribe(event => {
             if (!!event.error) {
                  let errorMsg = '';
                  const erroCode = Number.parseInt(event.error['errorCode']);
src/app/routes/reports/query/query.component.ts
@@ -8,7 +8,6 @@
import * as moment from 'moment';
import { ExampleService } from '@business/services/util/example.service';
import { DeviceService } from '@business/services/http/device.service';
import { environment } from '@env/environment';
import { CascaderOption } from 'ng-zorro-antd/src/cascader/nz-cascader.component';
import { AreacodeService } from '@business/services/http/areacode.service';
import { MonitorPointService } from '@business/services/http/monitor-point.service';
@@ -109,7 +108,7 @@
        }
     }
     professionsChange(text?: string){
        this.http.get<ResultBean<any[]>>(environment.SERVER_BASH_URL+"profession/getall").subscribe(
        this.http.get<ResultBean<any[]>>('profession/getall').subscribe(
            result => {
                if(!!result.code){
                    this.dimensionOptions = result.data;
@@ -237,7 +236,7 @@
        );
        this.actualYearOptions = this.newArray(this.actualYear - 9, 10).map(item => Number(item)).reverse();
                // 省市区 初始值
                this.http.get(environment.SERVER_BASH_URL + 'organization/get-my-org').subscribe(
                this.http.get('organization/get-my-org').subscribe(
                    (res: ResultBean<Organization>) => {
                        if (res.code === ResultCode.SUCCESS) {
                            const org = res.data;
@@ -329,13 +328,13 @@
     // 第二步 设置 监控站点, 值变 改变设备选项,值为null 置空设备选项和设备值
     public dimensionItem:{label: string,value: DeviceDimension};
     public dimensions:{label: string,value: DeviceDimension}[] = [
         {label:"监控站点",value:DeviceDimension.MONITORPOINT},
         {label:"监控行业",value:DeviceDimension.PROFESSION}
         {label: '监控站点', value: DeviceDimension.MONITORPOINT},
         {label: '监控行业', value: DeviceDimension.PROFESSION}
     ];
     public get otherDimensions():{label: string,value: DeviceDimension}[] {
         return  this.dimensions.filter(
             item => {
                 return item.value != this.dimensionItem.value;
                 return item.value !== this.dimensionItem.value;
             }
         );
     }
@@ -566,7 +565,7 @@
      // 清空数据
      this.grid.data = [];
      console.log(lineChartCriteria);
      this.http.post(environment.SERVER_BASH_URL + '/report/line-chart', lineChartCriteria).subscribe(
      this.http.post('/report/line-chart', lineChartCriteria).subscribe(
        (res: ResultBean<{[key: string]: Array<Array<number>>}>) => {
           if (res.code === 1) {
              const data =  res.data;