DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

외사정보관리, 수사관리, 방첩관리 정렬 수정중

master
Hyung Geun 2023-01-25 17:36:29 +09:00
parent 86c8631579
commit be6d63151f
12 changed files with 86 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/static/css/common.css
View File

@ -181,16 +181,18 @@
.col-form-label-sm.text-center { .col-form-label-sm.text-center {
background-color: #aabfe178; background-color: #aabfe178;
border: 1px solid rgba(var(--bs-secondary-rgb))!important; border: 1px solid rgba(var(--bs-secondary-rgb))!important;
margin-bottom: 2px;
} }
.col-form-label-sm.text-start, .col-sm-11.form-control-sm, .col-sm-10.form-control-sm{ .col-form-label-sm.text-start, .col-sm-11.form-control-sm, .col-sm-10.form-control-sm{
border: 1px solid rgba(var(--bs-secondary-rgb))!important; border: 1px solid rgba(var(--bs-secondary-rgb))!important;
text-align: left; text-align: left;
margin-bottom: 2px;
} }
@font-face {font-family:'GmarketSansMedium';src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');} @font-face {font-family:'GmarketSansMedium';src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');}
.dash-title .dash-title

5
src/main/resources/templates/counterIntelligence/ciWork/ciWorkBoard.html
View File

@ -8,8 +8,9 @@
<div layout:fragment="content"> <div layout:fragment="content">
<main> <main>
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-auto"> <div class="col-auto mb-2">
<h5><i class="bi bi-square-fill"></i></i> 방첩공작</h5> <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
<h5 class="d-inline align-middle"> 방첩공작</h5>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<p class="mb-0 mt-2">외사방첩관리 > 방첩공작</p> <p class="mb-0 mt-2">외사방첩관리 > 방첩공작</p>

16
src/main/resources/templates/counterIntelligence/ciWork/ciWorkEditModal.html
View File

