Index: arms/html/reqReviewDetail/content-container.html =================================================================== diff -u -r5c690d7e44ecc88e8ccd13c0efc30ea98dd4f2a8 -r5bab2aa3f64bd76a111e36245f7ffe197c2d3bb9 --- arms/html/reqReviewDetail/content-container.html (.../content-container.html) (revision 5c690d7e44ecc88e8ccd13c0efc30ea98dd4f2a8) +++ arms/html/reqReviewDetail/content-container.html (.../content-container.html) (revision 5bab2aa3f64bd76a111e36245f7ffe197c2d3bb9) @@ -226,7 +226,7 @@ .timeline-with-icons .timeline-item h5 { margin: 0; - font-size: 16px; + font-size: 14px; line-height: normal; } @@ -239,6 +239,7 @@ .timeline-item-summary { width: 100%; margin-top: 10px; + font-size: 12px; } .history-profile { Index: arms/js/reqReviewDetail.js =================================================================== diff -u -r5c690d7e44ecc88e8ccd13c0efc30ea98dd4f2a8 -r5bab2aa3f64bd76a111e36245f7ffe197c2d3bb9 --- arms/js/reqReviewDetail.js (.../reqReviewDetail.js) (revision 5c690d7e44ecc88e8ccd13c0efc30ea98dd4f2a8) +++ arms/js/reqReviewDetail.js (.../reqReviewDetail.js) (revision 5bab2aa3f64bd76a111e36245f7ffe197c2d3bb9) @@ -141,9 +141,14 @@ var searchParams = new URLSearchParams(location.search); console.log(searchParams.get('c_id')); + var c_id = searchParams.get('c_id'); + var c_review_pdservice_link = searchParams.get('c_review_pdservice_link'); + var c_review_req_link = searchParams.get('c_review_req_link'); - getJsonForPrototype("/auth-user/api/arms/reqReviewLog/getHistory.do?reqID=" + searchParams.get('c_id'), buildHistory); + var param = "?c_id=" + c_id + "&c_review_pdservice_link=" + c_review_pdservice_link + "&c_review_req_link=" + c_review_req_link; + getJsonForPrototype("/auth-user/api/arms/reqReviewLog/getHistory.do" + param, buildHistory); + // $.ajax({ // url: "/auth-user/api/arms/reqReviewLog/getHistory.do", // data: { @@ -187,9 +192,12 @@ ${item.c_method}
${item.c_state}
- +
- ID:[${item.c_review_req_link}]-${item.c_review_req_name} + STATE: ${item.c_review_result_state}
+ ID: [${item.c_review_req_link}]-${item.c_review_req_name}
+ IN: ${item.c_review_responder}
+ OUT: ${item.c_review_sender}
`; @@ -270,8 +278,8 @@ `; }; -const historyLabel = (name) => { - let label = "inverse"; +var historyLabel = (name) => { + var label = "inverse"; switch (name) { case "close": @@ -287,6 +295,15 @@ case "work": label = "info"; break; + case "insert": + label = "success"; + break; + case "update": + label = "warning"; + break; + case "delete": + label = "important"; + break; case "start": default: break;