diff --git a/src/main/java/com/dbnt/faisp/config/BaseModel.java b/src/main/java/com/dbnt/faisp/config/BaseModel.java index 210b07cb..e858a8a9 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseModel.java +++ b/src/main/java/com/dbnt/faisp/config/BaseModel.java @@ -20,7 +20,7 @@ public class BaseModel { @Transient private Integer firstIndex=0; // 쿼리의 시작 row @Transient - private Integer rowCnt=10; //한 페이지에 표현되는 row 수 + private Integer rowCnt=20; //한 페이지에 표현되는 row 수 @Transient private Integer startNum=1; // pagination 시작값 @Transient diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 8d588145..124978a9 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -15,6 +15,7 @@ file.dir.equip=/equip file.dir.sailor=sailor file.dir.affair=affair file.dir.editor=editor +file.dir.sri=/sri editor.img.view=/file/editorFileDisplay?fileNm= diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 7fecce3c..15e520b8 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -1,4 +1,6 @@ - +#logo{ + height: 40px; +} #fadeDiv{ width: 100%; height: 100%; @@ -43,7 +45,7 @@ } #alarmListDiv{ width: 500px; - left: -300px; + left: -360px; top: 30px; z-index: 5000; } @@ -73,16 +75,11 @@ background-color: #d2eaf4; } .btn-toggle::before { - width: 1.25em; - line-height: 0; content: url("/img/bootstrap-icons-1.9.1/caret-right-fill.svg"); - transition: transform .35s ease; - transform-origin: 0.5em 50%; + filter: invert(100%); } .btn-toggle[aria-expanded="true"]::before { content: url("/img/bootstrap-icons-1.9.1/caret-down-fill.svg"); - /*왜 안돌까?*/ - /*transform: rotate(90deg);*/ } .fs-13{ diff --git a/src/main/resources/static/img/logo3.png b/src/main/resources/static/img/logo3.png new file mode 100644 index 00000000..c4e65c01 Binary files /dev/null and b/src/main/resources/static/img/logo3.png differ diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index 6b3ae794..e57b4891 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -285,7 +285,7 @@ function makeEntryVisaDiv() { function makeSpiInfoDiv(name) { $('#spiParentDiv').after( - '
' + '
' + '' + '
' + '
' @@ -333,7 +333,7 @@ function makeArrestAreaDiv(name) { }) $('#spiParentDiv').after( - '
' + '
' + '' + '
' + '' @@ -355,7 +355,7 @@ function makeMeansDiv(name, code) { } $('#spiParentDiv').after( - '
' + '
' + '' + '
' + '' diff --git a/src/main/resources/static/js/publicBoard/publicBoard.js b/src/main/resources/static/js/publicBoard/publicBoard.js index e4526ed1..076cad62 100644 --- a/src/main/resources/static/js/publicBoard/publicBoard.js +++ b/src/main/resources/static/js/publicBoard/publicBoard.js @@ -107,18 +107,6 @@ function getViewModal(publicKey, publicType){ dataType:"html", success: function(html){ $("#viewContent").empty().append(html) - $("#comment").summernote({ - lang:'ko-KR', - height: 100, - disableDragAndDrop: true, - toolbar: [ - ['style', ['style']], - ['font', ['bold', 'underline', 'clear']], - ['color', ['color']], - ['para', ['ul', 'ol', 'paragraph']], - ['table', ['table']] - ] - }); $("#viewModal").modal('show'); }, error:function(){ diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js index 4dc13f2b..2a9543b3 100644 --- a/src/main/resources/static/js/translator/translator.js +++ b/src/main/resources/static/js/translator/translator.js @@ -228,7 +228,7 @@ $(document).on('click', '#crrAddBtn', function (){ const trKey = (Number($('#tcInsertKey').val())); $('#insertCareer').append( '
'+ - '
'+ + '
'+ ''+ '
'+ '
- +
@@ -52,7 +52,7 @@
대분류
- +
diff --git a/src/main/resources/templates/adminPage/authMgt/authMgt.html b/src/main/resources/templates/adminPage/authMgt/authMgt.html index 6f49d014..decbc0e5 100644 --- a/src/main/resources/templates/adminPage/authMgt/authMgt.html +++ b/src/main/resources/templates/adminPage/authMgt/authMgt.html @@ -6,12 +6,12 @@
-
+

권한 설정

-
+
@@ -57,7 +57,7 @@
-
대분류
+
@@ -69,22 +69,22 @@ - + - - - + + + @@ -96,7 +96,7 @@
등록일
+ + - - - - + + - +
+
@@ -34,7 +34,7 @@ - +
설명
@@ -49,7 +49,7 @@
- +
@@ -58,7 +58,7 @@ - + diff --git a/src/main/resources/templates/adminPage/menuMgt/menuMgt.html b/src/main/resources/templates/adminPage/menuMgt/menuMgt.html index 41cc4a2a..fdb42b6c 100644 --- a/src/main/resources/templates/adminPage/menuMgt/menuMgt.html +++ b/src/main/resources/templates/adminPage/menuMgt/menuMgt.html @@ -6,12 +6,12 @@
-
+

메뉴 관리

-
+
@@ -69,7 +69,7 @@
-
사용
+
@@ -80,7 +80,7 @@ - + @@ -122,7 +122,7 @@
사용여부
+
@@ -47,7 +47,7 @@
-
+
diff --git a/src/main/resources/templates/adminPage/userLog/inoutLog.html b/src/main/resources/templates/adminPage/userLog/inoutLog.html index 7c918cc4..79130bc9 100644 --- a/src/main/resources/templates/adminPage/userLog/inoutLog.html +++ b/src/main/resources/templates/adminPage/userLog/inoutLog.html @@ -6,7 +6,7 @@
-
+

사용자 로그

-
+
@@ -68,7 +68,7 @@
-
+
@@ -103,7 +103,7 @@
접속아이피
+
@@ -101,7 +101,7 @@ -
+
@@ -41,7 +41,7 @@
-
+
@@ -52,7 +52,7 @@
-
+
@@ -62,7 +62,7 @@
-
+
-
+
@@ -81,7 +81,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -73,7 +73,7 @@
-
접속아이피
+
@@ -86,7 +86,7 @@ - + @@ -142,7 +142,7 @@
등록일
+
@@ -331,7 +331,7 @@
연번
+
@@ -60,7 +60,7 @@ - + @@ -98,7 +98,7 @@
url
+
@@ -53,7 +53,7 @@ - + @@ -84,7 +84,7 @@ -
+
-
+
@@ -44,7 +44,7 @@
-
등록일
+
@@ -80,7 +80,7 @@
+
@@ -25,7 +25,7 @@ - +
등록일
diff --git a/src/main/resources/templates/equip/equipList.html b/src/main/resources/templates/equip/equipList.html index a2cdd642..aa25d1e7 100644 --- a/src/main/resources/templates/equip/equipList.html +++ b/src/main/resources/templates/equip/equipList.html @@ -6,12 +6,12 @@
-
+

-
+
@@ -36,7 +36,7 @@
- +
@@ -76,7 +76,7 @@
+
@@ -72,7 +72,7 @@
분류
+
@@ -136,7 +136,7 @@ diff --git a/src/main/resources/templates/equip/pvreUseList.html b/src/main/resources/templates/equip/pvreUseList.html index a6f9da6d..6accdc0f 100644 --- a/src/main/resources/templates/equip/pvreUseList.html +++ b/src/main/resources/templates/equip/pvreUseList.html @@ -6,12 +6,12 @@
-
+

휴대용 녹화장비 사용대장

-
+
@@ -71,7 +71,7 @@
-
분류
+
@@ -106,7 +106,7 @@
+
@@ -105,7 +105,7 @@
+
@@ -25,7 +25,7 @@ - +
등록일
diff --git a/src/main/resources/templates/equip/useModifyModal.html b/src/main/resources/templates/equip/useModifyModal.html index 9cd83ff6..0b1bd99d 100644 --- a/src/main/resources/templates/equip/useModifyModal.html +++ b/src/main/resources/templates/equip/useModifyModal.html @@ -18,7 +18,7 @@ -
+
-
+
-
+
-
+
-
+
diff --git a/src/main/resources/templates/faRpt/faRptBoard.html b/src/main/resources/templates/faRpt/faRptBoard.html index d89bed65..76372519 100644 --- a/src/main/resources/templates/faRpt/faRptBoard.html +++ b/src/main/resources/templates/faRpt/faRptBoard.html @@ -7,13 +7,19 @@
-
-

외사정보관리 > 외사정보보고

-

외사정보보고

+
+
+
+

외사정보보고

+
+
+

외사정보관리 > 외사정보보고

+
+
-
+
-
+
@@ -75,7 +81,7 @@
- +
@@ -123,7 +129,7 @@
+
diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusEditModal.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusEditModal.html index c960f52b..cbe50894 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusEditModal.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusEditModal.html @@ -22,10 +22,10 @@ -
+
나포정보
-
+
@@ -44,7 +44,7 @@
-
+
-
+
특수공무집행방해
-
+
@@ -136,10 +136,10 @@
-
+
검거기관
-
+
-
+
선박제원
-
+
@@ -242,10 +242,10 @@
-
+
어획물 축소기재
-
+
@@ -255,10 +255,10 @@
-
+
범칙물
-
+
@@ -280,10 +280,10 @@
-
+
처리결과
-
+
@@ -314,19 +314,19 @@
-
+
담보금 미납
-
+
-
+
선박처리
-
+
@@ -362,10 +362,10 @@
-
+
직접인계
-
+
@@ -385,10 +385,10 @@
-
+
구속/ 불구속
-
+
@@ -418,7 +418,7 @@
-
+
@@ -440,10 +440,10 @@
-
+
현장조사
-
+
@@ -461,10 +461,10 @@
-
+
압송
-
+
@@ -482,10 +482,10 @@
-
+
압수어구
-
+
diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryDetail.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryDetail.html index ee9ecb90..160fe27e 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryDetail.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryDetail.html @@ -1,9 +1,9 @@ -
+
나포정보
-
+
@@ -16,7 +16,7 @@
-
+
-
+
@@ -36,10 +36,10 @@
-
+
특수공무집행방해
-
+
@@ -49,7 +49,7 @@
-
+
@@ -59,7 +59,7 @@
-
+
@@ -69,16 +69,16 @@
-
+
-
+
검거기관
-
+
-
+
-
+
현장조사
-
+
-
+
@@ -137,10 +137,10 @@
-
+
압송
-
+
@@ -150,7 +150,7 @@
-
+
diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryViewModal.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryViewModal.html index 4ec5b466..d2d618d2 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryViewModal.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryViewModal.html @@ -30,7 +30,7 @@
-
연번
+
@@ -53,10 +53,10 @@
-
+
나포정보
-
+
@@ -66,13 +66,13 @@
-
+
-
+
@@ -80,10 +80,10 @@
-
+
특수공무집행방해
-
+
@@ -93,7 +93,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -113,16 +113,16 @@
-
+
-
+
검거기관
-
+
@@ -132,7 +132,7 @@
-
+
@@ -142,10 +142,10 @@
-
+
현장조사
-
+
@@ -155,16 +155,16 @@
-
+
-
+
압송
-
+
@@ -174,7 +174,7 @@
-
+
diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusViewModal.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusViewModal.html index 7822c17e..a790ef3c 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusViewModal.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusViewModal.html @@ -37,10 +37,10 @@ -
+
나포정보
-
+
@@ -59,7 +59,7 @@
-
+
@@ -107,10 +107,10 @@
-
+
특수공무집행방해
-
+
@@ -140,10 +140,10 @@
-
+
검거기관
-
+
-
+
선박제원
-
+
@@ -247,10 +247,10 @@
-
+
어획물 축소기재
-
+
@@ -260,10 +260,10 @@
-
+
범칙물
-
+
@@ -285,10 +285,10 @@
-
+
처리결과
-
+
@@ -319,19 +319,19 @@
-
+
담보금 미납
-
+
-
+
선박처리
-
+
@@ -367,10 +367,10 @@
-
+
직접인계
-
+
@@ -390,10 +390,10 @@
-
+
구속/ 불구속
-
+
-
+
@@ -437,10 +437,10 @@
-
+
현장조사
-
+
@@ -454,10 +454,10 @@
-
+
압송
-
+
@@ -475,10 +475,10 @@
-
+
압수어구
-
+
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html index e748da14..717c1858 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html @@ -30,9 +30,9 @@ -
+
-
+
@@ -45,7 +45,7 @@
-
+
-
+
@@ -102,10 +102,10 @@
-
+
-
+
@@ -115,7 +115,7 @@
-
+
@@ -125,7 +125,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
@@ -163,13 +163,13 @@
-
+
-
+
@@ -179,7 +179,7 @@
-
+
@@ -189,13 +189,13 @@
-
+
-
+
@@ -207,10 +207,10 @@
-
+
-
+
@@ -220,7 +220,7 @@
-
+
@@ -230,7 +230,7 @@
-
+
@@ -240,7 +240,7 @@
-
+
@@ -269,13 +269,13 @@
-
+
-
+
@@ -285,7 +285,7 @@
-
+
@@ -295,13 +295,13 @@
-
+
-
+
@@ -314,7 +314,7 @@
-
+
@@ -350,7 +350,7 @@
-
+
@@ -368,7 +368,7 @@
-
+
-
+
@@ -431,7 +431,7 @@
-
+
@@ -447,7 +447,7 @@
-
+
-
+
-
+
@@ -513,7 +513,7 @@

- -
+
@@ -574,7 +574,7 @@
-
+
@@ -593,7 +593,7 @@
-
+
@@ -659,7 +659,7 @@
-
+
-
+
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html index 4d171294..5680a981 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html @@ -20,7 +20,7 @@
-
+

불법조업 외국어선 정보

외사통계 > 불법조업외국어선 > 불법조업 외국어선 정보

@@ -28,7 +28,7 @@
-
+
@@ -130,7 +130,7 @@
-
+
@@ -232,7 +232,7 @@
+
@@ -227,7 +227,7 @@
지방청
+
diff --git a/src/main/resources/templates/faStatistics/processResult/processResultAddModal.html b/src/main/resources/templates/faStatistics/processResult/processResultAddModal.html index 25580698..e7ceece6 100644 --- a/src/main/resources/templates/faStatistics/processResult/processResultAddModal.html +++ b/src/main/resources/templates/faStatistics/processResult/processResultAddModal.html @@ -18,7 +18,7 @@ -
+
-
+
@@ -54,7 +54,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
diff --git a/src/main/resources/templates/faStatistics/processResult/processResultEditModal.html b/src/main/resources/templates/faStatistics/processResult/processResultEditModal.html index e4385481..91a0eccf 100644 --- a/src/main/resources/templates/faStatistics/processResult/processResultEditModal.html +++ b/src/main/resources/templates/faStatistics/processResult/processResultEditModal.html @@ -18,7 +18,7 @@ -
+
@@ -35,7 +35,7 @@
-
+
@@ -47,7 +47,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
@@ -114,7 +114,7 @@
-
+
@@ -129,7 +129,7 @@
-
+
diff --git a/src/main/resources/templates/faStatistics/processResult/processResultHistoryDetail.html b/src/main/resources/templates/faStatistics/processResult/processResultHistoryDetail.html index 1201deab..2251aa24 100644 --- a/src/main/resources/templates/faStatistics/processResult/processResultHistoryDetail.html +++ b/src/main/resources/templates/faStatistics/processResult/processResultHistoryDetail.html @@ -1,6 +1,6 @@ -
+
@@ -10,7 +10,7 @@
-
+
@@ -20,7 +20,7 @@
-
+
-
+
@@ -52,7 +52,7 @@
-
+
diff --git a/src/main/resources/templates/faStatistics/processResult/processResultHistoryViewModal.html b/src/main/resources/templates/faStatistics/processResult/processResultHistoryViewModal.html index 61fc0f03..b2107de6 100644 --- a/src/main/resources/templates/faStatistics/processResult/processResultHistoryViewModal.html +++ b/src/main/resources/templates/faStatistics/processResult/processResultHistoryViewModal.html @@ -31,7 +31,7 @@
-
연번
+
@@ -54,7 +54,7 @@
-
+
@@ -64,7 +64,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
@@ -94,7 +94,7 @@
-
+
diff --git a/src/main/resources/templates/faStatistics/processResult/processResultViewModal.html b/src/main/resources/templates/faStatistics/processResult/processResultViewModal.html index a3ea3237..1ccc2d26 100644 --- a/src/main/resources/templates/faStatistics/processResult/processResultViewModal.html +++ b/src/main/resources/templates/faStatistics/processResult/processResultViewModal.html @@ -32,7 +32,7 @@ -
+
@@ -49,7 +49,7 @@
-
+
@@ -61,7 +61,7 @@
-
+
@@ -99,7 +99,7 @@
-
+
@@ -125,7 +125,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
diff --git a/src/main/resources/templates/faStatistics/sailor/sailor.html b/src/main/resources/templates/faStatistics/sailor/sailor.html index 294ea4b2..4984e99a 100644 --- a/src/main/resources/templates/faStatistics/sailor/sailor.html +++ b/src/main/resources/templates/faStatistics/sailor/sailor.html @@ -10,12 +10,12 @@
-
+

선원 세부 현황

-
+
@@ -127,7 +127,7 @@
-
+
diff --git a/src/main/resources/templates/faStatistics/sailor/sailorAddModal.html b/src/main/resources/templates/faStatistics/sailor/sailorAddModal.html index e668cee6..11bec03e 100644 --- a/src/main/resources/templates/faStatistics/sailor/sailorAddModal.html +++ b/src/main/resources/templates/faStatistics/sailor/sailorAddModal.html @@ -18,7 +18,7 @@ -
+
-
+
@@ -43,7 +43,7 @@
-
+
-
+
-
+
diff --git a/src/main/resources/templates/faStatistics/sailor/sailorEditModal.html b/src/main/resources/templates/faStatistics/sailor/sailorEditModal.html index 0c56dd3f..3e48cfe3 100644 --- a/src/main/resources/templates/faStatistics/sailor/sailorEditModal.html +++ b/src/main/resources/templates/faStatistics/sailor/sailorEditModal.html @@ -18,7 +18,7 @@ -
+
@@ -48,7 +48,7 @@
-
+
@@ -56,7 +56,7 @@
-
+
@@ -97,7 +97,7 @@
-
+
@@ -111,7 +111,7 @@
-
+
-
+
-
+
diff --git a/src/main/resources/templates/faStatistics/sailor/sailorHistoryDetail.html b/src/main/resources/templates/faStatistics/sailor/sailorHistoryDetail.html index 456abd74..a743ca8c 100644 --- a/src/main/resources/templates/faStatistics/sailor/sailorHistoryDetail.html +++ b/src/main/resources/templates/faStatistics/sailor/sailorHistoryDetail.html @@ -1,12 +1,12 @@ -
+
-
+
@@ -16,7 +16,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/src/main/resources/templates/faStatistics/sailor/sailorHistoryViewModal.html b/src/main/resources/templates/faStatistics/sailor/sailorHistoryViewModal.html index e58c4fe2..ce4e97e3 100644 --- a/src/main/resources/templates/faStatistics/sailor/sailorHistoryViewModal.html +++ b/src/main/resources/templates/faStatistics/sailor/sailorHistoryViewModal.html @@ -37,7 +37,7 @@
-
연번
+
@@ -60,13 +60,13 @@
-
+
-
+
@@ -76,7 +76,7 @@
-
+
@@ -86,7 +86,7 @@
-
+
@@ -96,7 +96,7 @@
-
+
@@ -106,7 +106,7 @@
-
+
@@ -116,13 +116,13 @@
-
+
-
+
diff --git a/src/main/resources/templates/faStatistics/sailor/sailorViewModal.html b/src/main/resources/templates/faStatistics/sailor/sailorViewModal.html index d1e89e98..96a4d35d 100644 --- a/src/main/resources/templates/faStatistics/sailor/sailorViewModal.html +++ b/src/main/resources/templates/faStatistics/sailor/sailorViewModal.html @@ -33,7 +33,7 @@ -
+
@@ -63,7 +63,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
@@ -109,7 +109,7 @@
-
+
@@ -123,7 +123,7 @@
-
+
-
+
-
+
diff --git a/src/main/resources/templates/fipTarget/ipShipEditModal.html b/src/main/resources/templates/fipTarget/ipShipEditModal.html index 459baff4..5b99c711 100644 --- a/src/main/resources/templates/fipTarget/ipShipEditModal.html +++ b/src/main/resources/templates/fipTarget/ipShipEditModal.html @@ -32,7 +32,7 @@


-
+
@@ -49,7 +49,7 @@


-
+
diff --git a/src/main/resources/templates/fipTarget/ipShipHistory.html b/src/main/resources/templates/fipTarget/ipShipHistory.html index 4a6d8cbc..f94af398 100644 --- a/src/main/resources/templates/fipTarget/ipShipHistory.html +++ b/src/main/resources/templates/fipTarget/ipShipHistory.html @@ -20,7 +20,7 @@
-
+
@@ -28,7 +28,7 @@ - +
등록일
diff --git a/src/main/resources/templates/fipTarget/ipShipList.html b/src/main/resources/templates/fipTarget/ipShipList.html index 608d7d9a..ef498aa2 100644 --- a/src/main/resources/templates/fipTarget/ipShipList.html +++ b/src/main/resources/templates/fipTarget/ipShipList.html @@ -6,7 +6,7 @@
-
+

국제여객선 목록

@@ -32,7 +32,7 @@
- +
@@ -78,7 +78,7 @@

-
+
diff --git a/src/main/resources/templates/fipTarget/partInfoEditModal.html b/src/main/resources/templates/fipTarget/partInfoEditModal.html index dcd983eb..94d3f746 100644 --- a/src/main/resources/templates/fipTarget/partInfoEditModal.html +++ b/src/main/resources/templates/fipTarget/partInfoEditModal.html @@ -34,7 +34,7 @@
-
+
@@ -42,7 +42,7 @@


해경
-
+
@@ -83,7 +83,7 @@


-
+
-
+
항로
+
@@ -35,7 +35,7 @@ - +
등록일
@@ -71,7 +71,7 @@ -
+
@@ -79,7 +79,7 @@

해경
-
+
@@ -91,7 +91,7 @@
-
+
육경
-
+
-
+
-
+

-
+
@@ -128,7 +128,7 @@
-
+
@@ -138,7 +138,7 @@ readonly>
-
+
diff --git a/src/main/resources/templates/fipTarget/partInfoList.html b/src/main/resources/templates/fipTarget/partInfoList.html index 0dc13908..97bbbaee 100644 --- a/src/main/resources/templates/fipTarget/partInfoList.html +++ b/src/main/resources/templates/fipTarget/partInfoList.html @@ -6,12 +6,12 @@
-
+

외사 분실 현황

-
+
@@ -79,7 +79,7 @@
- +
@@ -150,7 +150,7 @@ -
+
@@ -56,7 +56,7 @@


해경
-
+
@@ -97,7 +97,7 @@


-
+
-
+
-
+
-
+
@@ -36,7 +36,7 @@

-
+
@@ -53,13 +53,13 @@
-
+
-
+
diff --git a/src/main/resources/templates/fipTarget/partWorkList.html b/src/main/resources/templates/fipTarget/partWorkList.html index f37470b1..952abc0a 100644 --- a/src/main/resources/templates/fipTarget/partWorkList.html +++ b/src/main/resources/templates/fipTarget/partWorkList.html @@ -6,12 +6,12 @@
-
+

외사분실 실적

-
+
@@ -34,7 +34,7 @@
-
해경서
+
@@ -106,7 +106,7 @@
외사
터미널명
+
@@ -20,7 +20,7 @@ - + diff --git a/src/main/resources/templates/fipTarget/vulnViewModal.html b/src/main/resources/templates/fipTarget/vulnViewModal.html index 266c5f4c..e67e7bc7 100644 --- a/src/main/resources/templates/fipTarget/vulnViewModal.html +++ b/src/main/resources/templates/fipTarget/vulnViewModal.html @@ -10,7 +10,7 @@
-
취약지명작성일/수정일
+
@@ -19,7 +19,7 @@ - + diff --git a/src/main/resources/templates/fipTarget/vulnerableList.html b/src/main/resources/templates/fipTarget/vulnerableList.html index 17c98e03..d0b71c3c 100644 --- a/src/main/resources/templates/fipTarget/vulnerableList.html +++ b/src/main/resources/templates/fipTarget/vulnerableList.html @@ -6,7 +6,7 @@
-
+

외사취약지 목록

@@ -26,7 +26,7 @@
-
취약지명작성일/수정일
+
@@ -69,7 +69,7 @@ diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index 3e0f7672..e37b6e7d 100644 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -1,6 +1,6 @@ -
구분
+
@@ -88,7 +88,7 @@
메시지
+
@@ -232,7 +232,7 @@
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html index c784a185..155dd9c5 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html @@ -9,16 +9,16 @@
-
+

견문통계

-
+
-
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html index 9739270a..42c5c96f 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html @@ -10,7 +10,7 @@ -
+
@@ -28,7 +28,7 @@
-
+
@@ -46,7 +46,7 @@
-
+
@@ -97,13 +97,13 @@

-
+
-
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/fieldStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/affair/fieldStatistics.html index b7a5fafc..b80b8274 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/fieldStatistics.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/fieldStatistics.html @@ -12,7 +12,7 @@
-
제목
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/ratingStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/affair/ratingStatistics.html index 92471c8a..473f9515 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/ratingStatistics.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/ratingStatistics.html @@ -12,7 +12,7 @@
-
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html index b198307a..60b5e31f 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html @@ -13,7 +13,7 @@ -
+
@@ -27,13 +27,13 @@
-
+
-
+
@@ -49,7 +49,7 @@
-
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html index 3a82968b..2e5ee8ad 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html @@ -6,13 +6,13 @@
-
+

첩보수집활동 > 외사경찰 견문관리 > 계획수립

계획수립

-
+
-
+
@@ -83,7 +83,7 @@
-
구분
+
@@ -123,7 +123,7 @@
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html index 3a60b1be..0e2e8477 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html @@ -10,7 +10,7 @@ -
+
@@ -33,14 +33,14 @@
-
+

-
+
@@ -51,7 +51,7 @@

-
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/affairListModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/affairListModal.html index 46f4bb1d..ac62c4db 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/affairListModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/affairListModal.html @@ -5,7 +5,7 @@
제목
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html index 93744e0c..b4122e5b 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html @@ -24,9 +24,9 @@ -
+
-
+
@@ -36,13 +36,13 @@
-
+
-
+
@@ -58,7 +58,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -123,7 +123,7 @@
- -
+
@@ -148,13 +148,13 @@
-
+
-
+
@@ -172,7 +172,7 @@
-
+
@@ -210,7 +210,7 @@
- -
+
@@ -235,7 +235,7 @@
-
+
@@ -247,9 +247,9 @@
-
+
-
+
@@ -270,7 +270,7 @@
작성일자
-
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html index d066c944..683885f1 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html @@ -6,13 +6,13 @@
-
+

첩보수집활동 > 외사경찰 견문관리 > 청산보고서

청산보고서

-
+
-
+
@@ -78,7 +78,7 @@
- +
@@ -120,7 +120,7 @@
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html index 82ac5f3f..e6a835ec 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html @@ -21,9 +21,9 @@ -
+
-
+
@@ -41,7 +41,7 @@

-
+
@@ -52,7 +52,7 @@ th:value="${#strings.concat(#temporals.format(result.useStartDt, 'yyyy-MM-dd'), '~', #temporals.format(result.useEndDt, 'yyyy-MM-dd'))}" readonly>
-
+
@@ -69,10 +69,10 @@

-
+
-
제목
+
@@ -97,7 +97,7 @@
-
+
@@ -105,13 +105,13 @@
-
+
-
+
@@ -124,10 +124,10 @@

-
+
-
no
+
@@ -146,7 +146,7 @@
-
+
@@ -156,7 +156,7 @@
-
no
+
diff --git a/src/main/resources/templates/ivsgt/ivsgt.html b/src/main/resources/templates/ivsgt/ivsgt.html index 92efe3de..a9c970a8 100644 --- a/src/main/resources/templates/ivsgt/ivsgt.html +++ b/src/main/resources/templates/ivsgt/ivsgt.html @@ -4,183 +4,181 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - - + +
-
-

사건 보고

- - -
-
-
+
+

사건 보고

+ + +
+
+
+
+ + + +
+
+
+
- - - -
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
- - -
-
- -
-
-
- -
- - - - -
-
-
작성일자
- - - - - - - - - - - - - - - - - - - - - - - - -
문서번호관서검거유형1검거유형2제목작성자작성일
- -
-
진행보고서
-
결과보고서
-
-
- -
+ + + +
- +
-
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+ +
+
+
+ +
-
-
- -
-
+
+
+ +
\ No newline at end of file diff --git a/src/main/resources/templates/ivsgt/ivsgtEditModal.html b/src/main/resources/templates/ivsgt/ivsgtEditModal.html index a347b12e..4d432294 100644 --- a/src/main/resources/templates/ivsgt/ivsgtEditModal.html +++ b/src/main/resources/templates/ivsgt/ivsgtEditModal.html @@ -34,7 +34,7 @@ -
+
@@ -44,13 +44,13 @@
-
+
-
+
-
+
-
+
-
+
@@ -126,7 +126,7 @@
-
+
diff --git a/src/main/resources/templates/ivsgt/ivsgtViewModal.html b/src/main/resources/templates/ivsgt/ivsgtViewModal.html index 987cd3a4..3569cfc2 100644 --- a/src/main/resources/templates/ivsgt/ivsgtViewModal.html +++ b/src/main/resources/templates/ivsgt/ivsgtViewModal.html @@ -20,7 +20,7 @@ -
+
@@ -30,13 +30,13 @@
-
+
-
+
@@ -46,22 +46,22 @@
-
+
-
+
-
+
-
+
diff --git a/src/main/resources/templates/layout/defaultContentLayout.html b/src/main/resources/templates/layout/defaultContentLayout.html index c7e0e539..30be8a54 100644 --- a/src/main/resources/templates/layout/defaultContentLayout.html +++ b/src/main/resources/templates/layout/defaultContentLayout.html @@ -6,10 +6,10 @@
-
+

페이지 이름

-
+
@@ -63,7 +63,7 @@
-->
- +
@@ -75,7 +75,7 @@ - + -
-
-
+
+
-
+
-
- \ No newline at end of file diff --git a/src/main/resources/templates/login/dashboard.html b/src/main/resources/templates/login/dashboard.html index ed77c796..92873476 100644 --- a/src/main/resources/templates/login/dashboard.html +++ b/src/main/resources/templates/login/dashboard.html @@ -6,10 +6,10 @@
-
+

대시보드

-
+
diff --git a/src/main/resources/templates/login/joinForm.html b/src/main/resources/templates/login/joinForm.html index 7c591a32..b3e76a9d 100644 --- a/src/main/resources/templates/login/joinForm.html +++ b/src/main/resources/templates/login/joinForm.html @@ -24,7 +24,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
@@ -46,7 +46,7 @@
-
+
@@ -56,7 +56,7 @@
-
+
-
+
@@ -75,7 +75,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -26,7 +26,7 @@ -
+
@@ -76,7 +76,7 @@
-
상태
+
@@ -161,7 +161,7 @@
순번
+
diff --git a/src/main/resources/templates/police/career/kwmsCareerModal.html b/src/main/resources/templates/police/career/kwmsCareerModal.html index bd9bccac..0e5d8c0d 100644 --- a/src/main/resources/templates/police/career/kwmsCareerModal.html +++ b/src/main/resources/templates/police/career/kwmsCareerModal.html @@ -7,7 +7,7 @@
임용구분
+
diff --git a/src/main/resources/templates/police/education/eduEditModal.html b/src/main/resources/templates/police/education/eduEditModal.html index 91333e33..d5fd0197 100644 --- a/src/main/resources/templates/police/education/eduEditModal.html +++ b/src/main/resources/templates/police/education/eduEditModal.html @@ -15,7 +15,7 @@ -
+
@@ -25,7 +25,7 @@
-
+
@@ -39,7 +39,7 @@
-
+
@@ -48,7 +48,7 @@
-
경력구분
+
@@ -57,7 +57,7 @@ - + diff --git a/src/main/resources/templates/police/education/educationMgt.html b/src/main/resources/templates/police/education/educationMgt.html index abb094b3..d5a4f1df 100644 --- a/src/main/resources/templates/police/education/educationMgt.html +++ b/src/main/resources/templates/police/education/educationMgt.html @@ -6,12 +6,12 @@
-
+

외사경찰 교육 현황

-
+
@@ -26,7 +26,7 @@ -
+
@@ -77,7 +77,7 @@
-
교육명
+
@@ -123,7 +123,7 @@
순번
+
diff --git a/src/main/resources/templates/police/personnelStatus/personnelStatusHistory.html b/src/main/resources/templates/police/personnelStatus/personnelStatusHistory.html index c7f0eeba..78f2a644 100644 --- a/src/main/resources/templates/police/personnelStatus/personnelStatusHistory.html +++ b/src/main/resources/templates/police/personnelStatus/personnelStatusHistory.html @@ -2,7 +2,7 @@
-
관서
+
diff --git a/src/main/resources/templates/police/police/policeEditModal.html b/src/main/resources/templates/police/police/policeEditModal.html index db193992..f7d49680 100644 --- a/src/main/resources/templates/police/police/policeEditModal.html +++ b/src/main/resources/templates/police/police/policeEditModal.html @@ -25,7 +25,7 @@ -
+
@@ -36,7 +36,7 @@
-
+
@@ -46,7 +46,7 @@
-
+
-
+
@@ -65,7 +65,7 @@
-
+
-
+
-
+
-
+
-
+
관서
+
@@ -32,7 +32,7 @@ - +
등록일
@@ -51,13 +51,13 @@
-
+
-
+
@@ -67,7 +67,7 @@
-
+
@@ -77,13 +77,13 @@
-
+
-
+
@@ -93,7 +93,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -113,7 +113,7 @@
-
+
@@ -123,7 +123,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/src/main/resources/templates/police/police/policeList.html b/src/main/resources/templates/police/police/policeList.html index e0588d2b..e5080489 100644 --- a/src/main/resources/templates/police/police/policeList.html +++ b/src/main/resources/templates/police/police/policeList.html @@ -6,12 +6,12 @@
-
+

-
+
@@ -26,7 +26,7 @@ -
+
@@ -80,7 +80,7 @@
- +
@@ -140,7 +140,7 @@
순번
+
@@ -96,7 +96,7 @@
+
@@ -99,7 +99,7 @@
+
diff --git a/src/main/resources/templates/publicBoard/notice/noticeViewModal.html b/src/main/resources/templates/publicBoard/notice/noticeViewModal.html index df6b3b8c..accb3858 100644 --- a/src/main/resources/templates/publicBoard/notice/noticeViewModal.html +++ b/src/main/resources/templates/publicBoard/notice/noticeViewModal.html @@ -8,7 +8,7 @@
-
+
@@ -29,14 +29,14 @@
-
+

-
+
diff --git a/src/main/resources/templates/publicBoard/qna/qnaEditModal.html b/src/main/resources/templates/publicBoard/qna/qnaEditModal.html index 3c253043..58ef30fc 100644 --- a/src/main/resources/templates/publicBoard/qna/qnaEditModal.html +++ b/src/main/resources/templates/publicBoard/qna/qnaEditModal.html @@ -15,7 +15,7 @@ -
+
@@ -33,13 +33,13 @@
-
+
-
+
diff --git a/src/main/resources/templates/publicBoard/qna/qnaPage.html b/src/main/resources/templates/publicBoard/qna/qnaPage.html index 74c59f32..a91412d7 100644 --- a/src/main/resources/templates/publicBoard/qna/qnaPage.html +++ b/src/main/resources/templates/publicBoard/qna/qnaPage.html @@ -9,12 +9,12 @@
-
+

QnA

-
+
@@ -57,7 +57,7 @@
-
제목
+
@@ -97,7 +97,7 @@
+
@@ -106,7 +106,7 @@
+
@@ -126,7 +126,7 @@
+
@@ -144,7 +144,7 @@ diff --git a/src/main/resources/templates/translator/translatorCareerInsert.html b/src/main/resources/templates/translator/translatorCareerInsert.html index d0bed886..ef5b44d7 100644 --- a/src/main/resources/templates/translator/translatorCareerInsert.html +++ b/src/main/resources/templates/translator/translatorCareerInsert.html @@ -3,7 +3,7 @@
-
+
경력 등록
diff --git a/src/main/resources/templates/translator/translatorCareerModal.html b/src/main/resources/templates/translator/translatorCareerModal.html index 64f37c42..e85e9d2c 100644 --- a/src/main/resources/templates/translator/translatorCareerModal.html +++ b/src/main/resources/templates/translator/translatorCareerModal.html @@ -3,10 +3,10 @@
-
+
-
+
@@ -17,7 +17,7 @@
해양경찰청 이력
-
연번
+
@@ -40,7 +40,7 @@
타기관 이력
-
연번
+
diff --git a/src/main/resources/templates/translator/translatorDashBoard.html b/src/main/resources/templates/translator/translatorDashBoard.html index 5b064bfc..31f2a17c 100644 --- a/src/main/resources/templates/translator/translatorDashBoard.html +++ b/src/main/resources/templates/translator/translatorDashBoard.html @@ -11,7 +11,7 @@
-
연번
+
@@ -21,7 +21,7 @@ - + @@ -59,7 +59,7 @@ -
+
@@ -75,7 +75,7 @@ diff --git a/src/main/resources/templates/translator/translatorEditModal.html b/src/main/resources/templates/translator/translatorEditModal.html index 48dbebb8..eb344650 100644 --- a/src/main/resources/templates/translator/translatorEditModal.html +++ b/src/main/resources/templates/translator/translatorEditModal.html @@ -7,7 +7,7 @@
-
+
-
+
@@ -52,7 +52,7 @@
-
+
-
+
diff --git a/src/main/resources/templates/translator/translatorHistory.html b/src/main/resources/templates/translator/translatorHistory.html index e3798317..816f82f5 100644 --- a/src/main/resources/templates/translator/translatorHistory.html +++ b/src/main/resources/templates/translator/translatorHistory.html @@ -12,7 +12,7 @@
-
관서명연락처
+
@@ -20,7 +20,7 @@ - +
등록일
@@ -36,7 +36,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
@@ -64,7 +64,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -92,7 +92,7 @@
-
+
diff --git a/src/main/resources/templates/translator/translatorStatisticsLang.html b/src/main/resources/templates/translator/translatorStatisticsLang.html index d1785af3..564f4913 100644 --- a/src/main/resources/templates/translator/translatorStatisticsLang.html +++ b/src/main/resources/templates/translator/translatorStatisticsLang.html @@ -6,12 +6,12 @@
-
+

어권별 현황