diff --git a/src/main/resources/sql/20181201/update_function_region_dict.sql b/src/main/resources/sql/20181201/update_function_region_dict.sql new file mode 100644 index 000000000..7b5aa9175 --- /dev/null +++ b/src/main/resources/sql/20181201/update_function_region_dict.sql @@ -0,0 +1,6 @@ +UPDATE + function_region_dict +SET + config_ip_pattern = '1,3' +WHERE + dict_id = 231 AND function_id = 633; \ No newline at end of file diff --git a/src/main/resources/sql/20181201/update_ip_reuse_addr_pool.sql b/src/main/resources/sql/20181201/update_ip_reuse_addr_pool.sql new file mode 100644 index 000000000..5962129b3 --- /dev/null +++ b/src/main/resources/sql/20181201/update_ip_reuse_addr_pool.sql @@ -0,0 +1,2 @@ +ALTER TABLE ip_reuse_addr_pool DROP COLUMN addr_pool_id; +ALTER TABLE ip_reuse_addr_pool DROP COLUMN available_ip_total; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp index 74667f4a9..66ccbae35 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp @@ -29,10 +29,13 @@ $(function(){ }, errorContainer: "#messageBox" }); - //switchIpInfo($("select[name$='ipType']")); + $("select[name$='ipType']").on("change",function(){ switchIpInfo(this); }); + $("select[name$='ipPattern']").on("change",function(){ + switchIpInfo(this); + }); ipInfoDiv.removeClass("ipDiv"); ipInfoDiv.removeClass("hidden"); @@ -56,6 +59,9 @@ var resetDiv = function(obj){ $("select[name$='ipType']").on("change",function(){ switchIpInfo(this); }); + $("select[name$='ipPattern']").on("change",function(){ + switchIpInfo(this); + }); resetIndex(); } @@ -172,13 +178,14 @@ var resetIndex = function(){
- +
hidden"> +
@@ -196,21 +203,7 @@ var resetIndex = function(){
- +
@@ -228,6 +221,21 @@ var resetIndex = function(){
+
+
+ +
+ +
+
+
+