djb-eapim/eapim-admin
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/eactive/bundle/bundles/20260102/eapim-admin_incremental_2025-12-01.bundle into jenkins_with_weblogic

Browse Source
This commit is contained in:
daekuk
2026-01-02 17:18:05 +09:00
parent 7cd956a770 d024507be8
commit 56bb309593
9 changed files with 159 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/jsp/onl/admin/inflow/inflowControlHistoryMan.jsp
+24 -6
View File
@@ -31,6 +31,22 @@ function timeStampFormat2(cellvalue, options, rowObject){
}
function groupNameFormat(cellvalue, options, rowObject) {
if (!cellvalue) return "";
var strVal = cellvalue.toString().trim();
if (strVal.length === 36) {
// 그룹ID의 경우 GROUPNAME 으로 보여줌
var groupName = rowObject.GROUPNAME;
// 비어있다면 원래 값을 반환
return groupName ? groupName : strVal;
}
return strVal;
}
$(document).ready(function() {
$("input[name=searchStartYYYYMMDD],input[name=searchEndYYYYMMDD]").inputmask("yyyy-mm-dd",{'autoUnmask':true});
@@ -66,10 +82,11 @@ $(document).ready(function() {
'<%= localeMessage.getString("infConHstMan.eaiSvcSrlNum") %>',
'<%= localeMessage.getString("infConHstMan.instNm") %>',
'<%= localeMessage.getString("infConHstMan.eaiSvcCd") %>',
'<%= localeMessage.getString("infConHstMan.adpGrpNm") %>',
'그룹별 / <%= localeMessage.getString("infConHstMan.adpGrpNm") %>',
'<%= localeMessage.getString("infAdpConMan.thrPerSecond") %>',
'<%= localeMessage.getString("infAdpConMan.thr") %>',
'<%= localeMessage.getString("infAdpConMan.thrTimeUnit") %>'
'<%= localeMessage.getString("infAdpConMan.thrTimeUnit") %>',
'그룹별'
],
colModel:[
{ name : 'EAIBZWKDSTCD' , width:'50' , align:'center' , sortable:false },
@@ -77,10 +94,11 @@ $(document).ready(function() {
{ name : 'EAISVCSERNO' , width:'150', align:'left' },
{ name : 'EAISEVRINSTNCNAME' , width:'50' , align:'center' },
{ name : 'EAISVCNAME' , width:'70' , align:'center' },
{ name : 'ADPTRBZWKGROUPNAME' , width:'70' , align:'center' },
{ name : 'THRESHOLDPERSECOND' , width:'40' , align:'right' },
{ name : 'THRESHOLD' , width:'40' , align:'right' },
{ name : 'THRESHOLDTIMEUNIT' , width:'70' , align:'center' }
{ name : 'ADPTRBZWKGROUPNAME' , width:'100' , align:'center' , formatter: groupNameFormat },
{ name : 'THRESHOLDPERSECOND' , width:'30' , align:'right' },
{ name : 'THRESHOLD' , width:'30' , align:'right' },
{ name : 'THRESHOLDTIMEUNIT' , width:'50' , align:'center' },
{ name : 'GROUPNAME' , width:'70' , hidden:true }
],
jsonReader: {
repeatitems:false
WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp
+1 -1
View File
@@ -1606,7 +1606,7 @@
// 연결이 존재 하는 지 확인
if (jsPlumbInstance.getConnections({source:sourceEndpointElementId, target:targetEndpointElementId}).length > 0) {
alert('<%=localeMessage.getString("transformManDetail.alert10")%>');
<%-- alert('<%=localeMessage.getString("transformManDetail.alert10")%>'); --%>
return;
}
WebContent/jsp/onl/transaction/tracking/trackingMan.jsp
+3 -3
View File
@@ -373,16 +373,16 @@
{name: 'TRACKASISKEY1CTNT', hidden: true},
{name: 'TRACKASISKEY2CTNT', hidden: true},
{name: 'EAISVCSERNO_TMP', align: 'left', width: '230'},
{name: 'EAISVCSERNO_TMP', align: 'left', width: '220'},
{name: 'KEYMGTMSGCTNT', align: 'left', width: '240'},
{name: 'LOGPRCSSSERNO_TMP', align: 'center', width: '40'},
{name: 'TELGMRECVTRANCD', align: 'left', width: '135', hidden: true},
{name: 'EAISVCNAME', align: 'left', width: '100'},
{name: 'EAISVCNAME', align: 'left', width: '130'},
{name: 'EAISVCDESC', align: 'left', width: '280'},
{name: 'EAIBZWKDSTCD_TMP', align: 'center', width: '50'},
{name: 'EXTBIZCD', align: 'center', width: '50', hidden: isApiGw},
{name: 'REFKEY', align: 'left', width: '280', hidden: isApiGw},
{name: 'CLIENTNAME', align: 'left', width: '280', hidden: !isApiGw},
{name: 'CLIENTNAME', align: 'left', width: '260', hidden: !isApiGw},
{name: 'ORGNAME', align: 'left', width: '100', hidden: !isApiGw, formatter: orgNameFormatter},
{name: 'MSGDPSTYMS_TMP', align: 'center', width: '150', formatter: timeStampFormat2},
{name: 'MSGPRCSSYMS', align: 'center', width: '150', formatter: timeStampFormat2},