monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 4389922da1942d072429a0b3e69eaff8174c11ab 2 parents 6f3e3426 0b43dbf4

Merge branch 'joke' into 'master' 

Joke



See merge request !176
Inline Side-by-side
Showing 2 changed files with 10 additions and 10 deletions
... ... @@ -1246,7 +1246,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
}
form.render('select');
form.render();
//清空查询条件 joke add 20200409 开始
//清空查询条件 joke add 20200409 结束
var targetId = '';
var searchType = "";
... ... @@ -1376,7 +1376,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
$("#res_minicomputer").parent().parent().removeClass("hide");
var minicomputerStr = '';
minicomputerStr = '<option value="">=小型机服务器=</option>';
let url = `${common.domainName}/api-web/home/res-list/HOST_MINICOMPUTER?access_token=${accessToken}&page=1&limit=30&resCategory=resources`
let url = `${common.domainName}/api-web/home/res-list/hostMinicomputerPartitionParents?access_token=${accessToken}`
$.ajax({
url: url,
method: 'get',
... ... @@ -1399,7 +1399,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
if (targetId && searchType) {
var url = "/api-web/home/res-list/" + searchType + "?page=1&limit=50";
if(searchType == 'MIDDLEWARE_WEBLOGIC'){
url += '&parentId=null'
url += '&parentId=null&parentType=parent'
}
admin.req({
url: common.domainName + url
... ...
... ... @@ -159,13 +159,13 @@
</div>
</div>
</div>
<div class="layui-inline hide" >
<div class="layui-input-inline">
<select name="label" id="res_sub_restype" lay-filter="sub_restype">
<option value="">=资源类型=</option>
</select>
</div>
</div>
<!-- <div class="layui-inline hide" >-->
<!-- <div class="layui-input-inline">-->
<!-- <select name="label" id="res_sub_restype" lay-filter="sub_restype">-->
<!-- <option value="">=资源类型=</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<div class="layui-inline hide">
<div class="layui-input-inline">
<select name="label" id="res_vendor" lay-filter="res_vendor">
... ...