Merge branch 'devs/bap-monitoring' into 'jenkins_with_weblogic'
코드 수정사항 반영 See merge request eapim/eapim-admin!20
This commit is contained in:
@@ -90,6 +90,21 @@ function init(url,key){
|
|||||||
//new makeOptions("CODE","NAME").setObj($("select[name=bizlevel2]")).setNoValueInclude(true).setNoValue(' ','없음').setData(json.bizlevel2).rendering();
|
//new makeOptions("CODE","NAME").setObj($("select[name=bizlevel2]")).setNoValueInclude(true).setNoValue(' ','없음').setData(json.bizlevel2).rendering();
|
||||||
//setSearchable('bjobBzwkDstcd');
|
//setSearchable('bjobBzwkDstcd');
|
||||||
//setSearchable('uapplCd');
|
//setSearchable('uapplCd');
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
type : "POST",
|
||||||
|
url:url,
|
||||||
|
dataType:"json",
|
||||||
|
data:{ cmd: 'LIST_UAPPL_COMBO'},
|
||||||
|
success:function(json){
|
||||||
|
new makeOptions("CODE","NAME").setObj($("select[name=uapplCd]")).setNoValueInclude(true).setNoValue(' ','없음').setData(json.uapplCd).rendering();
|
||||||
|
setSearchable('uapplCd');
|
||||||
|
},
|
||||||
|
error:function(e){
|
||||||
|
// alert(e.responseText);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
debugger;
|
debugger;
|
||||||
if ( isDetail ){
|
if ( isDetail ){
|
||||||
detail(url, key);
|
detail(url, key);
|
||||||
@@ -326,8 +341,8 @@ $(document).ready(function() {
|
|||||||
<tr>
|
<tr>
|
||||||
<th>APPLICATION CODE</th>
|
<th>APPLICATION CODE</th>
|
||||||
<td>
|
<td>
|
||||||
<!-- <div class="select-style"><select name="uapplCd"></select></div> -->
|
<div class="select-style"><select name="uapplCd"></select></div>
|
||||||
<input type="text" name="uapplCd" />
|
<!-- <input type="text" name="uapplCd" /> -->
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<!--
|
<!--
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<%@ page language="java" contentType="text/html; charset=utf-8"%>
|
||||||
|
<%@ page import="java.io.*"%>
|
||||||
|
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
|
||||||
|
<%
|
||||||
|
response.setHeader("Pragma", "No-cache");
|
||||||
|
response.setHeader("Cache-Control", "no-cache");
|
||||||
|
response.setHeader("Expires", "0");
|
||||||
|
%>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title></title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
|
<jsp:include page="/jsp/common/include/css.jsp"/>
|
||||||
|
<jsp:include page="/jsp/common/include/script.jsp"/>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<!-- 메뉴권한 미존재 유저 빈 화면 frame 노출 20251126 -->
|
||||||
|
<div class="right_box">
|
||||||
|
<div class="content_top"></div>
|
||||||
|
<div class="content_middle" id="title"></div>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -63,7 +63,8 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="left_box">
|
<div class="left_box">
|
||||||
<div class="title"><%=menuName%></div>
|
<!-- 메뉴명이 null일 경우 공백 노출되도록 처리 20251126 -->
|
||||||
|
<div class="title"><%=menuName != null ? menuName : ""%></div>
|
||||||
<ul class="depth3">
|
<ul class="depth3">
|
||||||
<%
|
<%
|
||||||
for (MenuUI menuUi : list) {
|
for (MenuUI menuUi : list) {
|
||||||
|
|||||||
@@ -419,7 +419,9 @@
|
|||||||
<%} else {%>
|
<%} else {%>
|
||||||
goPage2('/monitoring/leftMenu.do?menuId=<%=firstTopMenuId%>', '<%=firstSubMenuUrl%>?menuId=<%=firstSubMenuId%>', '<%=firstSubMenuId%>');
|
goPage2('/monitoring/leftMenu.do?menuId=<%=firstTopMenuId%>', '<%=firstSubMenuUrl%>?menuId=<%=firstSubMenuId%>', '<%=firstSubMenuId%>');
|
||||||
<%}%>
|
<%}%>
|
||||||
|
<%} else {%>
|
||||||
|
// 메뉴권한이 없는 유저 로그인 시 빈화면 프레임을 노출 20251126
|
||||||
|
goPage2('/monitoring/leftMenu.do?menuId=00', '/monitoring/blankScreen.do', '');
|
||||||
<%}%>
|
<%}%>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+14
-1
@@ -156,7 +156,20 @@ public class BapMessageProcController extends BapBaseAnnotationController {
|
|||||||
ModelAndView modelAndView = new ModelAndView("jsonView",resultMap);
|
ModelAndView modelAndView = new ModelAndView("jsonView",resultMap);
|
||||||
return modelAndView;
|
return modelAndView;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@RequestMapping(value= "/bap/admin/work/messageProcMan.json",params = "cmd=LIST_UAPPL_COMBO")
|
||||||
|
public ModelAndView initUapplCdCombo( HttpServletRequest request,
|
||||||
|
HttpServletResponse response) throws Exception {
|
||||||
|
|
||||||
|
List<Map<String, Object>> uapplCd = comboService.selectCM01ComboList("TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME");
|
||||||
|
Map<String, Object> resultMap = new HashMap<String, Object>();
|
||||||
|
|
||||||
|
resultMap.put("uapplCd" , uapplCd);
|
||||||
|
|
||||||
|
ModelAndView modelAndView = new ModelAndView("jsonView",resultMap);
|
||||||
|
return modelAndView;
|
||||||
|
}
|
||||||
|
|
||||||
@RequestMapping(value= "/bap/admin/work/messageProcMan.json",params = "cmd=LIST_PROP")
|
@RequestMapping(value= "/bap/admin/work/messageProcMan.json",params = "cmd=LIST_PROP")
|
||||||
public ModelAndView getProps( HttpServletRequest request,
|
public ModelAndView getProps( HttpServletRequest request,
|
||||||
HttpServletResponse response,
|
HttpServletResponse response,
|
||||||
|
|||||||
@@ -122,5 +122,16 @@ public class MenuRenderController extends BaseAnnotationController {
|
|||||||
|
|
||||||
return "/common/screen/top_04";
|
return "/common/screen/top_04";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 메뉴권한 미존재 유저 접속 시 빈 화면 frame 노출 20251126
|
||||||
|
*
|
||||||
|
* @return 빈 화면 (blank_screen)
|
||||||
|
*/
|
||||||
|
@GetMapping("/blankScreen.do")
|
||||||
|
public String getBlankScreen(HttpServletRequest request, String serviceType, ModelMap modelMap) throws Exception {
|
||||||
|
return "/common/screen/blank_screen";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user