Skip to content

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

单位

parent 9c9c954b
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 26 deletions
src/main/webapp/app/alarm/send-set/send-set.component.html
View file @ 8c185dd3
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
</td> </td>
<td>用于告警中</td> <td>用于告警中</td>
<td> <td>
<span *ngIf="data.status == 0">启用</span> <span class="color-green" *ngIf="data.status == 0">启用</span>
<span *ngIf="data.status == 1">暂停</span> <span class="color-red" *ngIf="data.status == 1">暂停</span>
</td> </td>
<td> <td>
<span *ngIf="data.type == 0">GSM 调制解调器："{{data.gsm_modem}}"</span> <span *ngIf="data.type == 0">GSM 调制解调器："{{data.gsm_modem}}"</span>
......
src/main/webapp/app/modal/alarm-modal/alarm-modal.component.html
View file @ 8c185dd3
...@@ -151,7 +151,13 @@ ...@@ -151,7 +151,13 @@
<ng-container *ngIf="isEvent == '1'"> <ng-container *ngIf="isEvent == '1'">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="4" nzFor="serviceid">事件分类</nz-form-label> <nz-form-label [nzSpan]="4" nzRequired nzFor="hostName">事件标题</nz-form-label>
<nz-form-control [nzSpan]="14">
<input type="text" nz-input name="hostName" [(ngModel)]="validateForm.event.title">
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired nzFor="serviceid">事件分类</nz-form-label>
<nz-form-control [nzSpan]="14"> <nz-form-control [nzSpan]="14">
<nz-select name="serviceid" nzPlaceHolder="事件分类" [(ngModel)]="validateForm.event.eventTypeId"> <nz-select name="serviceid" nzPlaceHolder="事件分类" [(ngModel)]="validateForm.event.eventTypeId">
<ng-container *ngFor="let item of eventTypeList"> <ng-container *ngFor="let item of eventTypeList">
...@@ -162,21 +168,14 @@ ...@@ -162,21 +168,14 @@
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="4" nzFor="serviceid">事件负责人</nz-form-label> <nz-form-label [nzSpan]="4" nzRequired nzFor="serviceid">事件负责人</nz-form-label>
<nz-form-control [nzSpan]="14"> <nz-form-control [nzSpan]="14">
<button (click)="selectPerson()" nz-button><span>选择</span></button> <button (click)="selectPerson()" nz-button><span>选择</span></button>
<ng-container *ngFor="let item of operatorList;let i = index;"> <ng-container *ngFor="let item of operatorList;let i = index;">
<span style="margin-left: 10px">{{item.username}}</span><span class="main-color" style="margin-left: 5px" (click)="deleteOperator(i)">X</span> <span style="margin-left: 10px">{{item.username}}</span><span class="main-color cursor" style="margin-left: 5px" (click)="deleteOperator(i)">X</span>
</ng-container> </ng-container>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired nzFor="serviceid">详细描述</nz-form-label>
<nz-form-control [nzSpan]="14">
<textarea nz-input nzPlaceholder="事件描述" [nzAutosize]="{ minRows: 4, maxRows: 4 }" [(ngModel)]="validateForm.event.description"></textarea>
</nz-form-control>
</nz-form-item>
</ng-container> </ng-container>
</div> </div>
<div class="modal-footer-btn"> <div class="modal-footer-btn">
......
src/main/webapp/app/modal/alarm-modal/alarm-modal.component.ts
View file @ 8c185dd3
...@@ -88,7 +88,7 @@ export class AlarmModalComponent implements OnInit { ...@@ -88,7 +88,7 @@ export class AlarmModalComponent implements OnInit {
event:{ event:{
eventTypeId:null, //事件分类id eventTypeId:null, //事件分类id
operators:null, //事件负责人 operators:null, //事件负责人
description:null, //事件描述 title:null, //事件标题
} }
}; };
} }
...@@ -311,7 +311,7 @@ export class AlarmModalComponent implements OnInit { ...@@ -311,7 +311,7 @@ export class AlarmModalComponent implements OnInit {
event:{ event:{
eventTypeId:this.validateForm.event.eventTypeId, //事件分类id eventTypeId:this.validateForm.event.eventTypeId, //事件分类id
operators:this.operatorList, //事件负责人 operators:this.operatorList, //事件负责人
description:this.validateForm.event.description, //事件描述 title:this.validateForm.event.title, //事件标题
} }
}; };
......
src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.html
View file @ 8c185dd3
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="tabset"> <div class="tabset">
<div class="tabset-btn"> <div class="tabset-btn">
<button (click)="showCheckModal()" nz-button nzType="default">添加监测点</button> <button (click)="showCheckModal()" nz-button nzType="default">添加监测点</button>
<button (click)="showDeleteConfirm()" nz-button nzType="default">删除</button> <button (click)="showDeleteConfirm()" nz-button nzType="default">删除资源</button>
</div> </div>
<div class="releative" #checkEle> <div class="releative" #checkEle>
<div #colorEle class="checkTags tag-form"> <div #colorEle class="checkTags tag-form">
...@@ -195,17 +195,22 @@ ...@@ -195,17 +195,22 @@
<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 [nzMouseLeaveDelay]="10000" [nzTitle]="data.error" [nzPlacement]="'bottom'"> <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">
<nz-tooltip [nzTitle]="data.info">
<span class="color-yellow" nz-tooltip><i class="anticon anticon-warning"></i></span>
</nz-tooltip>
</ng-container>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.ts
View file @ 8c185dd3
...@@ -76,7 +76,7 @@ export class BasicDetailComponent implements OnInit, AfterViewInit { ...@@ -76,7 +76,7 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
//监控点 //监控点
isBasicEdit; isBasicEdit;
itemTypeValue; itemTypeValue = "";
interfaceList: any[]; interfaceList: any[];
itemTypeList: any[]; itemTypeList: any[];
...@@ -835,9 +835,9 @@ export class BasicDetailComponent implements OnInit, AfterViewInit { ...@@ -835,9 +835,9 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
const data = { const data = {
applicationid:'', applicationid:'',
name:'全部' name:'全部'
} };
if (null!=res.data){ if (null!=res.data){
this.itemTypeList.push(data); this.itemTypeList.unshift(data);
} }
} }
......
src/main/webapp/app/overAll/basic/basic.component.html
View file @ 8c185dd3
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<span (click)="showBasicCheckModal(item.hostid,item.host)">添加监测点</span> <span (click)="showBasicCheckModal(item.hostid,item.host)">添加监测点</span>
<span (click)="editBasicModal(item)">编辑</span> <span (click)="editBasicModal(item)">编辑</span>
<span (click)="showDeleteConfirm(item)">删除</span> <span (click)="showDeleteConfirm(item)">删除</span>
<nz-dropdown [nzTrigger]="'click'" class="table-dropdown"> <nz-dropdown [nzTrigger]="'click'" class="table-dropdown main-color">
<a nz-dropdown>更多 <i class="anticon anticon-down"></i> <a nz-dropdown>更多 <i class="anticon anticon-down"></i>
</a> </a>
<ul nz-menu nzSelectable> <ul nz-menu nzSelectable>
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
<span (click)="editBasicModal(item)">编辑</span> <span (click)="editBasicModal(item)">编辑</span>
<span (click)="showDeleteConfirm(item)">删除</span> <span (click)="showDeleteConfirm(item)">删除</span>
<nz-dropdown [nzTrigger]="'click'" class="table-dropdown"> <nz-dropdown [nzTrigger]="'click'" class="table-dropdown">
<a nz-dropdown>更多 <i class="anticon anticon-down"></i> <a nz-dropdown>更多 <i class="anticon anticon-down main-color"></i>
</a> </a>
<ul nz-menu nzSelectable> <ul nz-menu nzSelectable>
<li *ngIf="!item.monitorTask" (click)="showTempStop(item)" nz-menu-item><a>临时暂停</a></li> <li *ngIf="!item.monitorTask" (click)="showTempStop(item)" nz-menu-item><a>临时暂停</a></li>
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
<span (click)="editBasicModal(item)">编辑</span> <span (click)="editBasicModal(item)">编辑</span>
<span (click)="showDeleteConfirm(item)">删除</span> <span (click)="showDeleteConfirm(item)">删除</span>
<nz-dropdown [nzTrigger]="'click'" class="table-dropdown"> <nz-dropdown [nzTrigger]="'click'" class="table-dropdown">
<a nz-dropdown>更多 <i class="anticon anticon-down"></i> <a nz-dropdown>更多 <i class="anticon anticon-down main-color"></i>
</a> </a>
<ul nz-menu nzSelectable> <ul nz-menu nzSelectable>
<li (click)="showTempStop(item)" nz-menu-item><a>临时暂停</a></li> <li (click)="showTempStop(item)" nz-menu-item><a>临时暂停</a></li>
......
src/main/webapp/app/overAll/network-check/network-check.component.html
View file @ 8c185dd3
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<span (click)="editBasicModal(item)">编辑</span> <span (click)="editBasicModal(item)">编辑</span>
<span (click)="showDeleteConfirm(item)">删除</span> <span (click)="showDeleteConfirm(item)">删除</span>
<nz-dropdown [nzTrigger]="'click'" class="table-dropdown"> <nz-dropdown [nzTrigger]="'click'" class="table-dropdown">
<a nz-dropdown>更多 <i class="anticon anticon-down"></i> <a nz-dropdown>更多 <i class="anticon anticon-down main-color"></i>
</a> </a>
<ul nz-menu nzSelectable> <ul nz-menu nzSelectable>
<li nz-menu-item><a> <li nz-menu-item><a>
......
src/main/webapp/content/css/documentation.css
View file @ 8c185dd3
...@@ -161,6 +161,9 @@ ...@@ -161,6 +161,9 @@
.color-red{ .color-red{
color: red; color: red;
} }
.color-yellow{
color: #ffc029;
}
.color-green{ .color-green{
color: green; color: green;
} }
......
src/main/webapp/content/css/global.css
View file @ 8c185dd3
...@@ -324,6 +324,9 @@ ui bootstrap tweaks ...@@ -324,6 +324,9 @@ ui bootstrap tweaks
border: 1px solid #ddd; border: 1px solid #ddd;
color: red; color: red;
} }
.ant-tooltip-placement-left .ant-tooltip-arrow{
border-left-color:#dddddd;
}
.ant-tooltip-placement-bottom .ant-tooltip-arrow{ .ant-tooltip-placement-bottom .ant-tooltip-arrow{
border-bottom-color:#dddddd; border-bottom-color:#dddddd;
} }
......
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