Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj-ztq

@@ -47,7 +47,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 elem: '#noticemerge-table',
                 url: domainName + '/api-web/noticemerge/page?accessToken=' + accessToken,
                 where: conditions,
-                height: 'full-160',
+                height: 'full-70',
                 page: {
                     layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
                     , theme: '#1E9FFF'//自定义分页主题颜色

@@ -21,6 +21,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 reloadAllChange();
             }
         });
+
+        $("#predictionSeach").unbind().on("click", function () {
+            reloadAllChange();
+        });
+
         // 加载设备出入表格
         function renderpredictionListTable() {
             var conditions = form.val('form-prediction-condition');
@@ -85,4 +90,4 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             renderpredictionListTable();
         }
     });
-});
\ No newline at end of file
+});

@@ -9,11 +9,15 @@
                               lay-filter="form-prediction-condition">
                             <div class="layui-form-item">
                                 <div class="layui-inline">
-                                    <div class="layui-input-inline layui-input-inline--long">
+                                    <div class="layui-input-inline layui-input-inline--long keyword-input">
                                         <input type="text" name="keyword" lay-tips="关键字检索包含: </br>资源名称 </br>指标名称</br>flag" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                             </div>
+                            <button class="layui-btn layui-btn-normal layui-btn-normal" id="predictionSeach"
+                                    type="button">
+                                搜索
+                            </button>
                         </form>
 
                     </div>
@@ -27,4 +31,4 @@
     layui.use('prediction', function (fn) {
         fn();
     });
-</script>
\ No newline at end of file
+</script>