Skip to content

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

update

parent 7ddd6a30
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 77 deletions
src/main/webapp/app/home/home.component.html
View file @ f637d438
......@@ -168,7 +168,7 @@
</p>
<p>
<nz-tag nzColor="#80ba78"></nz-tag>
内存使用率 0%
内存使用率 {{(item.memory).toFixed(2)}}%
</p>
<!--<p>-->
<!--<nz-tag nzColor="#73b6e4"></nz-tag>-->
......
src/main/webapp/app/modal/basi-check/basi-check.component.html
View file @ f637d438
......@@ -133,17 +133,17 @@
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="6" nzFor="valuemapid">查看值</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select name="valuemapid" formControlName="valuemapid" nzPlaceHolder="请选择查看值">
<nz-option nzValue="0" nzLabel="不变"></nz-option>
<ng-container *ngFor="let item of valueMapList">
<nz-option [nzValue]="item.valuemapid" [nzLabel]="item.name"></nz-option>
</ng-container>
</nz-select>
</nz-form-control>
</nz-form-item>
<!--<nz-form-item>-->
<!--<nz-form-label [nzSpan]="6" nzFor="valuemapid">查看值</nz-form-label>-->
<!--<nz-form-control [nzSpan]="14">-->
<!--<nz-select name="valuemapid" formControlName="valuemapid" nzPlaceHolder="请选择查看值">-->
<!--<nz-option nzValue="0" nzLabel="不变"></nz-option>-->
<!--<ng-container *ngFor="let item of valueMapList">-->
<!--<nz-option [nzValue]="item.valuemapid" [nzLabel]="item.name"></nz-option>-->
<!--</ng-container>-->
<!--</nz-select>-->
<!--</nz-form-control>-->
<!--</nz-form-item>-->
</form>
<div class="modal-footer-btn">
<button nz-button (click)="handleCheckOk()" nzType="primary">下一步</button>
......
src/main/webapp/app/modal/basi-check/basi-check.component.ts
View file @ f637d438
......@@ -82,9 +82,9 @@ export class BasiCheckComponent implements OnInit {
// formula: [null, [Validators.required]],
history: ['3600'],
trends: [null],
valuemapid: ['0'],
// valuemapid: ['0'],
delay: [null, [Validators.required]],
snmp_oid: [null],
snmp_oid: ['interfaces.ifTable.ifEntry.ifInOctets.1'],
snmp_community: ['public'],
applications: [null],
});
......@@ -112,15 +112,15 @@ export class BasiCheckComponent implements OnInit {
//映射值
getValuemap() {
this.overAllSer.findValuemap().subscribe(
(res) => {
if (res.errCode == 10000) {
this.valueMapList = res.data;
} else {
this.message.error(res.errMsg);
}
}
);
// this.overAllSer.findValuemap().subscribe(
// (res) => {
// if (res.errCode == 10000) {
// this.valueMapList = res.data;
// } else {
// this.message.error(res.errMsg);
// }
// }
// );
}
//编辑
......@@ -136,9 +136,11 @@ export class BasiCheckComponent implements OnInit {
data.type += '';
data.interfaceid += '';
data.value_type += '';
data.applications = data.applications.map(e=>{
return e.applicationid;
});
if(data.applications){
data.applications = data.applications.map(e=>{
return e.applicationid;
});
}
this.validateForm.patchValue(data);
data.triggers.forEach((value) => {
......@@ -405,8 +407,8 @@ export class BasiCheckComponent implements OnInit {
createTrigger(data) {
const res = {
itemName: this.validateForm.value.name,
faultCondition: data.faultCondition,
condition: data.condition
faultCondition: data.faultCondition.substring(5,data.faultCondition.length),
condition: data.condition.substring(5,data.faultCondition.length)
};
this.overAllSer.createTrigger(res).subscribe(
(response) => {
......
src/main/webapp/app/modal/select-person/select-person.component.html
View file @ f637d438
......@@ -10,11 +10,11 @@
></nz-tree>
</div>
<div nz-col [nzSpan]="10">
<div nz-col [nzSpan]="11">
<nz-table #basicTable [nzData]="userList"
[nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageSize"
(nzCurrentPageDataChange)="currentPageDataChange($event)"
(nzPageIndexChange)="refreshStatus()"
(nzPageSizeChange)="refreshStatus()">
(nzPageIndexChange)="changePage($event)">
<thead>
<tr>
<th nzShowCheckbox [(nzChecked)]="allChecked" [nzIndeterminate]="indeterminate"
......@@ -33,12 +33,12 @@
</nz-table>
</div>
<div nz-col [nzSpan]="8">
<p>已选中用户 <span>清空</span></p>
<div nz-col [nzSpan]="7">
<p>已选中用户 <span (click)="clearList()" class="main-color cursor">清空</span></p>
<p (click)="handle" *ngFor="let item of selectList;let i = index;">
<span>{{item.name}}</span>
<span>{{item.phoneNumber}}</span>
<span (click)="deleteSelect(i)">X</span>
<span class="main-color cursor" (click)="deleteSelect(i)">X</span>
</p>
</div>
</div>
......
src/main/webapp/app/modal/select-person/select-person.component.ts
View file @ f637d438
......@@ -6,7 +6,11 @@ import {CommonService} from '../../shared/common/common.service';
@Component({
selector: 'smart-select-person',
templateUrl: './select-person.component.html',
styles: []
styles: [
`
`
]
})
export class SelectPersonComponent implements OnInit {
@Output() done = new EventEmitter();
......@@ -24,7 +28,8 @@ export class SelectPersonComponent implements OnInit {
deleteList=[];
pageNum = 1;
pageSize = 10;
pageSize = 5;
totalNum;
organizationId = null;
displayData: Array<{ key1: string; key2: number; key3: string; key4: string; checked: boolean }> = [];
......@@ -33,7 +38,14 @@ export class SelectPersonComponent implements OnInit {
}
checkAll(value: boolean): void {
this.displayData.forEach(data => data.checked = value);
this.displayData.forEach(data =>{
data.checked = value;
if(value){
this.selectList.push(data);
}else{
this.selectList = [];
}
});
this.refreshStatus();
}
......@@ -101,6 +113,12 @@ export class SelectPersonComponent implements OnInit {
}
}
//翻页
changePage($event){
this.pageNum = $event;
this.getUser();
}
getUser() {
const data = {
'search': null,
......@@ -111,6 +129,7 @@ export class SelectPersonComponent implements OnInit {
this.systemSer.user(data).subscribe(
(res) => {
this.userList = res.data.data;
this.totalNum = res.data.totalCount;
}
);
}
......@@ -185,4 +204,9 @@ export class SelectPersonComponent implements OnInit {
this.init();
}
//清空选择
clearList(){
this.selectList = [];
}
}
src/main/webapp/app/netTopology/flow-trend/flow-trend.component.html
View file @ f637d438
......@@ -76,7 +76,7 @@
</thead>
<tbody>
<ng-container *ngFor="let item of inList">
<tr (click)="getEcharts(item.itemid)">
<tr class="cursor" (click)="getEcharts(item.itemid)">
<td>{{item.itemName}}</td>
<td>{{item.max | toUtil}}</td>
<td>{{item.min | toUtil}}</td>
......
src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.html
View file @ f637d438
......@@ -30,19 +30,19 @@
</div>
<div class="releative" #checkEle>
<div #colorEle class="checkTags tag-form">
<span (click)="changeState('正常')">
<span [ngClass]="{'select-border': changeStates == '正常'}" (click)="changeState('正常')">
<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}}
</span>
<span (click)="changeState('告警')"> <nz-tag [nzColor]="color.yellow"></nz-tag>
<span [ngClass]="{'select-border': changeStates == '告警'}" (click)="changeState('告警')"> <nz-tag [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}}
</span>
<span (click)="changeState('严重')"> <nz-tag [nzColor]="color.red"></nz-tag>
<span [ngClass]="{'select-border': changeStates == '严重'}" (click)="changeState('严重')"> <nz-tag [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}}
</span>
<span (click)="changeState('禁用')"> <nz-tag [nzColor]="color.gray"></nz-tag>
<span [ngClass]="{'select-border': changeStates == '禁用'}" (click)="changeState('禁用')"> <nz-tag [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}}
</span>
......@@ -143,7 +143,7 @@
<div nz-row>
<div class="padding-15-0">
<nz-radio-group [(ngModel)]="itemTypeValue" [nzButtonStyle]="'solid'">
<label *ngFor="let item of itemTypeList" (click)="changeType(item.applicationid)" 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>
</div>
<nz-table #checkTable [nzData]="checkList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageIndex" [nzPageSize]="pageSize" (nzPageIndexChange)="change($event)" [nzLoading]="loading">
......
src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.ts
View file @ f637d438
......@@ -26,8 +26,14 @@ import {DatePipe} from '@angular/common';
right: 15px;
z-index: 999;
}
.select-border{
border: 1px solid #6097b7;
border-radius: 5px;
padding: 2px;
margin-right: 5px;
}
:host ::ng-deep .tabs-smart .ant-tabs-nav-scroll div.ant-tabs-tab:nth-child(3){
margin-right: 155px !important;
margin-right: 180px !important;
}
`
]
......@@ -694,9 +700,12 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
this.getCheckList();
}
changeType(type) {
changeType(item) {
this.pageIndex = 1;
this.applicationId = type;
if(item.name == "全部"){
this.changeStates = null;
}
this.applicationId = item.applicationid;
this.getCheckList();
}
......
src/main/webapp/app/overAll/network-check/network-check.component.html
View file @ f637d438
......@@ -88,7 +88,7 @@
<span *ngIf="item.status == 0">启用</span>
<span *ngIf="item.status == 1">禁用</span>
</td>
<td>最近检查记录</td>
<td>{{item.lastCheckTime}}</td>
<td>{{item.steps.length}}</td>
<td>{{item.delay}}</td>
<td>{{item.retries}}</td>
......@@ -119,8 +119,11 @@
</tbody>
</nz-table>
<!--添加网站-->
<!--网站-->
<smart-website #smartWebsite (done)="getwebList()"></smart-website>
<!--临时暂停-->
<smart-pause #smartPause (done)="getwebList()"></smart-pause>
\ No newline at end of file
<smart-pause #smartPause (done)="getwebList()"></smart-pause>
<!--告警-->
<smart-alarm-modal #smartAlarmModal></smart-alarm-modal>
\ No newline at end of file
src/main/webapp/app/overAll/network-check/network-check.component.ts
View file @ f637d438
......@@ -5,6 +5,7 @@ import {WebsiteComponent} from '../../modal/website/website.component';
import {Router} from '@angular/router';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {PauseComponent} from '../../modal/pause/pause.component';
import {AlarmModalComponent} from '../../modal/alarm-modal/alarm-modal.component';
@Component({
selector: 'smart-network-check',
......@@ -20,6 +21,7 @@ import {PauseComponent} from '../../modal/pause/pause.component';
export class NetworkCheckComponent implements OnInit {
@ViewChild('smartWebsite') smartWebsite:WebsiteComponent;
@ViewChild('smartPause') smartPause:PauseComponent;
@ViewChild('smartAlarmModal') smartAlarmModal:AlarmModalComponent;
color = color;
dataSet;
......@@ -219,4 +221,9 @@ export class NetworkCheckComponent implements OnInit {
showTempStop(item){
this.smartPause.showModal(item.httptestid,'网站监测');
}
//添加告警
showAlarm() {
this.smartAlarmModal.showAddModal('添加告警');
}
}
src/main/webapp/app/work/asset-part/assets-detail/assets-detail.component.html
View file @ f637d438
......@@ -48,6 +48,18 @@
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="equipmentTypeid">资产名称
</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.name}}
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
......@@ -62,22 +74,21 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="equipmentTypeid">资产名称
<nz-form-label [nzOffset]="4" nzRequired [nzSpan]="6" >父分类
</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.name}}
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">负责人</nz-form-label>
<nz-form-label [nzSpan]="6" nzRequired >子分类
</nz-form-label>
<nz-form-control [nzSpan]="14">
{{inventoryExtend?.person}}
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
......@@ -191,27 +202,6 @@
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" >父分类
</nz-form-label>
<nz-form-control [nzSpan]="14">
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired >子分类
</nz-form-label>
<nz-form-control [nzSpan]="14">
</nz-form-control>
</nz-form-item>
</div>
</div>
</div>
</nz-tab>
<nz-tab #thirdTabs nzTitle="关联事件" >
......@@ -231,7 +221,7 @@
<tbody>
<tr *ngFor="let data of thingList">
<td class="table-timeline">
<nz-timeline-item>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}}}</nz-timeline-item>
<nz-timeline-item>{{data.createTime | date:"yyyy-MM-dd HH:mm:ss"}}</nz-timeline-item>
</td>
<td class="round-tag tag-form">
{{data.id}}
......
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