Skip to content

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

update

parent 73ef8491
Expand all Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 21 deletions
src/main/webapp/app/modal/basi-check/basi-check.component.html
View file @ a03d9f45
......@@ -164,7 +164,7 @@
<nz-form-label [nzSpan]="3" > <span *ngIf="i == 0">危险阈值</span> </nz-form-label>
<nz-form-control [nzSpan]="18" class="form-select">
<div nz-row [nzGutter]="12">
<nz-form-control nz-col [nzSpan]="4">
<nz-form-control nz-col [nzSpan]="5">
<nz-select name="interfaces_main" nzPlaceHolder="选择接口类型" [(ngModel)]="fault.and" *ngIf="i>0">
<nz-option nzValue=" and " nzLabel="并且"></nz-option>
<nz-option nzValue=" or " nzLabel="或"></nz-option>
......@@ -173,7 +173,7 @@
<nz-form-control nz-col [nzSpan]="4">
<button class="tag-button" nz-button nzType="default">返回值</button>
</nz-form-control>
<nz-form-control nz-col [nzSpan]="3">
<nz-form-control nz-col [nzSpan]="5">
<nz-select name="interfaces_main" nzPlaceHolder="选择接口类型" [(ngModel)]="fault.equal">
<nz-option nzValue="=" nzLabel="="></nz-option>
<nz-option nzValue=">" nzLabel=">"></nz-option>
......@@ -195,7 +195,7 @@
<nz-form-label [nzSpan]="3"><span *ngIf="i == 0;">故障阈值</span></nz-form-label>
<nz-form-control [nzSpan]="18" class="form-select">
<div nz-row [nzGutter]="12">
<nz-form-control nz-col [nzSpan]="4">
<nz-form-control nz-col [nzSpan]="5">
<nz-select name="interfaces_main" [(ngModel)]="fault.and" *ngIf="i>0">
<nz-option nzValue=" and " nzLabel="并且"></nz-option>
<nz-option nzValue=" or " nzLabel="或"></nz-option>
......@@ -204,7 +204,7 @@
<nz-form-control nz-col [nzSpan]="4">
<button class="tag-button" nz-button nzType="default">返回值</button>
</nz-form-control>
<nz-form-control nz-col [nzSpan]="3">
<nz-form-control nz-col [nzSpan]="5">
<nz-select name="interfaces_main" nzPlaceHolder="选择接口类型" [(ngModel)]="fault.equal">
<nz-option nzValue="=" nzLabel="="></nz-option>
<nz-option nzValue=">" nzLabel=">"></nz-option>
......
src/main/webapp/app/modal/basic-edit/basic-edit.component.html
View file @ a03d9f45
......@@ -409,7 +409,7 @@
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="equipmentTypeid">资产名称
</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="资产名称" name="serialnoA">
<input nz-input placeholder="资产名称" name="name" [(ngModel)]="validateForm.name">
</nz-form-control>
</nz-form-item>
</div>
......@@ -439,7 +439,7 @@
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" nzFor="serialnoA">品牌</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="品牌">
<input nz-input placeholder="品牌" name="invertoryname" [(ngModel)]="validateForm.inventoryExtend.invertoryname">
</nz-form-control>
</nz-form-item>
</div>
......@@ -459,7 +459,7 @@
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" >型号</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="型号">
<input nz-input placeholder="型号" name="serialnoA" [(ngModel)]="validateForm.inventoryExtend.serialnoA">
</nz-form-control>
</nz-form-item>
</div>
......@@ -479,7 +479,7 @@
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" >MAC地址</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="MAC地址">
<input nz-input placeholder="MAC地址" name="mac" [(ngModel)]="validateForm.inventoryExtend.mac">
</nz-form-control>
</nz-form-item>
</div>
......@@ -498,7 +498,7 @@
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">维保到期</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="维保到期" >
<input nz-input placeholder="维保到期" name="maintenanceExpiration" [(ngModel)]="validateForm.inventoryExtend.maintenanceExpiration" >
</nz-form-control>
</nz-form-item>
</div>
......@@ -518,7 +518,7 @@
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">存放地点</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="存放地点">
<input nz-input placeholder="存放地点" [(ngModel)]="validateForm.inventoryExtend.storageLocation">
</nz-form-control>
</nz-form-item>
</div>
......
src/main/webapp/app/modal/basic-edit/basic-edit.component.ts
View file @ a03d9f45
......@@ -399,7 +399,8 @@ export class BasicEditComponent implements OnInit {
invertoryname: null,
mac: null,
storageLocation: null,
maintenanceExpiration: null
maintenanceExpiration: null,
name:null
},
templates: null,
name: null,
......
src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.html
View file @ a03d9f45
......@@ -113,7 +113,7 @@
</nz-collapse>
</div>
<div nz-row>
<nz-table #basicTable [nzData]="dataSet">
<nz-table #basicTable [nzData]="dataSet" [nzFrontPagination]="false" [nzTotal]="totalNumInOut" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="changeInoutInfo($event)" [nzLoading]="inOutLoading">
<thead>
<tr>
<th>状态</th>
......@@ -153,7 +153,6 @@
<th nzWidth="250px">最新数据时间</th>
<th>监测点分类</th>
<th>更新时间间隔</th>
<!--<th>来源</th>-->
<th>图表</th>
<th>操作</th>
</tr>
......
src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.ts
View file @ a03d9f45
......@@ -94,7 +94,9 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
//进出口流量-分页
pageNum = 1;
pageCount = 5;
totalNumInOut;
inOutLoading;
//分页--告警
warn_totalNum;
......@@ -573,17 +575,20 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
//进出口流量-SNMP
inOutInfo() {
this.inOutLoading = true;
const data = {
obj:{
hostid:Number(this.hostId)
},
pageNum:this.pageNum,
pageCount:this.pageSize
pageCount:this.pageCount
}
this.overAllSer.inOutInfoSnmp(data).subscribe(
(res) => {
if (res.errCode == 10000) {
this.dataSet = res.data;
this.dataSet = res.data.data;
this.inOutLoading = false;
this.totalNumInOut = res.data.totalNum;
}else{
this.message.info(res.errMsg);
}
......@@ -591,6 +596,12 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
);
}
//进出口流量 翻页
changeInoutInfo(e){
this.pageNum = e;
this.inOutInfo();
}
//添加监测点
showCheckModal() {
this.smartCheck.showAddModal(this.hostId,this.realName);
......
src/main/webapp/app/overAll/basic/basic.component.html
View file @ a03d9f45
......@@ -110,7 +110,9 @@
<nz-tag *ngIf="item.maxLevel == 2 || item.maxLevel == 3" [nzColor]="col.yellow"></nz-tag>
<nz-tag *ngIf="item.maxLevel < 2" [nzColor]="col.green"></nz-tag>
</td>
<td>关联资产</td>
<td>
<span (click)="goTOInventory(item?.inventory?.id)">{{item?.inventory?.name}}</span>
</td>
<td>
<span *ngIf="item.status == 0">已监控</span>
<span *ngIf="item.status == 1">未监控</span>
......@@ -211,7 +213,7 @@
<nz-tag *ngIf="item.maxLevel == 2 || item.maxLevel == 3" [nzColor]="color.yellow"></nz-tag>
<nz-tag *ngIf="item.maxLevel < 2" [nzColor]="color.green"></nz-tag>
</td>
<td>关联资产</td>
<td>{{item?.inventory?.name}}</td>
<td>
<span *ngIf="item.status == 0">已监控</span>
<span *ngIf="item.status == 1">未监控</span>
......@@ -303,7 +305,7 @@
<nz-tag *ngIf="item.maxLevel == 2 || item.maxLevel == 3" [nzColor]="color.yellow"></nz-tag>
<nz-tag *ngIf="item.maxLevel < 2" [nzColor]="color.green"></nz-tag>
</td>
<td>关联资产</td>
<td>{{item?.inventory?.name}}</td>
<td>
<span *ngIf="item.status == 0">已监控</span>
<span *ngIf="item.status == 1">未监控</span>
......
src/main/webapp/app/overAll/basic/basic.component.ts
View file @ a03d9f45
......@@ -231,6 +231,7 @@ export class BasicComponent implements OnInit {
this.loading = true;
this.searchStatus = false;
this.frontPagination = true;
this.findOpStatus();
if (this.selectedValue == 'group') {
this.overAllSer.getgroups({}).subscribe(
(res) => {
......@@ -540,4 +541,9 @@ export class BasicComponent implements OnInit {
nzOnCancel: () => console.log('Cancel')
});
}
//资产页面
goTOInventory(id){
}
}
src/main/webapp/app/work/inspect-plan/inspect-plan.component.html
View file @ a03d9f45
......@@ -84,5 +84,5 @@
</tbody>
</nz-table>
<smart-plan-modal #smartPlanMoadl ></smart-plan-modal>
<smart-plan-modal #smartPlanMoadl (done)="getList()"></smart-plan-modal>
<smart-look-plan #smartLookPlan></smart-look-plan>
\ No newline at end of file
src/main/webapp/app/work/modal/plan-modal/plan-modal.component.ts
View file @ a03d9f45
import {Component, OnInit, ViewChild} from '@angular/core';
import {Component, EventEmitter, OnInit, Output, ViewChild} from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {WorkService} from '../../work.service';
import {NzMessageService, UploadFile} from 'ng-zorro-antd';
......@@ -11,6 +11,7 @@ import {SelectPersonComponent} from '../../../modal/select-person/select-person.
})
export class PlanModalComponent implements OnInit {
@ViewChild('smartSelectPerson') smartSelectPerson: SelectPersonComponent;
@Output() done = new EventEmitter<any>();
planList;
planId;
......@@ -127,6 +128,7 @@ export class PlanModalComponent implements OnInit {
if (res.errCode == 10000) {
this.message.success('修改计划成功');
this.initForm();
this.done.emit();
this.isVisiable = false;
} else {
this.message.error(res.errMsg);
......
tslint.json
View file @ a03d9f45
......@@ -18,7 +18,7 @@
"label-position": true,
"max-line-length": [
true,
180
280
],
"member-access": false,
"member-ordering": [
......
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