Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
This commit is contained in:
chiguangxu
@@ -5,7 +5,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="letter"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="requestId" title=<spring:message code="select"/> data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control">
|
||||
<c:forEach items="${requestInfos}" var="requestInfo">
|
||||
@@ -28,20 +28,20 @@
|
||||
<c:forEach items="${fls}" var="fl">
|
||||
<c:choose>
|
||||
<c:when test="${_cfg.classify==null or _cfg.classify==''}">
|
||||
<option value="${fl.itemCode}">${fl.itemValue}</option>
|
||||
<option value="${fl.serviceDictId}">${fl.itemValue}</option>
|
||||
</c:when>
|
||||
<c:when test="${fn:contains(_cfg.classify,',')}">
|
||||
<option value="${fl.itemCode}"
|
||||
<option value="${fl.serviceDictId}"
|
||||
<c:forEach items="${fn:split(_cfg.classify,',')}" var="_classify">
|
||||
<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
|
||||
<c:if test="${fl.itemCode==_classify}">selected</c:if>
|
||||
<c:if test="${fn:trim(fl.serviceDictId) eq _classify}">selected</c:if>
|
||||
</c:forEach>
|
||||
>${fl.itemValue}</option>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<option value="${fl.itemCode}"
|
||||
<option value="${fl.serviceDictId}"
|
||||
<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
|
||||
<c:if test="${fl.itemCode==_classify}">selected</c:if>
|
||||
<c:if test="${fn:trim(fl.serviceDictId) eq _classify}">selected</c:if>
|
||||
>${fl.itemValue}</option>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
@@ -62,13 +62,13 @@
|
||||
<c:forEach items="${xzs}" var="xz">
|
||||
<c:choose>
|
||||
<c:when test="${_cfg.attribute==null or _cfg.attribute==''}">
|
||||
<option value="${xz.itemCode}">${xz.itemValue}</option>
|
||||
<option value="${xz.serviceDictId}">${xz.itemValue}</option>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:forEach items="${fn:split(_cfg.attribute,',')}" var="_attribute">
|
||||
<option value="${xz.itemCode}"
|
||||
<option value="${xz.serviceDictId}"
|
||||
<c:if test="${xz.isValid==0}">disabled="disabled"</c:if>
|
||||
<c:if test="${xz.itemCode==_attribute}">selected</c:if>
|
||||
<c:if test="${fn:trim(xz.serviceDictId) eq _attribute}">selected</c:if>
|
||||
>${xz.itemValue}</option>
|
||||
</c:forEach>
|
||||
</c:otherwise>
|
||||
@@ -86,13 +86,13 @@
|
||||
<c:forEach items="${lables}" var="lable">
|
||||
<c:choose>
|
||||
<c:when test="${_cfg.lable==null or _cfg.lable==''}">
|
||||
<option value="${lable.itemCode}">${lable.itemValue}</option>
|
||||
<option value="${lable.serviceDictId}">${lable.itemValue}</option>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:forEach items="${fn:split(_cfg.lable,',')}" var="_lable">
|
||||
<option value="${lable.itemCode}"
|
||||
<option value="${lable.serviceDictId}"
|
||||
<c:if test="${lable.isValid==0}">disabled="disabled"</c:if>
|
||||
<c:if test="${lable.itemCode==_lable}">selected</c:if>
|
||||
<c:if test="${fn:trim(lable.serviceDictId) eq _lable}">selected</c:if>
|
||||
>${lable.itemValue}</option>
|
||||
</c:forEach>
|
||||
</c:otherwise>
|
||||
|
||||
@@ -4,36 +4,39 @@
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
|
||||
</div>
|
||||
<div for="cfgDesc"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="match_area"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_area"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="district" value="${_cfg.district}">
|
||||
</div>
|
||||
<div for="district"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="key_word"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="keywords" value="${_cfg.keywords}">
|
||||
</div>
|
||||
<div for="keywords"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%-- <div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3">管控类型</label>
|
||||
<div class="col-md-8">
|
||||
<div class="col-md-6">
|
||||
<select name="action" class="selectpicker select2 form-control" readonly="readonly">
|
||||
<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> >阻断</option>
|
||||
<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> >监测</option>
|
||||
@@ -48,8 +51,8 @@
|
||||
</div> --%>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="isAreaEffective" value="1"
|
||||
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
|
||||
@@ -62,14 +65,15 @@
|
||||
</label>
|
||||
<%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
|
||||
</div>
|
||||
<div for="isAreaEffective"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="expression_type"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="exprType" value="1"
|
||||
<c:if test="${_cfg.exprType==1}">checked</c:if>
|
||||
@@ -81,12 +85,13 @@
|
||||
><spring:message code="null"/>
|
||||
</label>
|
||||
</div>
|
||||
<div for="isAreaEffective"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="match_method"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="matchMethod" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
|
||||
<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
|
||||
<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
|
||||
@@ -94,14 +99,15 @@
|
||||
<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
|
||||
</select>
|
||||
</div>
|
||||
<div for="matchMethod"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="whether_hexbinary"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
|
||||
<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
|
||||
<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
|
||||
@@ -113,7 +119,7 @@
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
|
||||
<div class="col-md-8">
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
|
||||
</div>
|
||||
@@ -13,7 +13,7 @@
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="ip_type"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="ipType" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
|
||||
<option value="4" <c:if test="${_cfg.ipType==4}">selected</c:if> >V4</option>
|
||||
@@ -28,7 +28,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="client_ip"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="srcIp" value="${_cfg.srcIp}">
|
||||
</div>
|
||||
@@ -37,7 +37,7 @@
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="client_address_mask"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_address_mask"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="srcIpMask" value="${_cfg.srcIpMask}">
|
||||
</div>
|
||||
@@ -48,7 +48,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="client_port"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="srcPort" value="${_cfg.srcPort}">
|
||||
</div>
|
||||
@@ -57,7 +57,7 @@
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="client_port_mask"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port_mask"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="srcPortMask" value="${_cfg.srcPortMask}">
|
||||
</div>
|
||||
@@ -68,7 +68,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="server_ip"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="dstIp" value="${_cfg.dstIp}">
|
||||
</div>
|
||||
@@ -77,7 +77,7 @@
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="server_address_mask"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_address_mask"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="dstIpMask" value="${_cfg.dstIpMask}">
|
||||
</div>
|
||||
@@ -88,7 +88,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="server_port"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="dstPort" value="${_cfg.dstPort}">
|
||||
</div>
|
||||
@@ -97,7 +97,7 @@
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="server_port_mask"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port_mask"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="dstPortMask" value="${_cfg.dstPortMask}">
|
||||
</div>
|
||||
@@ -108,7 +108,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="direction"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="direction" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
|
||||
<option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>>0</option>
|
||||
@@ -121,7 +121,7 @@
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="protocol"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="protocol" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
|
||||
<option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
|
||||
@@ -163,7 +163,7 @@
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="isAreaEffective" value="1"
|
||||
|
||||
@@ -4,42 +4,45 @@
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
|
||||
</div>
|
||||
<div for="cfgDesc"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="key_word"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
|
||||
</div>
|
||||
<div for="cfgKeywords"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="block_type"/></label>
|
||||
<div class="col-md-8">
|
||||
<select name="action" class="selectpicker select2 form-control" readonly="readonly">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="block_type"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="action" class="selectpicker select2 form-control" readonly="readonly">
|
||||
<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> ><spring:message code="block"/></option>
|
||||
<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> ><spring:message code="monitor"/></option>
|
||||
<option value="5" <c:if test="${_cfg.action==5}">selected</c:if><c:if test="${_cfg.action!=5}">disabled="disabled"</c:if> ><spring:message code="block_white_list"/></option>
|
||||
<option value="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">disabled="disabled"</c:if> ><spring:message code="monitor_white_list"/></option>
|
||||
<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> ><spring:message code="block_monitor_white_list"/></option>
|
||||
<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> ><spring:message code="grey_list"/></option>
|
||||
</select>
|
||||
</select>
|
||||
<%-- <input class="form-control" type="hidden" name="action" value="${_cfg.action}"> --%>
|
||||
</div>
|
||||
</div>
|
||||
<div for="action"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="isAreaEffective" value="1"
|
||||
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
|
||||
@@ -52,14 +55,15 @@
|
||||
</label>
|
||||
<%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
|
||||
</div>
|
||||
<div for="isAreaEffective"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="expression_type"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="exprType" value="1"
|
||||
<c:if test="${_cfg.exprType==1}">checked</c:if>
|
||||
@@ -71,12 +75,13 @@
|
||||
><spring:message code="null"/>
|
||||
</label>
|
||||
</div>
|
||||
<div for="exprType"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="match_method"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
|
||||
<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
|
||||
<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
|
||||
@@ -84,28 +89,32 @@
|
||||
<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
|
||||
</select>
|
||||
</div>
|
||||
<div for="matchMethod"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="whether_hexbinary"/></label>
|
||||
<div class="col-md-8">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
|
||||
<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
|
||||
<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
|
||||
<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
|
||||
</select>
|
||||
</div>
|
||||
<div for="isHexbin"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
|
||||
<div class="col-md-8">
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
|
||||
</div>
|
||||
<div for="areaEffectiveIds"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
136
src/main/webapp/WEB-INF/tags/sys/delRow.tag
Normal file
136
src/main/webapp/WEB-INF/tags/sys/delRow.tag
Normal file
@@ -0,0 +1,136 @@
|
||||
<%@ tag language="java" pageEncoding="UTF-8"%>
|
||||
<%@ include file="/WEB-INF/include/taglib.jsp"%>
|
||||
<%@ attribute name="id" type="java.lang.String" required="true"%>
|
||||
<%@ attribute name="url" type="java.lang.String" required="true"%>
|
||||
<%@ attribute name="label" type="java.lang.String" required="false"%>
|
||||
<c:choose>
|
||||
<c:when test="${label eq 'delete'}">
|
||||
<button class="btn btn-default" onclick="del('${url}')" data-toggle="tooltip" data-placement="top">
|
||||
<i class="fa fa-trash"> <spring:message code="delete"/></i>
|
||||
</button>
|
||||
</c:when>
|
||||
|
||||
<c:when test="${label eq 'approved'}">
|
||||
<a href="javascript:void(0);" onclick="passOpt('${url}')"><i class="fa fa-check"></i> <spring:message code="approved"/></a>
|
||||
</c:when>
|
||||
<c:when test="${label eq 'unapproved'}">
|
||||
<a href="javascript:void(0);" onclick="noPassOpt('${url}')"><i class="fa fa-remove"></i> <spring:message code="unapproved"/></a>
|
||||
</c:when>
|
||||
<c:when test="${label eq 'cancelPass'}">
|
||||
<a href="javascript:void(0);" onclick="cancelPassOpt('${url}')"><i class="fa fa-undo"></i> <spring:message code="cancel_approved"/></a>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
<%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$('#${id} thead tr th input.i-checks').on('ifChecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定
|
||||
$('#${id} tbody tr td input.i-checks').iCheck('check');
|
||||
});
|
||||
|
||||
$('#${id} thead tr th input.i-checks').on('ifUnchecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定
|
||||
$('#${id} tbody tr td input.i-checks').iCheck('uncheck');
|
||||
});
|
||||
});
|
||||
//删除
|
||||
function del(url){
|
||||
var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
|
||||
|
||||
if($(checkboxes).filter(":checked").length>0){
|
||||
if(validatePass(checkboxes)){
|
||||
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}else{
|
||||
doAll(checkboxes,url);
|
||||
}
|
||||
}else{
|
||||
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
}
|
||||
//通过
|
||||
function passOpt(url){
|
||||
var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
|
||||
|
||||
if($(checkboxes).filter(":checked").length>0){
|
||||
if(validatePass(checkboxes)){
|
||||
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}else{
|
||||
doAll(checkboxes,url);
|
||||
}
|
||||
}else{
|
||||
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
}
|
||||
//未通过
|
||||
function noPassOpt(url){
|
||||
var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
|
||||
|
||||
if($(checkboxes).filter(":checked").length>0){
|
||||
if(validatePass(checkboxes)){
|
||||
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}else{
|
||||
doAll(checkboxes,url);
|
||||
}
|
||||
}else{
|
||||
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
}
|
||||
//配置取消
|
||||
function cancelPassOpt(url){
|
||||
var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
|
||||
|
||||
if($(checkboxes).filter(":checked").length>0){
|
||||
if(validatePass(checkboxes)){
|
||||
doAll(checkboxes,url);
|
||||
}else{
|
||||
top.$.jBox.tip("<spring:message code='hasnot_approved'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
}else{
|
||||
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
}
|
||||
function doAll(checkboxes,url){
|
||||
// var url = $(this).attr('data-url');
|
||||
var str="";
|
||||
var ids="";
|
||||
checkboxes.each(function(){
|
||||
if(true == $(this).is(':checked')){
|
||||
str+=$(this).attr("id")+",";
|
||||
}
|
||||
});
|
||||
if(str.substr(str.length-1)== ','){
|
||||
ids = str.substr(0,str.length-1);
|
||||
}
|
||||
if(ids == ""){
|
||||
//top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
|
||||
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
|
||||
|
||||
if(v=="ok"){
|
||||
window.location = url+"?ids="+ids;
|
||||
//$("#searchForm").submit();
|
||||
}
|
||||
},{buttonsFocus:1});
|
||||
top.$('.jbox-body .jbox-icon').css('top','55px');
|
||||
|
||||
}
|
||||
//验证选择的配置，是否有审核通过的
|
||||
function validatePass(checkboxes){
|
||||
var flag = false;
|
||||
$(checkboxes).filter(":checked").each(function(){
|
||||
if($(this).val()==1){
|
||||
flag = true;
|
||||
return;
|
||||
}
|
||||
});
|
||||
return flag;
|
||||
}
|
||||
</script>
|
||||
@@ -4,7 +4,7 @@
|
||||
<head>
|
||||
<title>配置信息</title>
|
||||
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
|
||||
<%-- <link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" /> --%>
|
||||
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
||||
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
|
||||
<script type="text/javascript">
|
||||
@@ -68,7 +68,9 @@
|
||||
return false;
|
||||
}
|
||||
$(document).ready(function() {
|
||||
|
||||
|
||||
//设定显示总条数
|
||||
$("#showTotalCount").text('${showTotalCount}');
|
||||
//设定selected，设定name 设定value
|
||||
|
||||
$("#seltype").find("option[value=${searchType==null?11:searchType}]").attr("selected",true);
|
||||
@@ -211,14 +213,14 @@
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
value="<fmt:formatDate value="${serviceDictInfo.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<label>到</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
value="<fmt:formatDate value="${serviceDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -268,7 +270,7 @@
|
||||
<c:forEach items="${list}" var="serviceDictInfo" varStatus="se">
|
||||
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
|
||||
<td><input type="checkbox" class="ckbox" name="check" value="${serviceDictInfo.serviceDictId}"></td>
|
||||
<td>${fns:getNumberResult(se.count,page.pageNo,page.pageSize) }</td>
|
||||
<td>${serviceDictInfo.showSequence}</td>
|
||||
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td>
|
||||
<td>${serviceDictInfo.itemValue}</td>
|
||||
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<head>
|
||||
<title>配置信息</title>
|
||||
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
|
||||
<%-- <link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" /> --%>
|
||||
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
||||
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
|
||||
<script type="text/javascript">
|
||||
@@ -70,7 +70,7 @@
|
||||
$(document).ready(function() {
|
||||
|
||||
//设定显示总条数
|
||||
//$("#showTotalCount").text();
|
||||
$("#showTotalCount").text('${showTotalCount}');
|
||||
//设定selected，设定name 设定value
|
||||
|
||||
$("#seltype").find("option[value='${searchType==null?11:searchType}']").attr("selected",true);
|
||||
@@ -213,14 +213,14 @@
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
value="<fmt:formatDate value="${serviceDictInfo.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<label>到</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
value="<fmt:formatDate value="${serviceDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -270,7 +270,7 @@
|
||||
<c:forEach items="${list}" var="serviceDictInfo" varStatus="se">
|
||||
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
|
||||
<td><input type="checkbox" class="ckbox" name="check" value="${serviceDictInfo.serviceDictId}"></td>
|
||||
<td>${fns:getNumberResult(se.count,page.pageNo,page.pageSize) }</td>
|
||||
<td>${serviceDictInfo.showSequence}</td>
|
||||
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td>
|
||||
<td>${serviceDictInfo.itemValue}</td>
|
||||
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<head>
|
||||
<title>配置信息</title>
|
||||
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
|
||||
<%-- <link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" /> --%>
|
||||
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
||||
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
|
||||
<script type="text/javascript">
|
||||
@@ -70,7 +70,7 @@
|
||||
}
|
||||
$(document).ready(function() {
|
||||
//设定显示总条数
|
||||
//$("#showTotalCount").text();
|
||||
$("#showTotalCount").text('${showTotalCount}');
|
||||
//设定selected，设定name 设定value
|
||||
|
||||
$("#seltype").find("option[value=${searchType==null?11:searchType}]").attr("selected",true);
|
||||
@@ -211,14 +211,14 @@
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
value="<fmt:formatDate value="${sysDictInfo.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<label>到</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
value="<fmt:formatDate value="${sysDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -268,7 +268,7 @@
|
||||
<c:forEach items="${list}" var="sysDictInfo" varStatus="se">
|
||||
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
|
||||
<td><input type="checkbox" class="ckbox" name="check" value="${sysDictInfo.sysDictId}"></td>
|
||||
<td>${fns:getNumberResult(se.count,page.pageNo,page.pageSize) }</td>
|
||||
<td>${sysDictInfo.showSequence}</td>
|
||||
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemCode}</a></td>
|
||||
<td>${sysDictInfo.itemValue}</td>
|
||||
<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<head>
|
||||
<title>配置信息</title>
|
||||
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
||||
<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
|
||||
<%-- <link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" /> --%>
|
||||
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
||||
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
|
||||
<script type="text/javascript">
|
||||
@@ -74,7 +74,7 @@
|
||||
}
|
||||
$(document).ready(function() {
|
||||
//设定显示总条数
|
||||
//$("#showTotalCount").text();
|
||||
$("#showTotalCount").text('${showTotalCount}');
|
||||
//设定selected，设定name 设定value
|
||||
|
||||
$("#seltype").find("option[value='${searchType==null?11:searchType}']").attr("selected",true);
|
||||
@@ -216,14 +216,14 @@
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
value="<fmt:formatDate value="${sysDictInfo.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<label>到</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
value="<fmt:formatDate value="${sysDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -273,7 +273,7 @@
|
||||
<c:forEach items="${list}" var="sysDictInfo" varStatus="se">
|
||||
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
|
||||
<td><input type="checkbox" class="ckbox" name="check" value="${sysDictInfo.sysDictId}"></td>
|
||||
<td>${fns:getNumberResult(se.count,page.pageNo,page.pageSize) }</td>
|
||||
<td>${sysDictInfo.showSequence}</td>
|
||||
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemCode}</a></td>
|
||||
<td>${sysDictInfo.itemValue}</td>
|
||||
<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
|
||||
|
||||
113
src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
Normal file
113
src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
Normal file
@@ -0,0 +1,113 @@
|
||||
<%@ page contentType="text/html;charset=UTF-8"%>
|
||||
<%@ include file="/WEB-INF/include/taglib.jsp"%>
|
||||
<html>
|
||||
<head>
|
||||
<title>专项任务</title>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div class="page-content">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="portlet box blue">
|
||||
<div class="portlet-title">
|
||||
<div class="caption">
|
||||
<i class="fa fa-gift"></i><c:if test="${not empty taskInfo.id}"><spring:message code="edit"/></c:if><c:if test="${empty taskInfo.id}"><spring:message code="add"/></c:if></div>
|
||||
</div>
|
||||
|
||||
<div class="portlet-body form">
|
||||
<!-- BEGIN FORM-->
|
||||
<form:form action="${ctx}/basics/taskInfo/saveOrUpdate" modelAttribute="taskInfo" class="form-horizontal" id="inputForm" method="post" >
|
||||
<sys:message content="${message}"/>
|
||||
<input type="hidden" name="id" value="${taskInfo.id}"/>
|
||||
<div class="form-body">
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 control-label"><spring:message code="task_name"></spring:message>:</label>
|
||||
<div class="col-md-4">
|
||||
<input type="text" class="form-control" name="taskName" value="${taskInfo.taskName}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 control-label"><spring:message code="task_org"></spring:message>:</label>
|
||||
<div class="col-md-4">
|
||||
<input type="text" class="form-control" name="taskOrg" value="${taskInfo.taskOrg}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 control-label"><spring:message code="task_time"></spring:message>:</label>
|
||||
<div class="col-md-4">
|
||||
<input id="taskTime" name="taskTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate"
|
||||
value="<fmt:formatDate value="${taskInfo.taskTime}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group last">
|
||||
<label class="col-md-3 control-label"><th><spring:message code="desc"/>:</label>
|
||||
<div class="col-md-4">
|
||||
<input type="text" class="form-control" name="taskDesc" value="${taskInfo.taskDesc}">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-actions">
|
||||
<div class="row">
|
||||
<div class="col-md-offset-3 col-md-9">
|
||||
<button type="submit" class="btn btn-circle green"><spring:message code="submit"></spring:message></button>
|
||||
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form:form>
|
||||
<!-- END FORM-->
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<style>
|
||||
.input-medium {
|
||||
width: 200px !important;
|
||||
}
|
||||
.Wdate {
|
||||
border: #c2cad8 1px solid;
|
||||
height: 34px;
|
||||
}
|
||||
|
||||
</style>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
|
||||
$("#inputForm").validate({
|
||||
rules: {
|
||||
taskName: {
|
||||
required: true,
|
||||
},
|
||||
taskOrg: {
|
||||
required: true,
|
||||
},
|
||||
taskTime: {
|
||||
required: true,
|
||||
},
|
||||
|
||||
},
|
||||
messages: {
|
||||
taskName: {
|
||||
required: '<spring:message code="required"/>',
|
||||
},
|
||||
taskOrg: {
|
||||
required: '<spring:message code="required"/>',
|
||||
},
|
||||
taskTime: {
|
||||
required: '<spring:message code="required"/>',
|
||||
},
|
||||
},
|
||||
submitHandler: function(form){
|
||||
//loading('onloading...');
|
||||
form.submit();
|
||||
},
|
||||
errorContainer: "#messageBox",
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
267
src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
Normal file
267
src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
Normal file
@@ -0,0 +1,267 @@
|
||||
<%@ page contentType="text/html;charset=UTF-8"%>
|
||||
<%@ include file="/WEB-INF/include/taglib.jsp"%>
|
||||
<html>
|
||||
<head>
|
||||
<title>专项任务</title>
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div class="page-content">
|
||||
<div class="theme-panel hidden-xs hidden-sm">
|
||||
<button type="button" class="btn btn-primary"
|
||||
onClick="javascript:window.location='${ctx}/basics/taskInfo/form'">
|
||||
<i class="fa fa-plus"></i>
|
||||
<spring:message code="add"/></button>
|
||||
</div>
|
||||
|
||||
<h3 class="page-title">
|
||||
<spring:message code="special_task"></spring:message>
|
||||
<small><spring:message code="date_list"/></small>
|
||||
</h3>
|
||||
|
||||
<h5 class="page-header"></h5>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="portlet">
|
||||
|
||||
<div class="portlet-body">
|
||||
|
||||
<div class="row" >
|
||||
<form:form id="searchForm" modelAttribute="taskInfo" action="${ctx}/basics/taskInfo/list" method="post" class="form-search">
|
||||
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
|
||||
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
|
||||
|
||||
<!-- 筛选按钮展开状态-->
|
||||
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${taskInfo.isFilterAction }"/>
|
||||
|
||||
<!-- 搜索内容与操作按钮栏 -->
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="pull-left">
|
||||
<form:select path="isAudit" class="selectpicker select2 input-small" >
|
||||
<form:option value=""><spring:message code="all_states"/></form:option>
|
||||
<form:option value="0"><spring:message code="created"></spring:message></form:option>
|
||||
<form:option value="1"><spring:message code="approved"></spring:message></form:option>
|
||||
</form:select>
|
||||
</div>
|
||||
|
||||
<div class="pull-left">
|
||||
<div class="input-group">
|
||||
<div class="input-group-btn">
|
||||
<input id="taskName" name="taskName" class="form-control input-medium" placeholder=<spring:message code="input_title"/> type="text" value="${taskInfo.taskName }">
|
||||
</div>
|
||||
|
||||
<div class="input-group-btn">
|
||||
<button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="pull-left">
|
||||
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message> <i class="fa fa-angle-double-down"></i></button>
|
||||
</div>
|
||||
|
||||
<div class="pull-right">
|
||||
|
||||
<button type="button" class="btn btn-default" onclick="edit()">
|
||||
<i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
|
||||
<sys:delRow url="${ctx}/basics/taskInfo/delete" id="contentTable" label="delete"></sys:delRow>
|
||||
<!-- <button type="button" class="btn btn-default">
|
||||
<i class="fa fa-download"></i> 导出</button> -->
|
||||
<div class="btn-group">
|
||||
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
|
||||
<i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
|
||||
<i class="fa fa-angle-down"></i>
|
||||
</button>
|
||||
<ul class="dropdown-menu pull-right">
|
||||
<li><sys:delRow url="${ctx}/basics/taskInfo/taskExamine" id="contentTable" label="approved"></sys:delRow></li>
|
||||
<li><sys:delRow url="${ctx}/basics/taskInfo/taskExamineNo" id="contentTable" label="unapproved"></sys:delRow></li>
|
||||
<li><sys:delRow url="${ctx}/basics/taskInfo/taskCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<!-- /搜索内容与操作按钮栏-->
|
||||
|
||||
<!-- 筛选搜索内容栏默认隐藏-->
|
||||
<div class="col-md-12 filter-action-select-panle hide" >
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="pull-left">
|
||||
<label><spring:message code="task_time"/>：</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate" data-options="buttons:buttons"
|
||||
value="<fmt:formatDate value="${taskInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<label><spring:message code="to"/></label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${taskInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="pull-left">
|
||||
<label><spring:message code="operate_time"/>：</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${taskInfo.dobeginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<label><spring:message code="to"/></label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input id="doendDate" name="doendDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${taskInfo.doendDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h5 class="page-header"></h5>
|
||||
<div class="row">
|
||||
|
||||
<div class="pull-left">
|
||||
<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
|
||||
<button type="button" class="btn btn-default" onclick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- /筛选搜索内容栏 结束-->
|
||||
|
||||
</form:form>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- <div class="table-responsive"> -->
|
||||
<sys:message content="${message}"/>
|
||||
<table id="contentTable" class="table table-striped table-bordered table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
|
||||
<th><spring:message code="seq"></spring:message></th>
|
||||
<th><spring:message code="task_name"></spring:message></th>
|
||||
<th><spring:message code="task_org"></spring:message></th>
|
||||
<th><spring:message code="task_time"></spring:message></th>
|
||||
<th><spring:message code="state"></spring:message></th>
|
||||
<th><spring:message code="operator"></spring:message></th>
|
||||
<th><spring:message code="operate_time"></spring:message></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:forEach items="${page.list}" var="taskInfo">
|
||||
<tr>
|
||||
<td><input type="checkbox" class="i-checks" id="${taskInfo.id}" value="${taskInfo.isAudit}"></td>
|
||||
<td>${taskInfo.id }</td>
|
||||
<td>${taskInfo.taskName }</td>
|
||||
<td>${taskInfo.taskOrg }</td>
|
||||
<td><fmt:formatDate value="${taskInfo.taskTime }" pattern="yyyy-MM-dd"/></td>
|
||||
<td>
|
||||
<c:choose>
|
||||
<c:when test="${taskInfo.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
|
||||
<c:when test="${taskInfo.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
|
||||
<c:when test="${taskInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td>${taskInfo.creatorName }</td>
|
||||
<td>
|
||||
<!-- 编辑时间为空则显示创建时间 -->
|
||||
<c:choose>
|
||||
<c:when test="${empty taskInfo.editTime}">
|
||||
<fmt:formatDate value="${taskInfo.createTime }" pattern="yyyy-MM-dd"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<fmt:formatDate value="${taskInfo.editTime }" pattern="yyyy-MM-dd"/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="page">${page}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
if("${taskInfo.taskName}"){
|
||||
$("#intype").val("${taskInfo.taskName}");
|
||||
}else{
|
||||
$("#intype").attr("placeholder","<spring:message code='input'/>"+$("#seltype").find("option:selected").text());
|
||||
}
|
||||
//筛选功能初始化
|
||||
filterActionInit();
|
||||
|
||||
$("#isAudit").change(function(){
|
||||
page();
|
||||
});
|
||||
|
||||
$("#taskName").attr("placeholder","<spring:message code='input'/> "+"<spring:message code='task_name'/>");
|
||||
//全选及取消
|
||||
$("#checkAll").change(function(){
|
||||
if($("#checkAll").prop("checked")){
|
||||
$("input.i-checks").prop("checked",true);
|
||||
}else{
|
||||
$("input.i-checks").prop("checked",false);
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
||||
function resetx(){
|
||||
// $("#searchForm").reset();
|
||||
$(':input','#searchForm')
|
||||
.not(':button,:submit,:reset,:hidden')
|
||||
.val('')
|
||||
.removeAttr('checked')
|
||||
.removeAttr('selected');
|
||||
}
|
||||
|
||||
|
||||
//查询
|
||||
function page(n,s){
|
||||
|
||||
$("#pageNo").val(n);
|
||||
$("#pageSize").val(s);
|
||||
$("#searchForm").attr("action","${ctx}/basics/taskInfo/list");
|
||||
$("#searchForm").submit();
|
||||
return false;
|
||||
}
|
||||
//编辑
|
||||
function edit(){
|
||||
var cked = $('tbody tr td input.i-checks:checkbox:checked');
|
||||
if(cked.val()==1){
|
||||
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
if(cked.length==1){
|
||||
window.location = "${ctx}/basics/taskInfo/form?id="+cked.attr("id");
|
||||
}else{
|
||||
top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -28,6 +28,62 @@ $(function(){
|
||||
$("#cancel").on("click",function(){
|
||||
window.history.back();
|
||||
});
|
||||
$("#cfgFrom").validate({
|
||||
rules: {
|
||||
'cfgDesc':{
|
||||
required:true
|
||||
},
|
||||
'keywords':{
|
||||
required:true
|
||||
},
|
||||
'district':{
|
||||
required:true
|
||||
},
|
||||
'isAreaEffective':{
|
||||
required:true
|
||||
},
|
||||
'exprType':{
|
||||
required:true
|
||||
},
|
||||
'matchMethod':{
|
||||
required:true
|
||||
},
|
||||
'requestId': {
|
||||
required: true,
|
||||
}
|
||||
},
|
||||
messages: {
|
||||
'cfgDesc':{
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'keywords':{
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'district':{
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'isAreaEffective':{
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'exprType':{
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'matchMethod':{
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'requestId': {
|
||||
required: '<spring:message code="required"/>'
|
||||
}
|
||||
},
|
||||
errorPlacement: function(error,element){
|
||||
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
|
||||
},
|
||||
submitHandler: function(form){
|
||||
//loading('onloading...');
|
||||
form.submit();
|
||||
},
|
||||
errorContainer: "#messageBox",
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
|
||||
@@ -21,8 +21,22 @@
|
||||
</c:choose>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
|
||||
//筛选功能初始化
|
||||
filterActionInit();
|
||||
$("#isAudit").change(function(){
|
||||
page();
|
||||
});
|
||||
//reset
|
||||
$("#resetBtn").on("click",function(){
|
||||
$("select.selectpicker").each(function(){
|
||||
$(this).selectpicker('val',$(this).find('option:first').val());
|
||||
$(this).find("option").attr("selected",false);
|
||||
$(this).find("option:first").attr("selected",true);
|
||||
});
|
||||
$(".Wdate").attr("value",'');
|
||||
$("#keywords").attr("value",'');
|
||||
$("#searchForm")[0].reset();
|
||||
});
|
||||
});
|
||||
//查询
|
||||
function page(n,s){
|
||||
@@ -37,7 +51,7 @@
|
||||
|
||||
<div class="page-content">
|
||||
<div class="theme-panel hidden-xs hidden-sm">
|
||||
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
|
||||
<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> --%>
|
||||
<c:if test="${audit==0}">
|
||||
<button type="button" class="btn btn-primary"
|
||||
onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
|
||||
@@ -46,59 +60,165 @@
|
||||
|
||||
<h3 class="page-title">
|
||||
<spring:message code="${cfgName}"></spring:message>
|
||||
<small><spring:message code="date_list"/></small>
|
||||
</h3>
|
||||
|
||||
<h5 class="page-header"></h5>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="portlet box blue">
|
||||
<div class="portlet-title">
|
||||
<div class="caption">
|
||||
<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
|
||||
</div>
|
||||
<div class="tools">
|
||||
<!-- <a href="javascript:;" class="collapse" data-original-title=""
|
||||
title=""> </a> <a href="#portlet-config" data-toggle="modal"
|
||||
class="config" data-original-title="" title=""> </a> <a
|
||||
href="javascript:;" class="reload" data-original-title=""
|
||||
title=""> </a> <a href="javascript:;" class="remove"
|
||||
data-original-title="" title=""> </a> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="portlet">
|
||||
<div class="portlet-body">
|
||||
<div class="row" >
|
||||
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
|
||||
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/complex/list" method="post" class="form-search">
|
||||
<input id="cfgName" name="cfgName" type="hidden" value="${cfgName}"/>
|
||||
<input id="action" name="action" type="hidden" value="${action}"/>
|
||||
<input id="serviceId" name="serviceId" type="hidden" value="${serviceId}"/>
|
||||
<input id="audit" name="audit" type="hidden" value="${audit}"/>
|
||||
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
|
||||
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
|
||||
<!-- 筛选按钮展开状态-->
|
||||
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
|
||||
<!-- 搜索内容与操作按钮栏 -->
|
||||
<div class="col-md-12">
|
||||
<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2">
|
||||
<form:option value=""><spring:message code="select"/></form:option>
|
||||
<form:option value="0"><spring:message code="created"></spring:message></form:option>
|
||||
<form:option value="1"><spring:message code="approved"></spring:message></form:option>
|
||||
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
|
||||
<form:option value="3"><spring:message code="cancel"></spring:message></form:option>
|
||||
</form:select>
|
||||
<spring:message code="request_number"/> :
|
||||
<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
|
||||
<form:option value=""><spring:message code="select"/></form:option>
|
||||
<c:forEach items="${requestInfos}" var="requestInfo" >
|
||||
<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
<button type="button" class="btn btn-default btn-sm" onclick="return page()">
|
||||
<div class="pull-left">
|
||||
<c:set var="state"><spring:message code='state'/></c:set>
|
||||
<form:select path="isAudit" class="selectpicker select2 input-small" title="${state}">
|
||||
<%-- <form:option value=""><spring:message code="state"/></form:option> --%>
|
||||
<form:option value="0"><spring:message code="created"></spring:message></form:option>
|
||||
<form:option value="1"><spring:message code="approved"></spring:message></form:option>
|
||||
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
|
||||
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
|
||||
</form:select>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<c:set var="request_number"><spring:message code='request_number'/></c:set>
|
||||
<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
|
||||
<c:forEach items="${requestInfos}" var="requestInfo" >
|
||||
<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<c:set var="flI18n"><spring:message code='type'/></c:set>
|
||||
<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
|
||||
<c:forEach items="${fls}" var="fl" >
|
||||
<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
|
||||
<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
|
||||
<c:forEach items="${xzs}" var="xz" >
|
||||
<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<c:set var="labelI18n"><spring:message code='label'/></c:set>
|
||||
<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
|
||||
<c:forEach items="${lables}" var="lable" >
|
||||
<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
</div>
|
||||
<%-- <button type="button" class="btn btn-default btn-sm" onclick="return page()">
|
||||
<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
|
||||
</button>
|
||||
<spring:message code="sort"/> :
|
||||
<select name="orderBy" class="selectpicker select2">
|
||||
<option value=""><spring:message code="select"/></option>
|
||||
<option value="createTime asc" <c:if test="${page.orderBy eq 'createTime asc' }">selected</c:if> ><spring:message code="createTime_asc"/></option>
|
||||
<option value="createTime desc" <c:if test="${page.orderBy eq 'createTime desc' }">selected</c:if> ><spring:message code="createTime_desc"/></option>
|
||||
<option value="editTime asc" <c:if test="${page.orderBy eq 'editTime asc' }">selected</c:if> ><spring:message code="editTime_asc"/></option>
|
||||
<option value="editTime desc" <c:if test="${page.orderBy eq 'editTime desc' }">selected</c:if> ><spring:message code="editTime_desc"/></option>
|
||||
<option value="auditTime asc" <c:if test="${page.orderBy eq 'auditTime asc' }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
|
||||
<option value="auditTime desc" <c:if test="${page.orderBy eq 'auditTime desc' }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
|
||||
</select>
|
||||
</button> --%>
|
||||
<div class="pull-left">
|
||||
<c:set var="sortI18n"><spring:message code="sort"/></c:set>
|
||||
<select name="orderBy" class="selectpicker select2 input-small" title="${sortI18n}">
|
||||
<option value="${page.alias}.create_time asc" <c:if test="${fn:contains(page.orderBy,'create_time asc') }">selected</c:if> ><spring:message code="createTime_asc"/></option>
|
||||
<option value="${page.alias}.create_time desc" <c:if test="${fn:contains(page.orderBy , 'create_time desc') }">selected</c:if> ><spring:message code="createTime_desc"/></option>
|
||||
<option value="${page.alias}.edit_time asc" <c:if test="${fn:contains(page.orderBy , 'edit_time asc') }">selected</c:if> ><spring:message code="editTime_asc"/></option>
|
||||
<option value="${page.alias}.edit_time desc" <c:if test="${fn:contains(page.orderBy , 'edit_time desc') }">selected</c:if> ><spring:message code="editTime_desc"/></option>
|
||||
<option value="${page.alias}.audit_time asc" <c:if test="${fn:contains(page.orderBy , 'audit_time asc') }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
|
||||
<option value="${page.alias}.audit_time desc" <c:if test="${fn:contains(page.orderBy , 'audit_time desc') }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
<button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 搜索内容与操作按钮栏 -->
|
||||
|
||||
<!-- 筛选搜索内容栏默认隐藏-->
|
||||
<div class="col-md-12 filter-action-select-panle hide" >
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="pull-left col-md-2">
|
||||
<label><spring:message code="config_time"/>：</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<label>到</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="pull-left col-md-2">
|
||||
<label><spring:message code="edit_time"/>：</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<label>到</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="pull-left col-md-2">
|
||||
<label><spring:message code="audit_time"/>：</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<label>到</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="pull-left col-md-2">
|
||||
<label><spring:message code="key_word"/>：</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<form:input path="keywords" class="form-control input-small"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h5 class="page-header"></h5>
|
||||
<div class="row">
|
||||
|
||||
<div class="pull-left">
|
||||
<button type="button" class="btn blue" onclick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
|
||||
<button type="button" id="resetBtn" class="btn btn-default"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- /筛选搜索内容栏 结束-->
|
||||
</form:form>
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
@@ -130,9 +250,9 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:forEach items="${page.list }" var="cfg">
|
||||
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
|
||||
<tr>
|
||||
<td>${cfg.cfgId }</td>
|
||||
<td>${status.index+1 }</td>
|
||||
<td>${cfg.cfgDesc }</td>
|
||||
<td>${cfg.district }</td>
|
||||
<td>${cfg.keywords }</td>
|
||||
@@ -154,7 +274,7 @@
|
||||
<td>
|
||||
<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
|
||||
<c:forEach items="${fls}" var="fl">
|
||||
<c:if test="${classifyId==fl.itemCode}">
|
||||
<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
|
||||
${fl.itemValue},
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
@@ -164,14 +284,14 @@
|
||||
<td>
|
||||
<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
|
||||
<c:forEach items="${xzs}" var="xz">
|
||||
<c:if test="${attributeId==xz.itemCode}">${xz.itemValue},</c:if>
|
||||
<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
|
||||
</c:forEach>
|
||||
</c:forEach>
|
||||
</td>
|
||||
<td>
|
||||
<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
|
||||
<c:forEach items="${lables}" var="lable">
|
||||
<c:if test="${lableId==lable.itemCode}">${lable.itemValue},</c:if>
|
||||
<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
|
||||
</c:forEach>
|
||||
</c:forEach>
|
||||
</td>
|
||||
|
||||
@@ -85,12 +85,15 @@ $(function(){
|
||||
},
|
||||
srcIp: {
|
||||
required: true,
|
||||
checkIp: true
|
||||
},
|
||||
srcIpMask: {
|
||||
required: true,
|
||||
},
|
||||
srcPort: {
|
||||
required: true,
|
||||
max: 65535,
|
||||
min: 0
|
||||
},
|
||||
srcPortMask: {
|
||||
required: true,
|
||||
@@ -103,6 +106,8 @@ $(function(){
|
||||
},
|
||||
dstPort: {
|
||||
required: true,
|
||||
max: 65535,
|
||||
min: 0
|
||||
},
|
||||
dstPortMask: {
|
||||
required: true,
|
||||
@@ -137,6 +142,8 @@ $(function(){
|
||||
},
|
||||
srcPort: {
|
||||
required: '<spring:message code="required"/>',
|
||||
max: '范围0-65535!',
|
||||
min: '范围0-65535!'
|
||||
},
|
||||
srcPortMask: {
|
||||
required: '<spring:message code="required"/>',
|
||||
@@ -149,6 +156,8 @@ $(function(){
|
||||
},
|
||||
dstPort: {
|
||||
required: '<spring:message code="required"/>',
|
||||
max: '范围0-65535!',
|
||||
min: '范围0-65535!'
|
||||
},
|
||||
dstPortMask: {
|
||||
required: '<spring:message code="required"/>',
|
||||
@@ -175,6 +184,23 @@ $(function(){
|
||||
},
|
||||
errorContainer: "#messageBox",
|
||||
});
|
||||
|
||||
$.validator.addMethod(
|
||||
"checkIp",
|
||||
function(value, element, params) {
|
||||
var checkIp;
|
||||
if ($("[name=ipType]").val() == 4) {
|
||||
//checkIp = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
|
||||
checkIp = /((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/;
|
||||
//} else if ($("[name=ipType]").val() == 6) {
|
||||
// checkIp = /^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/;
|
||||
} else {
|
||||
checkIp = /\S+/;
|
||||
}
|
||||
return this.optional(element) || (checkIp.test(value) && (RegExp.$1 < 256 && RegExp.$2 < 256 && RegExp.$3 < 256 && RegExp.$4 < 256));
|
||||
},
|
||||
"请输入正确的IP!"
|
||||
);
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
|
||||
@@ -21,19 +21,22 @@
|
||||
</c:choose>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
//筛选功能初始化
|
||||
filterActionInit();
|
||||
|
||||
$("#isAudit").change(function(){
|
||||
page();
|
||||
});
|
||||
|
||||
|
||||
//reset
|
||||
$("#resetBtn").on("click",function(){
|
||||
$("select.selectpicker").each(function(){
|
||||
$(this).selectpicker('val',$(this).find('option:first').val());
|
||||
$(this).find("option").attr("selected",false);
|
||||
$(this).find("option:first").attr("selected",true);
|
||||
});
|
||||
$(".Wdate").attr("value",'');
|
||||
$("#searchForm")[0].reset();
|
||||
});
|
||||
});
|
||||
function reset(){
|
||||
$("#searchForm").reset();
|
||||
}
|
||||
//查询
|
||||
function page(n,s){
|
||||
$("#pageNo").val(n);
|
||||
@@ -59,13 +62,16 @@
|
||||
<spring:message code="${cfgName}"></spring:message>
|
||||
<small><spring:message code="date_list"/></small>
|
||||
</h3>
|
||||
|
||||
<h5 class="page-header"></h5>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="portlet">
|
||||
<div class="portlet-body">
|
||||
<div class="row" >
|
||||
<form:form id="searchForm" modelAttribute="ipCfg" action="${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}" method="post" class="form-search">
|
||||
<form:form id="searchForm" modelAttribute="ipCfg" action="${ctx}/cfg/ip/list" method="post" class="form-search">
|
||||
<input id="cfgName" name="cfgName" type="hidden" value="${cfgName}"/>
|
||||
<input id="action" name="action" type="hidden" value="${action}"/>
|
||||
<input id="serviceId" name="serviceId" type="hidden" value="${serviceId}"/>
|
||||
<input id="audit" name="audit" type="hidden" value="${audit}"/>
|
||||
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
|
||||
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
|
||||
@@ -95,7 +101,7 @@
|
||||
<c:set var="flI18n"><spring:message code='type'/></c:set>
|
||||
<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
|
||||
<c:forEach items="${fls}" var="fl" >
|
||||
<form:option value="${fl.itemCode}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
|
||||
<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
</div>
|
||||
@@ -103,7 +109,7 @@
|
||||
<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
|
||||
<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
|
||||
<c:forEach items="${xzs}" var="xz" >
|
||||
<form:option value="${xz.itemCode}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
|
||||
<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
</div>
|
||||
@@ -111,7 +117,7 @@
|
||||
<c:set var="labelI18n"><spring:message code='label'/></c:set>
|
||||
<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
|
||||
<c:forEach items="${lables}" var="lable" >
|
||||
<form:option value="${lable.itemCode}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
|
||||
<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
</div>
|
||||
@@ -224,7 +230,7 @@
|
||||
|
||||
<div class="pull-left">
|
||||
<button type="button" class="btn blue" onclick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
|
||||
<button type="button" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
|
||||
<button type="button" id="resetBtn" class="btn btn-default"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -313,7 +319,7 @@
|
||||
<td>
|
||||
<c:forEach items="${fn:split(ipCfg.classify,',')}" var="classifyId">
|
||||
<c:forEach items="${fls}" var="fl">
|
||||
<c:if test="${classifyId==fl.itemCode}">
|
||||
<c:if test="${fn:trim(fl.serviceDictId) eq classifyId}">
|
||||
${fl.itemValue},
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
@@ -323,14 +329,14 @@
|
||||
<td>
|
||||
<c:forEach items="${fn:split(ipCfg.attribute,',')}" var="attributeId">
|
||||
<c:forEach items="${xzs}" var="xz">
|
||||
<c:if test="${attributeId==xz.itemCode}">${xz.itemValue},</c:if>
|
||||
<c:if test="${fn:trim(xz.serviceDictId) eq attributeId}">${xz.itemValue},</c:if>
|
||||
</c:forEach>
|
||||
</c:forEach>
|
||||
</td>
|
||||
<td>
|
||||
<c:forEach items="${fn:split(ipCfg.lable,',')}" var="lableId">
|
||||
<c:forEach items="${lables}" var="lable">
|
||||
<c:if test="${lableId==lable.itemCode}">${lable.itemValue},</c:if>
|
||||
<c:if test="${fn:trim(lable.serviceDictId) eq lableId}">${lable.itemValue},</c:if>
|
||||
</c:forEach>
|
||||
</c:forEach>
|
||||
</td>
|
||||
|
||||
@@ -21,6 +21,65 @@
|
||||
</c:choose>
|
||||
<script type="text/javascript">
|
||||
$(function(){
|
||||
$("#cfgFrom").validate({
|
||||
rules: {
|
||||
'cfgDesc':{
|
||||
required:true
|
||||
},
|
||||
'cfgKeywords':{
|
||||
required:true
|
||||
},
|
||||
'action':{
|
||||
required:true
|
||||
},
|
||||
'isAreaEffective':{
|
||||
required:true
|
||||
},
|
||||
'exprType':{
|
||||
required:true
|
||||
},
|
||||
'matchMethod':{
|
||||
required:true
|
||||
},
|
||||
'isHexbin':{
|
||||
required:true
|
||||
},
|
||||
'requestId': {
|
||||
required: true,
|
||||
}
|
||||
},
|
||||
messages: {
|
||||
'cfgDesc':{
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'cfgKeywords':{
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'action':{
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'isAreaEffective':{
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'exprType':{
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'matchMethod':{
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'isHexbin':{
|
||||
required:'<spring:message code="required"/>'
|
||||
}
|
||||
},
|
||||
errorPlacement: function(error,element){
|
||||
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
|
||||
},
|
||||
submitHandler: function(form){
|
||||
//loading('onloading...');
|
||||
form.submit();
|
||||
},
|
||||
errorContainer: "#messageBox",
|
||||
});
|
||||
$("#save").on("click",function(){
|
||||
$("#cfgFrom").attr("action","${ctx}/cfg/string/saveOrUpdateCfg");
|
||||
$("#save").submit();
|
||||
|
||||
@@ -21,8 +21,22 @@
|
||||
</c:choose>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
|
||||
//筛选功能初始化
|
||||
filterActionInit();
|
||||
$("#isAudit").change(function(){
|
||||
page();
|
||||
});
|
||||
//reset
|
||||
$("#resetBtn").on("click",function(){
|
||||
$("select.selectpicker").each(function(){
|
||||
$(this).selectpicker('val',$(this).find('option:first').val());
|
||||
$(this).find("option").attr("selected",false);
|
||||
$(this).find("option:first").attr("selected",true);
|
||||
});
|
||||
$("#cfgKeywords").attr("value",'');
|
||||
$(".Wdate").attr("value",'');
|
||||
$("#searchForm")[0].reset();
|
||||
});
|
||||
});
|
||||
//查询
|
||||
function page(n,s){
|
||||
@@ -37,68 +51,174 @@
|
||||
|
||||
<div class="page-content">
|
||||
<div class="theme-panel hidden-xs hidden-sm">
|
||||
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
|
||||
<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> --%>
|
||||
<c:if test="${audit==0}">
|
||||
<button type="button" class="btn btn-primary"
|
||||
onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
|
||||
onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="add"></spring:message></button>
|
||||
</c:if>
|
||||
</div>
|
||||
|
||||
<h3 class="page-title">
|
||||
<spring:message code="${cfgName}"></spring:message>
|
||||
<small><spring:message code="date_list"/></small>
|
||||
</h3>
|
||||
|
||||
<h5 class="page-header"></h5>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="portlet box blue">
|
||||
<div class="portlet-title">
|
||||
<div class="caption">
|
||||
<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
|
||||
</div>
|
||||
<div class="tools">
|
||||
<!-- <a href="javascript:;" class="collapse" data-original-title=""
|
||||
title=""> </a> <a href="#portlet-config" data-toggle="modal"
|
||||
class="config" data-original-title="" title=""> </a> <a
|
||||
href="javascript:;" class="reload" data-original-title=""
|
||||
title=""> </a> <a href="javascript:;" class="remove"
|
||||
data-original-title="" title=""> </a> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="portlet">
|
||||
<div class="portlet-body">
|
||||
<div class="row" >
|
||||
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
|
||||
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/string/list" method="post" class="form-search">
|
||||
<input id="cfgName" name="cfgName" type="hidden" value="${cfgName}"/>
|
||||
<input id="action" name="action" type="hidden" value="${action}"/>
|
||||
<input id="serviceId" name="serviceId" type="hidden" value="${serviceId}"/>
|
||||
<input id="audit" name="audit" type="hidden" value="${audit}"/>
|
||||
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
|
||||
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
|
||||
<!-- 筛选按钮展开状态-->
|
||||
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
|
||||
<!-- 搜索内容与操作按钮栏 -->
|
||||
<div class="col-md-12">
|
||||
<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2" title="--请选择--" >
|
||||
<form:option value=""></form:option>
|
||||
<form:option value="0"><spring:message code="created"></spring:message></form:option>
|
||||
<form:option value="1"><spring:message code="approved"></spring:message></form:option>
|
||||
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
|
||||
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
|
||||
</form:select>
|
||||
<spring:message code="request_number"/> :
|
||||
<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
|
||||
<form:option value=""><spring:message code="select"/></form:option>
|
||||
<c:forEach items="${requestInfos}" var="requestInfo" >
|
||||
<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
<button type="button" class="btn btn-default btn-sm" onclick="return page()">
|
||||
<div class="pull-left">
|
||||
<c:set var="state"><spring:message code='state'/></c:set>
|
||||
<form:select path="isAudit" class="selectpicker select2 input-small" title="${state}">
|
||||
<%-- <form:option value=""><spring:message code="state"/></form:option> --%>
|
||||
<form:option value="0"><spring:message code="created"></spring:message></form:option>
|
||||
<form:option value="1"><spring:message code="approved"></spring:message></form:option>
|
||||
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
|
||||
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
|
||||
</form:select>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<c:set var="request_number"><spring:message code='request_number'/></c:set>
|
||||
<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
|
||||
<c:forEach items="${requestInfos}" var="requestInfo" >
|
||||
<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<c:set var="flI18n"><spring:message code='type'/></c:set>
|
||||
<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
|
||||
<c:forEach items="${fls}" var="fl" >
|
||||
<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
|
||||
<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
|
||||
<c:forEach items="${xzs}" var="xz" >
|
||||
<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<c:set var="labelI18n"><spring:message code='label'/></c:set>
|
||||
<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
|
||||
<c:forEach items="${lables}" var="lable" >
|
||||
<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
</div>
|
||||
<%-- <button type="button" class="btn btn-default btn-sm" onclick="return page()">
|
||||
<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
|
||||
</button>
|
||||
<spring:message code="sort"/> :
|
||||
<select name="orderBy" class="selectpicker select2">
|
||||
<option value=""><spring:message code="select"/></option>
|
||||
<option value="createTime asc" <c:if test="${page.orderBy eq 'createTime asc' }">selected</c:if> ><spring:message code="createTime_asc"/></option>
|
||||
<option value="createTime desc" <c:if test="${page.orderBy eq 'createTime desc' }">selected</c:if> ><spring:message code="createTime_desc"/></option>
|
||||
<option value="editTime asc" <c:if test="${page.orderBy eq 'editTime asc' }">selected</c:if> ><spring:message code="editTime_asc"/></option>
|
||||
<option value="editTime desc" <c:if test="${page.orderBy eq 'editTime desc' }">selected</c:if> ><spring:message code="editTime_desc"/></option>
|
||||
<option value="auditTime asc" <c:if test="${page.orderBy eq 'auditTime asc' }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
|
||||
<option value="auditTime desc" <c:if test="${page.orderBy eq 'auditTime desc' }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
|
||||
</select>
|
||||
</button> --%>
|
||||
<div class="pull-left">
|
||||
<c:set var="sortI18n"><spring:message code="sort"/></c:set>
|
||||
<select name="orderBy" class="selectpicker select2 input-small" title="${sortI18n}">
|
||||
<option value="${page.alias}.create_time asc" <c:if test="${fn:contains(page.orderBy,'create_time asc') }">selected</c:if> ><spring:message code="createTime_asc"/></option>
|
||||
<option value="${page.alias}.create_time desc" <c:if test="${fn:contains(page.orderBy , 'create_time desc') }">selected</c:if> ><spring:message code="createTime_desc"/></option>
|
||||
<option value="${page.alias}.edit_time asc" <c:if test="${fn:contains(page.orderBy , 'edit_time asc') }">selected</c:if> ><spring:message code="editTime_asc"/></option>
|
||||
<option value="${page.alias}.edit_time desc" <c:if test="${fn:contains(page.orderBy , 'edit_time desc') }">selected</c:if> ><spring:message code="editTime_desc"/></option>
|
||||
<option value="${page.alias}.audit_time asc" <c:if test="${fn:contains(page.orderBy , 'audit_time asc') }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
|
||||
<option value="${page.alias}.audit_time desc" <c:if test="${fn:contains(page.orderBy , 'audit_time desc') }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
<button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 搜索内容与操作按钮栏 -->
|
||||
|
||||
<!-- 筛选搜索内容栏默认隐藏-->
|
||||
<div class="col-md-12 filter-action-select-panle hide" >
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="pull-left col-md-2">
|
||||
<label><spring:message code="config_time"/>：</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<label>到</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="pull-left col-md-2">
|
||||
<label><spring:message code="edit_time"/>：</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<label>到</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="pull-left col-md-2">
|
||||
<label><spring:message code="audit_time"/>：</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<label>到</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||
value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="pull-left col-md-2">
|
||||
<label><spring:message code="key_word"/>：</label>
|
||||
</div>
|
||||
<div class="pull-left">
|
||||
<form:input path="cfgKeywords" class="form-control input-small"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h5 class="page-header"></h5>
|
||||
<div class="row">
|
||||
|
||||
<div class="pull-left">
|
||||
<button type="button" class="btn blue" onclick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
|
||||
<button type="button" id="resetBtn" class="btn btn-default"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- /筛选搜索内容栏 结束-->
|
||||
</form:form>
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
@@ -152,7 +272,7 @@
|
||||
<td>
|
||||
<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
|
||||
<c:forEach items="${fls}" var="fl">
|
||||
<c:if test="${classifyId==fl.itemCode}">
|
||||
<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
|
||||
${fl.itemValue},
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
@@ -162,14 +282,14 @@
|
||||
<td>
|
||||
<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
|
||||
<c:forEach items="${xzs}" var="xz">
|
||||
<c:if test="${attributeId==xz.itemCode}">${xz.itemValue},</c:if>
|
||||
<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
|
||||
</c:forEach>
|
||||
</c:forEach>
|
||||
</td>
|
||||
<td>
|
||||
<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
|
||||
<c:forEach items="${lables}" var="lable">
|
||||
<c:if test="${lableId==lable.itemCode}">${lable.itemValue},</c:if>
|
||||
<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
|
||||
</c:forEach>
|
||||
</c:forEach>
|
||||
</td>
|
||||
|
||||
@@ -29,6 +29,22 @@
|
||||
|
||||
|
||||
});
|
||||
//面包屑导航
|
||||
$(function(){
|
||||
|
||||
$("div ul li a").click(function(){
|
||||
if(typeof $(this).attr("id") !='undefined'){
|
||||
$("#menutwo").text($(this).text().trim());
|
||||
$("#menuthree").text("");
|
||||
}else{
|
||||
$("#menuthree").text($(this).text().trim());
|
||||
}
|
||||
// var urlto=this+"";
|
||||
// var ur="${ctx}"+urlto.split("nis")[1];
|
||||
// $("#menutwo").attr("href",ur);
|
||||
})
|
||||
})
|
||||
|
||||
</script>
|
||||
</head>
|
||||
|
||||
@@ -39,7 +55,6 @@
|
||||
|
||||
<!-- BEGIN HEADER INNER -->
|
||||
<div class="page-header-inner ">
|
||||
|
||||
<!-- BEGIN LOGO -->
|
||||
<div class="page-logo">
|
||||
<a href="index.html"> <img
|
||||
@@ -212,8 +227,8 @@
|
||||
<ul class="page-breadcrumb">
|
||||
<li><a href="index.html">Home</a> <i class="fa fa-circle"></i>
|
||||
</li>
|
||||
<li><a href="#">Tables</a> <i class="fa fa-circle"></i></li>
|
||||
<li><span>Datatables</span></li>
|
||||
<li><a href="#" id="menutwo" target="mainFrame">Tables</a> <i class="fa fa-circle"></i></li>
|
||||
<li><span id="menuthree">Datatables</span></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -139,8 +139,15 @@
|
||||
|
||||
// 如果在框架或在对话框中，则弹出提示并跳转到首页
|
||||
if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
|
||||
alertx("<spring:message code='login_timeout'/>");
|
||||
window.setTimeout(function () { top.location = "${pageContext.request.contextPath }"; }, 5000);
|
||||
top.$.jBox.confirm("<spring:message code='login_timeout'/>","<spring:message code='info'/>",function(v,h,f){
|
||||
|
||||
if(v=="ok"){
|
||||
top.location = "${pageContext.request.contextPath }";
|
||||
}else{
|
||||
top.location = "${pageContext.request.contextPath }";
|
||||
}
|
||||
},{buttonsFocus:1});
|
||||
top.$('.jbox-body .jbox-icon').css('top','55px');
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user