Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
duandongmei
2018-08-10 09:18:12 +08:00

View File

@@ -53,7 +53,7 @@ function selectP(){
form.submit(); form.submit();
}, },
errorContainer : "#messageBox", errorContainer : "#messageBox",
errorPlacement : function(error, element) { /* errorPlacement : function(error, element) {
$("#messageBox").text("<spring:message code='enter_error'/>"); $("#messageBox").text("<spring:message code='enter_error'/>");
if (element.is(":checkbox") if (element.is(":checkbox")
|| element.is(":radio") || element.is(":radio")
@@ -64,6 +64,9 @@ function selectP(){
} else { } else {
error.insertAfter(element); error.insertAfter(element);
} }
} */
errorPlacement: function(error,element){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
} }
}); });
}); });
@@ -109,28 +112,30 @@ function selectP(){
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code='protocol_name' />:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code='protocol_name' />:</label>
<c:set var="spec_service_id"></c:set> <c:set var="spec_service_id"></c:set>
<div class="col-md-6"> <div class="col-md-6">
<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" <sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}"
labelName="parent.specServiceName" labelName="parent.specServiceName"
labelValue="${empty specificServiceHostCfg.specServiceId?spec_service_id:fns:getBySpecServiceId(specificServiceHostCfg.specServiceId).specServiceName}" labelValue="${empty specificServiceHostCfg.specServiceId?spec_service_id:fns:getBySpecServiceId(specificServiceHostCfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="" title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
cssClass="form-control required"/> cssClass="form-control required"/>
<div for="parent.specServiceName"></div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><spring:message code='direction' />:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code='direction' />:</label>
<div class="col-md-6"> <div class="col-md-6">
<form:select path="direction" class="select2 form-control required" > <form:select name="direction" path="direction" class="select2 form-control required" >
<form:option value=""><spring:message code='select' /></form:option> <form:option value=""><spring:message code='select' /></form:option>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="dict"> <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}' /></form:option> <form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}' /></form:option>
</c:forEach> </c:forEach>
</form:select> </form:select>
<div for="direction"></div>
</div> </div>
</div> </div>
</div> </div>
@@ -141,12 +146,13 @@ function selectP(){
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code='protocol' />:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code='protocol' />:</label>
<div class="col-md-6"> <div class="col-md-6">
<form:select path="protocol" class="select2 form-control required" > <form:select name="protocol" path="protocol" class="select2 form-control required" >
<form:option value=""><spring:message code='select' /></form:option> <form:option value=""><spring:message code='select' /></form:option>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="dict"> <c:forEach items="${fns:getDictList('PROTOCOL')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}' /></form:option> <form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}' /></form:option>
</c:forEach> </c:forEach>
</form:select> </form:select>
<div for="protocol"></div>
</div> </div>
</div> </div>
</div> </div>
@@ -186,6 +192,7 @@ function selectP(){
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code='server_ip' />:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code='server_ip' />:</label>
<div class="col-md-6"> <div class="col-md-6">
<form:input class="form-control required ipCheck" type="text" path="destIpAddress" /> <form:input class="form-control required ipCheck" type="text" path="destIpAddress" />
<div for="destIpAddress"></div>
</div> </div>
</div> </div>
</div> </div>
@@ -213,6 +220,7 @@ function selectP(){
<div class="col-md-6"> <div class="col-md-6">
<form:input class="form-control required portCheck" type="text" <form:input class="form-control required portCheck" type="text"
path="destPort" /> path="destPort" />
<div for="destPort"></div>
</div> </div>
</div> </div>
</div> </div>