monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 5d136ff00e7ff0f7e971cae24ece1a3d55bda35b 2 parents 179a4b52 9afacbcc

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-lushangqing
Inline Side-by-side
Showing 2 changed files with 10 additions and 10 deletions
... ... @@ -107,7 +107,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
});
}
function renderDefaultIndex() {
function renderDefaultIndex(keyWords) {
$('#bizIndexContent').show();
$('#bizListContent').hide();
$('#biztreeTableContent').hide();
... ... @@ -117,7 +117,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
autoHeight(bizindexTable);
window.setResizeEvents('autoHeight', autoHeight);
admin.req({
url: common.domainName + '/api-web/home/resource/countResourceGroupByBusType',
url: common.domainName + '/api-web/home/resource/countResourceGroupByBusType?keyWords='+keyWords,
}).done(function (res) {
layer.close(loading);
laytpl($('#bizindexTpl').html()).render({list: res.data, isBiz: true}, function (html) {
... ... @@ -252,16 +252,16 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
$('#bizindexTable').html(html);
});
});
renderDefaultIndex();
renderDefaultIndex(val);
}
$("#bizTotal").parent().on("click",function () {
renderDefaultIndex();
renderDefaultIndex('');
})
$(".layui-input-search").keyup(function (e) {
if (e.keyCode === 13) {
loadBizTree($(this).val())
loadBizTree($(this).val());
}
});
... ... @@ -1036,4 +1036,4 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
}
});
});
\ No newline at end of file
});
... ...
... ... @@ -107,7 +107,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
});
}
function renderDefaultIndex() {
function renderDefaultIndex(keyWords) {
$('#bizIndexContent').show();
$('#bizListContent').hide();
$('#biztreeTableContent').hide();
... ... @@ -117,7 +117,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
autoHeight(bizindexTable);
window.setResizeEvents('autoHeight', autoHeight);
admin.req({
url: common.domainName + '/api-web/home/resource/countResourceGroupByBusType',
url: common.domainName + '/api-web/home/resource/countResourceGroupByBusType?keyWords='+keyWords
}).done(function (res) {
layer.close(loading);
laytpl($('#bizindexTpl').html()).render({list: res.data, isBiz: true}, function (html) {
... ... @@ -252,11 +252,11 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
$('#bizindexTable').html(html);
});
});
renderDefaultIndex();
renderDefaultIndex(val);
}
$("#bizTotal").parent().on("click",function () {
renderDefaultIndex();
renderDefaultIndex('');
})
$(".layui-input-search").keyup(function (e) {
... ...