Skip to content

S
smart
Commit afcc1f77 authored by wangqinghua's avatar wangqinghua
Browse files
Options

update

parent 27c933dd
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 41 deletions
src/main/webapp/app/alarm/alarm-list/alarm-list.component.html
View file @ afcc1f77
......@@ -49,12 +49,10 @@
</div>
<div nz-col nzSpan="8" *ngIf="timeType == '5'">
<nz-date-picker
nzShowTime
[nzFormat]="timeFormat"
[(ngModel)]="dateBegin"
nzPlaceHolder="开始时间"></nz-date-picker>
<nz-date-picker
nzShowTime
[nzFormat]="timeFormat"
[(ngModel)]="dateEnd"
nzPlaceHolder="结束时间"></nz-date-picker>
......
src/main/webapp/app/alarm/alarm-list/alarm-list.component.ts
View file @ afcc1f77
......@@ -35,7 +35,7 @@ export class AlarmListComponent implements OnInit {
groupList = [];
pageNum = 1;
pageCount = pageSize;
timeFormat = "yyyy-MM-dd HH:mm:ss";
timeFormat = "yyyy-MM-dd";
//条件
timeType = '1';
......
src/main/webapp/app/alarm/alarm-log/alarm-log.component.html
View file @ afcc1f77
......@@ -42,18 +42,19 @@
<label nz-radio-button nzValue="5">自定义</label>
</nz-radio-group>
</div>
<div nz-col nzSpan="8" *ngIf="timeType == '5'">
<nz-date-picker
nzShowTime
[(ngModel)]="startTime"
nzPlaceHolder="开始时间"
></nz-date-picker>
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd HH:mm:ss"
[(ngModel)]="endTime"
nzPlaceHolder="结束时间"
></nz-date-picker>
<div nz-col nzSpan="8">
<ng-container *ngIf="timeType == '5'">
<nz-date-picker
nzFormat="yyyy-MM-dd"
[(ngModel)]="startTime"
nzPlaceHolder="开始时间"
></nz-date-picker>
<nz-date-picker
nzFormat="yyyy-MM-dd"
[(ngModel)]="endTime"
nzPlaceHolder="结束时间"
></nz-date-picker>
</ng-container>
</div>
<div nz-col nzSpan="3">
<button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button>
......
src/main/webapp/app/analysis/operation-work/analysis-deal/analysis-deal.component.html
View file @ afcc1f77
......@@ -13,13 +13,12 @@
<div nz-col nzSpan="8" >
<ng-container *ngIf="timeType == '4'">
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd"
[(ngModel)]="startTime"
nzPlaceHolder="开始时间"
></nz-date-picker>
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd HH:mm:ss"
nzFormat="yyyy-MM-dd"
[(ngModel)]="endTime"
nzPlaceHolder="结束时间"
></nz-date-picker>
......
src/main/webapp/app/analysis/operation-work/analysis-deal/analysis-deal.component.ts
View file @ afcc1f77
......@@ -49,6 +49,7 @@ export class AnalysisDealComponent implements OnInit {
this.setEcharts();
this.noData = false;
} else {
this.message.warning("处理人统计暂无数据")
this.noData = true;
}
} else {
......
src/main/webapp/app/analysis/operation-work/analysis-event/analysis-event.component.html
View file @ afcc1f77
......@@ -13,13 +13,12 @@
<div nz-col nzSpan="8" >
<ng-container *ngIf="timeType == '4'">
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd"
[(ngModel)]="startTime"
nzPlaceHolder="开始时间"
></nz-date-picker>
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd HH:mm:ss"
nzFormat="yyyy-MM-dd"
[(ngModel)]="endTime"
nzPlaceHolder="结束时间"
></nz-date-picker>
......
src/main/webapp/app/analysis/operation-work/analysis-event/analysis-event.component.ts
View file @ afcc1f77
......@@ -50,6 +50,7 @@ export class AnalysisEventComponent implements OnInit {
this.setEcharts();
this.noData = false;
} else {
this.message.warning("事件分类统计暂无数据")
this.noData = true;
}
} else {
......
src/main/webapp/app/analysis/operation-work/analysis-status/analysis-status.component.html
View file @ afcc1f77
......@@ -13,13 +13,12 @@
<div nz-col nzSpan="8" >
<ng-container *ngIf="timeType == '4'">
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd"
[(ngModel)]="startTime"
nzPlaceHolder="开始时间"
></nz-date-picker>
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd HH:mm:ss"
nzFormat="yyyy-MM-dd"
[(ngModel)]="endTime"
nzPlaceHolder="结束时间"
></nz-date-picker>
......
src/main/webapp/app/analysis/operation-work/analysis-status/analysis-status.component.ts
View file @ afcc1f77
......@@ -48,6 +48,7 @@ export class AnalysisStatusComponent implements OnInit {
this.setEcharts();
this.noData = false;
} else {
this.message.warning("解决状态统计暂无数据")
this.noData = true;
}
} else {
......
src/main/webapp/app/analysis/resource-alarm/resource-alarm.component.html
View file @ afcc1f77
......@@ -44,13 +44,12 @@
<div nz-col nzSpan="8">
<ng-container *ngIf="timeType == '5'">
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd"
[(ngModel)]="startTime"
nzPlaceHolder="开始时间"
></nz-date-picker>
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd HH:mm:ss"
nzFormat="yyyy-MM-dd"
[(ngModel)]="endTime"
nzPlaceHolder="结束时间"
></nz-date-picker>
......
src/main/webapp/app/analysis/resource-usabil/resource-usabil.component.html
View file @ afcc1f77
......@@ -39,13 +39,12 @@
<div nz-col nzSpan="8">
<ng-container *ngIf="timeType == '5'">
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd"
[(ngModel)]="startTime"
nzPlaceHolder="开始时间"
></nz-date-picker>
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd HH:mm:ss"
nzFormat="yyyy-MM-dd"
[(ngModel)]="endTime"
nzPlaceHolder="结束时间"
></nz-date-picker>
......
src/main/webapp/app/netTopology/flow-trend/flow-trend.component.html
View file @ afcc1f77
......@@ -58,13 +58,12 @@
<div nz-col nzSpan="8">
<ng-container *ngIf="timeType == '5'">
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd"
[(ngModel)]="timeBegin"
nzPlaceHolder="开始时间"
></nz-date-picker>
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd HH:mm:ss"
nzFormat="yyyy-MM-dd"
[(ngModel)]="timeEnd"
nzPlaceHolder="结束时间"
></nz-date-picker>
......
src/main/webapp/app/overAll/network-check/network-detail/network-detail.component.html
View file @ afcc1f77
......@@ -106,14 +106,12 @@
</nz-radio-group>
</div>
<div nz-col nzSpan="8" *ngIf="timeType == '5'">
<nz-date-picker
nzShowTime
<nz-date-picker nzFormat="yyyy-MM-dd"
[(ngModel)]="obj.startTime"
nzPlaceHolder="开始时间"
></nz-date-picker>
<nz-date-picker
nzShowTime
nzFormat="yyyy-MM-dd HH:mm:ss"
nzFormat="yyyy-MM-dd"
[(ngModel)]="obj.endTime"
nzPlaceHolder="结束时间"
(ngModelChange)="findChart()"
......
src/main/webapp/app/system/audit/audit.component.html
View file @ afcc1f77
......@@ -29,13 +29,11 @@
<label nz-radio-button nzValue="5"><span>自定义</span></label>
</nz-radio-group>
<ng-container *ngIf="timeType == '5'">
<nz-date-picker
nzShowTime
<nz-date-picker nzFormat="yyyy-MM-dd"
[nzFormat]="timeFormat"
[(ngModel)]="startTime"
nzPlaceHolder="开始时间"></nz-date-picker>
<nz-date-picker
nzShowTime
<nz-date-picker nzFormat="yyyy-MM-dd"
[nzFormat]="timeFormat"
[(ngModel)]="endTime"
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