Skip to content

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

update

parent afd8670a
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 61 deletions
src/main/webapp/app/home/home.component.ts
View file @ e1012384
......@@ -256,20 +256,19 @@ export class HomeComponent implements OnInit,AfterViewInit {
)
}
setLeftOne(data){
this.leftOneTotal = data.disabled + data.high + data.normal + data.warning;
let a:any = ( (this.leftOneData.high / this.leftOneTotal).toFixed(2) );
this.leftOneData.highPer = a * 100;
let a:any = (this.leftOneData.high / this.leftOneTotal)* 100;
this.leftOneData.highPer = a.toFixed(2);
let b:any = ( (this.leftOneData.warning / this.leftOneTotal).toFixed(2) );
this.leftOneData.warningPer = b * 100;
let b:any = ( (this.leftOneData.warning / this.leftOneTotal)* 100 );
this.leftOneData.warningPer = b .toFixed(2);
let c:any = ( (this.leftOneData.normal / this.leftOneTotal).toFixed(2) );
this.leftOneData.normalPer = c * 100;
let c:any = ( (this.leftOneData.normal / this.leftOneTotal)* 100);
this.leftOneData.normalPer = c .toFixed(2);
let d:any = ( (this.leftOneData.disabled / this.leftOneTotal).toFixed(2) );
this.leftOneData.disabledPer = d * 100;
let d:any = ( (this.leftOneData.disabled / this.leftOneTotal)* 100 );
this.leftOneData.disabledPer = d .toFixed(2);
this.leftOneChart =
{
title: {
......@@ -331,17 +330,17 @@ export class HomeComponent implements OnInit,AfterViewInit {
setLeftTwo(data){
this.leftTwoTotal = data.disabled + data.high + data.normal + data.warning;
let w:any = ( (this.leftTwoData.high / this.leftTwoTotal).toFixed(2) );
this.leftTwoData.highPer = w * 100;
let w:any = ( (this.leftTwoData.high / this.leftTwoTotal)*100 );
this.leftTwoData.highPer = w.toFixed(2);
let x:any = ( (this.leftTwoData.warning / this.leftTwoTotal).toFixed(2) );
this.leftTwoData.warningPer = x * 100;
let x:any = ( (this.leftTwoData.warning / this.leftTwoTotal)*100 );
this.leftTwoData.warningPer = x .toFixed(2);
let y:any = ( (this.leftTwoData.normal / this.leftTwoTotal).toFixed(2) );
this.leftTwoData.normalPer = y * 100;
let y:any = ( (this.leftTwoData.normal / this.leftTwoTotal)*100 );
this.leftTwoData.normalPer = y.toFixed(2);
let z:any = ( (this.leftTwoData.disabled / this.leftTwoTotal).toFixed(2) );
this.leftTwoData.disabledPer = z * 100;
let z:any = ( (this.leftTwoData.disabled / this.leftTwoTotal)*100);
this.leftTwoData.disabledPer = z.toFixed(2);
this.leftTwoChart =
{
title: {
......
src/main/webapp/app/modal/warn-list/warn-list.component.html
View file @ e1012384
......@@ -29,8 +29,8 @@
<td>{{data.continuedTime}}</td>
<!--<td>{{data.eventid}}</td>-->
<td>
<ng-container *ngIf="data.r_clock">已恢复</ng-container>
<ng-container *ngIf="!data.r_clock">告警中</ng-container>
<ng-container *ngIf="data.r_clock"><span class="color-red"><i class="anticon anticon-check-square-o"></i></span> </ng-container>
<ng-container *ngIf="!data.r_clock"><span class="color-green"> <i class="anticon anticon-warning"></i></span></ng-container>
</td>
<td class="list-icon cursor" (click)="showLog(data)"><i class="anticon anticon-profile"></i></td>
</tr>
......
src/main/webapp/app/netTopology/topology-img/topology-img.component.html
View file @ e1012384
......@@ -23,7 +23,7 @@
<button nz-button (click)="addIcon()" nzType="default"><i class="anticon anticon-plus"></i>添加图标</button>
</div>
</div>
<nz-table #nzTable [nzData]="iconList">
<nz-table #nzTable [nzData]="iconList" [nzFrontPagination]="false" [nzTotal]="totalNum" [nzPageIndex]="pageNum" [nzPageSize]="pageCount" (nzPageIndexChange)="changePage($event)">
<thead>
<tr>
<th>一级类型</th>
......
src/main/webapp/app/netTopology/topology-img/topology-img.component.ts
View file @ e1012384
......@@ -2,7 +2,7 @@ import {Component, OnInit, ViewChild} from '@angular/core';
import {TopologyService} from '../topology.service';
import {NzMessageService, NzModalService, NzMode} from 'ng-zorro-antd';
import {IconComponent} from '../model/icon/icon.component';
import {imgUrl} from '../../app.constants';
import {imgUrl, pageSize} from '../../app.constants';
@Component({
selector: 'smart-topology-img',
......@@ -14,6 +14,10 @@ export class TopologyImgComponent implements OnInit {
imgUrl = imgUrl;
iconList;
pageNum = 1;
pageCount = pageSize;
totalNum;
constructor(private topologySer: TopologyService,private message:NzMessageService,
private modalSer:NzModalService) {
}
......@@ -23,10 +27,15 @@ export class TopologyImgComponent implements OnInit {
}
getList() {
this.topologySer.iconFindAll().subscribe(
const data = {
pageNum:this.pageNum,
pageCount:this.pageCount
}
this.topologySer.iconFindAll(data).subscribe(
(res) => {
if(res.errCode == 10000){
this.iconList = res.data;
this.iconList = res.data.data;
this.totalNum = res.data.totalNum;
}else{
this.message.error(res.errMsg);
}
......@@ -34,8 +43,13 @@ export class TopologyImgComponent implements OnInit {
);
}
//添加图标
//翻页
changePage(e){
this.pageNum = e;
this.getList();
}
//添加图标
addIcon(){
this.smartIcon.showAddModal("添加图标");
}
......
src/main/webapp/app/netTopology/topology.service.ts
View file @ e1012384
......@@ -40,8 +40,8 @@ export class TopologyService {
}
//查询所有图标
iconFindAll(): Observable<any> {
return this.http.get(SERVER_API_URL + '/icon/findAll' );
iconFindAll(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/icon/findPage',data );
}
//添加图标
......
src/main/webapp/app/system/modal/group-modal/group-modal.component.ts
View file @ e1012384
......@@ -91,7 +91,7 @@ export class GroupModalComponent implements OnInit {
this.initForm();
this.isVisible = false;
this.done.emit();
this.message.success("新增部门成功");
this.message.success("部门信息更新成功");
}else{
this.message.error(res.errMsg);
}
......
src/main/webapp/app/work/asset-part/asset-part.component.ts
View file @ e1012384
......@@ -80,7 +80,8 @@ export class AssetPartComponent implements OnInit {
this.router.navigate(['app/main/assetChild'],
{
queryParams:{
id:data.id
id:data.id,
name:data.name
}
})
}
......
src/main/webapp/app/work/asset-part/child-assets/child-assets.component.html
View file @ e1012384
......@@ -11,7 +11,7 @@
资产备件
</nz-breadcrumb-item>
<nz-breadcrumb-item>
子分类详情
子分类：{{childName}}
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
......
src/main/webapp/app/work/asset-part/child-assets/child-assets.component.ts
View file @ e1012384
......@@ -17,12 +17,14 @@ export class ChildAssetsComponent implements OnInit {
childId;
childrenList;
childName;
constructor(private workSer: WorkService, private routerInfo: ActivatedRoute,private router:Router,
private conmonSer:CommonService,private message:NzMessageService) {
this.routerInfo.queryParams.subscribe(
(res) => {
this.childId = res.id;
this.childName = res.name
}
);
}
......
src/main/webapp/app/work/modal/assets/assets.component.html
View file @ e1012384
......@@ -26,6 +26,35 @@
<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-select name="secondLevelType" nzPlaceHolder="选择父分类" [ngModelOptions]="{standalone: true}" [(ngModel)]="parentId" (ngModelChange)="getTypeByParent($event)">
<ng-container *ngFor="let item of parentTypeList">
<nz-option [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
</ng-container>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" nzRequired>子分类
</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select name="secondLevelType" nzPlaceHolder="选择子分类" formControlName="inventoryTypeid">
<ng-container *ngFor="let item of typeList">
<nz-option [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
</ng-container>
</nz-select>
</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" nzFor="secondLevelType">资产数量
</nz-form-label>
<nz-form-control [nzSpan]="14">
......@@ -142,37 +171,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-select name="secondLevelType" nzPlaceHolder="选择父分类" [ngModelOptions]="{standalone: true}" [(ngModel)]="parentId" (ngModelChange)="getTypeByParent($event)">
<ng-container *ngFor="let item of parentTypeList">
<nz-option [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
</ng-container>
</nz-select>
</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-select name="secondLevelType" nzPlaceHolder="选择子分类" formControlName="inventoryTypeid">
<ng-container *ngFor="let item of typeList">
<nz-option [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
</ng-container>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
</div>
</div>
</form>
</nz-modal>
\ No newline at end of file
src/main/webapp/app/work/modal/plan-modal/plan-modal.component.ts
View file @ e1012384
......@@ -131,6 +131,7 @@ export class PlanModalComponent implements OnInit {
if (res.errCode == 10000) {
this.initForm();
this.isVisiable = false;
this.done.emit();
this.message.success('新增计划成功');
} else {
this.message.error(res.errMsg);
......
src/main/webapp/content/css/documentation.css
View file @ e1012384
......@@ -154,4 +154,7 @@
}
.color-red{
color: red;
}
.color-red{
color: green;
}
\ No newline at end of file
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