monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 4505c09e755a15a42476767485d64d5a5b949159 2 parents 0f9f27ab 586e9965

Merge branch 'master-v32-xwx' into 'master' 

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



See merge request !767
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
var trs = '';
if(res.data && res.data.length > 0){
$.each(res.data,function (i,v){
var collProtocol = '';
if (v.collProtocol){
collProtocol = v.collProtocol;
}
trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
<td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
<td>${v.resTypeName}</td><td>`+collProtocol+`</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
});
}
... ... @@ -679,8 +683,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
function reloadData(res) {
var trs = '';
$.each(res.data,function (i,v){
var collProtocol = '';
if (v.collProtocol){
collProtocol = v.collProtocol;
}
trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
<td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
<td>${v.resTypeName}</td><td>`+collProtocol+`</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
});
var tb = `
<form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form">
... ...