monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 015fac1e69f339e75c25da28d20bda168fa72fe1 2 parents 9c5079e6 567b30db

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

资源视图-【无】weblogic查询



See merge request !936
Inline Side-by-side
Showing 1 changed file with 22 additions and 12 deletions
... ... @@ -34,7 +34,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
var busIdSelect;
var busTypeList = [];
var collProtocols = '';
var parentId = 'null';
var editFlag = false;
if (data.choose == '1') {
editFlag = true;
... ... @@ -207,7 +207,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
}
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+$("#res_cluster").val()
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+parentId
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ... @@ -746,6 +746,12 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
// renderList(currentResType); new
reloadTable();
});
//集群选择事件
form.on('select(res_cluster)', function (data) {
parentId = $('#res_cluster').val();
renderParentList(currentResType);
reloadTable();
});
//资源状态
form.on('select(resStatus)', function (data) {
... ... @@ -842,7 +848,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
var cols = commonCols.resTypeCls[resType];
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+$("#res_cluster").val()
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+parentId
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ... @@ -1082,11 +1088,16 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
$('#host_state_div').hide();
$('#power_state_div').show();
}
let colResType = resType;
if (colResType == 'MIDDLEWARE_WEBLOGIC' && parentId == 'null') {
// 展示控制台的表头
colResType = 'MIDDLEWARE_WEBLOGICCONSOLE'
}
//渲染表格
var cols = commonCols.resTypeCls[resType];
var cols = commonCols.resTypeCls[colResType];
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+$("#res_cluster").val()
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+parentId
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ... @@ -1149,7 +1160,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
busId: bizId,
resHealth: $("#resStatus").val(),
colonlyId: $("#res_colony").val(),
parentId: $("#res_cluster").val(),
parentId: parentId,
sortKey: sortKey,
state: $("#state").val(),
linkState: $("#link_state").val(),
... ... @@ -1257,7 +1268,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
var cols = commonCols.resTypeCls[resType];
//start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
admin.req({
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+$("#res_cluster").val()
url: common.domainName + "/api-web/resource/expand/list?resType=" + resType + "&parentId="+parentId
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
... ... @@ -1329,7 +1340,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
busId: bizId,
resHealth: $("#resStatus").val(),
colonlyId: $("#res_colony").val(),
parentId: $("#res_cluster").val(),
parentId: parentId,
sortKey: sortKey,
state: $("#state").val(),
linkState: $("#link_state").val(),
... ... @@ -1445,9 +1456,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
busIdSelect.setValue([]);
bizId = '';
}
form.render('select');
form.render();
//清空查询条件 joke add 20200409 结束
var targetId = '';
var searchType = "";
... ... @@ -1466,7 +1474,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
targetId = "res_cluster";
$("#res_cluster_id").show();
} else if ("MIDDLEWARE_WEBLOGIC" == resType) {
optons = "<option value=''>=所属控制台=</option>"
optons = "<option value=''>=服务列表=</option>"
optons += "<option value='null'>=控制台列表=</option>"
searchType = "MIDDLEWARE_WEBLOGIC";
targetId = 'res_cluster'
$("#res_cluster_id").show();
... ... @@ -1609,6 +1618,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
});
}
$('#' + targetId).html(optons);
$('#res_cluster').val(parentId);
form.render("select");
})
}
... ...