From 99b1ed8fc6169bdebdfff2bd99e99d549cee4cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 7 Dec 2022 13:55:40 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=EC=9A=A9=EA=B2=8C=EC=8B=9C=ED=8C=90,?= =?UTF-8?q?=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A9=94=EB=89=B4=20=EB=AA=A8?= =?UTF-8?q?=EB=8B=AC=20=EC=88=98=EC=A0=95.=20=EA=B6=8C=ED=95=9C=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EB=AA=A8=EB=8B=AC=20=ED=8E=B8=EC=9D=98=EC=84=B1=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatisMapper/FipTarget.xml | 11 +- src/main/resources/static/css/common.css | 3 + .../resources/static/js/authMgt/authMgt.js | 9 + src/main/resources/static/js/equip/equip.js | 2 +- .../static/js/publicBoard/publicBoard.js | 7 +- .../adminPage/authMgt/authEditModal.html | 56 ++-- .../templates/adminPage/authMgt/authMgt.html | 2 +- .../adminPage/menuMgt/menuEditModal.html | 2 +- .../adminPage/organMgt/organMgt.html | 2 +- .../templates/adminPage/userLog/inoutLog.html | 2 +- .../adminPage/userLog/requestLog.html | 2 +- .../adminPage/userMgt/userEditModal.html | 6 +- .../templates/equip/cellPhoneEditModal.html | 4 +- .../templates/equip/cellPhoneList.html | 2 +- .../templates/equip/equipEditModal.html | 2 +- .../templates/equip/equipHistory.html | 8 +- .../resources/templates/equip/equipList.html | 2 +- .../templates/equip/equipModifyModal.html | 10 +- .../templates/equip/equipStatus.html | 2 +- .../templates/equip/pvreUseList.html | 2 +- .../resources/templates/equip/qirUseList.html | 2 +- .../templates/equip/useEditModal.html | 14 +- .../resources/templates/equip/useHistory.html | 8 +- .../templates/equip/useModifyModal.html | 18 +- .../resources/templates/faRpt/faRptBoard.html | 8 +- .../templates/faRpt/faRptEditModal.html | 8 +- .../templates/faRpt/faRptViewModal.html | 8 +- .../crackdownStatusEditModal.html | 8 +- .../crackdownStatusHistoryViewModal.html | 8 +- .../crackdownStatusViewModal.html | 8 +- .../fishingBoat/fishingBoatEditModal.html | 8 +- .../fishingBoat/fishingBoatMgt.html | 8 +- .../fishingBoat/fishingBoatViewModal.html | 8 +- .../internationalCrimeArrestEditModal.html | 8 +- .../internationalCrimeArrestViewModal.html | 8 +- .../processResult/processResultAddModal.html | 8 +- .../processResult/processResultEditModal.html | 8 +- .../processResultHistoryViewModal.html | 8 +- .../processResult/processResultViewModal.html | 8 +- .../faStatistics/sailor/sailorAddModal.html | 8 +- .../faStatistics/sailor/sailorEditModal.html | 2 +- .../sailor/sailorHistoryViewModal.html | 8 +- .../faStatistics/sailor/sailorViewModal.html | 8 +- .../templates/fipTarget/ipShipEditModal.html | 12 +- .../templates/fipTarget/ipShipHistory.html | 15 +- .../templates/fipTarget/ipShipViewModal.html | 10 +- .../fipTarget/partInfoEditModal.html | 10 +- .../templates/fipTarget/partInfoHistory.html | 12 +- .../templates/fipTarget/partInfoList.html | 2 +- .../fipTarget/partInfoModifyModal.html | 10 +- .../fipTarget/partWorkEditModal.html | 8 +- .../templates/fipTarget/partWorkList.html | 2 +- .../fipTarget/partWorkModifyModal.html | 20 +- .../templates/fipTarget/vulnEditModal.html | 13 +- .../templates/fipTarget/vulnInfoModal.html | 10 +- .../templates/fipTarget/vulnViewModal.html | 9 +- .../templates/fipTarget/vulnerableList.html | 2 +- .../fpiMgt/affair/affairEditModal.html | 8 +- .../fpiMgt/affair/affairViewModal.html | 8 +- .../fpiMgt/affairPlan/planEditModal.html | 8 +- .../fpiMgt/affairPlan/planViewModal.html | 8 +- .../fpiMgt/affairResult/affairListModal.html | 8 +- .../fpiMgt/affairResult/resultEditModal.html | 8 +- .../fpiMgt/affairResult/resultViewModal.html | 8 +- .../templates/ivsgt/ivsgtEditModal.html | 20 +- .../templates/ivsgt/ivsgtViewModal.html | 14 +- .../templates/ivsgt/searchViewModal.html | 8 +- .../resources/templates/login/joinForm.html | 2 +- src/main/resources/templates/login/login.html | 6 +- .../police/career/careerFormModal.html | 8 +- .../templates/police/career/careerModal.html | 8 +- .../police/career/kwmsCareerModal.html | 8 +- .../police/education/eduEditModal.html | 8 +- .../personnelStatus/personnelStatus.html | 16 +- .../police/police/policeEditModal.html | 8 +- .../police/police/policeHistory.html | 8 +- .../publicBoard/board/boardEditModal.html | 8 +- .../publicBoard/board/boardViewModal.html | 229 +++++++++-------- .../publicBoard/notice/noticeViewModal.html | 75 +++--- .../publicBoard/qna/qnaEditModal.html | 8 +- .../publicBoard/qna/qnaViewModal.html | 229 +++++++++-------- .../reference/referenceEditModal.html | 8 +- .../reference/referenceViewModal.html | 240 +++++++++--------- .../resources/templates/sri/sriBoard.html | 8 +- .../resources/templates/sri/sriEditModal.html | 8 +- .../resources/templates/sri/sriViewModal.html | 8 +- .../templates/translator/translator.html | 22 +- .../translator/translatorCareerInsert.html | 2 +- .../translator/translatorCareerModal.html | 2 +- .../translator/translatorDashBoard.html | 12 +- .../translator/translatorEditModal.html | 2 +- src/main/resources/templates/user/myInfo.html | 16 +- 92 files changed, 768 insertions(+), 738 deletions(-) diff --git a/src/main/resources/mybatisMapper/FipTarget.xml b/src/main/resources/mybatisMapper/FipTarget.xml index 8788aa6d..4c73632e 100644 --- a/src/main/resources/mybatisMapper/FipTarget.xml +++ b/src/main/resources/mybatisMapper/FipTarget.xml @@ -539,7 +539,7 @@ diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 467e53e0..fbc20583 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -115,4 +115,7 @@ .statusInput::-webkit-inner-spin-button{ -webkit-appearance: none; margin: 0; +} +.mouse-hover:hover{ + cursor: pointer; } \ No newline at end of file diff --git a/src/main/resources/static/js/authMgt/authMgt.js b/src/main/resources/static/js/authMgt/authMgt.js index 24bc0d4c..304b057e 100644 --- a/src/main/resources/static/js/authMgt/authMgt.js +++ b/src/main/resources/static/js/authMgt/authMgt.js @@ -19,6 +19,15 @@ $(document).on('click', '.userInfoTr', function (){ $(document).on('click', '.radioTd', function (){ $(this).find('input').prop('checked', true); }) +$(document).on('click', '.selectTh', function (){ + const type = $(this).attr("data-type"); + const target = $(this).attr("data-target"); + if(target){ + $("."+type+"Radio"+target).prop("checked", true) + }else{ + $("."+type+"RadioEmpty").prop("checked", true) + } +}) $(document).on('click', '#saveAuthBtn', function (){ if(confirm("저장하시겠습니까?")){ diff --git a/src/main/resources/static/js/equip/equip.js b/src/main/resources/static/js/equip/equip.js index a16247df..f6672223 100644 --- a/src/main/resources/static/js/equip/equip.js +++ b/src/main/resources/static/js/equip/equip.js @@ -294,7 +294,7 @@ $(document).on('click', '#statusExcel', function (){ } }) -$(document).on('click', '#btn-close', function (){ +$(document).on('click', '.modalCloseBtn', function (){ location.reload(); }) diff --git a/src/main/resources/static/js/publicBoard/publicBoard.js b/src/main/resources/static/js/publicBoard/publicBoard.js index 2ca51dd4..be216632 100644 --- a/src/main/resources/static/js/publicBoard/publicBoard.js +++ b/src/main/resources/static/js/publicBoard/publicBoard.js @@ -30,7 +30,7 @@ $(document).on('click', '#commentSaveBtn', function (){ if(!parentComment.val()){ $("#commentDiv").append(html) }else{ - $("#addedCommentHome"+parentComment.val()).append(html); + $("#childComment"+parentComment.val()).append(html); } commentFormReset(); alert("저장되었습니다."); @@ -59,7 +59,7 @@ $(document).on('click', '.deleteCommentBtn', function (){ const commentRow = $(this).parents(".commentRow"); const publicKey = Number(commentRow.find(".publicKey").val()); const commentKey = Number(commentRow.find(".commentKey").val()); - /*$.ajax({ + $.ajax({ type : 'POST', data : JSON.stringify({publicKey: publicKey, commentKey: commentKey}), url : "/publicBoard/deleteComment", @@ -69,6 +69,7 @@ $(document).on('click', '.deleteCommentBtn', function (){ }, success : function(result) { commentRow.remove(); + $("#childComment"+commentKey).remove(); alert("삭제되었습니다."); contentFade("out"); }, @@ -76,7 +77,7 @@ $(document).on('click', '.deleteCommentBtn', function (){ alert("삭제를 실패하였습니다.") contentFade("out"); } - })*/ + }) }) function getEditModal(publicKey, publicType){ diff --git a/src/main/resources/templates/adminPage/authMgt/authEditModal.html b/src/main/resources/templates/adminPage/authMgt/authEditModal.html index e2cc1182..a963f67e 100644 --- a/src/main/resources/templates/adminPage/authMgt/authEditModal.html +++ b/src/main/resources/templates/adminPage/authMgt/authEditModal.html @@ -1,17 +1,17 @@ -
+
- - - - + + + + @@ -35,34 +35,29 @@ + + + - - -
대분류 중분류 소분류관리작성조회해제해제
+ + - - - - - - - +
-
+
- - - - - + + + + @@ -86,20 +81,13 @@ + + + - - - - diff --git a/src/main/resources/templates/adminPage/authMgt/authMgt.html b/src/main/resources/templates/adminPage/authMgt/authMgt.html index 0c79781b..3edc2463 100644 --- a/src/main/resources/templates/adminPage/authMgt/authMgt.html +++ b/src/main/resources/templates/adminPage/authMgt/authMgt.html @@ -151,7 +151,7 @@ -
+
diff --git a/src/main/resources/templates/adminPage/menuMgt/menuEditModal.html b/src/main/resources/templates/adminPage/menuMgt/menuEditModal.html index 287b0a3a..2d5b550a 100644 --- a/src/main/resources/templates/adminPage/menuMgt/menuEditModal.html +++ b/src/main/resources/templates/adminPage/menuMgt/menuEditModal.html @@ -69,7 +69,7 @@
-
+
diff --git a/src/main/resources/templates/adminPage/organMgt/organMgt.html b/src/main/resources/templates/adminPage/organMgt/organMgt.html index 797e7830..e2046b02 100644 --- a/src/main/resources/templates/adminPage/organMgt/organMgt.html +++ b/src/main/resources/templates/adminPage/organMgt/organMgt.html @@ -86,7 +86,7 @@
-
+
diff --git a/src/main/resources/templates/adminPage/userLog/inoutLog.html b/src/main/resources/templates/adminPage/userLog/inoutLog.html index 1b7c6b6c..50551c3c 100644 --- a/src/main/resources/templates/adminPage/userLog/inoutLog.html +++ b/src/main/resources/templates/adminPage/userLog/inoutLog.html @@ -164,7 +164,7 @@
-
+
diff --git a/src/main/resources/templates/adminPage/userLog/requestLog.html b/src/main/resources/templates/adminPage/userLog/requestLog.html index 39e0e613..41bdb4ac 100644 --- a/src/main/resources/templates/adminPage/userLog/requestLog.html +++ b/src/main/resources/templates/adminPage/userLog/requestLog.html @@ -171,7 +171,7 @@
-
+
diff --git a/src/main/resources/templates/adminPage/userMgt/userEditModal.html b/src/main/resources/templates/adminPage/userMgt/userEditModal.html index 6f9382e1..044cbc53 100644 --- a/src/main/resources/templates/adminPage/userMgt/userEditModal.html +++ b/src/main/resources/templates/adminPage/userMgt/userEditModal.html @@ -45,7 +45,7 @@
- +
@@ -60,7 +60,7 @@
- +
@@ -160,7 +160,7 @@
-
+
diff --git a/src/main/resources/templates/equip/cellPhoneEditModal.html b/src/main/resources/templates/equip/cellPhoneEditModal.html index 085f8d29..bbefa2a1 100644 --- a/src/main/resources/templates/equip/cellPhoneEditModal.html +++ b/src/main/resources/templates/equip/cellPhoneEditModal.html @@ -7,7 +7,7 @@ - +
@@ -83,7 +83,7 @@
-
+
diff --git a/src/main/resources/templates/equip/cellPhoneList.html b/src/main/resources/templates/equip/cellPhoneList.html index 75e2ced9..8c3ae7b2 100644 --- a/src/main/resources/templates/equip/cellPhoneList.html +++ b/src/main/resources/templates/equip/cellPhoneList.html @@ -119,7 +119,7 @@
대분류 중분류 소분류해제계장대행계장과장대행과장해제
+ + - - - - - - - - - +
@@ -56,7 +56,7 @@
-
+
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html index b4122e5b..956973ae 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html @@ -1,8 +1,8 @@ -
- - +
+
+
@@ -291,7 +291,7 @@
-
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html index e6a835ec..8e8c842d 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html @@ -1,8 +1,8 @@ -
- - +
+
청산보고서 열람
+
@@ -247,7 +247,7 @@
-
+
diff --git a/src/main/resources/templates/ivsgt/ivsgtEditModal.html b/src/main/resources/templates/ivsgt/ivsgtEditModal.html index 4d432294..dc9ee9ae 100644 --- a/src/main/resources/templates/ivsgt/ivsgtEditModal.html +++ b/src/main/resources/templates/ivsgt/ivsgtEditModal.html @@ -1,29 +1,31 @@ -
+
+
- + 검거보고서 작성 - + 진행보고서 작성 - + 결과보고서 작성 - + 검거보고서 수정 - + 진행보고서 수정 - + 결과보고서 수정 - +
+
@@ -149,7 +151,7 @@
-
+
diff --git a/src/main/resources/templates/ivsgt/ivsgtViewModal.html b/src/main/resources/templates/ivsgt/ivsgtViewModal.html index 3569cfc2..e343dd5b 100644 --- a/src/main/resources/templates/ivsgt/ivsgtViewModal.html +++ b/src/main/resources/templates/ivsgt/ivsgtViewModal.html @@ -1,16 +1,18 @@ -
+
+
- + 검거보고서 - + 진행보고서 - + 결과보고서 - +
+
@@ -111,7 +113,7 @@
-
+
diff --git a/src/main/resources/templates/ivsgt/searchViewModal.html b/src/main/resources/templates/ivsgt/searchViewModal.html index f428b1d6..15094c34 100644 --- a/src/main/resources/templates/ivsgt/searchViewModal.html +++ b/src/main/resources/templates/ivsgt/searchViewModal.html @@ -1,8 +1,8 @@ -
- - +
+
검거보고서
+
@@ -13,7 +13,7 @@
-
+
diff --git a/src/main/resources/templates/login/joinForm.html b/src/main/resources/templates/login/joinForm.html index c700d39e..657e16c3 100644 --- a/src/main/resources/templates/login/joinForm.html +++ b/src/main/resources/templates/login/joinForm.html @@ -289,7 +289,7 @@
-
+
diff --git a/src/main/resources/templates/login/login.html b/src/main/resources/templates/login/login.html index 25eadd42..0cc6b6e0 100644 --- a/src/main/resources/templates/login/login.html +++ b/src/main/resources/templates/login/login.html @@ -53,9 +53,9 @@