monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 张凯
Commit 7d72204594eb7fbf89946b37f103b809b6d95ac1 1 parent 8dca09f7

chore:收藏夹功能迁移

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 @@ -267,7 +267,7 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
267 var domId = $(this).attr("id"); 267 var domId = $(this).attr("id");
268 ids.push(domId); 268 ids.push(domId);
269 }); 269 });
270 - return !common.hasPermission(id, ids); 270 + return $.inArray(id, ids);
271 } 271 }
272 272
273 //绑定下拉搜索事件 273 //绑定下拉搜索事件
@@ -414,10 +414,10 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -414,10 +414,10 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
414 elem: '#favoriteListTable', 414 elem: '#favoriteListTable',
415 id: 'favoriteListTable' 415 id: 'favoriteListTable'
416 , 416 ,
417 - 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>' //开启头部工具栏，并为其绑定左侧模板  
418 - ,  
419 - defaultToolbar: ['filter']  
420 - , 417 + // 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>' //开启头部工具栏，并为其绑定左侧模板
  418 + // ,
  419 + // defaultToolbar: ['filter']
  420 + // ,
421 url: common.domainName + '/api-web/favorites/res/noList' 421 url: common.domainName + '/api-web/favorites/res/noList'
422 , 422 ,
423 where: { 423 where: {
@@ -452,13 +452,14 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -452,13 +452,14 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
452 var resType = $(this).data("restype"); 452 var resType = $(this).data("restype");
453 var resTypeName = $(this).data("restypename"); 453 var resTypeName = $(this).data("restypename");
454 var ip = $(this).data("ip") ? $(this).data("ip") : ""; 454 var ip = $(this).data("ip") ? $(this).data("ip") : "";
455 - var resName = $(this).data("name") ? $(this).data("name") + " | " : "";  
456 - var pingEnable = $(this).data("pingenable");  
457 - if (pingEnable == '2') {  
458 - commonDetail.openNewWin('template/detail/pingIndex', resName + resTypeName + ' | ' + ip, {'resId': resId}, false);  
459 - } else {  
460 - commonDetail.openDetail(resId, resType, resName + ip);  
461 - } 455 + var resName = $(this).data("name") ? $(this).data("name") : "";
  456 + // var pingEnable = $(this).data("pingenable");
  457 + // if (pingEnable == '2') {
  458 + // commonDetail.openNewWin('template/detail/pingIndex', resName + resTypeName + ' | ' + ip, {'resId': resId}, false);
  459 + // } else {
  460 + // commonDetail.openDetail(resId, resType, resName + ip);
  461 + // }
  462 + showResDetail(resId,resType,resName);
462 }); 463 });
463 464
464 //触发拖动列事件，参数为保存按钮的id 465 //触发拖动列事件，参数为保存按钮的id
@@ -479,6 +480,13 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -479,6 +480,13 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
479 }); 480 });
480 }); 481 });
481 } 482 }
  483 + //查看详情页
  484 + function showResDetail(resId,resType,resName){
  485 + window.parent.postMessage({
  486 + type: 'resDetail',
  487 + message: {'params':{'resId':resId,'resType':resType},'title':resName}
  488 + }, '*')
  489 + }
482 490
483 //刷新表格 491 //刷新表格
484 function reloadFariteResList(favId) { 492 function reloadFariteResList(favId) {
@@ -20,14 +20,6 @@ @@ -20,14 +20,6 @@
20 placeholder="关键字，回车搜索" type="text"> 20 placeholder="关键字，回车搜索" type="text">
21 </div> 21 </div>
22 </div> 22 </div>
23 - <div class="layui-inline favorite-cards">  
24 - <div class="layui-input-inline layui-input-inline--long" >  
25 - <button type="button" id="fav_keyword"  
26 - class="layui-btn layui-btn-normal layui-btn-normal">  
27 - 搜索  
28 - </button>  
29 - </div>  
30 - </div>  
31 <div class="layui-inline favorite-reslist"> 23 <div class="layui-inline favorite-reslist">
32 <div class="layui-input-inline layui-input-inline--long"> 24 <div class="layui-input-inline layui-input-inline--long">
33 <input autocomplete="off" class="layui-input" id="keyword_id" name="keyword_id" 25 <input autocomplete="off" class="layui-input" id="keyword_id" name="keyword_id"
@@ -62,14 +54,6 @@ @@ -62,14 +54,6 @@
62 </select> 54 </select>
63 </div> 55 </div>
64 </div> 56 </div>
65 - <div class="layui-inline favorite-reslist">  
66 - <div class="layui-input-inline layui-input-inline--long" style="margin-top: -4px;">  
67 - <button type="button" id="keyword"  
68 - class="layui-btn layui-btn-normal layui-btn-normal">  
69 - 搜索  
70 - </button>  
71 - </div>  
72 - </div>  
73 </div> 57 </div>
74 </form> 58 </form>
75 <div class="favorites-header-btngroup"> 59 <div class="favorites-header-btngroup">