@ -17,7 +17,7 @@
<input type="hidden" name="status" id="status" th:value="${ciWork.status}"> <input type="hidden" name="status" id="status" th:value="${ciWork.status}">
<div class="row mb-1"> <div class="row mb-1">
<label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label> <label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
<div class="col-sm-2"> <div class="col-sm-3">
<th:block th:if="${ciWork.wrtUserGrd eq null}"> <th:block th:if="${ciWork.wrtUserGrd eq null}">
<input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="${ciWork.wrtUserNm}" readonly> <input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="${ciWork.wrtUserNm}" readonly>
</th:block> </th:block>
@ -30,7 +30,7 @@
</th:block> </th:block>
</div> </div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label> <label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
<div class="col-sm-2"> <div class="col-sm-3">
<input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(ciWork.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly> <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(ciWork.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
</div> </div>
</div> </div>
@ -42,21 +42,21 @@
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="workStartDate" class="col-sm-1 col-form-label col-form-label-sm text-center">착수일</label> <label for="workStartDate" class="col-sm-1 col-form-label col-form-label-sm text-center">착수일</label>
<div class="col-sm-2"> <div class="col-sm-3">
<input type="text" class="form-control form-control-sm dateSelector" id="workStartDate" name="workStartDate" th:value="${#temporals.format(ciWork.workStartDate, 'yyyy-MM-dd')}" readonly> <input type="text" class="form-control form-control-sm dateSelector" id="workStartDate" name="workStartDate" th:value="${#temporals.format(ciWork.workStartDate, 'yyyy-MM-dd')}" readonly>
</div> </div>
<label for="workPlanDate" class="col-sm-1 col-form-label col-form-label-sm text-center">예정일</label> <label for="workPlanDate" class="col-sm-1 col-form-label col-form-label-sm text-center">예정일</label>
<div class="col-sm-2"> <div class="col-sm-3">
<input type="text" class="form-control form-control-sm dateSelector" id="workPlanDate" name="workPlanDate" th:value="${#temporals.format(ciWork.workPlanDate, 'yyyy-MM-dd')}" readonly> <input type="text" class="form-control form-control-sm dateSelector" id="workPlanDate" name="workPlanDate" th:value="${#temporals.format(ciWork.workPlanDate, 'yyyy-MM-dd')}" readonly>
</div> </div>
<label for="workEndDate" class="col-sm-1 col-form-label col-form-label-sm text-center">종결일</label> <label for="workEndDate" class="col-sm-1 col-form-label col-form-label-sm text-center">종결일</label>
<div class="col-sm-2"> <div class="col-sm-3">
<input type="text" class="form-control form-control-sm dateSelector" id="workEndDate" name="workEndDate" th:value="${#temporals.format(ciWork.workEndDate, 'yyyy-MM-dd')}" readonly> <input type="text" class="form-control form-control-sm dateSelector" id="workEndDate" name="workEndDate" th:value="${#temporals.format(ciWork.workEndDate, 'yyyy-MM-dd')}" readonly>
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="workRating" class="col-sm-1 col-form-label col-form-label-sm text-center">등급</label> <label for="workRating" class="col-sm-1 col-form-label col-form-label-sm text-center">등급</label>
<div class="col-sm-2"> <div class="col-sm-3">
<select class="form-select form-select-sm" id="workRating" name="workRating"> <select class="form-select form-select-sm" id="workRating" name="workRating">
<option value="">선택해주세요.</option> <option value="">선택해주세요.</option>
<th:block th:each="code:${ciwrCodeList}"> <th:block th:each="code:${ciwrCodeList}">
@ -65,11 +65,11 @@
</select> </select>
</div> </div>
<label for="reRatingDate1" class="col-sm-1 col-form-label col-form-label-sm text-center">1차재평가</label> <label for="reRatingDate1" class="col-sm-1 col-form-label col-form-label-sm text-center">1차재평가</label>
<div class="col-sm-2"> <div class="col-sm-3">
<input type="text" class="form-control form-control-sm dateSelector" id="reRatingDate1" name="reRatingDate1" th:value="${#temporals.format(ciWork.reRatingDate1, 'yyyy-MM-dd')}" readonly> <input type="text" class="form-control form-control-sm dateSelector" id="reRatingDate1" name="reRatingDate1" th:value="${#temporals.format(ciWork.reRatingDate1, 'yyyy-MM-dd')}" readonly>
</div> </div>
<label for="reRatingDate2" class="col-sm-1 col-form-label col-form-label-sm text-center">2차재평가</label> <label for="reRatingDate2" class="col-sm-1 col-form-label col-form-label-sm text-center">2차재평가</label>
<div class="col-sm-2"> <div class="col-sm-3">
<input type="text" class="form-control form-control-sm dateSelector" id="reRatingDate2" name="reRatingDate2" th:value="${#temporals.format(ciWork.reRatingDate2, 'yyyy-MM-dd')}" readonly> <input type="text" class="form-control form-control-sm dateSelector" id="reRatingDate2" name="reRatingDate2" th:value="${#temporals.format(ciWork.reRatingDate2, 'yyyy-MM-dd')}" readonly>
</div> </div>
</div> </div>

18
src/main/resources/templates/counterIntelligence/ciWork/ciWorkViewModal.html
View File

@ -17,34 +17,34 @@
<div class="tab-content bg-white border border-top-0 p-2"> <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="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
<div class="row mb-1"> <div class="row mb-1">
<div class="col-sm-9"></div> <div class="col-sm-0"></div>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">공작명</label>
<label class="col-sm-5 col-form-label col-form-label-sm text-start" th:text="|${ciWork.status eq 'DST001'?'[임시] ':''}${ciWork.title}|"></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(ciWork.wrtDt, 'yyyy-MM-dd HH:mm')}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">공작명</label>
<label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="|${ciWork.status eq 'DST001'?'[임시] ':''}${ciWork.title}|"></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="${ciWork.wrtUserNm}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ciWork.wrtUserNm}"></label>
</div> </div>
<hr class="my-1"> <hr class="my-1">
<div class="row mb-1"> <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:text="${#temporals.format(ciWork.workStartDate, 'yyyy-MM-dd')}"></label> <label class="col-sm-3 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.workStartDate, 'yyyy-MM-dd')}"></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(ciWork.workPlanDate, 'yyyy-MM-dd')}"></label> <label class="col-sm-3 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.workPlanDate, 'yyyy-MM-dd')}"></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(ciWork.workEndDate, 'yyyy-MM-dd')}"></label> <label class="col-sm-3 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.workEndDate, 'yyyy-MM-dd')}"></label>
</div> </div>
<div class="row mb-1"> <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"> <label class="col-sm-3 col-form-label col-form-label-sm text-start">
<th:block th:each="code:${session.commonCode.get('CIWR')}"> <th:block th:each="code:${session.commonCode.get('CIWR')}">
<th:block th:if="${code.itemCd eq ciWork.workRating}" th:text="${code.itemValue}"></th:block> <th:block th:if="${code.itemCd eq ciWork.workRating}" th:text="${code.itemValue}"></th:block>
</th:block> </th:block>
</label> </label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">1차재평가</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">1차재평가</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.reRatingDate1, 'yyyy-MM-dd')}"></label> <label class="col-sm-3 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.reRatingDate1, 'yyyy-MM-dd')}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">2차재평가</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">2차재평가</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.reRatingDate2, 'yyyy-MM-dd')}"></label> <label class="col-sm-3 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.reRatingDate2, 'yyyy-MM-dd')}"></label>
</div> </div>
<hr class="my-1"> <hr class="my-1">
<div class="row mb-1"> <div class="row mb-1">

