Skip to content

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

单位

parent 8c185dd3
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 32 deletions
src/main/webapp/app/modal/alarm-modal/alarm-modal.component.ts
View file @ b2acf8c5
...@@ -347,6 +347,20 @@ export class AlarmModalComponent implements OnInit { ...@@ -347,6 +347,20 @@ export class AlarmModalComponent implements OnInit {
this.message.error("请输入发送信息"); this.message.error("请输入发送信息");
return false; return false;
} }
if(this.isEvent == '1'){
if(!this.validateForm.event.title ){
this.message.error("请输入事件标题");
return false;
}
if(!this.validateForm.event.eventTypeId ){
this.message.error("请选择事件分类");
return false;
}
if(this.operatorList.length == 0 ){
this.message.error("请选择事件负责人");
return false;
}
}
let number = true; let number = true;
this.sendInfoList.map(e=>{ this.sendInfoList.map(e=>{
......
src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.html
View file @ b2acf8c5
<div nz-row class="breadcrumbs"> <div nz-row class="breadcrumbs">
<div nz-col nzSpan="16"> <div nz-col nzSpan="16">
<nz-breadcrumb class="padding-8-0"> <nz-breadcrumb class="padding-8-0">
...@@ -32,23 +31,29 @@ ...@@ -32,23 +31,29 @@
<div #colorEle class="checkTags tag-form"> <div #colorEle class="checkTags tag-form">
<span [ngClass]="{'select-border': changeStates == '正常'}" (click)="changeState('正常')"> <span [ngClass]="{'select-border': changeStates == '正常'}" (click)="changeState('正常')">
<nz-tag [nzColor]="color.green"></nz-tag> <nz-tag [nzColor]="color.green"></nz-tag>
<i *ngIf="!checkStatus.normal && checkStatus.normal !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>{{checkStatus.normal}} <i *ngIf="!checkStatus.normal && checkStatus.normal !=0"
class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>{{checkStatus.normal}}
</span> </span>
<span [ngClass]="{'select-border': changeStates == '告警'}" (click)="changeState('告警')"> <nz-tag [nzColor]="color.yellow"></nz-tag> <span [ngClass]="{'select-border': changeStates == '告警'}" (click)="changeState('告警')"> <nz-tag
<i *ngIf="!checkStatus.warning && checkStatus.warning !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i> [nzColor]="color.yellow"></nz-tag>
<i *ngIf="!checkStatus.warning && checkStatus.warning !=0"
class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
{{checkStatus.warning}} {{checkStatus.warning}}
</span> </span>
<span [ngClass]="{'select-border': changeStates == '严重'}" (click)="changeState('严重')"> <nz-tag [nzColor]="color.red"></nz-tag> <span [ngClass]="{'select-border': changeStates == '严重'}" (click)="changeState('严重')"> <nz-tag
<i *ngIf="!checkStatus.high && checkStatus.high !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i> [nzColor]="color.red"></nz-tag>
<i *ngIf="!checkStatus.high && checkStatus.high !=0" class="anticon anticon-spin anticon-loading"
style="font-size: 15px;"></i>
{{checkStatus.high}} {{checkStatus.high}}
</span> </span>
<span [ngClass]="{'select-border': changeStates == '禁用'}" (click)="changeState('禁用')"> <nz-tag [nzColor]="color.gray"></nz-tag> <span [ngClass]="{'select-border': changeStates == '禁用'}" (click)="changeState('禁用')"> <nz-tag
<i *ngIf="!checkStatus.disabled && checkStatus.disabled !=0" class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i> [nzColor]="color.gray"></nz-tag>
<i *ngIf="!checkStatus.disabled && checkStatus.disabled !=0"
class="anticon anticon-spin anticon-loading" style="font-size: 15px;"></i>
{{checkStatus.disabled}} {{checkStatus.disabled}}
</span> </span>
</div> </div>
<nz-tabset [nzSelectedIndex]="tabNum" class="tabs-smart"> <nz-tabset [nzSelectedIndex]="tabNum" class="tabs-smart">
<nz-tab nzTitle="资源详情"> <nz-tab nzTitle="资源详情">
<section> <section>
<p class="padding-8-0">资源显示名称</p> <p class="padding-8-0">资源显示名称</p>
...@@ -59,14 +64,16 @@ ...@@ -59,14 +64,16 @@
[nzDisabled]="panel1.disabled"> [nzDisabled]="panel1.disabled">
<div nz-row> <div nz-row>
<div class="releative" nz-col nzSpan="12"> <div class="releative" nz-col nzSpan="12">
<div echarts [options]="chartOption1" style="height: 220px;width: 100%"></div> <div echarts [options]="chartOption1"
style="height: 220px;width: 100%"></div>
<div class="posiabsolutStr"> <div class="posiabsolutStr">
<p>{{responseTimeStr}}</p> <p>{{responseTimeStr}}</p>
<p>ms</p> <p>ms</p>
</div> </div>
</div> </div>
<div class="releative" nz-col nzSpan="12"> <div class="releative" nz-col nzSpan="12">
<div echarts [options]="chartOption2" style="height: 220px;width: 100%;"></div> <div echarts [options]="chartOption2"
style="height: 220px;width: 100%;"></div>
<div class="posiabsolutStr"> <div class="posiabsolutStr">
<p>{{losedStr}}</p> <p>{{losedStr}}</p>
<p>%</p> <p>%</p>
...@@ -82,14 +89,16 @@ ...@@ -82,14 +89,16 @@
[nzDisabled]="panel2.disabled"> [nzDisabled]="panel2.disabled">
<div nz-row> <div nz-row>
<div class="releative" nz-col nzSpan="12"> <div class="releative" nz-col nzSpan="12">
<div echarts [options]="chartOption3" style="height: 220px;width: 100%;"></div> <div echarts [options]="chartOption3"
style="height: 220px;width: 100%;"></div>
<div class="posiabsolutStr"> <div class="posiabsolutStr">
<p>{{cpuUsedStr}}</p> <p>{{cpuUsedStr}}</p>
<p>%</p> <p>%</p>
</div> </div>
</div> </div>
<div class="releative" nz-col nzSpan="12"> <div class="releative" nz-col nzSpan="12">
<div echarts [options]="chartOption4" style="height: 220px;width: 100%"></div> <div echarts [options]="chartOption4"
style="height: 220px;width: 100%"></div>
<div class="posiabsolutStr"> <div class="posiabsolutStr">
<p>{{usedStr}}</p> <p>{{usedStr}}</p>
<p>%</p> <p>%</p>
...@@ -140,15 +149,13 @@ ...@@ -140,15 +149,13 @@
</section> </section>
</nz-tab> </nz-tab>
<nz-tab nzTitle="监测点列表"> <nz-tab nzTitle="监测点列表">
<div nz-row>
<div class="padding-8-0"> <div class="padding-8-0">
<input (keyup.enter)="getCheckList()" style="width: 200px;" type="text" nz-input [(ngModel)]="searchName" placeholder="输入监测点名称"> <input (keyup.enter)="getCheckList()" style="width: 200px;" type="text" nz-input [(ngModel)]="searchName" placeholder="输入监测点名称">
<button (click)="getCheckList()" nz-button nzType="default"><i class="anticon anticon-search" <button (click)="getCheckList()" nz-button nzType="default"><i class="anticon anticon-search" style="color: #6097b7"></i>搜索</button>
style="color: #6097b7"></i>搜索</button>
</div> </div>
<div class="padding-15-0"> <div class="padding-15-0">
<nz-radio-group [(ngModel)]="itemTypeValue" [nzButtonStyle]="'solid'"> <nz-radio-group [(ngModel)]="itemTypeValue" [nzButtonStyle]="'solid'">
<label *ngFor="let item of itemTypeList" (click)="changeType(item)" nz-radio-button nzValue="{{item.applicationid}}">{{item.name}}</label> <label *ngFor="let item of itemTypeList" (click)="changeType(item)" nz-radio-button [nzValue]="item.applicationid">{{item.name}}</label>
</nz-radio-group> </nz-radio-group>
</div> </div>
<nz-table #checkTable [nzData]="checkList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageIndex" [nzPageSize]="pageSize" (nzPageIndexChange)="change($event)" [nzLoading]="loading"> <nz-table #checkTable [nzData]="checkList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageIndex" [nzPageSize]="pageSize" (nzPageIndexChange)="change($event)" [nzLoading]="loading">
...@@ -176,10 +183,10 @@ ...@@ -176,10 +183,10 @@
</ng-container> </ng-container>
<ng-container *ngIf="data.status == 1"> <ng-container *ngIf="data.status == 1">
<nz-tag [nzColor]="color.gray"></nz-tag> <nz-tag [nzColor]="color.gray"></nz-tag>
</ng-container> </ng-container>{{data.name}}
{{data.name}}</td> </td>
<td> <td>
<span title="123123">{{data.lastvalue}}</span> <span>{{data.lastvalue}}</span>
</td> </td>
<td>{{data.lastclock}}</td> <td>{{data.lastclock}}</td>
<td>{{data.itemType}}</td> <td>{{data.itemType}}</td>
...@@ -195,27 +202,28 @@ ...@@ -195,27 +202,28 @@
<span *ngIf="data.triggerCount == 0" (click)="showAddThresholdModal(data)">添加阈值</span> <span *ngIf="data.triggerCount == 0" (click)="showAddThresholdModal(data)">添加阈值</span>
<span *ngIf="data.triggerCount > 0" (click)="showEditThresholdModal(data)">编辑阈值</span> <span *ngIf="data.triggerCount > 0" (click)="showEditThresholdModal(data)">编辑阈值</span>
</ng-container> </ng-container>
<span *ngIf="data.status == 0 && data.state==0" (click)="updateItem(data.itemid,1)" style="color: green" >已启用</span> <span *ngIf="data.status == 0 && data.state==0" (click)="updateItem(data.itemid,1)" style="color: green">已启用</span>
<span *ngIf="data.status == 0 && data.state==1" (click)="updateItem(data.itemid,1)" style="color: red">不支持的</span> <span *ngIf="data.status == 0 && data.state==1" (click)="updateItem(data.itemid,1)" style="color: red">不支持的</span>
<span *ngIf="data.status == 1 && data.state==0" (click)="updateItem(data.itemid,0)" style="color: red" >停用的</span> <span *ngIf="data.status == 1 && data.state==0" (click)="updateItem(data.itemid,0)" style="color: red">停用的</span>
<span *ngIf="data.status == 1 && data.state==1" (click)="updateItem(data.itemid,0)" style="color: green">停用的</span> <span *ngIf="data.status == 1 && data.state==1" (click)="updateItem(data.itemid,0)" style="color: green">停用的</span>
</td> </td>
<td> <td>
<ng-container *ngIf="data.error"> <ng-container *ngIf="data.error">
<nz-tooltip [nzTitle]="data.error"> <nz-tooltip [nzTitle]="data.error">
<span class="color-red" nz-tooltip><i class="anticon anticon-warning"></i></span> <span class="color-red" nz-tooltip><i
class="anticon anticon-warning"></i></span>
</nz-tooltip> </nz-tooltip>
</ng-container> </ng-container>
<ng-container *ngIf="data.info"> <ng-container *ngIf="data.info">
<nz-tooltip [nzTitle]="data.info"> <nz-tooltip [nzTitle]="data.info">
<span class="color-yellow" nz-tooltip><i class="anticon anticon-warning"></i></span> <span class="color-yellow" nz-tooltip><i
class="anticon anticon-warning"></i></span>
</nz-tooltip> </nz-tooltip>
</ng-container> </ng-container>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</nz-table> </nz-table>
</div>
</nz-tab> </nz-tab>
<nz-tab #thirdTabs nzTitle="历史告警" > <nz-tab #thirdTabs nzTitle="历史告警" >
<smart-warn-list #warnList></smart-warn-list> <smart-warn-list #warnList></smart-warn-list>
...@@ -234,7 +242,8 @@ ...@@ -234,7 +242,8 @@
<nz-modal [nzFooter]="null" nzWidth="1080" [(nzVisible)]="isGrapha" nzTitle="" (nzOnCancel)="handleImageCancel()"> <nz-modal [nzFooter]="null" nzWidth="1080" [(nzVisible)]="isGrapha" nzTitle="" (nzOnCancel)="handleImageCancel()">
<div class="releative"> <div class="releative">
<div class="time-select"> <div class="time-select">
<nz-date-picker [(ngModel)]="imageSelectDate" (ngModelChange)="getGraphDate()" [nzSize]="size"></nz-date-picker> <nz-date-picker [(ngModel)]="imageSelectDate" (ngModelChange)="getGraphDate()"
[nzSize]="size"></nz-date-picker>
</div> </div>
<div echarts [options]="chartOptionGrapha" style="height: 520px;width: 100%"></div> <div echarts [options]="chartOptionGrapha" style="height: 520px;width: 100%"></div>
</div> </div>
......
src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.ts
View file @ b2acf8c5
...@@ -36,11 +36,6 @@ import {ThresholdComponent} from '../../../modal/threshold/threshold.component'; ...@@ -36,11 +36,6 @@ import {ThresholdComponent} from '../../../modal/threshold/threshold.component';
:host ::ng-deep .tabs-smart .ant-tabs-nav-scroll div.ant-tabs-tab:nth-child(3){ :host ::ng-deep .tabs-smart .ant-tabs-nav-scroll div.ant-tabs-tab:nth-child(3){
margin-right: 180px !important; margin-right: 180px !important;
} }
:host ::ng-deep .ant-tooltip-inner{
background-color: #fff;
border: 1px solid #ddd;
color: red;
}
` `
] ]
}) })
...@@ -76,7 +71,7 @@ export class BasicDetailComponent implements OnInit, AfterViewInit { ...@@ -76,7 +71,7 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
//监控点 //监控点
isBasicEdit; isBasicEdit;
itemTypeValue = ""; itemTypeValue;
interfaceList: any[]; interfaceList: any[];
itemTypeList: any[]; itemTypeList: any[];
...@@ -839,6 +834,7 @@ export class BasicDetailComponent implements OnInit, AfterViewInit { ...@@ -839,6 +834,7 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
if (null!=res.data){ if (null!=res.data){
this.itemTypeList.unshift(data); this.itemTypeList.unshift(data);
} }
this.itemTypeValue = '';
} }
); );
......
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