monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 6caaca93bda851dd5ecf9f6b8c27f071abdf49e5 2 parents 450265c1 afcf4ae1

Merge branch 'master-500-dev-xwx' into 'master-500-dev' 

通知查询-【无】-资源列表不展示



See merge request !926
Inline Side-by-side
Showing 2 changed files with 9 additions and 4 deletions
... ... @@ -117,6 +117,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
renderSearchCondition(resType, bizId);
let colResType = resType;
if (colResType == 'MIDDLEWARE_WEBLOGIC' && parentId == 'null') {
// 展示控制台的表头
colResType = 'MIDDLEWARE_WEBLOGICCONSOLE'
}
... ... @@ -515,7 +516,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
xmSelect.get('#collProtocolSelect', true).setValue([]);
collProtocols = '';
}
form.render('select');
var targetId = '';
var searchType = "";
... ... @@ -535,8 +535,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
$("#biz_reslist_res_cluster_id").show();
} else if (resType == 'MIDDLEWARE_WEBLOGIC') {
searchType = 'MIDDLEWARE_WEBLOGIC';
optons = "<option value='null'>=全部控制台=</option>"
optons += "<option value=''>全部服务</option>"
optons = "<option value=''>=服务列表=</option>"
optons += "<option value='null'>=控制台列表=</option>"
targetId = 'biz_reslist_res_cluster';
$("#biz_reslist_res_cluster_id").show();
} else {
... ... @@ -631,6 +631,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
});
}
$('#' + targetId).html(optons);
$('#biz_reslist_res_cluster').val(parentId);
form.render("select");
})
}
... ... @@ -787,7 +789,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
} else {
$('#' + domStr).find('.div-link-state').show();
}
$('#biz_reslist_res_cluster').val(parentId);
form.render("select");
})
}
... ...
... ... @@ -243,7 +243,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
method: 'GET',
success: function (res) {
// 资源类型下拉框
if (res && res.success && response.data.length > 0) {
if (res && res.success && res.data.length > 0) {
var resTypeList = res.data;
resTypeSelect = xmSelect.render({
el: '#notice_search_resType',
... ...