Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

fengxiang

2018-07-20 46ca57d5f64bafb642017b50c2fba85e38ca2289

Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

 src/app/routes/pollution/management/management.component.html

@@ -5,13 +5,13 @@
            <ng-template #extra>
                <div class="sales-card-extra">
                    <div class="sales-type-radio">
                        <nz-radio-group [(ngModel)]="salesType" (ngModelChange)="changeSaleType()" [nzSize]="'large'">
                            <label nz-radio-button [nzValue]="'1'"><span>PM2.5</span></label>
                            <label nz-radio-button [nzValue]="'2'"><span>PM10</span></label>
                            <label nz-radio-button [nzValue]="'3'"><span>SO2</span></label>
                            <label nz-radio-button [nzValue]="'4'"><span>NO3</span></label>
                            <label nz-radio-button [nzValue]="'5'"><span>O3</span></label>
                            <label nz-radio-button [nzValue]="'6'"><span>CO</span></label>
                        <nz-radio-group [(ngModel)]="sensorKey" (ngModelChange)="changeSensorKey($event)" [nzSize]="'large'">
                            <label nz-radio-button [nzValue]="'e1'"><span>PM2.5</span></label>
                            <label nz-radio-button [nzValue]="'e2'"><span>PM10</span></label>
                            <label nz-radio-button [nzValue]="'e11'"><span>SO2</span></label>
                            <label nz-radio-button [nzValue]="'e16'"><span>NO2</span></label>
                            <label nz-radio-button [nzValue]="'e15'"><span>O3</span></label>
                            <label nz-radio-button [nzValue]="'e10'"><span>CO</span></label>
                        </nz-radio-group>
                    </div>
                </div>
@@ -19,22 +19,22 @@
            <ng-template #body>
                <h4 class="margin:8px 0 32px 0;">站点排序结果</h4>

                <nz-table #keyTable [nzDataSource]="data.searchData" [nzPageSize]="5" nzSize="small">
                <nz-table #keyTable [nzAjaxData]="_dataSet" nzSize="small" [nzIsPagination]="false">
                    <thead nz-thead>
                    <tr>
                        <th nz-th><span>序号</span></th>
                        <th nz-th><span>站点名称</span></th>
                        <th nz-th class="text-right">
                            <span>因子数值 mg/m3</span>
                            <nz-table-sort (nzValueChange)="sort('count',$event)"></nz-table-sort>
                            <nz-table-sort (nzValueChange)="sort('sum',$event)"></nz-table-sort>
                        </th>
                    </tr>
                    </thead>
                    <tbody nz-tbody>
                    <tr nz-tbody-tr *ngFor="let i of keyTable.data">
                        <td nz-td>{{i.index}}</td>
                        <td nz-td><a (click)="msg.success(i.point)">{{i.point}}</a></td>
                        <td nz-td class="text-right">{{i.value}}</td>
                    <tr nz-tbody-tr *ngFor="let i of keyTable.data;let j = index">
                        <td nz-td>{{j + 1}}</td>
                        <td nz-td><a>{{i.name}}</a></td>
                        <td nz-td class="text-right">{{i.sum}}</td>
                    </tr>
                    </tbody>
                </nz-table>

 src/app/routes/pollution/management/management.component.ts

@@ -1,56 +1,53 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd';
import { _HttpClient } from '@delon/theme';
import { HttpClient } from '@angular/common/http';
import {environment} from '../../../../environments/environment';
import {Component, OnInit, OnDestroy} from '@angular/core';
import {NzMessageService} from 'ng-zorro-antd';
import {_HttpClient} from '@delon/theme';
import {HttpClient} from '@angular/common/http';
import * as moment from 'moment';
import { DeviceService } from '@business/services/http/device.service';
import {DeviceService} from '@business/services/http/device.service';

@Component({
    selector: 'pollution-management',
    templateUrl: './management.component.html',
    styleUrls: ['./management.component.less'],
    providers: [DeviceService]
  selector: 'pollution-management',
  templateUrl: './management.component.html',
  styleUrls: ['./management.component.less'],
  providers: [DeviceService]
})
export class PollutionManagementComponent implements OnInit, OnDestroy {

    data: any = {};
  constructor(
    private deviceService: DeviceService,
    private http: _HttpClient,
    public msg: NzMessageService,
    private http2: HttpClient) {
  }

    constructor(
        private deviceService: DeviceService,
        private http: _HttpClient,
        public msg: NzMessageService,
        private http2: HttpClient) {
    }
  _dataSet = [];

    ngOnInit() {
        const searchData = [];
        for (let i = 0; i < 50; i += 1) {
            searchData.push({
                index: i + 1,
                point: `监测站点-${i}`,
                value: Math.floor(Math.random() * 100)
            });
  ngOnInit() {
    this.changeSensorKey('e1');
  }

  changeSensorKey(sensorKey) {
    const params = {sensorKey: sensorKey, dimension: 'monitorPoint', areaCode: '320583'};
    this.http2.get(environment.SERVER_BASH_URL + 'demo/pollution', {params: params}).subscribe((res: any) => {
      this._dataSet = res;
    });
  }

  ngOnDestroy(): void {
  }

  sort(sortName, sortValue) {
    this._dataSet = [
      ...(<any[]>this._dataSet).sort((a, b) => {
        if (a[sortName] > b[sortName]) {
          return (sortValue === 'ascend') ? 1 : -1;
        } else if (a[sortName] < b[sortName]) {
          return (sortValue === 'ascend') ? -1 : 1;
        } else {
          return 0;
        }

        this.data = {
            searchData: searchData
        };
    }

    ngOnDestroy(): void {
    }

    sort(sortName, sortValue) {
        this.data.searchData = [
            ...(<any[]>this.data.searchData).sort((a, b) => {
                if (a[sortName] > b[sortName]) {
                    return (sortValue === 'ascend') ? 1 : -1;
                } else if (a[sortName] < b[sortName]) {
                    return (sortValue === 'ascend') ? -1 : 1;
                } else {
                    return 0;
                }
            })
        ];
    }
      })
    ];
  }
}