5
src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html
View File

@ -8,8 +8,9 @@
<div layout:fragment="content"> <div layout:fragment="content">
<main> <main>
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-auto"> <div class="col-auto mb-2">
<h5><i class="bi bi-square-fill"></i></i> 해양산업보호 관리업체 현황</h5> <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
<h5 class="d-inline align-middle"> 해양산업보호 관리업체 현황</h5>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<p class="mb-0 mt-2">외사방첩관리 > 방첩활동 > 해양산업보호 관리업체 현황</p> <p class="mb-0 mt-2">외사방첩관리 > 방첩활동 > 해양산업보호 관리업체 현황</p>

24
src/main/resources/templates/counterIntelligence/ciaManageCompanyViewModal.html
View File

@ -16,45 +16,45 @@
<div class="tab-content bg-white border border-top-0 p-2"> <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="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
<div class="row mb-1"> <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-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"> <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:each="commonCode:${session.commonCode.get('OG')}">
<option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.manageCompanyInfo.mgtOrgan}" th:text="${commonCode.itemValue}"></option> <option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.manageCompanyInfo.mgtOrgan}" th:text="${commonCode.itemValue}"></option>
</th:block> </th:block>
</label> </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-center fw-bold">작성자</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start"> <label class="col-sm-2 col-form-label col-form-label-sm text-start">
<th:block th:each="commonCode:${session.commonCode.get('JT')}"> <th:block th:each="commonCode:${session.commonCode.get('JT')}">
<option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.wrtUserGrd}" th:text="|${commonCode.itemValue} ${cia.wrtUserNm}|"></option> <option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.wrtUserGrd}" th:text="|${commonCode.itemValue} ${cia.wrtUserNm}|"></option>
</th:block> </th:block>
</label> </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-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> <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> </div>
<hr class="my-1"> <hr class="my-1">
<div class="row mb-1"> <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-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="${cia.manageCompanyInfo.companyNm}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${cia.manageCompanyInfo.companyNm}"></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-center fw-bold">소재지</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${cia.manageCompanyInfo.companyLocation}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${cia.manageCompanyInfo.companyLocation}"></label>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">담당자<br>번호</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="${cia.manageCompanyInfo.cellPhone}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${cia.manageCompanyInfo.cellPhone}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">담당자<br>부서</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="${cia.manageCompanyInfo.department}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${cia.manageCompanyInfo.department}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">담당자<br>이름</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="${cia.manageCompanyInfo.name}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${cia.manageCompanyInfo.name}"></label>
</div> </div>
<hr class="my-1"> <hr class="my-1">
<div class="row mb-1"> <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-2 col-form-label col-form-label-sm text-center fw-bold">관련분야</label>
<div class="col-sm-11 form-control-sm" th:utext="${#strings.replace(cia.manageCompanyInfo.relatedField, lineSeparator, '<br>')}"></div> <div class="col-sm-10 form-control-sm" th:utext="${#strings.replace(cia.manageCompanyInfo.relatedField, lineSeparator, '<br>')}"></div>
</div> </div>
<hr class="my-1"> <hr class="my-1">
<div class="row mb-1"> <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-2 col-form-label col-form-label-sm text-center fw-bold">특이사항</label>
<div class="col-sm-11 form-control-sm" th:utext="${#strings.replace(cia.manageCompanyInfo.description, lineSeparator, '<br>')}"></div> <div class="col-sm-10 form-control-sm" th:utext="${#strings.replace(cia.manageCompanyInfo.description, lineSeparator, '<br>')}"></div>
</div> </div>
</div> </div>
<div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0"> <div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0">

