diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java index c9f18bf6..5529ca48 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java @@ -44,7 +44,6 @@ public class UnlawfulFishingController { yearList.add(params.getYear()); } List csDTOList = new ArrayList<>(); - CSStatistics statistics = new CSStatistics(); mav.addObject("crackdownInfoList", csDTOList); mav.addObject("yearList", yearList); @@ -69,10 +68,20 @@ public class UnlawfulFishingController { return mav; } + @GetMapping("/cdiSelectModal") + public ModelAndView crackdownInfoSelectModal(@AuthenticationPrincipal UserInfo loginUser, CrackdownInfo params){ + ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/crackdownInfo/cdiSelectModal"); + List csDTOList = new ArrayList<>(); + + mav.addObject("crackdownInfoList", csDTOList); + mav.addObject("searchParams", params); + return mav; + } + @GetMapping("/illegalShipInfo") public ModelAndView illegalShipPage(@AuthenticationPrincipal UserInfo loginUser, UnlawfulFishingParam params){ - ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/crackdownInfo/illegalShipInfoPage"); + ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage"); //메뉴권한 확인 AccessConfig accessConfig = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/illegalShipInfo").get(0); mav.addObject("menuKey", accessConfig.getMenuKey()); @@ -111,6 +120,15 @@ public class UnlawfulFishingController { return mav; } + @GetMapping("/isiSelectModal") + public ModelAndView illegalShipInfoSelectModal(@AuthenticationPrincipal UserInfo loginUser, IllegalShipInfo params){ + ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/illegalShipInfo/isiSelectModal"); + List csDTOList = new ArrayList<>(); + + mav.addObject("crackdownInfoList", csDTOList); + mav.addObject("searchParams", params); + return mav; + } @GetMapping("/shipProcessInfo") public ModelAndView shipProcessInfoPage(@AuthenticationPrincipal UserInfo loginUser, UnlawfulFishingParam params){ diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipInfo.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipInfo.js new file mode 100644 index 00000000..770b9df8 --- /dev/null +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipInfo.js @@ -0,0 +1,53 @@ + +$(document).on('click', '#addIllegalShipInfoBtn', function (){ + getIsiEditModal(null); +}) + +function getIsiEditModal(fbKey){ + $.ajax({ + url: '/unlawfulFishing/isiEditModal', + data: {fbKey: fbKey}, + type: 'GET', + dataType:"html", + success: function(html){ + const contentDiv = $("#isiEditModalContent"); + contentDiv.empty().append(html) + $(".dateSelector").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + $("#isiEditModal").modal('show'); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); +} + + + +$(document).on('click', '#selectCrackdownInfoBtn', function (){ + getCdiSelectModal(null); +}) + +function getCdiSelectModal(){ + $.ajax({ + url: '/unlawfulFishing/cdiSelectModal', + type: 'GET', + dataType:"html", + success: function(html){ + const contentDiv = $("#cdiSelectModalContent"); + contentDiv.empty().append(html) + $(".dateSelector").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + $("#cdiSelectModal").modal('show'); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); +} \ No newline at end of file diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js new file mode 100644 index 00000000..2493a395 --- /dev/null +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js @@ -0,0 +1,26 @@ + +$(document).on('click', '#addIllegalShipSailorBtn', function (){ + getIssEditModal(null); +}) + +function getIssEditModal(sailorKey){ + $.ajax({ + url: '/unlawfulFishing/issEditModal', + data: {sailorKey: sailorKey}, + type: 'GET', + dataType:"html", + success: function(html){ + const contentDiv = $("#issEditModalContent"); + contentDiv.empty().append(html) + $(".dateSelector").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + $("#issEditModal").modal('show'); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); +} \ No newline at end of file diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSelectModal.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSelectModal.js new file mode 100644 index 00000000..6d2460fd --- /dev/null +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSelectModal.js @@ -0,0 +1,25 @@ + +$(document).on('click', '#selectIllegalShipInfoBtn', function (){ + getIsiSelectModal(null); +}) + +function getIsiSelectModal(){ + $.ajax({ + url: '/unlawfulFishing/isiSelectModal', + type: 'GET', + dataType:"html", + success: function(html){ + const contentDiv = $("#isiSelectModalContent"); + contentDiv.empty().append(html) + $(".dateSelector").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + $("#isiSelectModal").modal('show'); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); +} \ No newline at end of file diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/shipProcessInfo.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/shipProcessInfo.js new file mode 100644 index 00000000..4faf03b8 --- /dev/null +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/shipProcessInfo.js @@ -0,0 +1,26 @@ + +$(document).on('click', '#addShipProcessInfoBtn', function (){ + getSpiEditModal(null); +}) + +function getSpiEditModal(prKey){ + $.ajax({ + url: '/unlawfulFishing/spiEditModal', + data: {prKey: prKey}, + type: 'GET', + dataType:"html", + success: function(html){ + const contentDiv = $("#spiEditModalContent"); + contentDiv.empty().append(html) + $(".dateSelector").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + $("#spiEditModal").modal('show'); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); +} \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html index 942c229b..c466cbd5 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html @@ -18,10 +18,38 @@
+
- -
- + +
+ +
+
+
+ +
+ +
+ + + + +
+
+
+
@@ -60,13 +88,17 @@
+ +
+ +
@@ -104,6 +136,79 @@
+
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+
+
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+
+
+
+
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+
- \ No newline at end of file + + diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html index f9cec94e..95e64c30 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html @@ -3,7 +3,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - + - -
-
- - - -
-
-
-
불법조업 외국어선 단속현황
-
-

외사통계 > 불법조업외국어선 > 불법조업 외국어선 단속현황

-
-
-
-
-
- -
-
-
- -
-
- -
-
-
-
-
-
-
- -
-
- -
-
- -
-
- -
+ + +
+
- \ No newline at end of file + + diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html index f9cec94e..8f62b2ff 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html @@ -3,7 +3,8 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - + +