Merge branch 'test' into dev

王言钊
2 parents 6782e061 c35ba20b
Showing 2 changed files with 19 additions and 6 deletions
src/main/resources/templates/page/log.html
src/main/resources/templates/page/site.html
@@ -36,7 +36,7 @@
                                         </div>
                                     </div>
                                     <div class="columns columns-right btn-group pull-right">
-                                        <button class="btn btn-default" type="button" name="refresh" title="搜索" id="site_query">刷新</button>
+                                        <button class="btn btn-default" type="button" name="refresh" title="搜索" id="log_query">刷新</button>
                                             <ul class="dropdown-menu" role="menu">
                                                 <li><label><input type="checkbox" data-field="sp_id" value="0"
                                                                   checked="checked"> 视频ID</label></li>
@@ -54,9 +54,9 @@
                                         </div>
                                     </div>
                                     <div class="pull-right search">
-                                        <form id="searchForm">
+<!--                                        <form id="searchForm">-->
                                             <input class="form-control" type="text"  placeholder="刷新" id="keyword" name="keyword" th:value="${param.keyword}">
-                                        </form>
+<!--                                        </form>-->
                                     </div>
                                 </div>
                                 <div class="fixed-table-container" style="padding-bottom: 0px;">
@@ -225,12 +225,19 @@
         }
         //搜索
-        $('#site_query').click(function () {
+        $('#log_query').click(function () {
         	var keyword = $("#keyword").val();
         	var pageSize = $("#pageSize").val();
         	window.location.href = "/log/page?keyword=" + keyword + "&pageNum=" + 1 + "&pageSize=" + pageSize;
 		});
+        //鼠标回车事件
+        $(document).keyup(function (event) {
+            if (event.keyCode == 13) {
+                $("#log_query").trigger("click");
+            }
+        });
+
     </script>
     <footer th:replace="../templates/common/foot::foot" ></footer>
@@ -66,10 +66,10 @@
                                     </div>
                                 </div>
                                 <div class="pull-right search">
-                                    <form id="searchForm">
+                                   <!--<form id="searchForm">-->
                                         <input class="form-control" type="text" placeholder="搜索" id="keyword"
                                                name="keyword" th:value="${param.keyword}">
-                                    </form>
+                                   <!-- </form> -->
                                 </div>
                             </div>
                             <div class="fixed-table-container" style="padding-bottom: 0px;">
@@ -309,6 +309,12 @@
         var pageSize = $("#pageSize").val();
         window.location.href = "/sites/page?keyword=" + keyword + "&page=" + 1 + "&pageSize=" + pageSize;
     });
+    //鼠标回车事件
+    $(document).keyup(function (event) {
+        if (event.keyCode == 13) {
+            $("#site_query").trigger("click");
+        }
+    });
 </script>