From 92938c51cfc2a7d5b0f59fc1d0800d177b9e9c16 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Sat, 28 Jan 2023 15:35:41 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=A9=EC=B2=A9=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EB=8C=80=EC=83=81=EB=AA=A9=ED=91=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ciWork/ciWorkViewModal.html               |   2 +
 .../counterIntelligence/ciaEduEditModal.html  |   2 +
 .../counterIntelligence/ciaEduList.html       |   8 +-
 .../counterIntelligence/ciaEduViewModal.html  |   2 +
 .../ciaForeignerEditModal.html                |   6 +-
 .../counterIntelligence/ciaForeignerList.html |  12 +-
 .../ciaForeignerViewModal.html                |   6 +-
 .../ciaManageCompanyEditModal.html            |   2 +-
 .../ciaManageCompanyList.html                 |   4 +-
 .../ciaManageCompanyViewModal.html            |   6 +-
 .../ciaSaftyDemandList.html                   |   4 +-
 .../ciaSaftyDemandviewModal.html              |   2 +
 .../fipTarget/partWorkEditModal.html          |   2 +
 .../templates/fipTarget/partWorkList.html     |   4 +-
 .../fipTarget/partWorkModifyModal.html        |   2 +
 .../templates/fipTarget/vulnEditModal.html    |   4 +-
 .../templates/fipTarget/vulnInfoModal.html    |   2 +
 .../templates/fipTarget/vulnViewModal.html    |   2 +
 .../ivsgt/majorStatus/majorStatusPage.html    |   4 +-
 .../majorStatus/majorStatusViewModal.html     | 165 ++++++++++--------
 20 files changed, 140 insertions(+), 101 deletions(-)

diff --git a/src/main/resources/templates/counterIntelligence/ciWork/ciWorkViewModal.html b/src/main/resources/templates/counterIntelligence/ciWork/ciWorkViewModal.html
index 917f076a..0b59a0fb 100644
--- a/src/main/resources/templates/counterIntelligence/ciWork/ciWorkViewModal.html
+++ b/src/main/resources/templates/counterIntelligence/ciWork/ciWorkViewModal.html
@@ -104,5 +104,7 @@
   <th:block th:if="${viewUserSeq eq ciWork.wrtUserSeq}">
     <button type="button" class="btn btn-warning" id="editCiWorkBtn" th:data-ciwkey="${ciWork.ciwKey}">수정</button>
   </th:block>
+<!--
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 </div>
\ No newline at end of file
diff --git a/src/main/resources/templates/counterIntelligence/ciaEduEditModal.html b/src/main/resources/templates/counterIntelligence/ciaEduEditModal.html
index 7d28c5c1..84fe7c68 100644
--- a/src/main/resources/templates/counterIntelligence/ciaEduEditModal.html
+++ b/src/main/resources/templates/counterIntelligence/ciaEduEditModal.html
@@ -115,7 +115,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
 <div class="col-auto">
+<!--
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 </div>
 <div class="col-auto">
   <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
diff --git a/src/main/resources/templates/counterIntelligence/ciaEduList.html b/src/main/resources/templates/counterIntelligence/ciaEduList.html
index fc428690..603c5dca 100644
--- a/src/main/resources/templates/counterIntelligence/ciaEduList.html
+++ b/src/main/resources/templates/counterIntelligence/ciaEduList.html
@@ -80,9 +80,9 @@
                     <th>교육방식</th>
                     <th>교육인원</th>
                     <th>비고</th>
-                    <th>상태</th>
                     <th>작성자</th>
                     <th>작성일</th>
+                    <th>상태</th>
                   </tr>
                   </thead>
                   <tbody class="table-group-divider">
@@ -93,10 +93,10 @@
                   	<td th:text="${list.eduType}"></td>
                   	<td th:text="${list.peopleCnt}"></td>
                   	<td th:utext="${list.description}"></td>
-                    <td th:text="${list.contentStatus}"></td>
                   	<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
-                  	<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
-                  	<th:block>
+                    <td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+                    <td th:text="${list.contentStatus}"></td>
+                    <th:block>
                   	<input type="hidden" class="ciKey" th:value="${list.ciKey}">
                   	</th:block> 
                   </tr>
diff --git a/src/main/resources/templates/counterIntelligence/ciaEduViewModal.html b/src/main/resources/templates/counterIntelligence/ciaEduViewModal.html
index 8a0e9a0f..cad4fa8d 100644
--- a/src/main/resources/templates/counterIntelligence/ciaEduViewModal.html
+++ b/src/main/resources/templates/counterIntelligence/ciaEduViewModal.html
@@ -85,7 +85,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
 <div class="col-auto">
+<!--
 	<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 	<th:block th:if="${accessAuth eq 'ACC003'} or ${viewUserSeq eq cia.wrtUserSeq}">
 	  <button type="button" class="btn btn-danger" id="deleteBtn" th:data-cikey="${cia.ciKey}">삭제</button>
 	</th:block>
diff --git a/src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html b/src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html
index ca42e399..03aef159 100644
--- a/src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html
+++ b/src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html
@@ -18,7 +18,7 @@
     <input type="hidden" name="wrtDt" th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}">
     <th:block th:if="${cia.ciKey eq null}">
     <div class="row mb-1">
-      <label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">관리관서</label>
+      <label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">관서</label>
       <div class="col-sm-2">
         <select class="form-select" id="mgtOrgan" name="mgtOrgan">
             <option value="">선택</option>
@@ -71,7 +71,7 @@
     </th:block>
     <th:block th:unless="${cia.ciKey eq null}">
     <div class="row mb-1">
-      <label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">관리관서</label>
+      <label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">관서</label>
       <div class="col-sm-2">
         <select class="form-select" id="mgtOrgan" name="mgtOrgan">
             <option value="">선택</option>
@@ -144,7 +144,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
 <div class="col-auto">
+<!--
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 </div>
 <div class="col-auto">
   <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
diff --git a/src/main/resources/templates/counterIntelligence/ciaForeignerList.html b/src/main/resources/templates/counterIntelligence/ciaForeignerList.html
index bccdfaab..da8b3863 100644
--- a/src/main/resources/templates/counterIntelligence/ciaForeignerList.html
+++ b/src/main/resources/templates/counterIntelligence/ciaForeignerList.html
@@ -39,7 +39,7 @@
                       <div class="row justify-content-end">
                         <div class="col-2">
                           <select class="form-select form-select-sm" name="mgtOrgan">
-                            <option value="">관리관서 선택</option>
+                            <option value="">관서 선택</option>
                             <th:block th:each="code:${session.commonCode.get('OG')}">
                               <th:block th:if="${#lists.contains(mgtOrganList, code.itemCd)}">
                                 <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.mgtOrgan}"></option>
@@ -78,15 +78,15 @@
                   <thead>
                   <tr class="table-secondary">
                     <th rowspan="2">순번</th>
-                    <th rowspan="2">관리관서</th>
+                    <th rowspan="2">관서</th>
                     <th rowspan="2">담당관</th>
                     <th colspan="3">대상커뮤니티</th>
                     <th rowspan="2">선정사유</th>
                     <th rowspan="2">모니터링 사항</th>
                     <th rowspan="2">선정일</th>
-                    <th rowspan="2">상태</th>
                     <th rowspan="2">작성자</th>
                     <th rowspan="2">작성일</th>
+                    <th rowspan="2">상태</th>
                   </tr>
                   <tr class="table-secondary">
                     <th>소재지</th>
@@ -105,10 +105,10 @@
                   	<td th:utext="${list.selectReason}"></td>
                   	<td th:utext="${list.monitoringInfo}"></td>
                   	<td th:text="${list.fixDate}"></td>
-                    <td th:text="${list.contentStatus}"></td>
                   	<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
