周伟鹏 / cnlive_shenhe · Commits

Commit 9da64547c07277efd30ef67572467436f7a060d8

Authored by 王言钊
2 parents 6900497f c64a9aad

Merge branch 'dev'

Inline Side-by-side
Showing 2 changed files with 19 additions and 6 deletions
src/main/resources/templates/page/log.html
  View file @9da6454
... ... @@ -36,7 +36,7 @@
36 36 </div>
37 37 </div>
38 38 <div class="columns columns-right btn-group pull-right">
39   - <button class="btn btn-default" type="button" name="refresh" title="搜索" id="site_query">刷新</button>
  39 + <button class="btn btn-default" type="button" name="refresh" title="搜索" id="log_query">刷新</button>
40 40 <ul class="dropdown-menu" role="menu">
41 41 <li><label><input type="checkbox" data-field="sp_id" value="0"
42 42 checked="checked"> 视频ID</label></li>
... ... @@ -54,9 +54,9 @@
54 54 </div>
55 55 </div>
56 56 <div class="pull-right search">
57   - <form id="searchForm">
  57 +<!-- <form id="searchForm">-->
58 58 <input class="form-control" type="text" placeholder="刷新" id="keyword" name="keyword" th:value="${param.keyword}">
59   - </form>
  59 +<!-- </form>-->
60 60 </div>
61 61 </div>
62 62 <div class="fixed-table-container" style="padding-bottom: 0px;">
... ... @@ -225,12 +225,19 @@
225 225 }
226 226  
227 227 //搜索
228   - $('#site_query').click(function () {
  228 + $('#log_query').click(function () {
229 229 var keyword = $("#keyword").val();
230 230 var pageSize = $("#pageSize").val();
231 231 window.location.href = "/log/page?keyword=" + keyword + "&pageNum=" + 1 + "&pageSize=" + pageSize;
232 232 });
233 233  
  234 + //鼠标回车事件
  235 + $(document).keyup(function (event) {
  236 + if (event.keyCode == 13) {
  237 + $("#log_query").trigger("click");
  238 + }
  239 + });
  240 +
234 241 </script>
235 242  
236 243 <footer th:replace="../templates/common/foot::foot" ></footer>
... ...
src/main/resources/templates/page/site.html
  View file @9da6454
... ... @@ -66,10 +66,10 @@
66 66 </div>
67 67 </div>
68 68 <div class="pull-right search">
69   - <form id="searchForm">
  69 + <!--<form id="searchForm">-->
70 70 <input class="form-control" type="text" placeholder="搜索" id="keyword"
71 71 name="keyword" th:value="${param.keyword}">
72   - </form>
  72 + <!-- </form> -->
73 73 </div>
74 74 </div>
75 75 <div class="fixed-table-container" style="padding-bottom: 0px;">
... ... @@ -309,6 +309,12 @@
309 309 var pageSize = $("#pageSize").val();
310 310 window.location.href = "/sites/page?keyword=" + keyword + "&page=" + 1 + "&pageSize=" + pageSize;
311 311 });
  312 + //鼠标回车事件
  313 + $(document).keyup(function (event) {
  314 + if (event.keyCode == 13) {
  315 + $("#site_query").trigger("click");
  316 + }
  317 + });
312 318  
313 319 </script>
314 320  
... ...