Skip to content

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

update

parent 8e3ebf88
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 44 deletions
src/main/webapp/app/home/home.component.html
View file @ cbcdfde3
......@@ -170,10 +170,10 @@
<nz-tag nzColor="#80ba78"></nz-tag>
内存使用率 0%
</p>
<p>
<nz-tag nzColor="#73b6e4"></nz-tag>
带宽使用率 {{item.lose}}%
</p>
<!--<p>-->
<!--<nz-tag nzColor="#73b6e4"></nz-tag>-->
<!--带宽使用率 {{item.lose}}%-->
<!--</p>-->
</div>
</div>
......
src/main/webapp/app/home/home.component.ts
View file @ cbcdfde3
......@@ -214,34 +214,34 @@ export class HomeComponent implements OnInit,AfterViewInit {
},
]
},
{
name: '带宽使用率',
type: 'pie',
clockWise: false,
radius: [20, 28],
center:['30%','50%'],
itemStyle: dataStyle,
hoverAnimation: false,
startAngle: 90,
data: [{
value: e.lose,
name: '带宽使用率',
itemStyle: {
normal: {
color: "#73b6e4"
}
}
},
{
value: 100 - e.lose,
name: '',
tooltip: {
show: false
},
itemStyle: placeHolderStyle
},
]
}
// {
// name: '带宽使用率',
// type: 'pie',
// clockWise: false,
// radius: [20, 28],
// center:['30%','50%'],
// itemStyle: dataStyle,
// hoverAnimation: false,
// startAngle: 90,
// data: [{
// value: e.lose,
// name: '带宽使用率',
// itemStyle: {
// normal: {
// color: "#73b6e4"
// }
// }
// },
// {
// value: 100 - e.lose,
// name: '',
// tooltip: {
// show: false
// },
// itemStyle: placeHolderStyle
// },
// ]
// }
]
};
})
......@@ -311,8 +311,8 @@ export class HomeComponent implements OnInit,AfterViewInit {
this.leftOneChart =
{
title: {
text: this.leftOneTotal+'台\n设备',
x: '40%',
text: " " +this.leftOneTotal+'台\n设备',
x: '41%',
y: '40%',
itemGap: 50,
textStyle: {
......@@ -335,7 +335,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
name:"设备",
type: 'pie',
clockWise: true,
center: ["47%", "50%"],
center: ["46%", "50%"],
radius: ['40%', '60%'],
color: ['#f93215', '#ff8400', '#2fb35b', '#a0a0a0'],
label: {
......@@ -399,7 +399,7 @@ export class HomeComponent implements OnInit,AfterViewInit {
{
title: {
text: this.leftTwoTotal+'个\n监测点',
x: '40%',
x: '41%',
y: '40%',
itemGap: 50,
textStyle: {
......
src/main/webapp/app/netTopology/ne-topology/ne-topology.component.html
View file @ cbcdfde3
......@@ -29,7 +29,7 @@
<div nz-col nzSpan="12" class="text-right">
<button nz-button (click)="addTopo()" nzType="default"><i class="anticon anticon-plus-circle-o"></i>添加</button>
<button nz-button (click)="editTopo()" nzType="default"><i class="anticon anticon-form"></i>编辑</button>
<button nz-button (click)="deleteTopo()" nzType="default"><i class="anticon anticon-play-circle-o"></i>删除</button>
<button nz-button (click)="deleteTopo()" nzType="default"><i class="anticon anticon-close-circle-o"></i>删除</button>
</div>
</div>
......
src/main/webapp/app/netTopology/ne-topology/ne-topology.component.ts
View file @ cbcdfde3
......@@ -207,8 +207,13 @@ export class NeTopologyComponent implements OnInit, AfterViewInit {
if (res.errCode == 10000) {
if (res.data.json.length > 0) {
let json = JSON.parse(res.data.json);
editor.loadTopologyByJson(JSON.parse(json.topology), 'img/backimg.png');
this.checkJson = json.check;
if(json.topology){
editor.loadTopologyByJson(JSON.parse(json.topology), 'img/backimg.png');
this.checkJson = json.check;
}else{
editor.utils.clearTopology();
this.checkJson = [];
}
} else {
editor.utils.clearTopology();
this.checkJson = [];
......@@ -249,7 +254,10 @@ export class NeTopologyComponent implements OnInit, AfterViewInit {
nzOkText: '确定',
nzOkType: 'danger',
nzOnOk: () => {
this.topologySer.delete(this.topoId).subscribe(
const data = {
id:this.topoId
}
this.topologySer.delete(data).subscribe(
(res) => {
if (res.errCode == 10000) {
this.topoId = null;
......
src/main/webapp/app/netTopology/topology.service.ts
View file @ cbcdfde3
......@@ -30,8 +30,8 @@ export class TopologyService {
}
//删除拓扑图
delete(params): Observable<any> {
return this.http.get(SERVER_API_URL + '/sysmapJson/delete/' + params);
delete(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/sysmapJson/delete' , data);
}
//删除图标
......
src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.html
View file @ cbcdfde3
......@@ -122,7 +122,7 @@
<th>进流量</th>
<th>出流量</th>
<th>状态变更时间</th>
<th nzWidth="150px">图表</th>
<!--<th nzWidth="150px">图表</th>-->
</tr>
</thead>
<tbody>
......@@ -132,7 +132,7 @@
<td>{{data.in}}</td>
<td>{{data.out}}</td>
<td>{{data.changeState}}</td>
<td>图表</td>
<!--<td>图表</td>-->
</tr>
</tbody>
</nz-table>
......
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