-                  	<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td> 
-                  	<th:block>
+                    <td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+                    <td th:text="${list.contentStatus}"></td>
+                    <th:block>
                   	<input type="hidden" class="ciKey" th:value="${list.ciKey}">
                   	</th:block> 
                   </tr>
diff --git a/src/main/resources/templates/counterIntelligence/ciaForeignerViewModal.html b/src/main/resources/templates/counterIntelligence/ciaForeignerViewModal.html
index 9f1228a2..7a0dd0b8 100644
--- a/src/main/resources/templates/counterIntelligence/ciaForeignerViewModal.html
+++ b/src/main/resources/templates/counterIntelligence/ciaForeignerViewModal.html
@@ -16,7 +16,7 @@
   <div class="tab-content bg-white border border-top-0 p-2">
     <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 fw-bold">관리관서</label>
+      	<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">관리</label>
         <label class="col-sm-2 col-form-label col-form-label-sm text-start">
         	<th:block th:each="commonCode:${session.commonCode.get('OG')}">
               <option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.foreignerInfo.mgtOrgan}" th:text="${commonCode.itemValue}"></option>
@@ -28,7 +28,7 @@
               <option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.wrtUserGrd}" th:text="|${commonCode.itemValue} ${cia.wrtUserNm}|"></option>
             </th:block>
         </label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성일시</label>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성일</label>
         <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
       </div>
       <hr class="my-1">
@@ -102,7 +102,7 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
 <div class="col-auto">
-	<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+	<!--<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
 	<th:block th:if="${accessAuth eq 'ACC003'} or ${viewUserSeq eq cia.wrtUserSeq}">
 	  <button type="button" class="btn btn-danger" id="deleteBtn" th:data-cikey="${cia.ciKey}">삭제</button>
 	</th:block>
diff --git a/src/main/resources/templates/counterIntelligence/ciaManageCompanyEditModal.html b/src/main/resources/templates/counterIntelligence/ciaManageCompanyEditModal.html
index cfd0e9c2..47de9b0f 100644
--- a/src/main/resources/templates/counterIntelligence/ciaManageCompanyEditModal.html
+++ b/src/main/resources/templates/counterIntelligence/ciaManageCompanyEditModal.html
@@ -17,7 +17,7 @@
     <input type="hidden" name="wrtUserNm" th:value="${cia.wrtUserNm}">
     <input type="hidden" name="wrtDt" th:value="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}">
     <div class="row mb-1">
-      <label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">관리관서</label>
+      <label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">관서</label>
       <div class="col-sm-2">
         <select class="form-select" id="mgtOrgan" name="mgtOrgan">
             <option value="">선택</option>
diff --git a/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html b/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html
index 71b8585c..3495929f 100644
--- a/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html
+++ b/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html
@@ -82,9 +82,9 @@
                     <th>관련<br>분야</th>
                     <th>특이사항</th>
                     <th>연락처<br>(부서,이름)</th>
-                    <th>상태</th>
                     <th>작성자</th>
                     <th>작성일</th>
+                    <th>상태</th>
                   </tr>
                   </thead>
                   <tbody class="table-group-divider">
@@ -100,9 +100,9 @@
                     	<br>
                     	([[${list.department}]] [[${list.name}]])
                     </td>
-                    <td th:text="${list.contentStatus}"></td>
                     <td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
                     <td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+                    <td th:text="${list.contentStatus}"></td>
                     <th:block>
                   	  <input type="hidden" class="ciKey" th:value="${list.ciKey}">
                     </th:block>
diff --git a/src/main/resources/templates/counterIntelligence/ciaManageCompanyViewModal.html b/src/main/resources/templates/counterIntelligence/ciaManageCompanyViewModal.html
index e87176f3..f1a4ea8f 100644
--- a/src/main/resources/templates/counterIntelligence/ciaManageCompanyViewModal.html
+++ b/src/main/resources/templates/counterIntelligence/ciaManageCompanyViewModal.html
@@ -16,7 +16,7 @@
   <div class="tab-content bg-white border border-top-0 p-2">
     <div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
       <div class="row mb-1">
