From 08623c9833c17e3e9533b6047953ca4264d797ec Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Fri, 27 Jan 2023 14:50:50 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=A4=911?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/css/common.css                  | 8 ++++++++
 src/main/resources/static/js/fipTarget/shipInfo.js        | 2 +-
 src/main/resources/templates/faRpt/faRptEditModal.html    | 2 +-
 .../faStatistics/fishingBoat/fishingBoatEditModal.html    | 4 ++--
 .../resources/templates/faStatistics/sailor/sailor.html   | 2 +-
 src/main/resources/templates/fipTarget/ipShipList.html    | 2 +-
 .../resources/templates/police/police/policeList.html     | 5 +++--
 7 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css
index db36d137..93304453 100644
--- a/src/main/resources/static/css/common.css
+++ b/src/main/resources/static/css/common.css
@@ -205,4 +205,12 @@
   background-color: #deebff78!important;
 }
 
+.pSticky thead{
+  position: sticky;
+}
 
+.pSticky th {
+  position: sticky;
+  top: 0px;
+
+}
diff --git a/src/main/resources/static/js/fipTarget/shipInfo.js b/src/main/resources/static/js/fipTarget/shipInfo.js
index 6ca271b1..4da49cb9 100644
--- a/src/main/resources/static/js/fipTarget/shipInfo.js
+++ b/src/main/resources/static/js/fipTarget/shipInfo.js
@@ -259,4 +259,4 @@ $(document).on('click', '#goExcel', function (){
 
 $(document).on('click', '#btn-close', function (){
 	location.reload();
-})
\ No newline at end of file
+})
diff --git a/src/main/resources/templates/faRpt/faRptEditModal.html b/src/main/resources/templates/faRpt/faRptEditModal.html
index 26e56519..cf9c507a 100644
--- a/src/main/resources/templates/faRpt/faRptEditModal.html
+++ b/src/main/resources/templates/faRpt/faRptEditModal.html
@@ -125,5 +125,5 @@
 <div class="modal-footer bg-light">
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
   <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
-  <button type="button" class="btn btn-primary" id="saveFaRptBtn">저장</button>
+  <button type="button" class="btn btn-primary" id="saveFaRptBtn">송신</button>
 </div>
\ No newline at end of file
diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html
index 4f242db6..f8834bb4 100644
--- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html
+++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html
@@ -630,14 +630,14 @@
               </th:block>
             </select>
           </div>
-          <label for="isIvsgtStop" class="col-sm-1 col-form-label col-form-label-sm text-center">수사중지여부</label>
+          <!--<label for="isIvsgtStop" class="col-sm-1 col-form-label col-form-label-sm text-center">수사중지여부</label>
           <div class="col-sm-2">
             <select class="form-select form-select-sm " id="isIvsgtStop" name="processResult.isIvsgtStop">
               <option value="">선택</option>
               <option value="Y" th:selected="${crackdownStatus.processResult.isIvsgtStop eq 'Y'}">O</option>
               <option value="N" th:selected="${crackdownStatus.processResult.isIvsgtStop eq 'N'}">X</option>
             </select>
-          </div>
+          </div>-->
           <label class="col-sm-1 col-form-label col-form-label-sm text-center">선고법원</label>
           <div class="col-sm-2">
             <input class="form-control form-control-sm" name="processResult.sentencingCourt" id="sentencingCourt" th:value="${crackdownStatus.processResult.sentencingCourt}">
diff --git a/src/main/resources/templates/faStatistics/sailor/sailor.html b/src/main/resources/templates/faStatistics/sailor/sailor.html
index 3364060b..46f8150c 100644
--- a/src/main/resources/templates/faStatistics/sailor/sailor.html
+++ b/src/main/resources/templates/faStatistics/sailor/sailor.html
@@ -143,7 +143,7 @@
                 <div class="col-12 overflow-auto">
                   <table class="table table-sm table-hover table-bordered text-nowrap" id="sailorTable">
                     <thead class="align-middle">
-                    <tr class="table-secondary">
+                    <tr class="table-secondary pSticky" >
                       <!--<th rowspan="2">연번</th>-->
                       <th rowspan="2">선박명</th>
                       <th rowspan="2">나포일시</th>
diff --git a/src/main/resources/templates/fipTarget/ipShipList.html b/src/main/resources/templates/fipTarget/ipShipList.html
index 46957edd..305caa7b 100644
--- a/src/main/resources/templates/fipTarget/ipShipList.html
+++ b/src/main/resources/templates/fipTarget/ipShipList.html
@@ -106,7 +106,7 @@
                     <input type="hidden" class="verNo" th:value="${si.versionNo}">
                     <td>
                       <div th:text="|${si.startPoint}/${si.endPoint}|"></div>
-                      <div th:text="|(${si.distanceNm}해리,${si.distanceKm}km)|"></div>
+                      <div th:text="|(${si.distanceNm}해리),${si.distanceKm}km)|"></div>
                     </td>
                     <td th:text="${si.ownerNm}"></td>
                     <td th:text="${si.shipNm}"></td>
diff --git a/src/main/resources/templates/police/police/policeList.html b/src/main/resources/templates/police/police/policeList.html
index ecc11bfb..05ee433d 100644
--- a/src/main/resources/templates/police/police/policeList.html
+++ b/src/main/resources/templates/police/police/policeList.html
@@ -130,8 +130,9 @@
                         <td th:text="${list.policeInDate}"></td>
                         <td th:text="${list.titleInDate}"></td>
                         <td th:text="${list.ofcInDate}"></td>
-                        <td th:text="${list.outturnCd}"></td>
-                        <td></td>
+                        <!--<td th:text="${list.outturnCd}"></td>-->
+                        <td th:if="${list.outturnCd == '수사'}">O</td>
+                        <td th:if="${list.outturnCd != '수사'}">X</td>
                         <td th:text="${list.jobInCd}"></td>
                         <td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                         <th:block th:if="${userStatus eq 'USC003'} and ${accessAuth eq 'ACC003'}">