diff --git a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml index dd2a81609..1111b97c8 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml @@ -379,6 +379,9 @@ ip_total = #{ipTotal,jdbcType=INTEGER}, + + addr_pool_name = #{addrPoolName,jdbcType=VARCHAR}, + is_valid = #{isValid,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml index 2f4972b93..c4cfc7cbb 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml @@ -252,6 +252,9 @@ user_type = #{userType,jdbcType=VARCHAR}, + + cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, + addr_pool_id = #{addrPoolId,jdbcType=INTEGER}, diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp index a5856584c..838eaed0d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp @@ -84,7 +84,7 @@ success:function(data,status){ var dataArr = data.candidate_ip; var html = "" - html = "

" + html = "

" html+=""; html+=""; if(dataArr.length == 0){ @@ -179,20 +179,13 @@ -
- - - - - - - + @@ -364,11 +357,11 @@
- - - + + + - + <%-- --%> <%-- --%> @@ -376,7 +369,7 @@ - + <%-- --%> @@ -391,21 +384,21 @@ - + --%> - + --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp index 950d2617e..7249c070c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp @@ -87,7 +87,7 @@ $(function(){
-
+
- - + + - - + <%-- --%> + - + <%-- --%> <%-- --%> - + - + - + @@ -330,13 +323,13 @@ - + --%> - + --%> <%--
${cfg.cfgId } - + ${fns:abbr(cfg.addrPoolName,20)} ${cfg.ipTotal }
+ <%-- - @@ -485,11 +478,11 @@ ${fns:abbr(lableInfo,20)} + <%-- - ${cfg.creatorName } ${cfg.editorName }
+ <%-- - @@ -350,13 +343,13 @@ + <%-- - diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 3d0b28091..79bab30a0 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -96,7 +96,7 @@ $(function(){ top.$.jBox(html,{height:450,width:600,title:" Log Info",showIcon:false,opacity:0.5}); }); //表格中的tooltips鼠标点击复制完整的内容 - $("td>.tooltips").on("click",function(){ + $("td>.tooltips").not(".addrPool").on("click",function(){ //$(this).attr("data-clipboard-action","copy"); $(this).attr("data-clipboard-text",$(this).attr("data-original-title")); var clipboard = new ClipboardJS('td >.tooltips');