monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 0206fa5d1f3d300ca785907d64c972efa484ab19 2 parents be55b9ef 7d722045

Merge branch 'master-mj-joke' into 'master-mj' 

chore:收藏夹功能迁移

chore:收藏夹功能迁移

See merge request !1182
Inline Side-by-side
Showing 2 changed files with 20 additions and 28 deletions
... ... @@ -267,7 +267,7 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
var domId = $(this).attr("id");
ids.push(domId);
});
return !common.hasPermission(id, ids);
return $.inArray(id, ids);
}
//绑定下拉搜索事件
... ... @@ -414,10 +414,10 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
elem: '#favoriteListTable',
id: 'favoriteListTable'
,
toolbar: '<div class="warn-btns"><button id="favorites_cols_save" class="layui-btn layui-btn-normal layui-btn-sm hide" style="float: right;">保存列顺序</button></div>' //开启头部工具栏，并为其绑定左侧模板
,
defaultToolbar: ['filter']
,
// toolbar: '<div class="warn-btns"><button id="favorites_cols_save" class="layui-btn layui-btn-normal layui-btn-sm hide" style="float: right;">保存列顺序</button></div>' //开启头部工具栏，并为其绑定左侧模板
// ,
// defaultToolbar: ['filter']
// ,
url: common.domainName + '/api-web/favorites/res/noList'
,
where: {
... ... @@ -452,13 +452,14 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
var resType = $(this).data("restype");
var resTypeName = $(this).data("restypename");
var ip = $(this).data("ip") ? $(this).data("ip") : "";
var resName = $(this).data("name") ? $(this).data("name") + " | " : "";
var pingEnable = $(this).data("pingenable");
if (pingEnable == '2') {
commonDetail.openNewWin('template/detail/pingIndex', resName + resTypeName + ' | ' + ip, {'resId': resId}, false);
} else {
commonDetail.openDetail(resId, resType, resName + ip);
}
var resName = $(this).data("name") ? $(this).data("name") : "";
// var pingEnable = $(this).data("pingenable");
// if (pingEnable == '2') {
// commonDetail.openNewWin('template/detail/pingIndex', resName + resTypeName + ' | ' + ip, {'resId': resId}, false);
// } else {
// commonDetail.openDetail(resId, resType, resName + ip);
// }
showResDetail(resId,resType,resName);
});
//触发拖动列事件，参数为保存按钮的id
... ... @@ -479,6 +480,13 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
});
});
}
//查看详情页
function showResDetail(resId,resType,resName){
window.parent.postMessage({
type: 'resDetail',
message: {'params':{'resId':resId,'resType':resType},'title':resName}
}, '*')
}
//刷新表格
function reloadFariteResList(favId) {
... ...
... ... @@ -20,14 +20,6 @@
placeholder="关键字，回车搜索" type="text">
</div>
</div>
<div class="layui-inline favorite-cards">
<div class="layui-input-inline layui-input-inline--long" >
<button type="button" id="fav_keyword"
class="layui-btn layui-btn-normal layui-btn-normal">
搜索
</button>
</div>
</div>
<div class="layui-inline favorite-reslist">
<div class="layui-input-inline layui-input-inline--long">
<input autocomplete="off" class="layui-input" id="keyword_id" name="keyword_id"
... ... @@ -62,14 +54,6 @@
</select>
</div>
</div>
<div class="layui-inline favorite-reslist">
<div class="layui-input-inline layui-input-inline--long" style="margin-top: -4px;">
<button type="button" id="keyword"
class="layui-btn layui-btn-normal layui-btn-normal">
搜索
</button>
</div>
</div>
</div>
</form>
<div class="favorites-header-btngroup">
... ...