| src/app/routes/dashboard/workplace/workplace.component.html | ●●●●● patch | view | raw | blame | history | |
| src/app/routes/dashboard/workplace/workplace.component.ts | ●●●●● patch | view | raw | blame | history | |
| src/app/routes/reports/alarm/alarm.component.html | ●●●●● patch | view | raw | blame | history | |
| src/app/routes/reports/alarm/alarm.component.ts | ●●●●● patch | view | raw | blame | history | |
| src/app/routes/reports/demo/demo.component.html | ●●●●● patch | view | raw | blame | history | |
| src/app/routes/reports/excel/excel.component.html | ●●●●● patch | view | raw | blame | history | |
| src/styles/index.less | ●●●●● patch | view | raw | blame | history |
src/app/routes/dashboard/workplace/workplace.component.html
@@ -109,13 +109,13 @@ </div> <nz-card [nzLoading]="loading" [nzBordered]="false" nzNoPadding class="sales-card"> <ng-template #body> <nz-tabset> <nz-tabset (nzSelectedIndexChange)=selectedIndexChange($event) > <nz-tab> <ng-template #nzTabHeading>所有警报</ng-template> <div nz-row> <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16"> <div class="bar"> <bar height="295" [title]="'所有警报月度统计'" [data]="data.alarmData" color="purple"></bar> <bar height="295" [title]="'所有警报月度统计'" [data]="alarmData._0" color="purple"></bar> </div> </div> <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8"> @@ -140,7 +140,7 @@ <div nz-row> <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16"> <div class="bar"> <bar height="295" [title]="'一级警报月度统计'" [data]="data.alarmData_1" color="yellow"></bar> <bar height="295" [title]="'一级警报月度统计'" [data]="alarmData._1" color="yellow"></bar> </div> </div> <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8"> @@ -165,7 +165,7 @@ <div nz-row> <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16"> <div class="bar"> <bar height="295" [title]="'二级警报月度统计'" [data]="data.alarmData_2" color="orange"></bar> <bar height="295" [title]="'二级警报月度统计'" [data]="alarmData._2" color="orange"></bar> </div> </div> <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8"> @@ -190,7 +190,7 @@ <div nz-row> <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16"> <div class="bar"> <bar height="295" [title]="'三级警报月度统计'" [data]="data.alarmData_3" color="red"></bar> <bar height="295" [title]="'三级警报月度统计'" [data]="alarmData._3" color="red"></bar> </div> </div> <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8"> src/app/routes/dashboard/workplace/workplace.component.ts
@@ -1,3 +1,4 @@ import { environment } from "../../../../environments/environment"; import { zip } from 'rxjs/observable/zip'; import { Component, OnInit, OnDestroy } from '@angular/core'; import { NzMessageService } from 'ng-zorro-antd'; @@ -33,7 +34,7 @@ activities: any[] = []; radarData: any[] = []; loading = true; public alarmData:any = {}; members = [ { id: 'members-1', @@ -85,7 +86,25 @@ private http2: HttpClient) { } selectedIndexChange(index) { if (!this.alarmData['_' + index]) { this.http2.get(environment.SERVER_BASH_URL + 'report/alarm-year', {params: {state: index > 0 ? index : null}}).subscribe((res: any) => { let data = []; for (let i = 0; i < res.data.length; i += 1) { let y = 0; if (!!res.data[i]) { y = res.data[i]; } data.push({x: `${i + 1}月`, y: y}); } this.alarmData['_' + index] = data; }); } } ngOnInit() { this.selectedIndexChange(0); // const today = new Date().getTime(); // const fakeDC = [60, 135, 70, 112, 80, 170, 200, 140, 52, 119, 164, 230]; // for (let i = 0; i < 12; i += 1) { @@ -148,17 +167,6 @@ } ); // this.avgDeviceCount = (this.totalDeviceCount / 12).toFixed(0); const alarmData = []; const alarmData_1 = []; const alarmData_2 = []; const alarmData_3 = []; for (let i = 0; i < 12; i += 1) { alarmData.push({ x: `${i + 1}月`, y: Math.floor(Math.random() * 1000) + 500 }); alarmData_1.push({ x: `${i + 1}月`, y: Math.floor(Math.random() * 1000) + 100 }); alarmData_2.push({ x: `${i + 1}月`, y: Math.floor(Math.random() * 1000) + 200 }); alarmData_3.push({ x: `${i + 1}月`, y: Math.floor(Math.random() * 1000) + 300 }); } const alertData = []; const alertData_1 = []; @@ -251,11 +259,7 @@ }); } const res = { alarmData: alarmData, alarmData_1: alarmData_1, alarmData_2: alarmData_2, alarmData_3: alarmData_3, alertData: alertData, alertData_1: alertData_1, alertData_2: alertData_2, @@ -275,6 +279,7 @@ this.radarData = res.radarData; const avatars = [ 'https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png', // Alipay 'https://gw.alipayobjects.com/zos/rmsportal/zOsKZmFRdUtvpqCImOVY.png', // Angular src/app/routes/reports/alarm/alarm.component.html
@@ -5,8 +5,8 @@ <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <label> 维 度</label> <div nz-form-label class="label-width-70"> <label>维度</label> </div> <div nz-form-control class="flex-1"> <nz-select [(ngModel)]="query.dimension" name="dimension" [nzSize]="'large'" [nzPlaceHolder]="'请选择'" (ngModelChange)="dimensionChange($event)"> @@ -20,8 +20,8 @@ <div nz-row [nzGutter]="24"> <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <label> 项 目</label> <div nz-form-label class="label-width-70"> <label>项目</label> </div> <div nz-form-control class="flex-1" style="width: 300px"> <nz-popover [nzPlacement]="'bottomLeft'" [nzTrigger]="'click'"> @@ -42,8 +42,8 @@ <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <label> 类 型</label> <div nz-form-label class="label-width-70"> <label>类型</label> </div> <div nz-form-control class="flex-1"> <nz-select [(ngModel)]="timeType" name="timeType" [nzSize]="'large'" [nzPlaceHolder]="'请选择'"> @@ -55,7 +55,7 @@ <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <div nz-form-label class="label-width-70"> <label >时间</label> </div> <div nz-form-control class="flex-1"> @@ -71,7 +71,7 @@ <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <div nz-form-label class="label-width-70"> <label nz-form-item-required>省市区</label> </div> <div nz-form-control class="flex-1"> @@ -83,11 +83,11 @@ <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <label>监测点</label> <div nz-form-label class="label-width-70"> <label>监测站点</label> </div> <div nz-form-control class="flex-1"> <nz-select [(ngModel)]="query.monitorPointId" name="monitorPoint" [nzPlaceHolder]="'请选择 监测点'" [nzSize]="'large'" <nz-select [(ngModel)]="query.monitorPointId" name="monitorPoint" [nzPlaceHolder]="'请选择 监测站点'" [nzSize]="'large'" [nzNotFoundContent]="'无法找到'" (ngModelChange)="monitorPointChange($event)" nzShowSearch nzAllowClear [nzDisabled]="isDisable"> <nz-option *ngFor="let option of monitorPointOptions" [nzLabel]="option['name']" [nzValue]="option['id']"> </nz-option> </nz-select> @@ -97,7 +97,7 @@ <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <div nz-form-label class="label-width-70"> <label>设备</label> </div> <div nz-form-control class="flex-1"> src/app/routes/reports/alarm/alarm.component.ts
@@ -43,7 +43,7 @@ ]; public dimensionOptions = [ {value: 'sensor', label: '项目'}, {value: 'monitorPoint', label: '监测点'} {value: 'monitorPoint', label: '监测站点'} ]; isDisable = false; private treeClickStream: Subject<any> = new Subject<any>(); src/app/routes/reports/demo/demo.component.html
@@ -4,8 +4,8 @@ <div nz-row [nzGutter]="24"> <div nz-col [nzSpan]="5" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <label> 项 目</label> <div nz-form-label class="label-width-70"> <label>项目</label> </div> <div nz-form-control class="flex-1"> <!-- <nz-select [nzMode]="'multiple'" [(ngModel)]="query.sensorKeys" name="sensorKeys" [nzSize]="'large'" [nzPlaceHolder]="'请选择'"> @@ -28,8 +28,8 @@ </div> <div nz-col [nzSpan]="5" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <label nz-form-item-required>类 型</label> <div nz-form-label class="label-width-70"> <label nz-form-item-required>类型</label> </div> <div nz-form-control class="flex-1"> <nz-select [(ngModel)]="timeType" name="timeType" [nzSize]="'large'" [nzPlaceHolder]="'请选择'"> @@ -40,7 +40,7 @@ </div> <div nz-col [nzSpan]="5" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <div nz-form-label class="label-width-70"> <label nz-form-item-required>图型</label> </div> <div nz-form-control class="flex-1"> @@ -63,7 +63,7 @@ <div nz-row [nzGutter]="24" *ngFor="let item of items;let i = index"> <div nz-col [nzSpan]="5" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <div nz-form-label class="label-width-70"> <label nz-form-item-required>省市区</label> </div> <div nz-form-control class="flex-1"> @@ -75,11 +75,11 @@ <div nz-col [nzSpan]="5" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <label>监测点</label> <div nz-form-label class="label-width-70"> <label>监测站点</label> </div> <div nz-form-control class="flex-1"> <nz-select [(ngModel)]="item.monitorPoint" name="monitorPoint{{item.id}}" [nzPlaceHolder]="'请选择 监测点'" [nzSize]="'large'" <nz-select [(ngModel)]="item.monitorPoint" name="monitorPoint{{item.id}}" [nzPlaceHolder]="'请选择 监测站点'" [nzSize]="'large'" [nzNotFoundContent]="'无法找到'" (ngModelChange)="monitorPointChange($event,i)" nzShowSearch nzAllowClear> <nz-option *ngFor="let option of item.monitorPointOptions" [nzLabel]="option['name']" [nzValue]="option"> </nz-option> </nz-select> @@ -88,8 +88,8 @@ </div> <div nz-col [nzSpan]="5" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <label> 设 备</label> <div nz-form-label class="label-width-70"> <label>设备</label> </div> <div nz-form-control class="flex-1"> <nz-select [(ngModel)]="item.device" name="mac{{item.id}}" [nzSize]="'large'" [nzPlaceHolder]="'请选择 设备'" [nzNotFoundContent]="'无法找到'" nzShowSearch nzAllowClear> @@ -100,7 +100,7 @@ </div> <div nz-col [nzSpan]="5" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <div nz-form-label class="label-width-70"> <label nz-form-item-required>时间</label> </div> <div nz-form-control class="flex-1"> src/app/routes/reports/excel/excel.component.html
@@ -4,7 +4,7 @@ <div nz-row [nzGutter]="24"> <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <div nz-form-label class="label-width-70"> <label>项目</label> </div> <div nz-form-control class="flex-1"> @@ -25,7 +25,7 @@ </div> <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <div nz-form-label class="label-width-70"> <label nz-form-item-required>省市区</label> </div> <div nz-form-control class="flex-1"> @@ -36,11 +36,11 @@ </div> <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <label>监测点</label> <div nz-form-label class="label-width-70"> <label>监测站点</label> </div> <div nz-form-control class="flex-1"> <nz-select [(ngModel)]="query.monitorPointId" name="monitorPoint" [nzPlaceHolder]="'请选择 监测点'" [nzSize]="'large'" <nz-select [(ngModel)]="query.monitorPointId" name="monitorPoint" [nzPlaceHolder]="'请选择 监测站点'" [nzSize]="'large'" [nzNotFoundContent]="'无法找到'" (ngModelChange)="monitorPointChange($event)" nzShowSearch nzAllowClear> <nz-option *ngFor="let option of monitorPointOptions" [nzLabel]="option['name']" [nzValue]="option['id']"> </nz-option> </nz-select> @@ -49,7 +49,7 @@ </div> <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <div nz-form-label class="label-width-70"> <label>设备</label> </div> <div nz-form-control class="flex-1"> @@ -64,7 +64,7 @@ <div nz-row [nzGutter]="24"> <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <div nz-form-label class="label-width-70"> <label>类型</label> </div> <div nz-form-control class="flex-1"> @@ -76,7 +76,7 @@ </div> <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <div nz-form-label class="label-width-70"> <label nz-form-item-required>时间从</label> </div> <div nz-form-control class="flex-1"> @@ -87,7 +87,7 @@ </div> <div nz-col [nzSpan]="6" class="mb-md"> <div nz-form-item class="d-flex"> <div nz-form-label> <div nz-form-label class="label-width-70"> <label >时间至</label> </div> <div nz-form-control class="flex-1"> src/styles/index.less
@@ -1 +1,4 @@ // 建议所有项目自定义样式放在该文件夹下 // 建议所有项目自定义样式放在该文件夹下 .label-width-70 { width: 70px; }
