From bbd0aeeee8031d0ff670028d69bcb488bb9f9a5e Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Fri, 25 May 2018 18:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=88=86=E7=B1=BB=E3=80=81=E6=80=A7=E8=B4=A8?=
 =?UTF-8?q?=E3=80=81=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/av/fileSampleList.jsp   | 48 ++++++++++++++++---
 .../WEB-INF/views/cfg/av/signSampleList.jsp   | 48 ++++++++++++++++---
 .../WEB-INF/views/cfg/website/httpList.jsp    | 48 ++++++++++++++++---
 3 files changed, 123 insertions(+), 21 deletions(-)

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 6d97795be..48e8ddf47 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
@@ -321,28 +321,62 @@
 									</td>
 									<td>${cfg.requestName }</td>
 									<td>
-									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
+									<c:set var="classify"></c:set>
+									<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},
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="classify" value="${fl.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
-									${classifyName[status]}
+										<a href="${classify}" target="_blank" data-original-title="${classify}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(classify,20)}
+										</a>	
 									</td>
 									<td>
-									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
+									<c:set var="attribute"></c:set>
+									<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)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="attribute" value="${xz.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+											</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
+										<a href="${attribute}" target="_blank" data-original-title="${attribute}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(attribute,20)}
+										</a>	
+									
 									</td>
 									<td>
-									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
+									<c:set var="lableInfo"></c:set>
+									<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)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+											</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
+										<a href="${lableInfo}" target="_blank" data-original-title="${lableInfo}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(lableInfo,20)}
+										</a>
 									</td>
 									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
 									<td>
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 1fcc72118..984f9187f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
@@ -318,28 +318,62 @@
 									</td>
 									<td>${cfg.requestName }</td>
 									<td>
-									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
+									<c:set var="classify"></c:set>
+									<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},
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="classify" value="${fl.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
-									${classifyName[status]}
+										<a href="${classify}" target="_blank" data-original-title="${classify}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(classify,20)}
+										</a>	
 									</td>
 									<td>
-									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
+									<c:set var="attribute"></c:set>
+									<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)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="attribute" value="${xz.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+											</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
+										<a href="${attribute}" target="_blank" data-original-title="${attribute}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(attribute,20)}
+										</a>	
+									
 									</td>
 									<td>
-									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
+									<c:set var="lableInfo"></c:set>
+									<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)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+											</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
+										<a href="${lableInfo}" target="_blank" data-original-title="${lableInfo}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(lableInfo,20)}
+										</a>
 									</td>
 									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index a4167e5ab..727b3e7f9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -368,28 +368,62 @@
 									</td>
 									<td>${indexCfg.requestName }</td>
 									<td>
-									<c:forEach items="${fn:split(indexCfg.classify,',')}" var="classifyId">
+									<c:set var="classify"></c:set>
+									<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},
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="classify" value="${fl.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
-									${classifyName[status]}
+										<a href="${classify}" target="_blank" data-original-title="${classify}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(classify,20)}
+										</a>	
 									</td>
 									<td>
-									<c:forEach items="${fn:split(indexCfg.attribute,',')}" var="attributeId">
+									<c:set var="attribute"></c:set>
+									<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)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="attribute" value="${xz.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+											</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
+										<a href="${attribute}" target="_blank" data-original-title="${attribute}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(attribute,20)}
+										</a>	
+									
 									</td>
 									<td>
-									<c:forEach items="${fn:split(indexCfg.lable,',')}" var="lableId">
+									<c:set var="lableInfo"></c:set>
+									<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)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+											</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
+										<a href="${lableInfo}" target="_blank" data-original-title="${lableInfo}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(lableInfo,20)}
+										</a>
 									</td>
 								    <td>
 										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>