Commit faf9b5bd authored by wangqinghua's avatar wangqinghua

bug update

parent a8943c91
...@@ -96,6 +96,7 @@ export class AnalysisDealComponent implements OnInit { ...@@ -96,6 +96,7 @@ export class AnalysisDealComponent implements OnInit {
if(this.timeType =='99') return ; if(this.timeType =='99') return ;
this.obj.startTime = this.commonSer.getTimeByType(this.timeType).startTime; this.obj.startTime = this.commonSer.getTimeByType(this.timeType).startTime;
this.obj.endTime = this.commonSer.getTimeByType(this.timeType).endTime; this.obj.endTime = this.commonSer.getTimeByType(this.timeType).endTime;
this.getEcharts();
} }
//搜索 //搜索
......
...@@ -96,6 +96,7 @@ export class AnalysisEventComponent implements OnInit { ...@@ -96,6 +96,7 @@ export class AnalysisEventComponent implements OnInit {
if(this.timeType =='99') return ; if(this.timeType =='99') return ;
this.obj.startTime = this.commonSer.getTimeByType(this.timeType).startTime; this.obj.startTime = this.commonSer.getTimeByType(this.timeType).startTime;
this.obj.endTime = this.commonSer.getTimeByType(this.timeType).endTime; this.obj.endTime = this.commonSer.getTimeByType(this.timeType).endTime;
this.getEcharts();
} }
//搜索 //搜索
......
...@@ -95,6 +95,7 @@ export class AnalysisStatusComponent implements OnInit { ...@@ -95,6 +95,7 @@ export class AnalysisStatusComponent implements OnInit {
if(this.timeType =='99') return ; if(this.timeType =='99') return ;
this.obj.startTime = this.commonSer.getTimeByType(this.timeType).startTime; this.obj.startTime = this.commonSer.getTimeByType(this.timeType).startTime;
this.obj.endTime = this.commonSer.getTimeByType(this.timeType).endTime; this.obj.endTime = this.commonSer.getTimeByType(this.timeType).endTime;
this.getEcharts();
} }
//搜索 //搜索
......
...@@ -34,7 +34,7 @@ export class ResourceWarningComponent implements OnInit { ...@@ -34,7 +34,7 @@ export class ResourceWarningComponent implements OnInit {
obj = { obj = {
ruleType: '1', //1:资源预警;2:业务预警;3:工作预警; ruleType: '1', //1:资源预警;2:业务预警;3:工作预警;
ruleLevel: null, ruleLevel: '',
keyword: '', keyword: '',
startDate: '', startDate: '',
endDate: '', endDate: '',
......
...@@ -105,10 +105,10 @@ ...@@ -105,10 +105,10 @@
<ng-container *ngIf="item.status == 0"><span <ng-container *ngIf="item.status == 0"><span
(click)="operationHost(item,'1','关闭')">停止监控</span></ng-container> (click)="operationHost(item,'1','关闭')">停止监控</span></ng-container>
</a></li> </a></li>
<li (click)="showTempStop(item)" nz-menu-item> <li *ngIf="item.status == 0" (click)="showTempStop(item)" nz-menu-item>
<a *ngIf="!item.monitorTask">临时暂停</a> <a *ngIf="!item.monitorTask">临时暂停</a>
</li> </li>
<li (click)="showAlarm(item)" nz-menu-item><a>添加告警</a></li> <li (click)="showAlarm()" nz-menu-item><a>添加告警</a></li>
</ul> </ul>
</nz-dropdown> </nz-dropdown>
</td> </td>
......
...@@ -21,10 +21,11 @@ ...@@ -21,10 +21,11 @@
项目类型 项目类型
</nz-form-label> </nz-form-label>
<nz-form-control [nzSpan]="14"> <nz-form-control [nzSpan]="14">
<ng-container *ngIf="obj?.type == 0">中心驻场</ng-container> <ng-container *ngIf="obj?.type == 0">软件维护类</ng-container>
<ng-container *ngIf="obj?.type == 1">中心运维</ng-container> <ng-container *ngIf="obj?.type == 1">硬件维护</ng-container>
<ng-container *ngIf="obj?.type == 2">外单位驻场</ng-container> <ng-container *ngIf="obj?.type == 2">网络维护</ng-container>
<ng-container *ngIf="obj?.type == 3">外单位运维</ng-container> <ng-container *ngIf="obj?.type == 3">终端维护</ng-container>
<ng-container *ngIf="obj?.type == 4">建设类</ng-container>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
...@@ -45,7 +46,7 @@ ...@@ -45,7 +46,7 @@
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="secondLevelType"> <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="secondLevelType">
乙方名称 乙方名称
</nz-form-label> </nz-form-label>
<nz-form-control [nzSpan]="2"> <nz-form-control [nzSpan]="14">
{{obj?.companyName}} {{obj?.companyName}}
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
......
...@@ -69,6 +69,8 @@ export class ChangeCreateComponent implements OnInit { ...@@ -69,6 +69,8 @@ export class ChangeCreateComponent implements OnInit {
verifyUserName: [null, [Validators.required]], verifyUserName: [null, [Validators.required]],
description: [null, [Validators.required]], description: [null, [Validators.required]],
}); });
this.fileList = [];
this.fileId = [];
} }
//变更分类 //变更分类
......
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