From 7374c16da76f2f7ef1726098899eebfe97970abc Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 24 Aug 2018 19:44:19 +0800
Subject: [PATCH] =?UTF-8?q?ratelimit=E9=99=90=E5=88=B6=E5=A4=A7=E5=B0=8F0-?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/basicprotocol/form.jsp  |  6 +-
 .../views/cfg/encryptedtunnelbehav/form.jsp   | 65 ++++++++++---------
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
index 85e95296d..0c4f469f8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
@@ -17,6 +17,8 @@ $(function(){
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
+		var action=$("input[name='action']:checked").val();
+	 	switchAction(action);
 		if($(".action:checked").val()==64){
 			$("#ratelimit").show();
 		}else{
@@ -217,7 +219,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 										            <div for="action"></div>
 										       </div>
 										   </div>
-										   <div class="col-md-6">
+										   <div class="col-md-6 doLog">
 											<div class="form-group">
 												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
@@ -241,7 +243,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 										        <div class="form-group">
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
 										            <div class="col-md-6">
-										                <input class="form-control required digest" range="[0,100]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
+										                <input class="form-control required digest" range="[0,1]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
 										            </div>
 										            <div for="ratelimit"></div>
 										        </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
index 0e2496d1a..6085c0699 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
@@ -12,6 +12,8 @@ $(function(){
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
+		var action=$("input[name='action']:checked").val();
+	 	switchAction(action);
 		if($(".action:checked").val()==64){
 			$("#ratelimit").show();
 		}else{
@@ -200,33 +202,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 									    </div>
                    					</div>
 									 <div class="row">
-		                              		<div class="col-md-6">
-										        <div class="form-group">
-										            <c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
-										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="encrypted_tunnel_behavior"/></label>
-										            <div class="col-md-6">
-												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
-														 labelName="parent.specServiceName" 
-														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
-														notAllowSelectRoot="true" cssClass="form-control required"/>
-										            </div>
-										            <div for="parent.specServiceName"></div>
-										        </div>
-										    </div>
-										    <div class="col-md-6">
-										    	<div class="form-group">
-										    	 	<label class="control-label col-md-3"><spring:message code="behaviour_type"/></label>
-										    	 	 <div class="col-md-6" id="behaviour">
-										    	 	 <select name="behavCode" data-live-search="true" class="selectpicker form-control">
-										    	 	 <option value=""><spring:message code="select"/></option>
-										    	 	 </select>
-										    	 	 </div>
-										    	</div>
-										    </div>
-									</div>
-									<div class="row">
-										    <div class="col-md-6">
+									 <div class="col-md-6">
 										        <div class="form-group">
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
 										            <div class="col-md-6">
@@ -252,7 +228,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 										            <div for="action"></div>
 										       </div>
 										   </div>
-										   <div class="col-md-6">
+										   <div class="col-md-6 doLog">
 											<div class="form-group">
 												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
@@ -271,12 +247,41 @@ var delContent = function(contentClassName, addBtnClassName) {
 												</c:forEach>
 											</div>
 											</div>
+		                              		
+									</div>
+									<div class="row">
+										    <div class="col-md-6">
+										        <div class="form-group">
+										            <c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="encrypted_tunnel_behavior"/></label>
+										            <div class="col-md-6">
+												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
+														 labelName="parent.specServiceName" 
+														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
+														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
+														notAllowSelectRoot="true" cssClass="form-control required"/>
+										            </div>
+										            <div for="parent.specServiceName"></div>
+										        </div>
+										    </div>
+										    <div class="col-md-6">
+										    	<div class="form-group">
+										    	 	<label class="control-label col-md-3"><spring:message code="behaviour_type"/></label>
+										    	 	 <div class="col-md-6" id="behaviour">
+										    	 	 <select name="behavCode" data-live-search="true" class="selectpicker form-control">
+										    	 	 <option value=""><spring:message code="select"/></option>
+										    	 	 </select>
+										    	 	 </div>
+										    	</div>
+										    </div>
 										   
-										   <div class="col-md-6" id="ratelimit">
+									</div>
+									<div class="row">
+										<div class="col-md-6" id="ratelimit">
 										        <div class="form-group">
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
 										            <div class="col-md-6">
-										                <input class="form-control required digest" range="[0,100]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
+										                <input class="form-control required digest" range="[0,1]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
 										            </div>
 										            <div for="ratelimit"></div>
 										        </div>