(1)修复voip日志列表管理员登陆下日志详情列错乱bug

(2)首页变更宽度提交

2 files changed, 14 insertions, 8 deletions

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index 5df2df9..6cfc383 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -223,12 +223,14 @@ $(document).ready(function(){
 								<th class="sort-column called_account"><spring:message code='called_account'/></th>
 								<th class="sort-column calling_number" isVisible="false"><spring:message code='calling_number'/></th>
 								<th class="sort-column called_number" isVisible="false"><spring:message code='called_number'/></th>
- 								<c:if test="${fns:getUser().isAdmin()}"><th><spring:message code='from_to_store_ip'/></th>
+ 								<c:if test="${fns:getUser().isAdmin()}">
+ 								<th><spring:message code='from_to_store_ip'/></th>
  								<th><spring:message code='from_to_store_url'/></th>
  								<th><spring:message code='to_from_store_ip'/></th>
- 								<th><spring:message code='to_from_store_url'/></th></c:if>
+ 								<th><spring:message code='to_from_store_url'/></th>
+ 								</c:if>
  								<th class="sort-column pid" isVisible="false"><spring:message code='pid'/></th>
- 								<%-- <th class="sort-column log_uri"><spring:message code='log_uri'/></th> --%>
+ 								<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column log_uri"><spring:message code='log_uri'/></th></c:if>
  								<th class="sort-column level"  isVisible="false"><spring:message code='harm_level'/></th>
 								<th class="sort-column fd_type"  isVisible="false"><spring:message code='fd_type'/></th>
  								 
@@ -293,12 +295,15 @@ $(document).ready(function(){
 									<td>${log.calledAccount }</td>
 									<td>${log.callingNumber}</td>
 									<td>${log.calledNumber}</td>
- 									<c:if test="${fns:getUser().isAdmin()}"><td>${log.fromToStoreIp}</td> 
+ 									<c:if test="${fns:getUser().isAdmin()}">
+ 									<td>${log.fromToStoreIp}</td> 
  									<td>${log.fromToStoreUrl}</td> 
  									<td>${log.toFromStoreIp}</td>
- 									<td>${log.toFromStoreUrl}</td></c:if>
+ 									<td>${log.toFromStoreUrl}</td>
+ 									</c:if>
  									<td>${log.pid}</td>
- 									<c:if test="${fns:getUser().isAdmin()}"><td>
+ 									<c:if test="${fns:getUser().isAdmin()}">
+ 									<td>
 										<c:if test="${fn:startsWith(log.logUri, 'http')}">
 											<a href="${log.logUri}" data-original-title="${log.logUri}" target="_blank"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -312,7 +317,8 @@ $(document).ready(function(){
 											http://${fn:substring(log.logUri,0,20) }
 										</a>
 										</c:if>	
-									</td></c:if>
+									</td>
+									</c:if>
 									<td>${log.level}</td>
 									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index 9ff4df6..160f963 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -213,7 +213,7 @@
 			$("body").height(bodyHeight+"px");
 			$("#ntc_chart").height((bodyHeight-200)+"px");
 			$("#ntc_chart").width($(".main_left").width()+"px");
-			var lineheight_y = 346;
+			var lineheight_y = 485;
 			var lineheight_y2 = 724;
 			var lineheight_x2 = 761;
 			var lineheight_x = 346;