-      	<label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">관리관서</label>
+      	<label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">관서</label>
         <label class="col-sm-2 col-form-label col-form-label-sm text-start">
         	<th:block th:each="commonCode:${session.commonCode.get('OG')}">
               <option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.manageCompanyInfo.mgtOrgan}" th:text="${commonCode.itemValue}"></option>
@@ -28,7 +28,7 @@
               <option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.wrtUserGrd}" th:text="|${commonCode.itemValue} ${cia.wrtUserNm}|"></option>
             </th:block>
         </label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">작성일시</label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">작성일</label>
         <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
       </div>
       <hr class="my-1">
@@ -94,7 +94,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
 <div class="col-auto">
+<!--
 	<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 	<th:block th:if="${accessAuth eq 'ACC003'} or ${viewUserSeq eq cia.wrtUserSeq}">
 	  <button type="button" class="btn btn-danger" id="deleteBtn" th:data-cikey="${cia.ciKey}">삭제</button>
 	</th:block>
diff --git a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html
index 8894525b..f2c38984 100644
--- a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html
+++ b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html
@@ -75,9 +75,9 @@
                     <th>관서</th>
                     <th>지역특성</th>
                     <th>예상문제점</th>
-                    <th>상태</th>
                     <th>작성자</th>
                     <th>작성일</th>
+                    <th>상태</th>
                   </tr>
                   </thead>
                   <tbody class="table-group-divider">
@@ -92,9 +92,9 @@
                     	<th:block th:if="${#strings.length(list.outlookProblem)>35}" th:utext="|${#strings.substring(list.outlookProblem, 0, 35)}...|"></th:block>
                         <th:block th:unless="${#strings.length(list.outlookProblem)>35}" th:utext="${list.outlookProblem}"></th:block>
                     </td>
-                    <td th:text="${list.contentStatus}"></td>
                     <td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
                     <td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+                    <td th:text="${list.contentStatus}"></td>
                     <th:block>
                     	<input type="hidden" class="ciKey" th:value="${list.ciKey}">
                     </th:block>
diff --git a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandviewModal.html b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandviewModal.html
index cd1322c6..35df1c50 100644
--- a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandviewModal.html
+++ b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandviewModal.html
@@ -75,7 +75,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
 <div class="col-auto">
+<!--
 	<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 	<th:block th:if="${accessAuth eq 'ACC003'} or ${viewUserSeq eq cia.wrtUserSeq}">
 	  <button type="button" class="btn btn-danger" id="deleteBtn" th:data-cikey="${cia.ciKey}">삭제</button>
 	</th:block>
diff --git a/src/main/resources/templates/fipTarget/partWorkEditModal.html b/src/main/resources/templates/fipTarget/partWorkEditModal.html
index cb14d027..a531e669 100644
--- a/src/main/resources/templates/fipTarget/partWorkEditModal.html
+++ b/src/main/resources/templates/fipTarget/partWorkEditModal.html
@@ -69,7 +69,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
   <div class="col-auto">
+<!--
     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
   </div>
   <div class="col-auto">
     <button type="button" class="btn btn-primary" id="temporarySaveBtn">임시저장</button>
diff --git a/src/main/resources/templates/fipTarget/partWorkList.html b/src/main/resources/templates/fipTarget/partWorkList.html
index d9ab0787..45c8acdc 100644
--- a/src/main/resources/templates/fipTarget/partWorkList.html
+++ b/src/main/resources/templates/fipTarget/partWorkList.html
@@ -59,6 +59,7 @@
                         </colgroup>
                         <thead>
                         <tr class="table-secondary">
+                          <th rowspan="2">순번</th>
                           <th rowspan="2">외사<br>터미널명</th>
                           <th rowspan="2">작성자</th>
                           <th rowspan="2">일시</th>
