diff --git a/src/main/java/com/nis/web/controller/basics/AsnIpController.java b/src/main/java/com/nis/web/controller/basics/AsnIpController.java index 6e9db0acf..92b7c0358 100644 --- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java +++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java @@ -32,6 +32,8 @@ public class AsnIpController extends BaseController{ Page page = asnIpCfgService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); initPageCondition(model); + List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(4); + model.addAttribute("policyGroups", policyGroups); return "/basics/asnIpCfgList"; } @RequestMapping(value = {"/addForm"}) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 30ebb3f3d..839e9c313 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1136,4 +1136,5 @@ app_header_feature_monit=APP Header Feature Monitoring can_not_edit_issued_ans_ip=Can not edit issued ASN IP is_issued=Is Issued asn_ip_configuration=ASN IP Configuration -asn_policy=ASN Policy \ No newline at end of file +asn_policy=ASN Policy +asn_ip_group=ASN IP Group \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 60ba0c1cb..e17389a31 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1133,4 +1133,5 @@ app_header_feature_monit=APP\u5C42\u5934\u7279\u5F81\u76D1\u6D4B can_not_edit_issued_ans_ip=\u4E0D\u80FD\u4FEE\u6539\u5DF2\u7ECF\u4E0B\u53D1\u8FC7\u7684ASN IP is_issued=\u662F\u5426\u4E0B\u53D1 asn_ip_configuration=ASN IP\u914D\u7F6E -asn_policy=ASN\u7B56\u7565 \ No newline at end of file +asn_policy=ASN\u7B56\u7565 +asn_ip_group=ASN IP\u7EC4 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp index a68ebe976..51a67c0c5 100644 --- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp @@ -85,15 +85,23 @@
- <%-- + + + + + + +
+ <%--
+ - --%> -
+ +
--%>