From 94b5e61eb939c926e99c4e4aec6967af7b5999e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Fri, 9 Dec 2022 18:13:29 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=A0=9C=EC=97=AC=EA=B0=9D=EC=84=A0?= =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=20=EB=AA=A8=EB=8B=AC=20=EB=94=94=EC=9E=90?= =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/fipTarget/FipTargetController.java | 6 +- .../resources/static/js/fipTarget/shipInfo.js | 14 +- .../templates/fipTarget/ipShipEditModal.html | 156 +++++++------- .../templates/fipTarget/ipShipHistory.html | 127 ++++-------- .../templates/fipTarget/ipShipHistoryDiv.html | 84 ++++++++ .../templates/fipTarget/ipShipViewModal.html | 192 ++++++++++-------- 6 files changed, 320 insertions(+), 259 deletions(-) create mode 100644 src/main/resources/templates/fipTarget/ipShipHistoryDiv.html diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java index a42c06f1..85223122 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java @@ -571,8 +571,10 @@ public class FipTargetController { @GetMapping("/ipShipHistoryView") @ResponseBody - public ShipInfo ipShipHistoryView(ShipInfo shipInfo){ - return fipTargetService.selectIpShipHistoryView(shipInfo); + public ModelAndView ipShipHistoryView(ShipInfo shipInfo){ + ModelAndView mav = new ModelAndView("fipTarget/ipShipHistoryDiv"); + mav.addObject("shipInfo", fipTargetService.selectIpShipHistoryView(shipInfo)); + return mav; } @PostMapping("/deleteShipInfo") diff --git a/src/main/resources/static/js/fipTarget/shipInfo.js b/src/main/resources/static/js/fipTarget/shipInfo.js index 0b09fe2c..3f5788aa 100644 --- a/src/main/resources/static/js/fipTarget/shipInfo.js +++ b/src/main/resources/static/js/fipTarget/shipInfo.js @@ -96,6 +96,7 @@ $(document).on('click', '.shipInfoTr', function (){ $(document).on('click', '#viewTab', function (){ const siSeq = (Number($(this).data('siseq'))); const siType = $(this).data('sitype'); + $(this).parents(".modal-dialog")[0].className = "modal-dialog modal-lg modal-dialog-scrollable"; showViewModal(siSeq,siType); }) @@ -121,6 +122,7 @@ function showViewModal(siSeq,siType){ $(document).on('click', '#historyTab', function (){ const siSeq = (Number($(this).data('siseq'))); const siType = $(this).data('sitype'); + $(this).parents(".modal-dialog")[0].className = "modal-dialog modal-xl modal-dialog-scrollable"; showHistory(siSeq,siType); }) @@ -210,15 +212,9 @@ $(document).on('click', '.historyInfoTr', function (){ versionNo : Number($(this).find(".verNo").val()) }, type: 'GET', - dataType:"json", - success: function(data){ - $('#hHangro').val(data.startPoint+' / '+data.endPoint+'('+data.distanceNm+','+data.distanceKm+')'); - $('#hOwnerNm').val(data.ownerNm); - $('#hShipNm').val(data.shipNm); - $('#hShipWeight').val(data.shipWeight); - $('#hSusong').val('여객 : '+data.passengerCnt+'명'+'\n'+'화물 : '+data.freightCnt+'TEU'); - $('#hOperationCnt').val(data.operationCnt); - $('#hCloseYn').val(data.closeYn); + dataType:"html", + success: function(html){ + $("#valueDiv").empty().append(html); }, error:function(){ diff --git a/src/main/resources/templates/fipTarget/ipShipEditModal.html b/src/main/resources/templates/fipTarget/ipShipEditModal.html index dae68ba0..8c739e0a 100644 --- a/src/main/resources/templates/fipTarget/ipShipEditModal.html +++ b/src/main/resources/templates/fipTarget/ipShipEditModal.html @@ -9,88 +9,98 @@
- - - -
항로
-
- -
- -
- -
- -
+ + + +
+ +
+
+ +
+
-
- -
- -
- -
- -
+ +
+
-

-
- -
- -
- -
- -
+
+
+ +
+
-
- -
- -
+ +
+
-

-
- -
- -
- -
- -
-
-
- -
- -
-
-
- -
+
+
+ +
-
+ + + +
-
- -
- -
+
+
+
+
+ +
+
+ +
+
- + +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+
+
+ +
+ +
+
+
-
- -
-
-
+
+ +
+
+
diff --git a/src/main/resources/templates/fipTarget/ipShipHistory.html b/src/main/resources/templates/fipTarget/ipShipHistory.html index 9e02e6c1..3959e7ad 100644 --- a/src/main/resources/templates/fipTarget/ipShipHistory.html +++ b/src/main/resources/templates/fipTarget/ipShipHistory.html @@ -2,98 +2,53 @@
-
+
한-중 국제여객선 수정이력 한-일,러 국제여객선 수정이력
- +
- -
-
-
-
-
- - - - - - - - - - - - - - - -
작성자등록일
- - -
-
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
+ +
+
+
+ + + + + + + + + + + + + + + +
작성자등록일
+ + +
+
+
+ 목록에서 선택해주세요. +
+
+
-
- -
+
+ +
\ No newline at end of file diff --git a/src/main/resources/templates/fipTarget/ipShipHistoryDiv.html b/src/main/resources/templates/fipTarget/ipShipHistoryDiv.html new file mode 100644 index 00000000..9a49a435 --- /dev/null +++ b/src/main/resources/templates/fipTarget/ipShipHistoryDiv.html @@ -0,0 +1,84 @@ + + +
+ +
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+
+
+ +
+ +
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/fipTarget/ipShipViewModal.html b/src/main/resources/templates/fipTarget/ipShipViewModal.html index 924b2678..7dfcaaf5 100644 --- a/src/main/resources/templates/fipTarget/ipShipViewModal.html +++ b/src/main/resources/templates/fipTarget/ipShipViewModal.html @@ -1,105 +1,119 @@ -
-
+
+ 한-중 국제여객선 상세 + 한-일,러 국제여객선 상세 +
- -
- - - - - -
항로
-
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-

-
- -
- -
- -
- -
-
-
- -
- -
-
-

-
- -
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- + +
+ + + + + + +
+ +
+
+
- + +
+ +
+
- +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
-
+
-
-
-
+
+
+