monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 17e305e69d811f15c69672ab4809b202a6439a0e 2 parents 4e0286a9 190e0197

Merge branch 'master-yjp' into 'master' 

资源管理修正，云平台的下拉修正



See merge request !111
Inline Side-by-side
Showing 5 changed files with 20 additions and 63 deletions
... ... @@ -560,6 +560,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
if (platform == '=所属平台=') {
platform = '';
}
if(platform==''){
platform = $("#aliyun_plantform").val()
}
table.reload('bizResListTable', {
page: {
curr: 1
... ... @@ -578,8 +584,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
subResType: $("#biz_reslist_sub_restype").val(),
powerState: $("#biz_reslist_power_state").val(),
serverState: $("#biz_reslist_server_state").val(),
collProtocols: collProtocols,
platform: $("#aliyun_plantform").val()
collProtocols: collProtocols
}
})
}
... ... @@ -634,6 +639,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
// 渲染统计数据
function loadRightResTypeSelectEvent(resType, type) {
layer.closeAll('tips');
if (collProtocols) {
xmSelect.get('#collProtocolSelect', true).setValue([]);
collProtocols = '';
}
form.render('select');
var counturl = `${common.domainName}/api-web/bResource/resCountInfomation?resType=${resType}`
admin.req({
url: counturl,
... ... @@ -643,6 +653,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
subResType: $("#res_sub_restype").val()
}
}).done(function (res) {
var str = '';
var domStr = 'bizResListTableContent'
var fun = reloadTable;
... ...
... ... @@ -39,57 +39,9 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
if(bizId!=''){
bizId.substring(0,bizId.length-1);
}
reloadTable();
}
});
var collProtocols = '';
initProtocolSelect()
//获取全部协议
function initProtocolSelect() {
admin.req({
url: domainName + '/api-web/manage/protocol/page',
data: {
access_token: accessToken,
startTime: '',
endTime: '',
keyword: '',
hasParam: '',
limit: -1
}
}).done(function (res) {
xmSelect.render({
el: '#collProtocolSelect'
, filterable: true
, tips: '=采集协议='
, name: 'collProtocols'
, prop: {
name: 'protocolName',
value: 'protocolCode',
}
, model: {
label: {
type: 'block',
block: {
//最大显示数量, 0:不限制
showCount: 1,
//是否显示删除图标
showIcon: true,
}
}
}
, data: res.data
,hide: function () {
var selectValue = xmSelect.get('#collProtocolSelect', true).getValue('value');
collProtocols = selectValue.join(',');
form.render()
reloadTable();
}
})
})
}
function autoHeight(el) {
// var height = el.parents('.layui-card').height();
// el.css('min-height', height - 75);
... ... @@ -842,7 +794,6 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
, id: 'resManageTable'
, url: common.domainName + '/api-web/home/res-list/' + resType
, where: {
access_token: accessToken,
editMode: 'true',
resName: $("#resManageIndexForm").find("input[name='resName']").val() ? $("#resManageIndexForm").find("input[name='resName']").val() : searchId,
... ... @@ -852,8 +803,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
busId: $("#resManageIndexForm").find("input[name='busId']").val(),
state: $("#resManageIndexForm").find("select[name='state']").val(),
parentId: $("#resManageIndexForm").find("select[name='parentId']").val(),
collectionState: $("#resManageIndexForm").find("select[name='collectionState']").val(),
collProtocols: collProtocols
collectionState: $("#resManageIndexForm").find("select[name='collectionState']").val()
}
, height: 'full-200'
, cellMinWidth: 80
... ...
... ... @@ -52,12 +52,6 @@
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long" style="width: 180px;">
<div id="collProtocolSelect" class="xm-select">
</div>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="parentId" id="slt_res_manage_superior" lay-filter="slt_res_manage_superior">
... ...
... ... @@ -115,8 +115,9 @@
<div class="layui-inline hide">
<div class="layui-input-inline">
<select name="platform" id="aliyun_plantform" lay-filter="aliyun_plantform">
<option value="">=阿里回迁云平台=</option>
<option value="阿里云">=阿里云平台=</option>
<option value="">云平台</option>
<option value="b0e0773031c24317ab00ac9b3cf268be">=阿里回迁云平台=</option>
<option value="576c11c9755c4e7cabf8a134168d3cf8">=阿里云平台=</option>
</select>
</div>
</div>
... ...
... ... @@ -183,8 +183,9 @@
<div class="layui-inline hide">
<div class="layui-input-inline">
<select name="platform" id="aliyun_plantform" lay-filter="aliyun_plantform">
<option value="">=阿里回迁云平台=</option>
<option value="阿里云">=阿里云平台=</option>
<option value="">云平台</option>
<option value="b0e0773031c24317ab00ac9b3cf268be">=阿里回迁云平台=</option>
<option value="576c11c9755c4e7cabf8a134168d3cf8">=阿里云平台=</option>
</select>
</div>
</div>
... ...