From 5aa92ec478e17b015c9ef489e73c3770be53dd33 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 21 Aug 2018 08:54:15 +0800
Subject: [PATCH] =?UTF-8?q?voip=20ip=E5=8A=A0=E5=85=A5function=5Fregion=5F?=
 =?UTF-8?q?dict=20=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/update_function_region_dict_data.sql | 3 +++
 src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp      | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/sql/update_function_region_dict_data.sql b/src/main/resources/sql/update_function_region_dict_data.sql
index bce43004c..87237ab84 100644
--- a/src/main/resources/sql/update_function_region_dict_data.sql
+++ b/src/main/resources/sql/update_function_region_dict_data.sql
@@ -54,6 +54,9 @@ UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,4
 #pxy whitelist
 UPDATE function_service_dict SET region_code='1,2,3' WHERE function_id=211 AND ACTION IN(128);
 UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0' WHERE dict_id=101;
+#voip ip
+UPDATE function_service_dict SET region_code='1,2' WHERE function_id=24 AND ACTION IN(1,16);
+UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=8;
 
 
 
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
index c507587a3..ebe38004c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
@@ -13,13 +13,14 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
+						initCommIpVal();
+						/* $("#cancel").on("click", function() {
 							window.history.back();
 						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
-						});
+						}); */
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
 						$("#cfgFrom").validate(
@@ -175,6 +176,7 @@
 													<label class="radio-inline"> <c:if test="${_cfg.functionId eq service.functionId}">
 														<input type="radio" name="action" serviceId="${service.serviceId }"
 																protocolId="${service.protocolId }"
+																regionCode="${service.regionCode }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">