Merge branch 'feature-traffic-log' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into feature-traffic-log

src/main/webapp/WEB-INF/tlds/fns.tld

@@ -414,4 +414,12 @@
     <function-signature>java.util.List getIspDicList(java.lang.String)</function-signature>
     <example>${fns:getIspDicList(str)}</example>
   </function>
+   <!-- 根据表名取出运营商ISP标签集合 -->
+    <function>
+    <description>根据asnGroupId获取asn 的v4数量和v6数量</description>
+    <name>getASNIPNum</name>
+    <function-class>com.nis.util.ConfigDictUtils</function-class>
+    <function-signature>java.util.List getASNIPNum(java.lang.Integer)</function-signature>
+    <example>${fns:getASNIPNum(str)}</example>
+  </function>
 </taglib>

src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp

@@ -263,6 +263,8 @@
 									<th class="sort-column r.country"><spring:message code="country"/></th>
 									<th class="sort-column r.detail"><spring:message code="detail"/></th>
 									<th class="sort-column r.asn_id"><spring:message code="asn_no"/></th>
+									<th ><spring:message code="v4_num"/></th>
+									<th ><spring:message code="v6_num"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="is_issued"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -293,6 +295,11 @@
 										</a>
 									</td>
 									<td>${cfg.asnId}</td>
+									<c:forEach items="${fns:getASNIPNum(cfg.userRegion1)}" var="num" >
+										<td>
+											${num}  
+										</td>
+									</c:forEach>
 									<td>
 										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>

src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp

@@ -289,6 +289,8 @@
 									<th class="sort-column r.country"><spring:message code="country"/></th>
 									<th class="sort-column r.detail"><spring:message code="detail"/></th>
 									<th class="sort-column r.user_region1" column="userregion1" ><spring:message code="asn_no"/></th>
+									<th ><spring:message code="v4_num"/></th>
+									<th ><spring:message code="v6_num"/></th>
 									<th column="ip_type" ><spring:message code="ip_type"/></th>
 									<th column="IP" ><spring:message code="IP"/></th>
 									<%-- <th><spring:message code="port"/></th> --%>
@@ -322,6 +324,11 @@
 									<td>${cfg.country }</td>
 									<td>${cfg.detail }</td>
 									<td>${cfg.userRegion1}</td>
+									<c:forEach items="${fns:getASNIPNum(cfg.userRegion1)}" var="num" >
+										<td>
+											${num}  
+										</td>
+									</c:forEach>
 									<td>
 										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
 											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>

src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp

@@ -192,7 +192,7 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
-									<div class="col-md-2">
+									<div class="col-md-2 hidden">
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
 											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>