From ee3d724b68b1a3aa4e6be6b818d0bdb14f335fae Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Tue, 31 Jan 2023 10:20:14 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EA=B2=BD=EC=B0=B0=20?=
 =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=B2=A9=EB=B3=B4=EB=A7=9D=20=EA=B2=AC?=
 =?UTF-8?q?=EB=AC=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/css/common.css        |  2 +-
 src/main/resources/static/js/ivsgt/ivsgt.js     |  4 ++--
 .../fpiMgt/affairResult/resultViewModal.html    | 17 ++++++++---------
 .../fpiMgt/intelligenceNetwork/analyzeList.html |  2 +-
 .../fireExtensionReportList.html                |  2 +-
 .../fireExtensionReportViewModal.html           | 10 ++++------
 .../intelligenceAnalyzeEditModal.html           | 12 ++++++------
 .../intelligenceAnalyzeViewModal.html           |  8 +++++---
 .../operationPlanEditModal.html                 | 10 +++++-----
 .../intelligenceNetwork/operationPlanList.html  |  5 ++++-
 .../operationPlanViewModal.html                 |  7 +++----
 11 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css
index 7ae75411..88d34e03 100644
--- a/src/main/resources/static/css/common.css
+++ b/src/main/resources/static/css/common.css
@@ -245,4 +245,4 @@ body {
 
 .titleLeft {
   text-align: left !important;
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/static/js/ivsgt/ivsgt.js b/src/main/resources/static/js/ivsgt/ivsgt.js
index 4d5a8025..12cd09e1 100644
--- a/src/main/resources/static/js/ivsgt/ivsgt.js
+++ b/src/main/resources/static/js/ivsgt/ivsgt.js
@@ -171,11 +171,11 @@ function contentCheck(){
     flag = false;
   }
   else if(!$("#arrestCd").val()){
-    alert("검거유형1을 선택해주세요.")
+    alert("범죄테마를 선택해주세요.")
     flag = false;
   }
   else if(!$("#arrestCd2").val()){
-    alert("검거유형2를 선택해주세요.")
+    alert("위반유형을 선택해주세요.")
     flag = false;
   }
   else if(!$("#relatedReport").is(':checked') && $("input[name='ivsgtType']").val() != "arrest") {
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html
index cb41bb6d..3f2f2690 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html
@@ -33,7 +33,7 @@
               <input type="text" class="form-control border-0" id="wrtDt" name="wrtDt" th:value="${#temporals.format(result.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
             </div>
             <label for="resultState" class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">상태</label>
-            <div class="col-sm-2 border-end border-secondary col-form-label col-form-label-sm text-start">
+            <div class="col-sm-4 border-end border-secondary col-form-label col-form-label-sm text-start">
               <th:block th:each="commonCode:${session.commonCode.get('DST')}">
                 <input type="text" class="form-control border-0" th:if="${commonCode.itemCd eq result.resultState}" th:value="${commonCode.itemValue}" readonly>
               </th:block>
@@ -42,11 +42,11 @@
           <hr>
           <div class="row mb-1">
             <label for="clearTitle" class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">목적(제목)</label>
-            <div class="col-sm-6 border-end border-secondary col-form-label col-form-label-sm text-start">
+            <div class="col-sm-5 border-end border-secondary col-form-label col-form-label-sm text-start">
               <input type="text" class="form-control border-0" id="clearTitle" name="clearTitle" th:value="${result.clearTitle}" readonly>
             </div>
             <label for="useDate" class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">사용기간</label>
-            <div class="col-sm-3 border-end border-secondary col-form-label col-form-label-sm text-start">
+            <div class="col-sm-4 border-end border-secondary col-form-label col-form-label-sm text-start">
               <input type="text" class="form-control border-0" id="useDate" name="useDate"
                      th:value="${#strings.concat(#temporals.format(result.useStartDt, 'yyyy-MM-dd'), '~', #temporals.format(result.useEndDt, 'yyyy-MM-dd'))}" readonly>
             </div>
@@ -61,7 +61,7 @@
               <input type="text" class="form-control border-0" id="usePrice" name="usePrice" th:value="${#numbers.formatInteger(result.usePrice, 1, 'COMMA')+'원'}" readonly>
             </div>
             <label for="workDate" class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">사업기간</label>
-            <div class="col-sm-3 border-end border-secondary col-form-label col-form-label-sm text-start">
+            <div class="col-sm-4 border-end border-secondary col-form-label col-form-label-sm text-start">
               <input type="text" class="form-control border-0" id="workDate" name="workDate"
                      th:value="${#strings.concat(#temporals.format(result.workStartDt, 'yyyy-MM-dd'), '~', #temporals.format(result.workEndDt, 'yyyy-MM-dd'))}" readonly>
             </div>
@@ -105,18 +105,17 @@
         <div class="tab-pane fade p-2" id="resultReportViewTabPanel" role="tabpanel" aria-labelledby="resultReportViewTab" tabindex="0">
           <div class="row mb-1">
             <label for="resultTitle" class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">사업명</label>
-            <div class="col-sm-10">
+            <div class="col-sm-9 border-end border-secondary col-form-label col-form-label-sm text-start">
               <input type="text" class="form-control border-0" id="resultTitle" name="resultTitle" th:value="${result.resultTitle}" readonly>
             </div>
           </div>
           <div class="row mb-1">
             <label for="usePrice" class="col-sm-1 border-end border-secondary col-fo rm-label col-form-label-sm text-center fw-bold">집행예산</label>
-            <div class="col-sm-2">
+            <div class="col-sm-3 border-end border-secondary col-form-label col-form-label-sm text-start">
               <input type="text" class="form-control border-0" id="usePrice" name="usePrice" th:value="${#numbers.formatInteger(result.usePrice, 1, 'COMMA')+'원'}" readonly>
             </div>
-            <div class="col-sm-1"></div>
             <label for="workDate" class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">사업기간</label>
-            <div class="col-sm-3">
+            <div class="col-sm-5 border-end border-secondary col-form-label col-form-label-sm text-start">
               <input type="text" class="form-control border-0" id="workDate" name="workDate"
                      th:value="${#strings.concat(#temporals.format(result.workStartDt, 'yyyy-MM-dd'), '~', #temporals.format(result.workEndDt, 'yyyy-MM-dd'))}" readonly>
             </div>
@@ -146,7 +145,7 @@
           <hr>
           <div class="row mb-1">
             <label for="resultEtc" class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">비고</label>
-            <div class="col-sm-10">
+            <div class="col-sm-9 border-end border-secondary col-form-label col-form-label-sm text-start">
               <input type="text" class="form-control border-0" id="resultEtc" name="resultEtc" th:value="${result.resultEtc}" readonly>
             </div>
           </div>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/analyzeList.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/analyzeList.html
index e22e79d7..664d752b 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/analyzeList.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/analyzeList.html
@@ -86,7 +86,7 @@
                     <th rowspan="2">등록일</th>
                     <th rowspan="2">관리관<br>결제여부</th>
                   </tr>
-                  <tr>
+                  <tr class="table-secondary">
                   	<th>계</th>
                     <th>특보</th>
                     <th>중보</th>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html
index 007b665e..61f583de 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html
@@ -99,7 +99,7 @@
                     <th rowspan="2">조치</th>
                     <th rowspan="2">등록일</th>
                   </tr>
-                  <tr>
+                  <tr class="table-secondary">
                   	<th>성명</th>
                     <th>나이</th>
                     <th>근무처(소속)</th>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportViewModal.html
index cac78ca2..664598ad 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportViewModal.html
@@ -26,9 +26,8 @@
         </th:block>
       </div>
       <hr>
-      <div class="row mb-1"><h6 class="text-center">정보협력자<br>구성</h6></div>
-      <br>
-      <div class="row">
+      <div class="row mb-1"><h6 class="text-center">정보협력자 구성</h6></div>
+      <div class="row text-center">
         <div class="col-sm-1"></div>
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">성명:</label>
         <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${fer.operationPlan.opName}"></label>
@@ -55,7 +54,6 @@
      </div>
 	 <hr>
       <div class="row mb-1"><h6 class="text-center">소요예산</h6></div>
-      <br>
       <div class="row">
         <div class="col-sm-1"></div>
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">배정액:</label>
@@ -68,7 +66,7 @@
       <div class="row">
         <div class="col-sm-1"></div>
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">비고</label>
-        <div class="col-sm-8 form-control-sm" id="contentDiv">
+        <div class="col-sm-8 form-control-sm col-form-label col-form-label-sm text-start" id="contentDiv">
           <div th:utext="${#strings.replace(fer.note, lineSeparator, '<br>')}"></div>
         </div>
       </div>
@@ -107,7 +105,7 @@
                 <th:block th:if="${commonCode.itemCd eq apprv.userGrd}" th:text="|결재자: ${commonCode.itemValue} ${apprv.userNm}|"></th:block>
             </th:block>
             </label>
-            <label class="col-sm-2 col-form-label col-form-label-sm text-center">
+            <label class="col-sm-4 col-form-label col-form-label-sm text-center">
                 <th:block th:text="|결제일시: ${#temporals.format(apprv.saveDt, 'yyyy-MM-dd HH:mm:ss')}|"></th:block>
             </label>
             
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal.html
index 9a467d1d..741e0265 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal.html
@@ -51,7 +51,7 @@
                     <th rowspan="2">허위오보</th>
                     <th colspan="4">활용실적</th>
                   </tr>
-                  <tr>
+                  <tr class="table-secondary">
                   	<th>계</th>
                     <th>특보</th>
                     <th>중보</th>
@@ -86,31 +86,31 @@
     <div class="row mb-1">
       <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">외사활동</label>
       <div class="col-sm-11">
-      	<textarea id="targetLocation" name="foreignAffairs" th:utext="${ia.foreignAffairs}" rows="5" cols="139" ></textarea>
+      	<textarea id="targetLocation" name="foreignAffairs" th:utext="${ia.foreignAffairs}" rows="5" cols="108" ></textarea>
       </div>
     </div>
     <div class="row mb-1">
       <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">공작</label>
       <div class="col-sm-11">
-      	<textarea id="vulnerabilityAnalyze" name="work" th:utext="${ia.work}" rows="5" cols="139" ></textarea>
+      	<textarea id="vulnerabilityAnalyze" name="work" th:utext="${ia.work}" rows="5" cols="108" ></textarea>
       </div>
     </div>
     <div class="row mb-1">
       <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">외사사범 검거</label>
       <div class="col-sm-11">
-      	<textarea id="eligibilityAnalyze" name="arrestOffenders" th:utext="${ia.arrestOffenders}" rows="5" cols="139" ></textarea>
+      	<textarea id="eligibilityAnalyze" name="arrestOffenders" th:utext="${ia.arrestOffenders}" rows="5" cols="108" ></textarea>
       </div>
     </div>
     <div class="row mb-1">
       <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">분석 및 평가</label>
       <div class="col-sm-11">
-      	<textarea id="focusCollection" name="analysisEvaluation" th:utext="${ia.analysisEvaluation}" rows="5" cols="139"></textarea>
+      	<textarea id="focusCollection" name="analysisEvaluation" th:utext="${ia.analysisEvaluation}" rows="5" cols="108"></textarea>
       </div>
     </div>
     <div class="row mb-1">
       <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">대책</label>
       <div class="col-sm-11">
-      	<textarea id="focusCollection" name="measures" th:utext="${ia.measures}" rows="5" cols="139"></textarea>
+      	<textarea id="focusCollection" name="measures" th:utext="${ia.measures}" rows="5" cols="108"></textarea>
       </div>
     </div>
 
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html
index c47e7912..61b31ebb 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html
@@ -11,7 +11,7 @@
       <button class="nav-link active" id="boardTab" data-bs-toggle="tab" data-bs-target="#boardTabPanel" type="button" role="tab" aria-controls="boardTabPanel" aria-selected="true">본문</button>
     </li>
   </ul>
-  <div class="tab-content bg-white border border-top-0 p-2">
+  <div class="tab-content bg-white border border-top-0 p-2 text-center">
     <div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
       <div class="row mb-1">
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
@@ -37,7 +37,7 @@
                     <th rowspan="2">허위오보</th>
                     <th colspan="4">활용실적</th>
                   </tr>
-                  <tr>
+                  <tr class="table-secondary">
                   	<th>계</th>
                     <th>특보</th>
                     <th>중보</th>
@@ -124,7 +124,7 @@
             <label class="col-sm-2 col-form-label col-form-label-sm text-center">
                 <th:block th:text="|지시사항: ${apprv.Instruction}|"></th:block>
             </label>
-            <label class="col-sm-2 col-form-label col-form-label-sm text-center">
+            <label class="col-sm-4 col-form-label col-form-label-sm text-center">
                 <th:block th:text="|결제일시: ${#temporals.format(apprv.saveDt, 'yyyy-MM-dd HH:mm:ss')}|"></th:block>
             </label>
             
@@ -137,6 +137,8 @@
         <form action="#" method="post" id="apprvForm">
         <div class="row">
             <input type="hidden" name="iaKey" th:value="${ia.iaKey}">
+          ]
+
             <input type="hidden" name="state" id="viewModalApprvValue">
             <div class="row">
             	<label class="col-sm-1 col-form-label col-form-label-sm text-center">관리관 의견</label>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html
index 1d831c6a..50bc2036 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html
@@ -30,7 +30,7 @@
       </div>
     </div>
     <hr>
-    <div class="row mb-1"><h6 class="text-center">정보협력자<br>구성</h6></div>
+    <div class="row mb-1"><h6 class="text-center">정보협력자 구성</h6></div>
     <div class="row mb-1">
     <div class="col-sm-1"></div>
       <label for="affairType1" class="col-sm-1 col-form-label col-form-label-sm text-center">*성명</label>
@@ -83,25 +83,25 @@
     <div class="row mb-1">
       <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">대상목표<br>및<br>위치</label>
       <div class="col-sm-11">
-      	<textarea id="targetLocation" name="targetLocation" rows="5" cols="139" th:utext="${op.targetLocation}"></textarea>
+      	<textarea id="targetLocation" name="targetLocation" rows="5" cols="108" th:utext="${op.targetLocation}"></textarea>
       </div>
     </div>
     <div class="row mb-1">
       <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">취약성 분석</label>
       <div class="col-sm-11">
-      	<textarea id="vulnerabilityAnalyze" name="vulnerabilityAnalyze" rows="5" cols="139" th:utext="${op.vulnerabilityAnalyze}"></textarea>
+      	<textarea id="vulnerabilityAnalyze" name="vulnerabilityAnalyze" rows="5" cols="108" th:utext="${op.vulnerabilityAnalyze}"></textarea>
       </div>
     </div>
     <div class="row mb-1">
       <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">적격성 분석</label>
       <div class="col-sm-11">
-      	<textarea id="eligibilityAnalyze" name="eligibilityAnalyze" rows="5" cols="139" th:utext="${op.eligibilityAnalyze}"></textarea>
+      	<textarea id="eligibilityAnalyze" name="eligibilityAnalyze" rows="5" cols="108" th:utext="${op.eligibilityAnalyze}"></textarea>
       </div>
     </div>
     <div class="row mb-1">
       <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">중점<br>수집사항</label>
       <div class="col-sm-11">
-      	<textarea id="focusCollection" name="focusCollection" rows="5" cols="139" th:utext="${op.focusCollection}"></textarea>
+      	<textarea id="focusCollection" name="focusCollection" rows="5" cols="108" th:utext="${op.focusCollection}"></textarea>
       </div>
     </div>
     
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html
index c181d6c4..8ffddc2c 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html
@@ -92,8 +92,10 @@
                     <th rowspan="2">등록일</th>
                     <th rowspan="2">상태</th>
                     <th rowspan="2">관리관<br>결제여부</th>
+                    <th></th>
                   </tr>
                   <tr class="table-secondary">
+                    <th>순번</th>
                   	<th>성명</th>
                     <th>생년월일</th>
                     <th>근무처</th>
@@ -102,7 +104,8 @@
                   </tr>
                   </thead>
                   <tbody class="table-group-divider">
-                  <tr class="operationPlanTr" th:each="list:${opList}">
+                  <tr class="operationPlanTr" th:each="list,cnt:${opList}">
+                    <td th:text="${cnt.count}"></td>
                   	<td th:text="${list.opName}"></td>
                   	<td th:text="${list.opBirth}"></td>
                   	<td th:text="${list.opPosition}"></td>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html
index de6ce934..d2f8274f 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html
@@ -31,9 +31,8 @@
         </th:block>
       </div>
       <hr>
-      <div class="row mb-1"><h6 class="text-center">정보협력자<br>구성</h6></div>
-      <br>
-      <div class="row">
+      <div class="row mb-1"><h6 class="text-center bold">정보협력자 구성</h6></div>
+      <div class="row text-center">
         <div class="col-sm-1"></div>
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">성명:</label>
         <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${op.opName}"></label>
@@ -42,7 +41,7 @@
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">근무처(소속):</label>
         <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${op.opPosition}"></label>
       </div>
-      <div class="row">  
+      <div class="row text-center">
         <div class="col-sm-1"></div>
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">직업(직위):</label>
         <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${op.opJob}"></label>