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 @@ -673,7 +673,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
673 var trs = ''; 673 var trs = '';
674 if (res.data && res.data.length > 0) { 674 if (res.data && res.data.length > 0) {
675 $.each(res.data, function (i, v) { 675 $.each(res.data, function (i, v) {
676 - trs += `<tr><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td> 676 + trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
677 <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`; 677 <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
678 }); 678 });
679 } 679 }
@@ -689,7 +689,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -689,7 +689,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
689 function reloadData(res) { 689 function reloadData(res) {
690 var trs = ''; 690 var trs = '';
691 $.each(res.data, function (i, v) { 691 $.each(res.data, function (i, v) {
692 - trs += `<tr><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td> 692 + trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
693 <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`; 693 <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
694 }); 694 });
695 var tb = ` 695 var tb = `
@@ -751,7 +751,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -751,7 +751,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
751 kpiIdent = "告警指标"; 751 kpiIdent = "告警指标";
752 } 752 }
753 753
754 - trs += `<tr><td>${i + 1}</td><td>${v.resId}</td><td>${v.kpiId}</td><td>${v.kpiName}</td> 754 + trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.resId}</td><td>${v.kpiId}</td><td>${v.kpiName}</td>
755 <td>${kpiIdent}</td><td><span id="${v.relId}" class="link resource_kpi_sublist_del">删除</span></td></tr>`; 755 <td>${kpiIdent}</td><td><span id="${v.relId}" class="link resource_kpi_sublist_del">删除</span></td></tr>`;
756 }); 756 });
757 var tb = `<div class="layui-form" style="padding: 0 10px;"> 757 var tb = `<div class="layui-form" style="padding: 0 10px;">