monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 3f8db9150809917b25a996593bbc984fcb9e2653 1 parent 764bf264

订阅管理订阅的资源列表null值处理

Inline Side-by-side
Showing 1 changed file with 10 additions and 2 deletions
@@ -663,8 +663,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function @@ -663,8 +663,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
663 var trs = ''; 663 var trs = '';
664 if(res.data && res.data.length > 0){ 664 if(res.data && res.data.length > 0){
665 $.each(res.data,function (i,v){ 665 $.each(res.data,function (i,v){
  666 + var collProtocol = '';
  667 + if (v.collProtocol){
  668 + collProtocol = v.collProtocol;
  669 + }
666 trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td> 670 trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
667 - <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`; 671 + <td>${v.resTypeName}</td><td>`+collProtocol+`</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
668 }); 672 });
669 } 673 }
670 674
@@ -679,8 +683,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function @@ -679,8 +683,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
679 function reloadData(res) { 683 function reloadData(res) {
680 var trs = ''; 684 var trs = '';
681 $.each(res.data,function (i,v){ 685 $.each(res.data,function (i,v){
  686 + var collProtocol = '';
  687 + if (v.collProtocol){
  688 + collProtocol = v.collProtocol;
  689 + }
682 trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td> 690 trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
683 - <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`; 691 + <td>${v.resTypeName}</td><td>`+collProtocol+`</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
684 }); 692 });
685 var tb = ` 693 var tb = `
686 <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form"> 694 <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form">