Index: arms/js/analysis/api/resourceApi.js =================================================================== diff -u -ra5539c9004959271e9e5b57a7cebb291ff647a50 -r4fe8174d4c9e74beb1e1117fb4f532ffa9e14c98 --- arms/js/analysis/api/resourceApi.js (.../resourceApi.js) (revision a5539c9004959271e9e5b57a7cebb291ff647a50) +++ arms/js/analysis/api/resourceApi.js (.../resourceApi.js) (revision 4fe8174d4c9e74beb1e1117fb4f532ffa9e14c98) @@ -18,27 +18,20 @@ setPdServiceVersionLinks(pdServiceVersionLinks); $.ajax({ - url: "/auth-user/api/arms/analysis/resource/workerStatus/"+pdservice_id, + url: "/auth-user/api/arms/analysis/resource/workerStatus/pdServiceId/"+pdservice_id, type: "GET", - data: { - "pdServiceLink": pdservice_id, - "메인그룹필드": "assignee.assignee_emailAddress.keyword", - "하위그룹필드들": "isReq,status.status_name.keyword", - "컨텐츠보기여부": true, - "크기": 1000, - "하위크기": 1000, - "pdServiceVersionLinks" : pdServiceVersionLinks - }, + data: { "pdServiceVersionLinks" : pdServiceVersionLinks }, contentType: "application/json;charset=UTF-8", dataType: "json", progress: true, statusCode: { 200: function (data) { //console.log("=== === === 작업자 상태 집계 시작=== === ===") + console.log("[resourceApi :: fetchResourceData] 작업자 상태 집계 "); console.log(data); let search_name = data["검색결과"]["group_by_assignee.assignee_displayName.keyword"]; let search_mail = data["검색결과"]["group_by_assignee.assignee_emailAddress.keyword"]; - //console.log("=== === === 작업자 상태 집계 종료=== === ===") + console.log("=== === === 작업자 상태 집계 종료=== === ===") fetchedResourceData = search_mail; deferred.resolve(fetchedResourceData); }, @@ -53,46 +46,10 @@ return fetchedResourceData; } - var fetchResourceDetailInfo = function (assignee_email) { - var deferred = $.Deferred(); - let pdservice_id = getPdServiceId(); - let pdServiceVersionLinks = getPdServiceVersions(); - $.ajax({ - url: "/auth-user/api/arms/analysis/resource/workerStatus/"+pdservice_id, - type: "GET", - data: { "서비스아이디" : pdservice_id, - "메인그룹필드" : "assignee.assignee_emailAddress.keyword", - "하위그룹필드들": "isReq,status.status_name.keyword", - "컨텐츠보기여부" : true, - "크기" : 1000, - "하위크기": 1000, - "pdServiceVersionLinks" : pdServiceVersionLinks}, - contentType: "application/json;charset=UTF-8", - dataType: "json", - progress: true, - statusCode: { - 200: function (data) { - let search_keys2 = data["검색결과"]["group_by_assignee.assignee_emailAddress.keyword"]; - fetchedResourceDetailData = search_keys2; - deferred.resolve(fetchedResourceDetailData); - }, - error: function (e) { - jError("Resource Status 조회에 실패했습니다. 나중에 다시 시도 바랍니다."); - } - } - }); - return deferred.promise(); - } - - var getFetchedResourceDetailData = function () { - return fetchedResourceDetailData; - } - return { setPdServiceId, getPdServiceId, setPdServiceVersionLinks, getPdServiceVersions, - fetchResourceData, getFetchedResourceData, - fetchResourceDetailInfo, getFetchedResourceDetailData + fetchResourceData, getFetchedResourceData } })(); \ No newline at end of file Index: arms/js/analysis/topmenu/topMenuApi.js =================================================================== diff -u -r60b40b7276f2123fae7e0e722e1159ef2c0ba754 -r4fe8174d4c9e74beb1e1117fb4f532ffa9e14c98 --- arms/js/analysis/topmenu/topMenuApi.js (.../topMenuApi.js) (revision 60b40b7276f2123fae7e0e722e1159ef2c0ba754) +++ arms/js/analysis/topmenu/topMenuApi.js (.../topMenuApi.js) (revision 4fe8174d4c9e74beb1e1117fb4f532ffa9e14c98) @@ -400,6 +400,7 @@ $("#sub_max").text(resource_info["sub_max"]); $("#sub_avg").text(resource_info["sub_avg"]); $("#sub_min").text(resource_info["sub_min"]); + }) .catch((error) => { console.error('Error occurred:', error); @@ -432,6 +433,23 @@ return diffDays; } + function setEqualHeight(selector) { + var maxHeight = 0; + $(selector).each(function() { + var height = $(this).height(); + if (height > maxHeight) { + maxHeight = height; + } + }); + $(selector).height(maxHeight); + } + + function resizeHeightEvent() { + $(window).resize(function() { + TopMenuApi.setEqualHeight('.top-menu-div'); + }); + } + return { pullTotalApi, reqStateData, getReqStateData, @@ -440,6 +458,7 @@ resourceInfo, getResourceInfo, getReqProgress, calExpectedEndDate, getExpectedEndDate, - 톱메뉴_초기화, 톱메뉴_세팅 + 톱메뉴_초기화, 톱메뉴_세팅, + setEqualHeight, resizeHeightEvent } })(); //즉시실행 함수 \ No newline at end of file