Index: arms/html/searchEngine/content-container.html =================================================================== diff -u -re7d82be4e7b09a53e3c2b086e7587f86ae457683 -r3ba68007972bf8c0257dfe92715cc29df70977d1 --- arms/html/searchEngine/content-container.html (.../content-container.html) (revision e7d82be4e7b09a53e3c2b086e7587f86ae457683) +++ arms/html/searchEngine/content-container.html (.../content-container.html) (revision 3ba68007972bf8c0257dfe92715cc29df70977d1) @@ -123,7 +123,7 @@ class="gradient_middle_border" style="width: 100%; height: 2px">
- 검색 결과입니다. 자세한 정보를 보시려면 해당 항목을 선택해주세요. + 이슈 인덱스 검색 결과입니다. 자세한 정보를 보시려면 해당 항목을 선택해주세요.
-
- -
-
- - - :sparkles: - -  A-RMS 는 IT 위기를 해결 할 수 있어요 - -
-
-

- 카테고리 fluentd-20240204 -

-

- 2024-02-15 15:18 KST -

-
-
-
- - 10.0.1.206 - - [04/Feb/2024:17:59:57 +0900] "POST - /php/matomo/matomo.php?action_name=A-RMS%20By%20313DEVGRP&idsite=1&rec=1&r=470936&h=17&m=59&s=57&url=http%3A%2F%2Fwww.a-rms.net%2Farms%2Ftemplate.html%3Fpage%3Ddashboard&_id=db14431d39b7ad70&_idn=0&send_image=0&_refts=0&pdf=1&qt=0&realp=0&wma=0&fla=0&java=0&ag=0&cookie=1&res=1728x1117&pv_id=UMPI0X&pf_net=0&pf_srv=1&pf_tfr=7&pf_dm1=90&uadata=%7B%7D - HTTP/1.1" 204 0 "http://www.a-rms.net/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:122.0) - Gecko/20100101 Firefox/122.0" "211.201.140.91" - -
-
-
-
-
- - - :sparkles: - -  A-RMS 는 IT 위기를 해결 할 수 있어요 - -
-
-

- 카테고리 fluentd-20240123 -