@@ -77,9 +78,10 @@
                         </tr>
                         </thead>
                         <tbody class="table-group-divider">
-                        <tr class="partWorkTr" th:each="pw:${partWorkList}">
+                        <tr class="partWorkTr" th:each="pw,cnt:${partWorkList}">
                           <input type="hidden" class="pwSeq" th:value="${pw.pwSeq}">
                           <input type="hidden" class="piSeq" th:value="${pw.piSeq}">
+                          <td th:text="${cnt.count}"></td>
                           <th:block th:if="${pw.saveYn eq 'N'} and ${pw.wrtUserSeq eq uesrSeq}">
                             <td th:text="${#strings.concat('[임시]', pw.terminalNm)}"></td>
                           </th:block>
diff --git a/src/main/resources/templates/fipTarget/partWorkModifyModal.html b/src/main/resources/templates/fipTarget/partWorkModifyModal.html
index c38a2c65..7d6a0dc4 100644
--- a/src/main/resources/templates/fipTarget/partWorkModifyModal.html
+++ b/src/main/resources/templates/fipTarget/partWorkModifyModal.html
@@ -80,7 +80,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
   <div class="col-auto">
+<!--
     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
     <th:block th:if="${userId eq pwInfo.wrtNm} or ${accessAuth eq 'ACC003'}">
       <button type="button" class="btn btn-danger" id="deletePartWork">삭제</button>
     </th:block>
diff --git a/src/main/resources/templates/fipTarget/vulnEditModal.html b/src/main/resources/templates/fipTarget/vulnEditModal.html
index 39142a8d..fd51ddf0 100644
--- a/src/main/resources/templates/fipTarget/vulnEditModal.html
+++ b/src/main/resources/templates/fipTarget/vulnEditModal.html
@@ -22,7 +22,7 @@
       </div>
     </div>
     <div class="row mb-1">
-      <label for="mgtOrgan" class="col-sm-2 col-form-label col-form-label-sm text-center">관리서</label>
+      <label for="mgtOrgan" class="col-sm-2 col-form-label col-form-label-sm text-center">관서</label>
       <div class="col-sm-4">
         <select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan">
           <option value="">선택</option>
@@ -76,7 +76,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
   <div class="col-auto">
+<!--
     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
   </div>
   <div class="col-auto">
     <th:block th:if="${info.vulnKey eq null}">
diff --git a/src/main/resources/templates/fipTarget/vulnInfoModal.html b/src/main/resources/templates/fipTarget/vulnInfoModal.html
index 5bb3da4b..3bd35fec 100644
--- a/src/main/resources/templates/fipTarget/vulnInfoModal.html
+++ b/src/main/resources/templates/fipTarget/vulnInfoModal.html
@@ -34,7 +34,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
 	<div class="col-auto">
+<!--
 		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 	</div>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/fipTarget/vulnViewModal.html b/src/main/resources/templates/fipTarget/vulnViewModal.html
index 94c6f5cc..be32a35c 100644
--- a/src/main/resources/templates/fipTarget/vulnViewModal.html
+++ b/src/main/resources/templates/fipTarget/vulnViewModal.html
@@ -55,7 +55,9 @@
 </div>
 <div class="modal-footer justify-content-between bg-light">
 	<div class="col-auto">
+<!--
 		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+-->
 	</div>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html
index 7be80f60..264e849c 100644
--- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html
+++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html
@@ -83,8 +83,8 @@
                           <th:block th:each="commonCode:${session.commonCode.get('MST')}">
                             <td th:if="${major.majorType eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
-                          <td th:text="|${major.contentStatus eq 'DST001'?'[임시]':''}${major.contentTitle}|"></td>
-                          <td th:utext="${major.contentInfo}"></td>
+                          <td class="titleLeft" th:text="|${major.contentStatus eq 'DST001'?'[임시]':''}${major.contentTitle}|"></td>
+                          <td class="titleLeft" th:utext="${major.contentInfo}"></td>
                           <td th:text="${major.fileCnt eq null?'파일 없음':#strings.concat(major.fileCnt,' 건')}"></td>
                           <td th:text="${#temporals.format(major.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                         </tr>
diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html
index dcf17b17..a5091662 100644
--- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html
+++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html
@@ -1,83 +1,98 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <div class="modal-header bg-dark">
-    <h5 class="modal-title text-white" id="MajorViewModalLabel">주요사건처리현황 열람</h5>
-    <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
+  <h5 class="modal-title text-white" id="MajorViewModalLabel">주요사건처리현황 열람</h5>
+  <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 <div class="modal-body">
-    <input type="hidden" name="majorKey" id="viewModalMajorKey" th:value="${majorStatus.majorKey}">
-    <ul class="nav nav-tabs" id="userTab" role="tablist">
-        <li class="nav-item" role="presentation">
-            <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>
-        <li class="nav-item" role="presentation" th:if="${#lists.size(majorStatus.fileList)>0}">
-            <button class="nav-link" id="fileTab" data-bs-toggle="tab" data-bs-target="#fileTabPanel" type="button" role="tab" aria-controls="fileTabPanel" aria-selected="false" th:text="${#strings.concat('첨부파일(', #lists.size(majorStatus.fileList), ')')}"></button>
-        </li>
-    </ul>
-    <div class="tab-content bg-white border border-top-0 p-2">
-        <div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
-            <div class="row mb-1">
-                <div class="col-sm-0"></div>
-              <label class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
-              <label class="col-sm-5 col-form-label col-form-label-sm text-start" th:text="${majorStatus.contentTitle}"></label>
-              <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="${#temporals.format(majorStatus.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
-                <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:block th:each="commonCode:${session.commonCode.get('OG')}">
-                        <th:block th:if="${commonCode.itemCd eq majorStatus.wrtOrgan}" th:text="${commonCode.itemValue}"></th:block>
-                    </th:block>
-                    <th:block th:each="commonCode:${session.commonCode.get('JT')}">
-                        <th:block th:if="${commonCode.itemCd eq majorStatus.wrtUserGrd}" th:text="${commonCode.itemValue}"></th:block>
-                    </th:block>
-                    <th:block th:text="${majorStatus.wrtUserNm}"></th:block>
-                </label>
-                <hr class="my-1">
-                <label for="contentInfo" class="col-sm-1 col-form-label col-form-label-sm text-center">내용</label>
-                <div class="col-sm-11 form-control-sm">
-                    <div id="contentInfo" th:utext="${majorStatus.contentInfo}"></div>
-                </div>
-            </div>
-        </div>
-        <div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0">
-            <div class="row">
-                <div class="col-12">
-                    <table class="table table-sm">
-                        <thead>
-                        <tr>
-                            <th>파일명</th>
-                            <th>사이즈</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <th:block th:if="${#lists.isEmpty(majorStatus.fileList)}">
-                            <tr>
-                                <td colspan="2">파일이 없습니다.</td>
-                            </tr>
-                        </th:block>
-                        <th:block th:unless="${#lists.isEmpty(majorStatus.fileList)}">
-                            <th:block th:each="file:${majorStatus.fileList}">
-                                <tr class="fileInfoTr">
-                                    <td><a href="#" class="fileDownLink" data-board="majorFile"
-                                           th:data-parentkey="${file.majorKey}" th:data-fileseq="${file.fileSeq}" th:text="|${file.origNm}.${file.fileExtn}|"></a></td>
-                                    <td th:text="${file.fileSize}"></td>
-                                </tr>
-                            </th:block>
-                        </th:block>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
+  <input type="hidden" name="majorKey" id="viewModalMajorKey" th:value="${majorStatus.majorKey}">
+  <ul class="nav nav-tabs" id="userTab" role="tablist">
+    <li class="nav-item" role="presentation">
+      <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>
+    <li class="nav-item" role="presentation" th:if="${#lists.size(majorStatus.fileList)>0}">
+      <button class="nav-link" id="fileTab" data-bs-toggle="tab" data-bs-target="#fileTabPanel" type="button" role="tab"
+              aria-controls="fileTabPanel" aria-selected="false"
+              th:text="${#strings.concat('첨부파일(', #lists.size(majorStatus.fileList), ')')}"></button>
+    </li>
+  </ul>
+  <div class="tab-content bg-white border border-top-0 p-2">
+    <div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
+      <div class="row mb-1">
+        <div class="col-sm-0"></div>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
+        <label class="col-sm-5 col-form-label col-form-label-sm text-start"
+               th:text="${majorStatus.contentTitle}"></label>
+        <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="${#temporals.format(majorStatus.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
+        <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:block th:each="commonCode:${session.commonCode.get('OG')}">
+            <th:block th:if="${commonCode.itemCd eq majorStatus.wrtOrgan}" th:text="${commonCode.itemValue}"></th:block>
+          </th:block>
+          <th:block th:each="commonCode:${session.commonCode.get('JT')}">
+            <th:block th:if="${commonCode.itemCd eq majorStatus.wrtUserGrd}"
+                      th:text="${commonCode.itemValue}"></th:block>
+          </th:block>
+          <th:block th:text="${majorStatus.wrtUserNm}"></th:block>
+        </label>
         <hr class="my-1">
+        <label for="contentInfo" class="col-sm-1 col-form-label col-form-label-sm text-center">내용</label>
+        <div class="col-sm-11 form-control-sm">
+          <div id="contentInfo" th:utext="${majorStatus.contentInfo}"></div>
+        </div>
+      </div>
     </div>
+    <div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0">
+      <div class="row">
+        <div class="col-12">
+          <table class="table table-sm">
+            <thead>
+            <tr>
+              <th>파일명</th>
+              <th>사이즈</th>
+            </tr>
+            </thead>
+            <tbody>
+            <th:block th:if="${#lists.isEmpty(majorStatus.fileList)}">
+              <tr>
+                <td colspan="2">파일이 없습니다.</td>
+              </tr>
+            </th:block>
+            <th:block th:unless="${#lists.isEmpty(majorStatus.fileList)}">
+              <th:block th:each="file:${majorStatus.fileList}">
+                <tr class="fileInfoTr">
+                  <td><a href="#" class="fileDownLink" data-board="majorFile"
+                         th:data-parentkey="${file.majorKey}" th:data-fileseq="${file.fileSeq}"
+                         th:text="|${file.origNm}.${file.fileExtn}|"></a></td>
+                  <td th:text="${file.fileSize}"></td>
+                </tr>
+              </th:block>
+            </th:block>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+    <hr class="my-1">
+  </div>
+</div>
+
+<div class="modal-footer bg-light row justify-content-between">
+    <div class="col-auto">
+      <button type="button" class="btn btn-danger float-start" id="deleteMajorBtn">삭제</button>
+    </div>
+
+    <div class="col-auto">
+      <th:block th:if="${userSeq eq majorStatus.wrtUserSeq}"><!--작성자일 경우 수정 허용-->
+        <button type="button" class="btn btn-warning" id="editBtn" th:data-majorkey="${majorStatus.majorKey}">수정
+        </button>
+      </th:block>
+    </div>
+  <!--
+      <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+  -->
 </div>
-<div class="modal-footer bg-light">
-    <th:block th:if="${userSeq eq majorStatus.wrtUserSeq}"><!--작성자일 경우 수정 허용-->
-        <button type="button" class="btn btn-warning" id="editBtn" th:data-majorkey="${majorStatus.majorKey}">수정</button>
-    </th:block>
-    <button type="button" class="btn btn-danger float-start" id="deleteMajorBtn">삭제</button>
-<!--
-    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
--->
-</div>
\ No newline at end of file