From 5f93a39d3fc434aa90f3d63121de6f9fb3ed9c4e Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Mon, 27 Aug 2018 16:31:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=85=8D=E7=BD=AE=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=95=8C=E9=9D=A2=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp    | 3 ---
 src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp            | 3 ---
 src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp        | 3 ---
 .../webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp     | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp     | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp  | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp     | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp   | 4 +---
 .../webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp    | 3 ---
 src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp     | 3 ---
 src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp          | 3 ---
 .../webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp    | 6 +-----
 src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp         | 3 ---
 src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp          | 3 ---
 .../WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp   | 3 ---
 .../WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp  | 3 ---
 src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp       | 4 +---
 src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp         | 3 ---
 src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp        | 3 ---
 .../WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp  | 3 ---
 .../WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp  | 3 ---
 .../webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp    | 4 ----
 src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp       | 3 ---
 23 files changed, 3 insertions(+), 72 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
index e5cf8fc94..ec9e5fa6f 100644
--- a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
index bab476265..c415a7073 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
@@ -49,9 +49,6 @@ $(function(){
 		$("#cfgFrom").attr("action","${ctx}/cfg/app/saveOrUpdateCfg");
 		$("#save").submit();
 	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$("#cfgFrom").validate({
 		submitHandler: function(form){
 			//loading('onloading...');
diff --git a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
index f573fcd0a..029463b9f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
@@ -7,9 +7,6 @@
 <script type="text/javascript">
 $(function(){
 	$("#cfgFrom").find("input,select,radio").attr("disabled",true);
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 
 });
 </script>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
index 6af43eeb0..6fdb70057 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$("input[name='cfgKeywords']").addClass("url");
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index 3f1bb6832..025447f74 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -52,9 +52,6 @@ $(function(){
 			$("#areaIp").addClass("hidden");
 		}
 	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change",function(){
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
index e3543b643..eae0cc0b9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
index 1a156fede..c2113764e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
@@ -42,9 +42,6 @@ $(function(){
 			$("#areaIp").addClass("hidden");
 		}
 	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change",function(){
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
index dea5c1b2d..6f06d1f13 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
@@ -25,9 +25,7 @@ $(function(){
 		},
 		errorContainer: "#messageBox",
 	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
+
 });
 </script>
 </head>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
index 1dc0c6a4b..993f7e945 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
index 4e13ef004..e7152f5f0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
@@ -13,9 +13,6 @@
 			$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());
 			$("#cfgType").val($("#cfgTypeMaat").val());
 		} */
-		$("#cancel").on("click", function() {
-			window.history.back();
-		});
 		$(".action").on("change", function() {
 			$("#serviceId").val($(this).attr("serviceId"));
 			$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
index 9fc26d8e4..f63d58057 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
index 0ef46a3b9..1a98a2cb2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -13,11 +13,7 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
-						
-						 $(".action").on("change", function() {
+						$(".action").on("change", function() {
 								 switchAction($("input[name=action]:checked").val());
 							   	//拦截根据action切换动作部分
 							   	setInterceptDefaultInfo("");
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
index 214971208..a78ef53c0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
@@ -48,9 +48,6 @@
 				$("#areaIp").addClass("hidden");
 			}
 		});
-		$("#cancel").on("click", function() {
-			window.history.back();
-		});
 		$("select[name$='ipType']").on("change", function() {
 			switchIpType($(this));
 		});
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp
index 3b86fa109..4dfdea7c2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp
@@ -12,9 +12,6 @@ $(function(){
 		$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());	
 		$("#cfgType").val($("#cfgTypeMaat").val());	
 	}
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
index f5160759d..5f6932316 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
index c44a8b6e1..1d75997ce 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
index 7577582a5..81e66f99c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
@@ -172,9 +172,7 @@ $(function(){
 		var tableName=$(this).attr("name").replace(".ipType","");
 		switchIpType($(".ipType"));
 	}); 		
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
+
 });
 </script>
 </head>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
index 2135334a9..c2d9e962a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
index 55e8643e0..548f97c89 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
index 868b0f21e..937fcf997 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
index 7742d6587..16967272e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp
index c7d8eca78..dd6292cd4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp
@@ -18,10 +18,6 @@
 		$("#cfgFile").on('change',function(){
 			$("#urlInfo").val($("#cfgFile").val());
 		});
-		
-		$("#cancel").on("click", function() {
-			window.history.back();
-		});
 
 		$("#cfgFrom") .validate( {
 			submitHandler : function(form) {
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
index b984969b6..0e9e7468a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));