Commit afcc1f77 authored by wangqinghua's avatar wangqinghua

update

parent 27c933dd
...@@ -49,12 +49,10 @@ ...@@ -49,12 +49,10 @@
</div> </div>
<div nz-col nzSpan="8" *ngIf="timeType == '5'"> <div nz-col nzSpan="8" *ngIf="timeType == '5'">
<nz-date-picker <nz-date-picker
nzShowTime
[nzFormat]="timeFormat" [nzFormat]="timeFormat"
[(ngModel)]="dateBegin" [(ngModel)]="dateBegin"
nzPlaceHolder="开始时间"></nz-date-picker> nzPlaceHolder="开始时间"></nz-date-picker>
<nz-date-picker <nz-date-picker
nzShowTime
[nzFormat]="timeFormat" [nzFormat]="timeFormat"
[(ngModel)]="dateEnd" [(ngModel)]="dateEnd"
nzPlaceHolder="结束时间"></nz-date-picker> nzPlaceHolder="结束时间"></nz-date-picker>
......
...@@ -35,7 +35,7 @@ export class AlarmListComponent implements OnInit { ...@@ -35,7 +35,7 @@ export class AlarmListComponent implements OnInit {
groupList = []; groupList = [];
pageNum = 1; pageNum = 1;
pageCount = pageSize; pageCount = pageSize;
timeFormat = "yyyy-MM-dd HH:mm:ss"; timeFormat = "yyyy-MM-dd";
//条件 //条件
timeType = '1'; timeType = '1';
......
...@@ -42,18 +42,19 @@ ...@@ -42,18 +42,19 @@
<label nz-radio-button nzValue="5">自定义</label> <label nz-radio-button nzValue="5">自定义</label>
</nz-radio-group> </nz-radio-group>
</div> </div>
<div nz-col nzSpan="8" *ngIf="timeType == '5'"> <div nz-col nzSpan="8">
<nz-date-picker <ng-container *ngIf="timeType == '5'">
nzShowTime <nz-date-picker
[(ngModel)]="startTime" nzFormat="yyyy-MM-dd"
nzPlaceHolder="开始时间" [(ngModel)]="startTime"
></nz-date-picker> nzPlaceHolder="开始时间"
<nz-date-picker ></nz-date-picker>
nzShowTime <nz-date-picker
nzFormat="yyyy-MM-dd HH:mm:ss" nzFormat="yyyy-MM-dd"
[(ngModel)]="endTime" [(ngModel)]="endTime"
nzPlaceHolder="结束时间" nzPlaceHolder="结束时间"
></nz-date-picker> ></nz-date-picker>
</ng-container>
</div> </div>
<div nz-col nzSpan="3"> <div nz-col nzSpan="3">
<button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button> <button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button>
......
...@@ -13,13 +13,12 @@ ...@@ -13,13 +13,12 @@
<div nz-col nzSpan="8" > <div nz-col nzSpan="8" >
<ng-container *ngIf="timeType == '4'"> <ng-container *ngIf="timeType == '4'">
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
[(ngModel)]="startTime" [(ngModel)]="startTime"
nzPlaceHolder="开始时间" nzPlaceHolder="开始时间"
></nz-date-picker> ></nz-date-picker>
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
nzFormat="yyyy-MM-dd HH:mm:ss"
[(ngModel)]="endTime" [(ngModel)]="endTime"
nzPlaceHolder="结束时间" nzPlaceHolder="结束时间"
></nz-date-picker> ></nz-date-picker>
......
...@@ -49,6 +49,7 @@ export class AnalysisDealComponent implements OnInit { ...@@ -49,6 +49,7 @@ export class AnalysisDealComponent implements OnInit {
this.setEcharts(); this.setEcharts();
this.noData = false; this.noData = false;
} else { } else {
this.message.warning("处理人统计暂无数据")
this.noData = true; this.noData = true;
} }
} else { } else {
......
...@@ -13,13 +13,12 @@ ...@@ -13,13 +13,12 @@
<div nz-col nzSpan="8" > <div nz-col nzSpan="8" >
<ng-container *ngIf="timeType == '4'"> <ng-container *ngIf="timeType == '4'">
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
[(ngModel)]="startTime" [(ngModel)]="startTime"
nzPlaceHolder="开始时间" nzPlaceHolder="开始时间"
></nz-date-picker> ></nz-date-picker>
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
nzFormat="yyyy-MM-dd HH:mm:ss"
[(ngModel)]="endTime" [(ngModel)]="endTime"
nzPlaceHolder="结束时间" nzPlaceHolder="结束时间"
></nz-date-picker> ></nz-date-picker>
......
...@@ -50,6 +50,7 @@ export class AnalysisEventComponent implements OnInit { ...@@ -50,6 +50,7 @@ export class AnalysisEventComponent implements OnInit {
this.setEcharts(); this.setEcharts();
this.noData = false; this.noData = false;
} else { } else {
this.message.warning("事件分类统计暂无数据")
this.noData = true; this.noData = true;
} }
} else { } else {
......
...@@ -13,13 +13,12 @@ ...@@ -13,13 +13,12 @@
<div nz-col nzSpan="8" > <div nz-col nzSpan="8" >
<ng-container *ngIf="timeType == '4'"> <ng-container *ngIf="timeType == '4'">
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
[(ngModel)]="startTime" [(ngModel)]="startTime"
nzPlaceHolder="开始时间" nzPlaceHolder="开始时间"
></nz-date-picker> ></nz-date-picker>
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
nzFormat="yyyy-MM-dd HH:mm:ss"
[(ngModel)]="endTime" [(ngModel)]="endTime"
nzPlaceHolder="结束时间" nzPlaceHolder="结束时间"
></nz-date-picker> ></nz-date-picker>
......
...@@ -48,6 +48,7 @@ export class AnalysisStatusComponent implements OnInit { ...@@ -48,6 +48,7 @@ export class AnalysisStatusComponent implements OnInit {
this.setEcharts(); this.setEcharts();
this.noData = false; this.noData = false;
} else { } else {
this.message.warning("解决状态统计暂无数据")
this.noData = true; this.noData = true;
} }
} else { } else {
......
...@@ -44,13 +44,12 @@ ...@@ -44,13 +44,12 @@
<div nz-col nzSpan="8"> <div nz-col nzSpan="8">
<ng-container *ngIf="timeType == '5'"> <ng-container *ngIf="timeType == '5'">
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
[(ngModel)]="startTime" [(ngModel)]="startTime"
nzPlaceHolder="开始时间" nzPlaceHolder="开始时间"
></nz-date-picker> ></nz-date-picker>
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
nzFormat="yyyy-MM-dd HH:mm:ss"
[(ngModel)]="endTime" [(ngModel)]="endTime"
nzPlaceHolder="结束时间" nzPlaceHolder="结束时间"
></nz-date-picker> ></nz-date-picker>
......
...@@ -39,13 +39,12 @@ ...@@ -39,13 +39,12 @@
<div nz-col nzSpan="8"> <div nz-col nzSpan="8">
<ng-container *ngIf="timeType == '5'"> <ng-container *ngIf="timeType == '5'">
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
[(ngModel)]="startTime" [(ngModel)]="startTime"
nzPlaceHolder="开始时间" nzPlaceHolder="开始时间"
></nz-date-picker> ></nz-date-picker>
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
nzFormat="yyyy-MM-dd HH:mm:ss"
[(ngModel)]="endTime" [(ngModel)]="endTime"
nzPlaceHolder="结束时间" nzPlaceHolder="结束时间"
></nz-date-picker> ></nz-date-picker>
......
...@@ -58,13 +58,12 @@ ...@@ -58,13 +58,12 @@
<div nz-col nzSpan="8"> <div nz-col nzSpan="8">
<ng-container *ngIf="timeType == '5'"> <ng-container *ngIf="timeType == '5'">
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
[(ngModel)]="timeBegin" [(ngModel)]="timeBegin"
nzPlaceHolder="开始时间" nzPlaceHolder="开始时间"
></nz-date-picker> ></nz-date-picker>
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
nzFormat="yyyy-MM-dd HH:mm:ss"
[(ngModel)]="timeEnd" [(ngModel)]="timeEnd"
nzPlaceHolder="结束时间" nzPlaceHolder="结束时间"
></nz-date-picker> ></nz-date-picker>
......
...@@ -106,14 +106,12 @@ ...@@ -106,14 +106,12 @@
</nz-radio-group> </nz-radio-group>
</div> </div>
<div nz-col nzSpan="8" *ngIf="timeType == '5'"> <div nz-col nzSpan="8" *ngIf="timeType == '5'">
<nz-date-picker <nz-date-picker nzFormat="yyyy-MM-dd"
nzShowTime
[(ngModel)]="obj.startTime" [(ngModel)]="obj.startTime"
nzPlaceHolder="开始时间" nzPlaceHolder="开始时间"
></nz-date-picker> ></nz-date-picker>
<nz-date-picker <nz-date-picker
nzShowTime nzFormat="yyyy-MM-dd"
nzFormat="yyyy-MM-dd HH:mm:ss"
[(ngModel)]="obj.endTime" [(ngModel)]="obj.endTime"
nzPlaceHolder="结束时间" nzPlaceHolder="结束时间"
(ngModelChange)="findChart()" (ngModelChange)="findChart()"
......
...@@ -29,13 +29,11 @@ ...@@ -29,13 +29,11 @@
<label nz-radio-button nzValue="5"><span>自定义</span></label> <label nz-radio-button nzValue="5"><span>自定义</span></label>
</nz-radio-group> </nz-radio-group>
<ng-container *ngIf="timeType == '5'"> <ng-container *ngIf="timeType == '5'">
<nz-date-picker <nz-date-picker nzFormat="yyyy-MM-dd"
nzShowTime
[nzFormat]="timeFormat" [nzFormat]="timeFormat"
[(ngModel)]="startTime" [(ngModel)]="startTime"
nzPlaceHolder="开始时间"></nz-date-picker> nzPlaceHolder="开始时间"></nz-date-picker>
<nz-date-picker <nz-date-picker nzFormat="yyyy-MM-dd"
nzShowTime
[nzFormat]="timeFormat" [nzFormat]="timeFormat"
[(ngModel)]="endTime" [(ngModel)]="endTime"
nzPlaceHolder="结束时间"></nz-date-picker> nzPlaceHolder="结束时间"></nz-date-picker>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment