短信查看

@@ -10,4 +10,6 @@ import java.util.List;
 @Data
 public class MonitorAlarmTableReq  extends  PageRequest{
     private String idcs;
+    private String beginTime;
+    private String filterRepeat;
 }

@@ -60,6 +60,7 @@
     <script src="<%=basePath %>js/layer/layer.js" charset="UTF-8" type="text/javascript"></script>
     <script src="<%=basePath %>js/bootstrap-plugin/bootstrap.select.js" charset="UTF-8" type="text/javascript"></script>
     <script src="<%=basePath %>js/jquery.toaster.js"></script>
+    <script src="<%=basePath %>js/laydate/laydate.js" charset="UTF-8" type="text/javascript"></script>
     <script src="<%=basePath%>js/select2-4.0.3.min.js"></script>
     <script>
         var contextPath = '<%=basePath %>';
@@ -87,7 +88,21 @@
                     <div>
                         <div class="form-inline" role="form" id="inBoxQueryDiv" style=" margin-top: 12px;margin-left: 25px;float: left;">
 
-                            <div class="input-group" style="float: left">
+                            <div class="input-group" style="float: left;">
+                                <span class="input-group-addon">过滤重复:</span>
+                                <select id="filterRepeat" class="form-control select2" >
+                                    <option value="1" checked>是</option>
+                                    <option value="0">否</option>
+                                </select>
+                            </div>
+
+                            <div class="input-group" style="float: left;margin-left: 20px">
+                                <span class="input-group-addon">开始日期:</span>
+                                <input id="beginTime"type="text" class="form-control dateTimeInput"  style="width:150px;" />
+                            </div>
+
+
+                            <div class="input-group" style="float: left;margin-left: 20px">
                                 <span class="input-group-addon">idc:</span>
                                 <select id="idc" class="form-control select2" multiple style="width: 580px;">
                                     <c:forEach items="${idcList}" var="item">
@@ -116,22 +131,53 @@
 
 <script type="text/javascript">
     $(function () {
-         //select2多选 设置选中默认值
+       lay('.dateTimeInput').each(function(){
+            laydate.render({
+                elem: this  ,type: 'datetime'
+                ,trigger: 'click'
+            });
+        });
+        //设置默认值：前一天
+        $("#beginTime").val(format(new Date(new Date()-12*60*60*1000)).substr(0,10)+" 00:00:00");
+
+        //select2多选 设置选中默认值
         $("#idc").val("").select2();
+
        loadAlarmMsgTable();
     });
 
+    //timeValue---时间戳
+    function format(timeValue){
+        var time = new Date(timeValue);
+        var y = time.getFullYear();
+        var m = time.getMonth()+1;
+        var d = time.getDate();
+        var h = time.getHours();
+        var mm = time.getMinutes();
+        var s = time.getSeconds();
+        return y+'-'+add0(m)+'-'+add0(d)+' '+add0(h)+':'+add0(mm)+':'+add0(s);
+    }
+    function add0(m){
+        return m<10 ? '0'+m : m;
+    }
+
     //点击搜索按钮
     $("#searchBtn").click(function () {
-        var idc = $("#idc").val();
-        $("#monitortable").table("load", {
-            idcs: JSON.stringify(idc)
-        });
+        $("#monitortable").table("load", getQueryParam());
     });
 
+    function getQueryParam(){
+        var idc = $("#idc").val();
+        var paramFront={
+            beginTime:$.trim($("#beginTime").val()),
+            filterRepeat:$("#filterRepeat").val(),
+            idcs: idc==null?"":JSON.stringify(idc)
+        }
+        return paramFront;
+    }
+
     //加载表格信息
     function loadAlarmMsgTable(){
-        var idc = $("#idc").val();
         //加载表格
         $("#monitortable").table({
             columnAutoWidth : false,
@@ -141,9 +187,7 @@
             dataType : "json",
             pagination : true,
             pageSize : 15,
-            queryParams: {
-                idcs: JSON.stringify(idc)
-            },
+            queryParams: getQueryParam(),
             loadFilter : function(data) {
                 return defaultLoadFilter(data);
             },