From b7e7df2e68792674bef665bc076dda25a0081769 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Sat, 5 Jan 2019 01:53:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89compileId=3D0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/basics/AsnIpCfg.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/com/nis/domain/basics/AsnIpCfg.java b/src/main/java/com/nis/domain/basics/AsnIpCfg.java
index 447e71c34..bae482edc 100644
--- a/src/main/java/com/nis/domain/basics/AsnIpCfg.java
+++ b/src/main/java/com/nis/domain/basics/AsnIpCfg.java
@@ -44,7 +44,6 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	@SerializedName("protocol")
 	private Integer protocol ;
 	private Integer protocolId;
-	private Integer compileId=0;
 	
 	@ExcelField(title="is_issued",dictType="VALID_IDENTIFIER",sort=90)
 	private String isIssued;
@@ -87,9 +86,6 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	public void setIsIssued(String isIssued) {
 		this.isIssued = isIssued;
 	}
-	public Integer getCompileId() {
-		return compileId;
-	}
 	public Integer getProtocolId() {
 		return protocolId;
 	}

From 795375e5e13eb45a47d67b8340fcb778c2a1ef70 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@zdjizhi.com>
Date: Sat, 5 Jan 2019 11:53:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=97=B6=E9=97=B4=E6=A3=80=E7=B4=A2=E9=99=90?=
 =?UTF-8?q?=E5=88=B6.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/report/eventBlockList.jsp   | 8 ++++----
 .../WEB-INF/views/report/eventKeyProtectionList.jsp       | 8 ++++----
 src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/report/eventBlockList.jsp b/src/main/webapp/WEB-INF/views/report/eventBlockList.jsp
index 53fbf6767..f7f0c2816 100644
--- a/src/main/webapp/WEB-INF/views/report/eventBlockList.jsp
+++ b/src/main/webapp/WEB-INF/views/report/eventBlockList.jsp
@@ -217,7 +217,7 @@
 									<div class="form-group">
                                          <label><spring:message code="task_time"/>：</label>
                                          <input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTaskTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/>
+											value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchTaskStartTime','#searchTaskEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                                        </div>
 		
 								</div>
@@ -227,7 +227,7 @@
 									<div class="form-group">
                                          <label>&nbsp;</label>
                                          <input id="searchTaskEndTime" name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchTaskStartTime\')}',maxDate:'#F{$dp.$D(\'searchTaskStartTime\',{d:7})}'});"/>
+											value="${log.searchTaskEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchTaskStartTime','#searchTaskEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                                     </div>
 		
 								</div>
@@ -238,7 +238,7 @@
 									<div class="form-group">
                                            <label><spring:message code="stat_time"/>：</label>
 										<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
+											value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchReportStartTime','#searchReportEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                                     </div>
 		
 								</div>
@@ -248,7 +248,7 @@
 									<div class="form-group">
                                            <label>&nbsp;</label>
                                          	<input id="searchReportEndTime" name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchReportStartTime\')}',maxDate:'#F{$dp.$D(\'searchReportStartTime\',{d:7})}'});"/>
+											value="${log.searchReportEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchReportStartTime','#searchReportEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                                     </div>
 		
 							 	</div>
diff --git a/src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp b/src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp
index 55e702363..1b3d4313e 100644
--- a/src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp
+++ b/src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp
@@ -215,7 +215,7 @@
 									<div class="form-group">
                                          <label><spring:message code="task_time"/>：</label>
                                          <input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTaskTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/>
+											value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchTaskStartTime','#searchTaskEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                                        </div>
 		
 								</div>
@@ -225,7 +225,7 @@
 									<div class="form-group">
                                          <label>&nbsp;</label>
                                          <input id="searchTaskEndTime" name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchTaskStartTime\')}',maxDate:'#F{$dp.$D(\'searchTaskStartTime\',{d:30})}'});"/>
+											value="${log.searchTaskEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchTaskStartTime','#searchTaskEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                                     </div>
 		
 								</div>
@@ -236,7 +236,7 @@
 									<div class="form-group">
                                            <label><spring:message code="stat_time"/>：</label>
 										<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
+											value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchReportStartTime','#searchReportEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                                     </div>
 		
 								</div>
@@ -246,7 +246,7 @@
 									<div class="form-group">
                                            <label>&nbsp;</label>
                                          	<input id="searchReportEndTime" name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchReportStartTime\')}',maxDate:'#F{$dp.$D(\'searchReportStartTime\',{d:30})}'});"/>
+											value="${log.searchReportEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchReportStartTime','#searchReportEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                                     </div>
 		
 							 	</div>
diff --git a/src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp b/src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp
index aeb9133bb..686d2a2f7 100644
--- a/src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp
+++ b/src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp
@@ -226,7 +226,7 @@
 									<div class="form-group">
                                          <label><spring:message code="task_time"/>：</label>
                                          <input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:setTaskTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchTaskEndTime\')}'});"/>
+											value="${log.searchTaskStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchTaskStartTime','#searchTaskEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                                        </div>
 		
 								</div>
@@ -236,7 +236,7 @@
 									<div class="form-group">
                                          <label>&nbsp;</label>
                                          <input id="searchTaskEndTime" name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchTaskEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchTaskStartTime\')}',maxDate:'#F{$dp.$D(\'searchTaskStartTime\',{d:7})}'});"/>
+											value="${log.searchTaskEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchTaskStartTime','#searchTaskEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                                     </div>
 		
 								</div>
@@ -247,7 +247,7 @@
 									<div class="form-group">
                                            <label><spring:message code="stat_time"/>：</label>
 										<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:setReportTime,dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'searchReportEndTime\')}'});"/>
+											value="${log.searchReportStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchReportStartTime','#searchReportEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                                     </div>
 		
 								</div>
@@ -257,7 +257,7 @@
 									<div class="form-group">
                                            <label>&nbsp;</label>
                                          	<input id="searchReportEndTime" name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="${log.searchReportEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'searchReportStartTime\')}',maxDate:'#F{$dp.$D(\'searchReportStartTime\',{d:7})}'});"/>
+											value="${log.searchReportEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchReportStartTime','#searchReportEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
                                     </div>
 		
 							 	</div>