Commit 9717f939 authored by wangqinghua's avatar wangqinghua

update

parent 2684c3ca
...@@ -15,16 +15,16 @@ export const color = { ...@@ -15,16 +15,16 @@ export const color = {
gray:'#bfbfbf', gray:'#bfbfbf',
black:'#6064' black:'#6064'
}; };
//图片地址
export const serverPath = "http://10.10.38.99:8282";
export const imgUrl = serverPath + "/file/icon/";
export const fileUrl = serverPath + "/file/";
// //图片地址 // //图片地址
// const urlPath = window.document.location.href; //浏览器显示地址 // export const serverPath = "http://10.10.38.99:8282";
// const docPath = window.document.location.pathname; //文件在服务器相对地址 // export const imgUrl = serverPath + "/file/icon/";
// const index = urlPath.indexOf(docPath); // export const fileUrl = serverPath + "/file/";
// const serverPath = urlPath.substring(0, index);//服务器地址
// export const imgUrl = serverPath + "file/icon/"; //图片地址
// // export const fileUrl = "http://10.10.38.99:8282/file/"; const urlPath = window.document.location.href; //浏览器显示地址
// export const fileUrl = serverPath + "file/"; const docPath = window.document.location.pathname; //文件在服务器相对地址
const index = urlPath.indexOf(docPath);
const serverPath = urlPath.substring(0, index);//服务器地址
export const imgUrl = serverPath + "file/icon/";
// export const fileUrl = "http://10.10.38.99:8282/file/";
export const fileUrl = serverPath + "file/";
...@@ -70,9 +70,9 @@ ...@@ -70,9 +70,9 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="6">丢失时间</nz-form-label> <nz-form-label [nzSpan]="6">丢失时间(秒)</nz-form-label>
<nz-form-control [nzSpan]="14" nzFor="lifetime"> <nz-form-control [nzSpan]="14" nzFor="lifetime">
<input type="text" name="lifetime" placeholder="输入丢失时间" nz-input <input type="text" name="lifetime" placeholder="输入丢失时间(秒)" nz-input
formControlName="lifetime"> formControlName="lifetime">
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
......
...@@ -45,7 +45,7 @@ export class DiscoveryComponent implements OnInit { ...@@ -45,7 +45,7 @@ export class DiscoveryComponent implements OnInit {
delay: [null, [Validators.required]], delay: [null, [Validators.required]],
description: [null], description: [null],
lifetime: ['3600'], lifetime: ['3600'],
status: [null], status: [null], //0启用 1禁用
}); });
} }
...@@ -67,6 +67,7 @@ export class DiscoveryComponent implements OnInit { ...@@ -67,6 +67,7 @@ export class DiscoveryComponent implements OnInit {
const data = res.data[0]; const data = res.data[0];
data.type += ''; data.type += '';
data.value_type += ''; data.value_type += '';
data.status = data.status == 0 ? true : false;
this.validateForm.patchValue(data); this.validateForm.patchValue(data);
} }
); );
...@@ -82,7 +83,7 @@ export class DiscoveryComponent implements OnInit { ...@@ -82,7 +83,7 @@ export class DiscoveryComponent implements OnInit {
this.message.error('请输入必填信息'); this.message.error('请输入必填信息');
return false; return false;
} }
let d = this.validateForm.value.status == true ? 1 : 0; let d = this.validateForm.value.status == true ? 0 : 1;
this.validateForm.patchValue({ this.validateForm.patchValue({
status:d, status:d,
hostid:this.hostId hostid:this.hostId
......
...@@ -335,7 +335,6 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe ...@@ -335,7 +335,6 @@ export class NeTopologyComponent implements OnInit, DoCheck, AfterViewInit, OnDe
const hostIds = []; const hostIds = [];
arr.forEach(e=>{ arr.forEach(e=>{
if(e.elementType == 'link' && e.itemId && e.itemId.length > 0){ if(e.elementType == 'link' && e.itemId && e.itemId.length > 0){
console.log(e);
const data = { const data = {
itemIdIn:e.itemId.split(',')[0], itemIdIn:e.itemId.split(',')[0],
itemIdOut:e.itemId.split(',')[1], itemIdOut:e.itemId.split(',')[1],
......
...@@ -265,7 +265,6 @@ export class NetworkDetailComponent implements OnInit, OnChanges { ...@@ -265,7 +265,6 @@ export class NetworkDetailComponent implements OnInit, OnChanges {
tooltip: { tooltip: {
// trigger: 'axis', // trigger: 'axis',
formatter: (params) => { formatter: (params) => {
console.log(params);
if (params.data) { if (params.data) {
let res = params.seriesName; let res = params.seriesName;
res += '<br/>时间:' + params.name; res += '<br/>时间:' + params.name;
......
...@@ -66,4 +66,4 @@ ...@@ -66,4 +66,4 @@
</nz-table> </nz-table>
<!--自动发现--> <!--自动发现-->
<smart-discovery #smartDiscovery></smart-discovery> <smart-discovery #smartDiscovery (done)="getList()"></smart-discovery>
\ No newline at end of file \ No newline at end of file
...@@ -94,6 +94,7 @@ export class CheckPrototypeComponent implements OnInit { ...@@ -94,6 +94,7 @@ export class CheckPrototypeComponent implements OnInit {
const data = res.data[0]; const data = res.data[0];
data.type += ''; data.type += '';
data.value_type += ''; data.value_type += '';
data.status = data.status == 0 ? true : false;
if (data.applications) { if (data.applications) {
data.applications = data.applications.map(e => { data.applications = data.applications.map(e => {
return e.applicationid; return e.applicationid;
......
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