diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp index eec6a4362..b3bd04589 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp @@ -158,8 +158,11 @@ $(function(){ + <%@include file="/WEB-INF/include/form/ipInfo.jsp" %> + + <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp index 33370a4fd..344c8bf39 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -217,10 +217,16 @@ <%-- --%> ip + + + + + + @@ -261,10 +267,16 @@ ${ipType.itemValue} - ${cfg.srcIpAddress } - ${cfg.srcPort } - ${cfg.destIpAddress } - ${cfg.destPort } + + ${cfg.srcIpAddress } + ${cfg.srcPort } + ${cfg.destIpAddress } + ${cfg.destPort } + + + ${cfg.srcIpAddress } + ${cfg.srcPort } + @@ -276,9 +288,16 @@ + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp b/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp deleted file mode 100644 index d26d5b444..000000000 --- a/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp +++ /dev/null @@ -1,170 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8"%> -<%@ include file="/WEB-INF/include/taglib.jsp"%> - - -<spring:message code="${cfgName}"></spring:message> - - - -
-

- -

-
-
-
-
-
- - - -
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
- -
- -
-
-
-
-
- -
- - - -
-
-
-
-
- - - - - - - <%@include file="/WEB-INF/include/form/ipInfo.jsp" %> - <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> - <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
- - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp deleted file mode 100644 index 05be41786..000000000 --- a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp +++ /dev/null @@ -1,362 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8"%> -<%@ include file="/WEB-INF/include/taglib.jsp"%> - - -<spring:message code="${cfgName}"></spring:message> - - - - -
- -

- - -

- -
-
-
-
-
- - - - - - - - - -
-
- - - - - - -
-
- -
-
- - - - - - - - - -
- - - -
-
-
- - - -
-
- - - - - -
- - -
-
- - href="javascript:;"> - - -
-
- - - -
-
-
-
- - -
-
- -
-
- - " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> - -
-
-
-
- - " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> - -
-
-
-
- - " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> - -
-
-
-
- - " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> - -
-
-
-
- - " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> - -
-
-
-
- -
-
-
- - - - - - <%-- --%> - - - - - - - - - - - - - - - - - - - - - - - - <%-- --%> - - - - - - - <%-- --%> - - - - - - - - - - - - - - - <%-- --%> - - - - - - - - - - - - -
ip
${status.index+1 }${cfg.cfgDesc } - ${ipType.itemValue} - ${cfg.srcIpAddress }${cfg.srcPort }${cfg.destIpAddress }${cfg.destPort } - - - - - - - - - - - - - - - - - - - ${cfg.requestName } - - - - - - - - - - - - - - - ${fns:abbr(classify,20)} - - - - - - - - - - - - - - - - - ${fns:abbr(attribute,20)} - - - - - - - - - - - - - - - - - ${fns:abbr(lableInfo,20)} - - ${cfg.areaEffectiveIds } - - - - - - - - - - -
${cfg.creatorName }${cfg.editorName }${cfg.auditorName }
-
${page}
-
- -
-
-
- - \ No newline at end of file