diff --git a/WebContent/emergency.jsp b/WebContent/emergency.jsp index 667d56a..cf5ed88 100644 --- a/WebContent/emergency.jsp +++ b/WebContent/emergency.jsp @@ -1,6 +1,7 @@ <%@ page language="java" contentType="text/html; charset=utf-8"%> <%@page import="org.apache.commons.lang3.StringUtils"%> <%@page import="com.eactive.eai.rms.common.login.SessionManager"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> diff --git a/WebContent/jsp/common/screen/main.jsp b/WebContent/jsp/common/screen/main.jsp index 8748ef8..e1e027d 100644 --- a/WebContent/jsp/common/screen/main.jsp +++ b/WebContent/jsp/common/screen/main.jsp @@ -52,6 +52,13 @@ var urlParam = window.document.location.search; var mod = ""; var strServiceType = "<%=request.getParameter("serviceType")%>"; + function getServiceType() { + var serviceType = sessionStorage.getItem("serviceType"); + if (!serviceType || serviceType == "undefined" || serviceType == "null") { + serviceType = localStorage.getItem("serviceType") || ""; + } + return serviceType; + } if(urlParam != ""){ if(urlParam.indexOf("mod=") > -1){ mod = urlParam.substring((urlParam.indexOf("mod=") + 4), urlParam.lastIndexOf("&")); @@ -67,15 +74,18 @@ } } - $(document).ready(function() { + $(document).ready(function() { var url = '<%=topPage%>'; - if (url.indexOf("?")>=0){ - url = url + "&serviceType="+ sessionStorage["serviceType"]; - }else{ - url = url + "?serviceType="+ sessionStorage["serviceType"]; + var serviceType = getServiceType(); + if (serviceType) { + if (url.indexOf("?")>=0){ + url = url + "&serviceType="+ serviceType; + }else{ + url = url + "?serviceType="+ serviceType; + } } - - $("#topFrame").attr('src',url); + + $("#topFrame").attr('src',url); $(".topMenu").load(function(){ // iframe이 모두 load된후 제어 $(".topMenu").contents().find('.gnb').on("mouseenter", function(e){