列表查询CGI接口修改.

src/main/resources/messages/message_en.properties

@@ -1338,3 +1338,4 @@ address_pool_id=Address Pool ID
 log_to_cfg=Config
 address_pool_is_used=Address pool is used and cannot perform this operation!
 cgi_service_failed=Request CGI server failed
+available_ip=Available IP

src/main/resources/messages/message_ru.properties

@@ -1337,3 +1337,4 @@ available_ip_total=Available IP Total
 address_pool_id=Address Pool ID
 log_to_cfg=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F
 address_pool_is_used=Address pool is used and cannot perform this operation!
+available_ip=Available IP

src/main/resources/messages/message_zh_CN.properties

@@ -1336,3 +1336,4 @@ address_pool_id=\u5730\u5740\u6C60ID
 log_to_cfg=\u914D\u7F6E   
 address_pool_is_used=\u5730\u5740\u6C60\u5DF2\u88AB\u4F7F\u7528\uFF0C\u65E0\u6CD5\u6267\u884C\u8BE5\u64CD\u4F5C\uFF01
 cgi_service_failed=\u8BF7\u6C42CGI\u670D\u52A1\u63A5\u53E3\u5931\u8D25
+available_ip=\u53EF\u7528IP\u5730\u5740

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp

@@ -38,41 +38,75 @@
 		  	} 
 		}
 		
- 	
- 	$("td[addrPoolId]").each(function(){
- 		var td = $(this);
- 		var audit = $(this).attr("audit")
- 		var addrPoolId = $(this).attr("addrPoolId");
- 		var timeout=$.validator.messages.timeout;
- 		var failed=$.validator.messages.failed;
- 		// 判断是否为审核通过状态
- 		if(audit == 1){
-		 	$.ajax({
-				type:'get',
-				timeout:10000,// 超时时间
-				url:'http://192.168.11.137:8090/command/?cmd=IpNumGet&addr_pool_id='+addrPoolId,
-				dataType:'json',
-				async:true,
-				success:function(data){
-					//alert(JSON.stringify(data));
-					$(td).html(data.num);
-						
-				},
-				complete:function(XMLHttpRequest,status){
-					if(status=="timeout"){
-						$(td).html(timeout);
-					}else if(status !="success"){
-						$(td).html(failed);
+		var requestUrl = "http://192.168.11.137:8090/command/?cmd=IpNumGet&addr_pool_id=";
+		//var requestUrl = "https://api.douban.com/v2/book/search?q=javascript&count=1";
+		$("td[addrPoolId]").each(function(){
+	 		var td = $(this);
+	 		var audit = $(this).attr("audit")
+	 		var addrPoolId = $(this).attr("addrPoolId");
+	 		var timeout=$.validator.messages.timeout;
+	 		var failed=$.validator.messages.failed;
+	 		// 判断是否为审核通过状态
+	 		if(audit == 1){
+	 			// $.getJSON(requestUrl,function(data,status){});
+			 	$.ajax({
+					type:'get',
+					timeout:15000,// 超时时间
+					url:requestUrl+addrPoolId,
+					dataType:'jsonp',
+					async:true,
+					success:function(data,status){
+						if(status == "success"){
+							$(td).html(data.num);
+						}
+					},
+					complete:function(XMLHttpRequest,status){
+						if(status=="timeout"){
+							$(td).html(timeout);
+						}else if(status !="success"){
+							$(td).html(failed);
+						}
 					}
-				}
-			});
+				});
 	 			
- 		}else {
- 			$(td).html(0);
+	 		}else {
+	 			$(td).html(0);
+	 			
+	 		}
+	 	});
 	 	
- 		}
- 	});
  });
+ 	function getInfo(obj){
+ 		var addrPoolId = $(obj).attr("addrPoolId");
+ 		$.ajax({
+			type:'get',
+			url:'http://192.168.11.137:8090/command/?cmd=AllIpGet&addr_pool_id='+addrPoolId,
+			dataType:'jsonp',
+			async:true,
+			success:function(data,status){
+				//var dataArr = [];
+				var dataArr = data.candidate_ip;
+				var html = ""
+					html = "<div style='width:98%;overflow: auto;margin-top: 10px;height: 300px;margin-left: 1%;margin-right: 1%;'>"
+					html+="<table class='table table-bordered table-condensed text-nowrap' style='width: 100%;'>";
+      			   	html+="<tbody>";
+      			   		if(dataArr.length == 0){
+      			   			html+="<tr>";
+	      			   		html+="<td>（"+"<spring:message code="nothing"/>"+"）</td>";
+	      					html+="</tr>";
+      			   		}
+	      			   	for(i=0;i<dataArr.length;i++){
+	      			   		html+="<tr>";
+	      			   		html+="<td>"+dataArr[i]+"</td>";
+	      					html+="</tr>";
+	      			   	}
+	      			html+="</tbody>";
+	      			html+="</table>";  
+	      			html+="</div>";
+				top.$.jBox(html,{width: $(document).width()*0.4,height: 380,persistent: false,title:"<spring:message code="available_ip"/>", buttons:{"<spring:message code="close"/>":true}});
+			}
+		});
+ 	}
 </script>
 </head>
 <body>
@@ -449,7 +483,7 @@
 									<td>
 										<!-- <a href="#">新增IP</a>
 										<a href="#">删除IP</a> -->
-										<a href="#"><spring:message code="show_detail"/></a>
+										<a href="javascript:;" onclick="getInfo(this)" addrPoolId="${cfg.addrPoolId }"><spring:message code="show_detail"/></a>
 									</td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>