xufenglei
2018-03-21 d6836305986df618fc6be6a46305b75b6b1dddf3
报表优化
2 files modified
12 ■■■■ changed files
src/app/routes/reports/demo/demo.component.html 4 ●●●● patch | view | raw | blame | history
src/app/routes/reports/demo/demo.component.ts 8 ●●●●● patch | view | raw | blame | history
src/app/routes/reports/demo/demo.component.html
@@ -8,8 +8,8 @@
                        <label>&nbsp;&nbsp;&nbsp;项&nbsp;&nbsp;&nbsp;&nbsp;目</label>
                    </div>
                    <div nz-form-control class="flex-1">
                        <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKey" name="sensorKey" [nzSize]="'large'" [nzPlaceHolder]="'请选择'" nzAllowClear>
                            <nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option.sensorKey" ></nz-option>
                        <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKey" name="sensorKey" [nzSize]="'large'" [nzPlaceHolder]="'请选择'">
                            <nz-option *ngFor="let option of sensorOptions" [nzLabel]="option.name" [nzValue]="option"></nz-option>
                        </nz-select>
                    </div>
                </div>
src/app/routes/reports/demo/demo.component.ts
@@ -154,6 +154,14 @@
      }
    }
    if (validate && query.type && query.reportType) {
      query.sensors = null;
      if (query.sensorKey && query.sensorKey.length > 0) {
        const sensors = [];
        query.sensorKey.forEach(sensor => {
          sensors.push(sensor.sensorKey + '-' + sensor.name + '-' + sensor.unit);
        });
        query.sensors = JSON.stringify(sensors);
      }
      query.timeType = JSON.stringify(this.timeType);
      query.items = JSON.stringify(this.items);
      this.router.navigate(['report'], {queryParams: query});