From 1f9a190924b1d26178ba123fd63e056bea7ac42a Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 11 Apr 2018 14:30:15 +0800
Subject: [PATCH] =?UTF-8?q?(1)=E6=9D=83=E9=99=90=E5=BE=AE=E8=B0=83=20(2)?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=87=BD=E6=95=B0=E7=A7=BB=E5=8A=A8=E5=88=B0?=
 =?UTF-8?q?common.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/controller/configuration/IpCfgController.java | 2 +-
 src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp           | 8 --------
 src/main/webapp/static/global/scripts/common.js           | 8 ++++++++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
index ca06814f5..dbd4e1471 100644
--- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
@@ -70,7 +70,7 @@ public class IpCfgController extends BaseController{
 //		return ipCfgList(model,Constants.AUDIT_PAGE,cfgName,ipCfg,request,response);
 //	}
 	@RequestMapping(value = {"list"})
-	@RequiresPermissions(value={"cfg:ip:add","cfg:ip:edit","cfg:ip:delete","cfg:ip:audit"},logical=Logical.OR)
+	@RequiresPermissions(value={"cfg:ip:view"},logical=Logical.OR)
 	public String ipCfgList(Model model,Integer audit,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("audit", audit);
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index ac7176524..d4ec9c8ec 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -34,14 +34,6 @@
 			$("#searchForm")[0].reset();
 		});
 	});
-	//查询
- 	function page(n,s){
- 		$("#intype").attr("name",$("#seltype").val());
-		$("#pageNo").val(n);
-		$("#pageSize").val(s);
-		$("#searchForm").submit();
-		return false;
-	}
  	var edit=function(url){
  		var cked = $('tbody tr td input.i-checks:checkbox:checked');
  		if(cked.val()==1){
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 4c2da19ad..555d7751c 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -103,4 +103,12 @@ var areaControlInit=function(){
 	}else{
 		$("input[name='areaEffectiveIds']").val("");
 	}
+}
+//查询
+var page=function(n,s){
+	$("#intype").attr("name",$("#seltype").val());
+	$("#pageNo").val(n);
+	$("#pageSize").val(s);
+	$("#searchForm").submit();
+	return false;
 }
\ No newline at end of file