2
src/main/resources/templates/counterIntelligence/ciaSaftyDemandEditModal.html
View File

@ -34,7 +34,7 @@
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">예상문제점</label> <label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">예상<br>문제점</label>
<div class="col-sm-11" id="contentInfoDiv"> <div class="col-sm-11" id="contentInfoDiv">
<textarea class="form-control form-control-sm" rows="5" cols="30" name="outlookProblem" th:if="${cia.ciKey eq null}"></textarea> <textarea class="form-control form-control-sm" rows="5" cols="30" name="outlookProblem" th:if="${cia.ciKey eq null}"></textarea>
<textarea class="form-control form-control-sm" rows="5" cols="30" name="outlookProblem" th:unless="${cia.ciKey eq null}" th:utext="${cia.saftyDemandInfo.outlookProblem}"></textarea> <textarea class="form-control form-control-sm" rows="5" cols="30" name="outlookProblem" th:unless="${cia.ciKey eq null}" th:utext="${cia.saftyDemandInfo.outlookProblem}"></textarea>

5
src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html
View File

@ -8,8 +8,9 @@
<div layout:fragment="content"> <div layout:fragment="content">
<main> <main>
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-auto"> <div class="col-auto mb-2">
<h5><i class="bi bi-square-fill"></i></i> 치안수요 분석결과</h5> <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
<h5 class="d-inline align-middle"> 치안수요 분석결과</h5>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<p class="mb-0 mt-2">외사방첩관리 > 방첩활동 > 치안수요 분석결과</p> <p class="mb-0 mt-2">외사방첩관리 > 방첩활동 > 치안수요 분석결과</p>

16
src/main/resources/templates/counterIntelligence/ciaSaftyDemandviewModal.html
View File

@ -18,10 +18,10 @@
<div class="tab-content bg-white border border-top-0 p-2"> <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="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
<div class="row mb-1"> <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-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> <label class="col-sm-3 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(cia.wrtDt, 'yyyy-MM-dd HH:mm')}"></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-center fw-bold">작성자</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start"> <label class="col-sm-5 col-form-label col-form-label-sm text-start">
<th:block th:each="commonCode:${session.commonCode.get('JT')}"> <th:block th:each="commonCode:${session.commonCode.get('JT')}">
<option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.wrtUserGrd}" th:text="|${commonCode.itemValue} ${cia.wrtUserNm}|"></option> <option th:value="${commonCode.itemCd}" th:if="${commonCode.itemCd eq cia.wrtUserGrd}" th:text="|${commonCode.itemValue} ${cia.wrtUserNm}|"></option>
</th:block> </th:block>
@ -29,13 +29,13 @@
</div> </div>
<hr class="my-1"> <hr class="my-1">
<div class="row mb-1"> <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-2 col-form-label col-form-label-sm text-center fw-bold">지역특성</label>
<div class="col-sm-11 form-control-sm" th:utext="${#strings.replace(cia.saftyDemandInfo.localInfo, lineSeparator, '<br>')}"></div> <div class="col-sm-10 form-control-sm" th:utext="${#strings.replace(cia.saftyDemandInfo.localInfo, lineSeparator, '<br>')}"></div>
</div> </div>
<hr class="my-1"> <hr class="my-1">
<div class="row mb-1"> <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-2 col-form-label col-form-label-sm text-center fw-bold">예상문제점</label>
<div class="col-sm-11 form-control-sm" th:utext="${#strings.replace(cia.saftyDemandInfo.outlookProblem, lineSeparator, '<br>')}"></div> <div class="col-sm-10 form-control-sm" th:utext="${#strings.replace(cia.saftyDemandInfo.outlookProblem, lineSeparator, '<br>')}"></div>
</div> </div>
</div> </div>
<div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0"> <div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0">

