From cd1cb600b91c344ec3ae15d327b339c6d9473269 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 25 May 2018 18:25:42 +0800
Subject: [PATCH] =?UTF-8?q?switchIpInfo=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E6=8F=90=E8=87=B3common.js=20=E5=8E=BB=E6=8E=89=E6=89=80?=
 =?UTF-8?q?=E6=9C=89list=E7=95=8C=E9=9D=A2=E7=9A=84=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E3=80=81=E6=A0=87=E7=AD=BE=E3=80=81=E6=80=A7=E8=B4=A8=E7=9A=84?=
 =?UTF-8?q?=E6=9C=AB=E5=B0=BE=E9=80=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ntc/AvContentController.java              | 16 ++++++++++++-
 .../webapp/WEB-INF/views/cfg/appCfgList.jsp   | 20 ++++++++++------
 .../WEB-INF/views/cfg/av/voip/voipForm.jsp    | 15 ------------
 .../WEB-INF/views/cfg/av/voip/voipList.jsp    | 24 ++++++++++++-------
 .../WEB-INF/views/cfg/complexCfgList.jsp      | 20 ++++++++++------
 .../webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp | 22 ++++++++++-------
 .../webapp/WEB-INF/views/cfg/ipCfgList.jsp    |  1 -
 .../WEB-INF/views/cfg/stringCfgList.jsp       |  1 -
 .../webapp/static/global/scripts/common.js    | 13 ++++++++++
 9 files changed, 83 insertions(+), 49 deletions(-)

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 6e3221bcc..256734a19 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
@@ -30,7 +30,6 @@ import com.nis.web.controller.BaseController;
 @RequestMapping("${adminPath}/ntc/av")
 public class AvContentController extends BaseController  {
 
-	
 	//音视频VOIP配置新增界面
 	@RequestMapping(value = {"/voipForm"})
 	public String voipFrom(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")CfgIndexInfo cfg){
@@ -117,4 +116,19 @@ public class AvContentController extends BaseController  {
 		return voipAndAccountInfoMap;
 	}
 	
+	//视频文本内容配置列表
+	@RequestMapping(value = {"/contIpList"})
+	public String contIpList(Model model,HttpServletRequest  request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo entity){
+		if(entity.getVoipIp()== null){
+			entity.setVoipIp(new AvVoipIpCfg());
+		}
+		if(entity.getVoipAccount()== null){
+			entity.setVoipAccount(new AvVoipAccountCfg());
+		}
+		Page<CfgIndexInfo> page = avContentCfgService.findPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
+		model.addAttribute("page", page);
+		initPageCondition(model);
+		return "/cfg/av/voip/voipList";
+	}
+	
 }
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
index 7e8151c68..de8913569 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
@@ -370,26 +370,32 @@
 										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 									</td>
 									<td>
-									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
+									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
 										<c:forEach items="${fls}" var="fl">
 											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
-											${fl.itemValue},
+											${fl.itemValue}
+											<c:if test="${status.index+1 ne fn:length(fn:split(cfg.classify,','))}">,</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
-									${classifyName[status]}
 									</td>
 									<td>
-									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
+									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId" varStatus="status">
 										<c:forEach items="${xzs}" var="xz">
-											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
+											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
+											${xz.itemValue}
+											<c:if test="${status.index+1 ne fn:length(fn:split(cfg.attribute,','))}">,</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
 									<td>
-									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
+									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId" varStatus="status">
 										<c:forEach items="${lables}" var="lable">
-											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
+											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
+											${lable.itemValue}
+											<c:if test="${status.index+1 ne fn:length(fn:split(cfg.lable,','))}">,</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
index 21a8a7f1b..89b812c9d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
@@ -4,8 +4,6 @@
 <head>
 <title><spring:message code="${cfgName}"></spring:message></title>
 <!-- BEGIN THEME GLOBAL STYLES -->
-<link href="${pageContext.request.contextPath}/static/global/css/components.css" rel="stylesheet" id="style_components" type="text/css" />
-<script src="${pageContext.request.contextPath}/static/global/scripts/common.js" type="text/javascript"></script>
 <style type="text/css">
 .boxSolid{
 border:1px solid #eeeeee
@@ -13,19 +11,6 @@ border:1px solid #eeeeee
 </style>
 <script type="text/javascript">
 $(function(){
-	$("select[name$='ipType']").each(function(){
-		switchIpInfo(this,"ipType");
-	})
-	$("select[name$='ipType']").on("change",function(){
-		switchIpInfo(this,"ipType");
-	});
-	$("select[name$='ipPattern']").on("change",function(){
-		switchIpInfo(this,"ipPattern");
-	});
-	$("select[name$='portPattern']").on("change",function(){
-		switchIpInfo(this,"portPattern");
-	});
-	
 	areaControlInit();
 	$("input[name='isAreaEffective']").on('change',function(){
 		var val=$(this).val();
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 0399ce270..cc88c6c72 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
@@ -241,7 +241,7 @@
 								html+="</div>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
-								html+="<label><spring:message code='strong_string'/>：</label>";
+								html+="<label><spring:message code='district'/>：</label>";
 								html+="<label>"
 								html+=item.district;
 								html+="</label>";
@@ -655,26 +655,32 @@
 									</td>
 									<td>${indexCfg.requestName }</td>
 									<td>
-									<c:forEach items="${fn:split(indexCfg.classify,',')}" var="classifyId">
-										<c:forEach items="${fls}" var="fl">
+									<c:forEach items="${fn:split(indexCfg.classify,',')}" var="classifyId" varStatus="status">
+										<c:forEach items="${fls}" var="fl" >
 											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
-											${fl.itemValue},
+											${fl.itemValue}
+											<c:if test="${status.index+1 ne fn:length(fn:split(indexCfg.classify,','))}">,</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
-									${classifyName[status]}
 									</td>
 									<td>
-									<c:forEach items="${fn:split(indexCfg.attribute,',')}" var="attributeId">
+									<c:forEach items="${fn:split(indexCfg.attribute,',')}" var="attributeId" varStatus="status">
 										<c:forEach items="${xzs}" var="xz">
-											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
+											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
+											${xz.itemValue}
+											<c:if test="${status.index+1 ne fn:length(fn:split(indexCfg.attribute,','))}">,</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
 									<td>
-									<c:forEach items="${fn:split(indexCfg.lable,',')}" var="lableId">
+									<c:forEach items="${fn:split(indexCfg.lable,',')}" var="lableId" varStatus="status">
 										<c:forEach items="${lables}" var="lable">
-											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
+											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
+											${lable.itemValue}
+											<c:if test="${status.index+1 ne fn:length(fn:split(indexCfg.lable,','))}">,</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index b0d2e1ea7..e1ea35f7a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -325,26 +325,32 @@
 									</td>
 									<td>${cfg.requestName }</td>
 									<td>
-									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
+									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
 										<c:forEach items="${fls}" var="fl">
 											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
-											${fl.itemValue},
+											${fl.itemValue}
+											<c:if test="${status.index+1 ne fn:length(fn:split(cfg.classify,','))}">,</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
-									${classifyName[status]}
 									</td>
 									<td>
-									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
+									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId" varStatus="status">
 										<c:forEach items="${xzs}" var="xz">
-											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
+											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
+											${xz.itemValue}
+											<c:if test="${status.index+1 ne fn:length(fn:split(cfg.attribute,','))}">,</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
 									<td>
-									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
+									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId" varStatus="status">
 										<c:forEach items="${lables}" var="lable">
-											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
+											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
+											${lable.itemValue}
+											<c:if test="${status.index+1 ne fn:length(fn:split(cfg.lable,','))}">,</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index 804f97424..216ef1795 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -310,26 +310,32 @@
 									<td><fmt:formatDate value="${dnsIpCfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td> --%>
 									<td>${dnsIpCfg.request.requestTitle }</td>
 									<td>
-									<c:forEach items="${fn:split(dnsIpCfg.classify,',')}" var="classifyId">
+									<c:forEach items="${fn:split(dnsIpCfg.classify,',')}" var="classifyId" varStatus="status">
 										<c:forEach items="${fls}" var="fl">
-											<c:if test="${fn:trim(fl.serviceDictId) eq classifyId}">
-											${fl.itemValue},
+											<c:if test="${fn:trim(fl.serviceDictId) eq classify}">
+											${fl.itemValue}
+											<c:if test="${status.index+1 ne fn:length(fn:split(dnsIpCfg.classify,','))}">,</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
-									${classifyName[status]}
 									</td>
 									<td>
-									<c:forEach items="${fn:split(dnsIpCfg.attribute,',')}" var="attributeId">
+									<c:forEach items="${fn:split(dnsIpCfg.attribute,',')}" var="attributeId" varStatus="status">
 										<c:forEach items="${xzs}" var="xz">
-											<c:if test="${fn:trim(xz.serviceDictId) eq attributeId}">${xz.itemValue},</c:if>
+											<c:if test="${fn:trim(xz.serviceDictId) eq attributeId}">
+											${xz.itemValue}
+											<c:if test="${status.index+1 ne fn:length(fn:split(dnsIpCfg.attribute,','))}">,</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
 									<td>
-									<c:forEach items="${fn:split(dnsIpCfg.lable,',')}" var="lableId">
+									<c:forEach items="${fn:split(dnsIpCfg.lable,',')}" var="lableId" varStatus="status">
 										<c:forEach items="${lables}" var="lable">
-											<c:if test="${fn:trim(lable.serviceDictId) eq lableId}">${lable.itemValue},</c:if>
+											<c:if test="${fn:trim(lable.serviceDictId) eq lableId}">
+											${lable.itemValue}
+											<c:if test="${status.index+1 ne fn:length(fn:split(dnsIpCfg.lable,','))}">,</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index 6fa2a6b4e..5fce5e0a6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -377,7 +377,6 @@
 													</c:if>
 												</c:forEach>
 											</c:forEach>
-											${classifyName[status]}
 											</td>
 											<td>
 											<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index d756a7daf..9429d90ef 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -323,7 +323,6 @@
 													</c:if>
 												</c:forEach>
 											</c:forEach>
-											${classifyName[status]}
 											</td>
 											<td>
 											<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 817946c39..839893be8 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -7,6 +7,19 @@ $(function(){
 			$("input.i-checks").prop("checked",false);
 		}
 	});
+	
+	$("select[name$='ipType']").each(function(){
+		switchIpInfo(this);
+	})
+	$("select[name$='ipType']").on("change",function(){
+		switchIpInfo(this);
+	});
+	$("select[name$='ipPattern']").on("change",function(){
+		switchIpInfo(this);
+	});
+	$("select[name$='portPattern']").on("change",function(){
+		switchIpInfo(this);
+	});
 });
 var switchIpType=function(obj){
 	var type=$(obj).val();