-
-
-
- - 2024-01-23 17:14:00.493 DEBUG 1 --- [r-http-epoll-11] o.s.http.codec.json.Jackson2JsonDecoder : - [2d8d7f6] [636415dd-3, L:/172.18.0.23:41310 - R:hsyang206.atlassian.net/43.202.69.1:443] Decoded - [지라이슈_데이터(id=10018, key=YHS-19, self=https://hsyang206.atlassian.net/rest/api/3/issue/10018, - fields=n (truncated)...] - -
-
-
-

Can I use CSS3 Radial-Gradient?

-

okendoken.com

-

- Yes you can! Further more, you should! It let's you create really beautiful images either for elements - or for the entire background. -

-
- 검색 결과입니다. 자세한 정보를 보시려면 해당 항목을 선택해주세요. + 로그 검색 결과입니다. 자세한 정보를 보시려면 해당 항목을 선택해주세요.
-
- -
-
- - - :sparkles: - -  A-RMS 는 IT 위기를 해결 할 수 있어요 - -
-
-

- 카테고리 fluentd-20240204 -

-

- 2024-02-15 15:18 KST -

-
-
-
- - 10.0.1.206 - - [04/Feb/2024:17:59:57 +0900] "POST - /php/matomo/matomo.php?action_name=A-RMS%20By%20313DEVGRP&idsite=1&rec=1&r=470936&h=17&m=59&s=57&url=http%3A%2F%2Fwww.a-rms.net%2Farms%2Ftemplate.html%3Fpage%3Ddashboard&_id=db14431d39b7ad70&_idn=0&send_image=0&_refts=0&pdf=1&qt=0&realp=0&wma=0&fla=0&java=0&ag=0&cookie=1&res=1728x1117&pv_id=UMPI0X&pf_net=0&pf_srv=1&pf_tfr=7&pf_dm1=90&uadata=%7B%7D - HTTP/1.1" 204 0 "http://www.a-rms.net/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:122.0) - Gecko/20100101 Firefox/122.0" "211.201.140.91" - -
-
-
-
-
- - - :sparkles: - -  A-RMS 는 IT 위기를 해결 할 수 있어요 - -
-
-

- 카테고리 fluentd-20240123 -

-
-
-
- - 2024-01-23 17:14:00.493 DEBUG 1 --- [r-http-epoll-11] o.s.http.codec.json.Jackson2JsonDecoder : - [2d8d7f6] [636415dd-3, L:/172.18.0.23:41310 - R:hsyang206.atlassian.net/43.202.69.1:443] Decoded - [지라이슈_데이터(id=10018, key=YHS-19, self=https://hsyang206.atlassian.net/rest/api/3/issue/10018, - fields=n (truncated)...] - -
-
-
-

Can I use CSS3 Radial-Gradient?

-

okendoken.com

-

- Yes you can! Further more, you should! It let's you create really beautiful images either for elements - or for the entire background. -

-
  • Prev
    • @@ -456,7 +232,7 @@
-
@@ -524,7 +300,7 @@
- + <!– 검색 결과 생성 시, append 하는 방식으로? –>
- 2024-01-23 17:14:00.493 DEBUG 1 --- [r-http-epoll-11] o.s.http.codec.json.Jackson2JsonDecoder : + 2024-01-23 17:14:00.493 DEBUG 1 --- [r-http-epoll-11] o.s.http.codec.json.Jackson2JsonDecoder : [2d8d7f6] [636415dd-3, L:/172.18.0.23:41310 - R:hsyang206.atlassian.net/43.202.69.1:443] Decoded [지라이슈_데이터(id=10018, key=YHS-19, self=https://hsyang206.atlassian.net/rest/api/3/issue/10018, fields=n (truncated)...] @@ -647,230 +423,8 @@
-
+ -->
-
Index: arms/js/searchEngine.js =================================================================== diff -u -r998f1174b4b14d86f06e96bb40b02952947d75f8 -r3ba68007972bf8c0257dfe92715cc29df70977d1 --- arms/js/searchEngine.js (.../searchEngine.js) (revision 998f1174b4b14d86f06e96bb40b02952947d75f8) +++ arms/js/searchEngine.js (.../searchEngine.js) (revision 3ba68007972bf8c0257dfe92715cc29df70977d1) @@ -2,15 +2,6 @@ //Page 전역 변수 //////////////////////////////////////////////////////////////////////////////////////// var dataTableRef; -var pieChart; -var windowCount = 0; -var linuxCount = 0; -var unixCount = 0; -var etcCount = 0; -var footerCheck = 0; -var activeTab; -var selectedStorData; -var datatableCallback_DuplicateDefence = 0; //////////////////////////////////////////////////////////////////////////////////////// //Document Ready //////////////////////////////////////////////////////////////////////////////////////// @@ -245,21 +236,35 @@ } function search_start(search_string) { + console.log("[searchEngine :: search_start] :: search_string => " + search_string); $.ajax({ - url: "/engine-search-api/engine/jira/dashboard/search", + url: "/engine-search-api/engine/jira/dashboard/search", //지라이슈로 바꾸자 type: "GET", data: { "search_string": search_string }, dataType: "json", success: function(result) { - console.log("[searchEngine :: search_start] :: search_string => " + search_string); - console.log("[searchEngine :: search_start] :: search_results => "); + console.log("[searchEngine :: search_start] :: jiraissue_search_results => "); console.log(result); SearchApi.setSearchResult(result); SearchApi.appendSearchResultSections(result); } }); + + $.ajax({ + url: "/engine-search-api/engine/jira/dashboard/search/fluentd", + type: "GET", + data: { "search_string": search_string, "page" : 0, "size": 100 }, + dataType: "json", + success: function(result) { + console.log("[searchEngine :: search_start] :: fluentd_search_results => "); + console.log(result); + + SearchApi.setSearchResult_fluentd(result); + SearchApi.appendSearchResultSections_fluentd(result); + } + }); } @@ -319,16 +324,25 @@ var SearchApi = (function() { var searchResult; + + var searchResultObject ={"jiraissue" : null, "fluentd" : null}; var setSearchResult = function (result) { console.log("[SearchApi :: setSearchResult] :: result =>"); console.log(result); searchResult = result; + //searchResultObject["jiraissue"] = result; // 변경 대상. }; + var setSearchResult_fluentd = function(result) { + searchResultObject["fluentd"] = result; + } var getSearchResult = function (order) { return searchResult[order]; // 자료구조 검토 } + var getSearchResult_fluentd = function(order) { + return searchResultObject["fluentd"][order]; + } ////////////////////////////////////////// // 1. 검색 결과를 바탕으로 content 보여주기 ////////////////////////////////////////// @@ -410,10 +424,85 @@ } } + var appendSearchResultSections_fluentd = function (results) { + const search_result_arr = results; + var today = new Date(); + + $("#log_section .search_result_group").html(""); + console.log("[searchEngine :: appendSearchResultSections_fluentd] :: search_result_arr길이 =>" +search_result_arr.length); + if(search_result_arr && search_result_arr.length !== 0) { + //해당 search_result_group 내용 초기화 + search_result_arr.forEach(function (content, index) { + $("#log_section .search_result_group").append( + `
+ + + +
+
+ + + :sparkles: + + +  ${content["content"]["logName"]} + +
+
+

+ + ${content["index"]} +

+

+ ${content["content"]["timestamp"]} +

+
+
+
+ + ${content["content"]["log"]} + +
+
` + ); + }); + } else { + $("#log_section .search_result_group").append( + `
+ +
+
+ + + :sparkles: + + +   검색 결과가 없습니다.   + +
+
+

+ + - +

+

+ ${today} +

+
+
+
+ + 검색 결과가 없습니다. 현재시각 :: ${today} + +
+
` + ); + } + } return { - setSearchResult, - getSearchResult, - appendSearchResultSections + setSearchResult, setSearchResult_fluentd, + getSearchResult, getSearchResult_fluentd, + appendSearchResultSections, appendSearchResultSections_fluentd } })(); //즉시실행 함수 @@ -427,6 +516,29 @@ search_start(searchTerm); } else { console.log("[searchEngine :: checkQueryStringOnUrl] :: 상단_검색 검색어가 없습니다."); - // 검색페이지 중앙으로 커서 이동 이벤트 넣기? + // 검색페이지 중앙으로 커서 이동 이벤트 넣기 검토 } +} + +function renderPagination(totalItems, itemsPerPage) { + var totalPages = Math.ceil(totalItems / itemsPerPage); + var paginationElement = document.getElementById('pagination'); + + for (var i = 1; i <= totalPages; i++) { + var li = document.createElement('li'); + var a = document.createElement('a'); + a.href = '#'; + a.textContent = i; + a.addEventListener('click', function(event) { + event.preventDefault(); + // 해당 페이지의 데이터를 가져오는 함수 호출 + fetchData(i); + }); + li.appendChild(a); + paginationElement.appendChild(li); + } +} + +function fetchData(pageNumber) { + // 해당 페이지의 데이터를 가져오는 로직을 여기에 구현 } \ No newline at end of file