5
src/main/resources/templates/ivsgt/ivsgtViewModal.html
View File

@ -93,9 +93,8 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<th:block th:if="${boardInvestigation.ivsgtType eq 'proceeding' or boardInvestigation.ivsgtType eq 'result'}"> <th:block th:if="${boardInvestigation.ivsgtType eq 'proceeding' or boardInvestigation.ivsgtType eq 'result'}">
<div class="row mb-3"> <div class="p-2 row mb-3">
<label class="col-sm-1 col-form-label col-form-label-sm text-center">연관보고서</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">연관보고서</label>
<div class="col-sm-11" id="relatedReportDiv"> <div class="col-sm-11" id="relatedReportDiv">
<div class="row justify-content-start"> <div class="row justify-content-start">
@ -107,6 +106,8 @@
</div> </div>
</th:block> </th:block>
</div> </div>
</div>
<div class="modal-footer bg-light"> <div class="modal-footer bg-light">
<th:block th:if="${userSeq eq boardInvestigation.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용--> <th:block th:if="${userSeq eq boardInvestigation.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
<button type="button" class="btn btn-warning" id="ivsgtEditBtn">수정</button> <button type="button" class="btn btn-warning" id="ivsgtEditBtn">수정</button>

8
src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html
View File

@ -17,11 +17,11 @@
<div class="tab-content bg-white border border-top-0 p-2"> <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="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
<div class="row mb-1"> <div class="row mb-1">
<div class="col-sm-9"></div> <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-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-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-8 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-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"> <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:each="commonCode:${session.commonCode.get('OG')}">
@ -34,7 +34,7 @@
</label> </label>
<hr class="my-1"> <hr class="my-1">
<label for="contentInfo" class="col-sm-1 col-form-label col-form-label-sm text-center">내용</label> <label for="contentInfo" class="col-sm-1 col-form-label col-form-label-sm text-center">내용</label>
<div class="col-sm-10 form-control-sm"> <div class="col-sm-11 form-control-sm">
<div id="contentInfo" th:utext="${majorStatus.contentInfo}"></div> <div id="contentInfo" th:utext="${majorStatus.contentInfo}"></div>
</div> </div>
</div> </div>

13
src/main/resources/templates/login/login.html
View File

@ -42,17 +42,9 @@
</div>--> </div>-->
<input type="submit" name="login" id="login" value="로그인" class="btn_login"> <input type="submit" name="login" id="login" value="로그인" class="btn_login">
<div class="join">
<!--<div class="join">
<a href="#" data-bs-toggle="modal" data-bs-target="#userInsertModal">회원가입</a>
</div>-->
<div class="row my-2 justify-content-between">
<div class="col-auto">
<a href="#" data-bs-toggle="modal" data-bs-target="#userInsertModal">회원가입</a> <a href="#" data-bs-toggle="modal" data-bs-target="#userInsertModal">회원가입</a>
</div> </div>
</div>
<a href="#"> <a href="#">
<div class="find">아이디/패스워드찾기</div> <div class="find">아이디/패스워드찾기</div>
@ -62,7 +54,8 @@
</form> </form>
</div> </div>
<div class="modal fade" id="userInsertModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userInsertModalLabel" aria-hidden="true"> <div class="modal fade" id="userInsertModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
aria-labelledby="userInsertModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content " id="userInsertModalContent"> <div class="modal-content " id="userInsertModalContent">
<div class="modal-header bg-dark"> <div class="modal-header bg-dark">