From 4e0be5b70b44651ff206a70d7b0e1f723f3b0ec5 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Wed, 25 Jul 2018 15:03:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0ico=E5=9B=BE=E6=A0=87=EF=BC=8C=E5=B7=A6=E4=BE=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?/(=E8=A7=A3=E5=86=B3=E8=AE=B0=E5=BD=95=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=97=B6=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84/=E5=8C=B9=E9=85=8D=E4=B8=8D=E4=B8=8A?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95=EF=BC=8C=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=A2=E5=A4=B1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/include/left_menu.jsp | 6 +++---
 src/main/webapp/WEB-INF/views/login.jsp       | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/left_menu.jsp b/src/main/webapp/WEB-INF/include/left_menu.jsp
index ef545e7de..0a960debe 100644
--- a/src/main/webapp/WEB-INF/include/left_menu.jsp
+++ b/src/main/webapp/WEB-INF/include/left_menu.jsp
@@ -17,7 +17,7 @@
 		     				
 		     				<a class="nav-link nav-toggle"		     					
 		     					<c:if test="${secondMenu.href != null && secondMenu.href != ''}" var="secondHref">
-		     						 href="javascript:;" onclick="page_turn('${secondMenu.id }','${secondMenu.functionId }','1','','${ctx}/${secondMenu.href }',this)" target="mainFrame" >
+		     						 href="javascript:;" onclick="page_turn('${secondMenu.id }','${secondMenu.functionId }','1','','${ctx}${secondMenu.href }',this)" target="mainFrame" >
 		     					</c:if>
 		     					<c:if test="${!secondHref }">
 		     						 href="javascript:;" class="nav-link nav-toggle"> 
@@ -42,7 +42,7 @@
 							
 						     				<a class="nav-link nav-toggle"		     					
 						     					<c:if test="${thirdMenu.href != null && thirdMenu.href != ''}" var="thirdHref">
-						     						 href="javascript:;" onclick="page_turn('${thirdMenu.id }','${thirdMenu.functionId }','2','','${ctx}/${thirdMenu.href }',this)" target="mainFrame" >
+						     						 href="javascript:;" onclick="page_turn('${thirdMenu.id }','${thirdMenu.functionId }','2','','${ctx}${thirdMenu.href }',this)" target="mainFrame" >
 						     						 
 						     					</c:if>
 						     					<c:if test="${!thirdHref }">
@@ -61,7 +61,7 @@
 													<c:forEach  items="${thirdMenu.children}" var="fourthMenu">
 														<li class="nav-item" id="menu_${fourthMenu.id }" menu-id="${fourthMenu.id }" menu-name="<spring:message code="${fourthMenu.code}"></spring:message>"  >
 															<a href="javascript:;" 
-															onclick="page_turn('${fourthMenu.id }','${fourthMenu.functionId }','3','','${ctx}/${fourthMenu.href }',this)" target="mainFrame" 
+															onclick="page_turn('${fourthMenu.id }','${fourthMenu.functionId }','3','','${ctx}${fourthMenu.href }',this)" target="mainFrame" 
 															class="nav-link ">
 																<%-- ${fourthMenu.name } --%> <spring:message code="${fourthMenu.code}"></spring:message> 
 																<!-- <span class="badge badge-danger">1</span> -->
diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index 956d046d2..fad1c94bb 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -17,6 +17,7 @@
         <meta content="width=device-width, initial-scale=1" name="viewport" />
         <meta content="" name="description" />
         <meta content="" name="author" />
+        <link rel="shortcut icon" href="${pageContext.request.contextPath}/static/pages/img/logo.ico" />
         <!-- BEGIN GLOBAL MANDATORY STYLES -->
         <link href="${pageContext.request.contextPath}/static/global/plugins/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
         <link href="${pageContext.request.contextPath}/static/global/plugins/simple-line-icons/simple-line-icons.min.css" rel="stylesheet" type="text/css" />