monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit d9efd03521c52ce8abf24dedcc2418b971b2022c 2 parents ba0fd927 4b0910d9

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

【911】我的收藏夹导航栏增加搜索按钮



See merge request !687
Inline Side-by-side
Showing 2 changed files with 28 additions and 3 deletions
@@ -27,6 +27,9 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -27,6 +27,9 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
27 reloadFariteResList(); 27 reloadFariteResList();
28 } 28 }
29 }); 29 });
  30 + $('#keyword').unbind('click').on('click', function () {
  31 + reloadFariteResList();
  32 + })
30 //回车搜索收藏夹 33 //回车搜索收藏夹
31 $('#fav_keyword_id').keydown(function (e) { 34 $('#fav_keyword_id').keydown(function (e) {
32 if (e.keyCode === 13) { 35 if (e.keyCode === 13) {
@@ -34,6 +37,9 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common @@ -34,6 +37,9 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
34 loadFavoriteList(parentId) 37 loadFavoriteList(parentId)
35 } 38 }
36 }); 39 });
  40 + $('#fav_keyword').unbind('click').on('click', function () {
  41 + loadFavoriteList();
  42 + })
37 //到达首页 43 //到达首页
38 $("#tofavorite_home").on("click", function () { 44 $("#tofavorite_home").on("click", function () {
39 $(".favorite-cards").show(); 45 $(".favorite-cards").show();
@@ -20,6 +20,14 @@ @@ -20,6 +20,14 @@
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" style="margin-top: -4px;">
  25 + <button type="button" id="fav_keyword"
  26 + class="layui-btn layui-btn-normal layui-btn-normal">
  27 + 搜索
  28 + </button>
  29 + </div>
  30 + </div>
23 <div class="layui-inline favorite-reslist"> 31 <div class="layui-inline favorite-reslist">
24 <div class="layui-input-inline layui-input-inline--long"> 32 <div class="layui-input-inline layui-input-inline--long">
25 <input autocomplete="off" class="layui-input" id="keyword_id" name="keyword_id" 33 <input autocomplete="off" class="layui-input" id="keyword_id" name="keyword_id"
@@ -36,7 +44,8 @@ @@ -36,7 +44,8 @@
36 </div> 44 </div>
37 <div class="layui-inline favorite-reslist"> 45 <div class="layui-inline favorite-reslist">
38 <div class="layui-input-inline"> 46 <div class="layui-input-inline">
39 - <select id="fav_reslist_resListBizTypes" lay-filter="fav_reslist_resListBizTypes" 47 + <select id="fav_reslist_resListBizTypes"
  48 + lay-filter="fav_reslist_resListBizTypes"
40 name="label"> 49 name="label">
41 <option value="">=选择业务=</option> 50 <option value="">=选择业务=</option>
42 </select> 51 </select>
@@ -53,6 +62,14 @@ @@ -53,6 +62,14 @@
53 </select> 62 </select>
54 </div> 63 </div>
55 </div> 64 </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>
56 </div> 73 </div>
57 </form> 74 </form>
58 <div class="favorites-header-btngroup"> 75 <div class="favorites-header-btngroup">
@@ -62,10 +79,12 @@ @@ -62,10 +79,12 @@
62 lay-direction="4" lay-skin="primary" lay-tips="新建收藏夹"></i> 79 lay-direction="4" lay-skin="primary" lay-tips="新建收藏夹"></i>
63 </li> 80 </li>
64 <li class="favorite-reslist"><i class="layui-icon layui-icon-addition icon-addres" 81 <li class="favorite-reslist"><i class="layui-icon layui-icon-addition icon-addres"
65 - id="add_favorite_res" lay-direction="4" lay-direction="4" 82 + id="add_favorite_res" lay-direction="4"
  83 + lay-direction="4"
66 lay-skin="primary" lay-tips="添加资源"></i></li> 84 lay-skin="primary" lay-tips="添加资源"></i></li>
67 <li class="favorite-reslist"><i class="layui-icon layui-icon-delete icon-delres" 85 <li class="favorite-reslist"><i class="layui-icon layui-icon-delete icon-delres"
68 - id="del_favorite_res" lay-direction="4" lay-direction="4" 86 + id="del_favorite_res" lay-direction="4"
  87 + lay-direction="4"
69 lay-skin="primary" lay-tips="移除资源"></i></li> 88 lay-skin="primary" lay-tips="移除资源"></i></li>
70 <!--<li><i class="layui-icon layui-icon-prev icon-goback" id="backto_favorite_card" lay-direction="4" lay-tips="返回收藏夹" lay-direction="4" lay-skin="primary"></i></li>--> 89 <!--<li><i class="layui-icon layui-icon-prev icon-goback" id="backto_favorite_card" lay-direction="4" lay-tips="返回收藏夹" lay-direction="4" lay-skin="primary"></i></li>-->
71 </ul> 90 </ul>