gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
zhangwei
2019-01-05 09:58:30 +06:00
parent b90160e85b 795375e5e1
commit 8948bf1025
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/domain/basics/AsnIpCfg.java
View File

@@ -44,7 +44,6 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
@SerializedName("protocol") @SerializedName("protocol")
private Integer protocol ; private Integer protocol ;
private Integer protocolId; private Integer protocolId;
private Integer compileId=0;
@ExcelField(title="is_issued",dictType="VALID_IDENTIFIER",sort=90) @ExcelField(title="is_issued",dictType="VALID_IDENTIFIER",sort=90)
private String isIssued; private String isIssued;
@@ -87,9 +86,6 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
public void setIsIssued(String isIssued) { public void setIsIssued(String isIssued) {
this.isIssued = isIssued; this.isIssued = isIssued;
} }
public Integer getCompileId() {
return compileId;
}
public Integer getProtocolId() { public Integer getProtocolId() {
return protocolId; return protocolId;
} }

8
src/main/webapp/WEB-INF/views/report/eventBlockList.jsp
View File

@@ -217,7 +217,7 @@
<div class="form-group"> <div class="form-group">
<label><spring:message code="task_time"/>：</label> <label><spring:message code="task_time"/>：</label>
<input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <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>
</div> </div>
@@ -227,7 +227,7 @@
<div class="form-group"> <div class="form-group">
<label>&nbsp;</label> <label>&nbsp;</label>
<input id="searchTaskEndTime" name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <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>
</div> </div>
@@ -238,7 +238,7 @@
<div class="form-group"> <div class="form-group">
<label><spring:message code="stat_time"/>：</label> <label><spring:message code="stat_time"/>：</label>
<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <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>
</div> </div>
@@ -248,7 +248,7 @@
<div class="form-group"> <div class="form-group">
<label>&nbsp;</label> <label>&nbsp;</label>
<input id="searchReportEndTime" name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <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>
</div> </div>

8
src/main/webapp/WEB-INF/views/report/eventKeyProtectionList.jsp
View File

@@ -215,7 +215,7 @@
<div class="form-group"> <div class="form-group">
<label><spring:message code="task_time"/>：</label> <label><spring:message code="task_time"/>：</label>
<input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <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>
</div> </div>
@@ -225,7 +225,7 @@
<div class="form-group"> <div class="form-group">
<label>&nbsp;</label> <label>&nbsp;</label>
<input id="searchTaskEndTime" name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <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>
</div> </div>
@@ -236,7 +236,7 @@
<div class="form-group"> <div class="form-group">
<label><spring:message code="stat_time"/>：</label> <label><spring:message code="stat_time"/>：</label>
<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <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>
</div> </div>
@@ -246,7 +246,7 @@
<div class="form-group"> <div class="form-group">
<label>&nbsp;</label> <label>&nbsp;</label>
<input id="searchReportEndTime" name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <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>
</div> </div>

8
src/main/webapp/WEB-INF/views/report/eventMonitorList.jsp
View File

@@ -226,7 +226,7 @@
<div class="form-group"> <div class="form-group">
<label><spring:message code="task_time"/>：</label> <label><spring:message code="task_time"/>：</label>
<input id="searchTaskStartTime" name="searchTaskStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <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>
</div> </div>
@@ -236,7 +236,7 @@
<div class="form-group"> <div class="form-group">
<label>&nbsp;</label> <label>&nbsp;</label>
<input id="searchTaskEndTime" name="searchTaskEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <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>
</div> </div>
@@ -247,7 +247,7 @@
<div class="form-group"> <div class="form-group">
<label><spring:message code="stat_time"/>：</label> <label><spring:message code="stat_time"/>：</label>
<input id="searchReportStartTime" name="searchReportStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <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>
</div> </div>
@@ -257,7 +257,7 @@
<div class="form-group"> <div class="form-group">
<label>&nbsp;</label> <label>&nbsp;</label>
<input id="searchReportEndTime" name="searchReportEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" <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>
</div> </div>