Merge remote-tracking branch 'origin/master'

- 메인 화면 serviceType 설정 수정: session/localStorage 분리
- emergency.jsp JSTL core 태그 추가
2026-06-19 11:23:13 +09:00 · 2026-06-19 11:23:07 +09:00
2 changed files with 18 additions and 7 deletions
@@ -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"%>
 <!DOCTYPE html>
 <html>
  <head>
@@ -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){
Author	SHA1	Message	Date
Rinjae	d1392821ef	Merge remote-tracking branch 'origin/master' eapim-admin CI / build (push) Has been cancelled Details	2026-06-19 11:23:13 +09:00
Rinjae	6542b0c0f8	- 메인 화면 serviceType 설정 수정: session/localStorage 분리 - emergency.jsp JSTL core 태그 추가	2026-06-19 11:23:07 +09:00