Commit 8e3ebf88 authored by wangqinghua's avatar wangqinghua

update

parent 5d6d4d86
...@@ -40,7 +40,6 @@ export class JhiMainComponent implements OnInit { ...@@ -40,7 +40,6 @@ export class JhiMainComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
console.log(this.container);
this.nzI18nService.setLocale(zh_CN); this.nzI18nService.setLocale(zh_CN);
......
...@@ -386,7 +386,6 @@ export class BasiCheckComponent implements OnInit { ...@@ -386,7 +386,6 @@ export class BasiCheckComponent implements OnInit {
let error = true; let error = true;
this.conditionList.map(e=>{ this.conditionList.map(e=>{
if(e.value.length > 0){ if(e.value.length > 0){
console.log(e.value)
}else{ }else{
error = false; error = false;
} }
......
...@@ -147,7 +147,7 @@ export class FlowTrendComponent implements OnInit { ...@@ -147,7 +147,7 @@ export class FlowTrendComponent implements OnInit {
tooltip: { tooltip: {
// trigger: 'axis', // trigger: 'axis',
formatter: (params)=> { formatter: (params)=> {
console.log(params);
let res = params.seriesName; let res = params.seriesName;
res += '<br/>时间:' + params.name; res += '<br/>时间:' + params.name;
let Mbps = 1000*1000; let Mbps = 1000*1000;
......
...@@ -78,8 +78,7 @@ export class CheckComponent implements OnInit { ...@@ -78,8 +78,7 @@ export class CheckComponent implements OnInit {
//获取下级 //获取下级
mouseAction(name: string, event: NzFormatEmitEvent) { mouseAction(name: string, event: NzFormatEmitEvent) {
console.log(event);
console.log(this.nodeList);
let type; let type;
if(event.node.level == 0){ if(event.node.level == 0){
type = "host"; //主机 type = "host"; //主机
......
...@@ -152,8 +152,14 @@ export class NeTopologyComponent implements OnInit, AfterViewInit { ...@@ -152,8 +152,14 @@ export class NeTopologyComponent implements OnInit, AfterViewInit {
//获取设备图片 //获取设备图片
setImg(e) { setImg(e) {
console.log(e); const data = {
editor.utils.addNode(e[0].icon, '图片'); hostIds:e
}
this.topologySer.findByHostIdOrWeb(data).subscribe(
(res)=>{
editor.utils.addNode(res.data[0].url, '图片');
}
)
} }
//获取列表 //获取列表
......
...@@ -74,6 +74,11 @@ export class TopologyService { ...@@ -74,6 +74,11 @@ export class TopologyService {
return this.http.post(SERVER_API_URL + '/icon/findDefaultIcon',data); return this.http.post(SERVER_API_URL + '/icon/findDefaultIcon',data);
} }
//查找图标
findByHostIdOrWeb(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/icon/findByHostIdOrWeb',data);
}
//添加图片 //添加图片
addPic(data): Observable<any> { addPic(data): Observable<any> {
return this.http.post(SERVER_API_URL + '/sysmapJson/addPic',data); return this.http.post(SERVER_API_URL + '/sysmapJson/addPic',data);
......
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