monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit a4aba49f2634e522d13c7e8795f19cf02d5b1aed 2 parents b2d851ea 84f22e44

Merge branch 'master-mj-joke' into 'master-mj' 

fix:告警订阅订阅资源列表表头和数据错位

fix:告警订阅订阅资源列表表头和数据错位

See merge request !1171
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
... ... @@ -673,7 +673,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
var trs = '';
if (res.data && res.data.length > 0) {
$.each(res.data, function (i, v) {
trs += `<tr><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
trs += `<tr style="text-align: center"><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>`;
});
}
... ... @@ -689,7 +689,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
function reloadData(res) {
var trs = '';
$.each(res.data, function (i, v) {
trs += `<tr><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
trs += `<tr style="text-align: center"><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>`;
});
var tb = `
... ... @@ -751,7 +751,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
kpiIdent = "告警指标";
}
trs += `<tr><td>${i + 1}</td><td>${v.resId}</td><td>${v.kpiId}</td><td>${v.kpiName}</td>
trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.resId}</td><td>${v.kpiId}</td><td>${v.kpiName}</td>
<td>${kpiIdent}</td><td><span id="${v.relId}" class="link resource_kpi_sublist_del">删除</span></td></tr>`;
});
var tb = `<div class="layui-form" style="padding: 0 10px;">
... ...