diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index d4bf62a8b..c94ecc550 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -143,7 +143,7 @@ public class AvContentController extends BaseController { } Page page = avContentCfgService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); return "/cfg/av/voip/voipList"; } //视频文本VOIP Account配置列表 @@ -158,7 +158,7 @@ public class AvContentController extends BaseController { } Page page = avContentCfgService.findAccountPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); return "/cfg/av/voip/voipAccountList"; } @@ -312,7 +312,7 @@ public class AvContentController extends BaseController { ,RedirectAttributes redirectAttributes){ Page page = avContentCfgService.findContIpPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); return "/cfg/av/contIp/contIpList"; } //音视频CONTIP新增界面 @@ -394,7 +394,7 @@ public class AvContentController extends BaseController { ,RedirectAttributes redirectAttributes){ Page page = avContentCfgService.findPicIpPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); return "/cfg/av/picIp/picIpList"; } //音视频CONTIP新增界面 @@ -477,7 +477,7 @@ public class AvContentController extends BaseController { ,RedirectAttributes redirectAttributes){ Page page = avContentCfgService.findContUrlPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); return "/cfg/av/contUrl/contUrlList"; } //音视频CONTUrl新增界面 @@ -559,7 +559,7 @@ public class AvContentController extends BaseController { ,RedirectAttributes redirectAttributes){ Page page = avContentCfgService.findPicUrlPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); return "/cfg/av/picUrl/picUrlList"; } //音视频CONTUrl新增界面 diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index df71e617f..3e864cf23 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -52,7 +52,7 @@ public class AvController extends BaseController { public String fileSampleList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")AvFileSampleCfg entity){ Page page = avCfgService.getAvFileSampleList(new Page(request, response,"a"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); for(FunctionRegionDict region:regionList){ model.addAttribute("regionValue",region.getConfigRegionValue()); @@ -65,7 +65,7 @@ public class AvController extends BaseController { public String audioSignSampleList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")AvSignSampleCfg entity){ Page page = avCfgService.getAvSignSampleList(new Page(request, response,"a"), entity); model.addAttribute("page", page); - initPageCondition(model); + initPageCondition(model,entity); List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); for(FunctionRegionDict region:regionList){ model.addAttribute("regionValue",region.getConfigRegionValue()); @@ -79,7 +79,7 @@ public class AvController extends BaseController { List list = avCfgService.getSignSampleList(entity); model.addAttribute("cfgs", list); model.addAttribute("functionId", entity.getFunctionId()); - initPageCondition(model); + initPageCondition(model,entity); /*List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); for(FunctionRegionDict region:regionList){ model.addAttribute("regionValue",region.getConfigRegionValue()); diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp index f2b4195aa..67960acfe 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp @@ -107,11 +107,20 @@ + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp index 3352b3b76..6db5bcc26 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp @@ -104,11 +104,20 @@ + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp index a3d92cc17..7825e75f1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -98,11 +98,20 @@ + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp index 454d7c22c..2fbbb8493 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp @@ -107,11 +107,20 @@ + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp index 986c18178..cc577ea7a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp @@ -105,11 +105,20 @@ + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp index 15c0a1754..0301581b4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -107,11 +107,20 @@ + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp index 039ef8679..f1f528f13 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp @@ -456,12 +456,21 @@ + - + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp index fe3a72aa0..27ea0e071 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp @@ -470,12 +470,21 @@ + - + +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp index 0181c3649..19e618e2c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp @@ -94,20 +94,11 @@
-
-
- - - - - - -
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 4b8dc9ba7..6a915dd0a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -77,20 +77,11 @@ -
-
- - - - - - -