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

Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs

master
강석 최 2023-03-17 18:02:36 +09:00
parent 562ddd1507 7c60c21e38
commit 2d5971a5fb
9 changed files with 135 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,3 +249,11 @@ body {
.titleLeft { .titleLeft {
text-align: left !important; text-align: left !important;
} }
.gray3{
background-color: #F8F9FA;
}
.gray5{
background-color:#E6E6E6;
}

BIN
src/main/resources/static/img/dash01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 70 KiB

1
src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
View File

@ -507,6 +507,7 @@ function saveInternationalCrimeArrest(contentState){
alert("저장되었습니다."); alert("저장되었습니다.");
contentFade("out"); contentFade("out");
$("#icaEditModal").modal('hide'); $("#icaEditModal").modal('hide');
location.reload();
}, },
error : function(xhr, status) { error : function(xhr, status) {
alert("저장에 실패하였습니다.") alert("저장에 실패하였습니다.")

1
src/main/resources/static/js/faStatistics/processResult.js
View File

@ -308,6 +308,7 @@ function saveProcessResult(saveYn){
contentFade("out"); contentFade("out");
$("#processResultEditModal").modal('hide'); $("#processResultEditModal").modal('hide');
$("#processResultAddModal").modal('hide'); $("#processResultAddModal").modal('hide');
//location.reload();
}, },
error : function(xhr, status) { error : function(xhr, status) {
alert("저장에 실패하였습니다.") alert("저장에 실패하였습니다.")

1
src/main/resources/static/js/faStatistics/sailor.js
View File

@ -240,6 +240,7 @@ function saveSailor(saveYn){
contentFade("out"); contentFade("out");
$("#sailorEditModal").modal('hide'); $("#sailorEditModal").modal('hide');
$("#sailorAddModal").modal('hide'); $("#sailorAddModal").modal('hide');
location.reload();
}, },
error : function(xhr, status) { error : function(xhr, status) {
alert("저장에 실패하였습니다.") alert("저장에 실패하였습니다.")

2
src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js
View File

@ -186,6 +186,7 @@ $(document).on('click', '.apprvBtn', function (){
alert("저장되었습니다") alert("저장되었습니다")
getResultViewModal(result); getResultViewModal(result);
contentFade("out"); contentFade("out");
//location.reload();
}, },
error : function(xhr, status) { error : function(xhr, status) {
alert("저장에 실패하였습니다."); alert("저장에 실패하였습니다.");
@ -292,6 +293,7 @@ function saveResult(resultState){
contentFade("out"); contentFade("out");
$("#resultEditModal").modal('hide'); $("#resultEditModal").modal('hide');
getResultViewModal(result); getResultViewModal(result);
location.reload();
}, },
error : function(xhr, status) { error : function(xhr, status) {
alert("저장에 실패하였습니다.") alert("저장에 실패하였습니다.")

3
src/main/resources/static/js/publicBoard/publicBoard.js
View File

@ -137,7 +137,8 @@ function savePublicBoard(formId, publicType){
alert("저장되었습니다."); alert("저장되었습니다.");
contentFade("out"); contentFade("out");
$("#editModal").modal('hide'); $("#editModal").modal('hide');
getViewModal(result, publicType); //getViewModal(result, publicType);
location.reload();
}, },
error : function(xhr, status) { error : function(xhr, status) {
alert("저장에 실패하였습니다.") alert("저장에 실패하였습니다.")

2
src/main/resources/templates/fragments/header.html
View File

@ -2,7 +2,7 @@
<html lang="ko" <html lang="ko"
xmlns:th="http://www.thymeleaf.org" xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5"> xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
<header th:fragment="headerFragment" class="row justify-content-between w-100 py-1 px-3 border-bottom" style="--bs-gutter-x: 0;"> <header th:fragment="headerFragment" class="row justify-content-between w-100 py-1 px-3 border-bottom bg-white" style="--bs-gutter-x: 0;">
<div class="col-auto row justify-content-start"> <div class="col-auto row justify-content-start">
<div class="col-auto"> <div class="col-auto">
<div class="navbar-header"> <div class="navbar-header">

194
src/main/resources/templates/login/dashboard.html
View File

@ -17,20 +17,28 @@
</div> </div>
</div> </div>
<div class="row mx-0"> <div class="row mx-0">
<div class="col-12 card bg-lightB-card"> <div class="col-12">
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row justify-content-center pt-2">
<div class="col-3 py-1 text-center align-middle align-self-center" id="subPage2">
<img src="img/dash01.png" alt="대시보드이미지" class="mb-4">
<h4 style="font-weight: bold">안녕하세요, <th:block th:each="commonCode:${session.commonCode.get('JT')}">
<th:block th:if="${commonCode.itemCd eq #authentication.principal.titleCd}">
<span class="d-lg-inline d-md-none" th:text="|${commonCode.itemValue} ${#authentication.principal.userNm}|">관리기능</span>님
</th:block></th:block> :D</h4>
<h5>해양경찰청의 외사포털에 오신것을 환영합니다.</h5>
</div>
<div class="col-4 py-1" id="subPage0"> <div class="col-4 py-1" id="subPage0">
<script type="text/javascript" th:src="@{/js/publicBoard/publicBoard.js}"></script> <script type="text/javascript" th:src="@{/js/publicBoard/publicBoard.js}"></script>
<script type="text/javascript" th:src="@{/js/publicBoard/notice.js}"></script> <script type="text/javascript" th:src="@{/js/publicBoard/notice.js}"></script>
<div class="card"> <div class="card">
<div class="card-header bg-white"> <div class="card-header gray5">
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-auto dash-title">공지사항</div> <div class="col-auto dash-title">공지사항</div>
<div class="col-auto"><a href="/publicBoard/noticePage" class="link-dark"><i class="bi bi-list"></i></a></div> <div class="col-auto"><a href="/publicBoard/noticePage" class="link-dark"><i class="bi bi-list"></i></a></div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body" style="height: 320px;">
<table class="table table-sm table-hover"> <table class="table table-sm table-hover">
<thead> <thead>
<tr> <tr>
@ -40,93 +48,37 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<th:block th:if="${#lists.isEmpty(noticeList)}">
<tr>
<td colspan="2">공지사항이 없습니다.</td>
</tr>
</th:block>
<th:block th:unless="${#lists.isEmpty(noticeList)}">
<tr class="noticeTr" th:each="notice:${noticeList}"> <tr class="noticeTr" th:each="notice:${noticeList}">
<input type="hidden" class="publicKey" th:value="${notice.publicKey}"> <input type="hidden" class="publicKey" th:value="${notice.publicKey}">
<td> <td>
<i class="bi bi-dot" style="color: #3d73d7"></i> <i class="bi bi-dot" style="color: #3d73d7"></i>
<th:block th:if="${#strings.length(notice.title)>20}" th:text="|${#strings.substring(notice.title, 0, 20)}...|"></th:block> <th:block th:if="${#strings.length(notice.title)>25}" th:text="|${#strings.substring(notice.title, 0, 25)}...|"></th:block>
<th:block th:unless="${#strings.length(notice.title)>20}" th:text="${notice.title}"></th:block> <th:block th:unless="${#strings.length(notice.title)>25}" th:text="${notice.title}"></th:block>
</td> </td>
<td th:text="${notice.wrtUserNm}"></td> <td th:text="${notice.wrtUserNm}"></td>
<td th:text="${#temporals.format(notice.wrtDt, 'yyyy-MM-dd')}"></td> <td th:text="${#temporals.format(notice.wrtDt, 'yyyy-MM-dd')}"></td>
</tr> </tr>
</tbody> </tbody>
</table> </th:block>
</div>
</div>
</div>
<div class="col-4 py-1" id="subPage1">
<div class="card">
<div class="card-header bg-white">
<div class="row justify-content-between">
<div class="col-auto dash-title" th:text="${#strings.concat('미확인 수신알람(', alarmListCnt, ')')}"></div>
<div class="col-auto"><a href="/myInfo/myAlarm" class="link-dark"><i class="bi bi-list"></i></a></div>
</div>
</div>
<div class="card-body">
<table class="table table-sm table-hover">
<thead>
<tr>
<th>메시지</th>
<th>발생일시</th>
</tr>
</thead>
<tbody>
<tr class="alarmTr" th:each="alarm:${dashboardAlarmList}">
<input type="hidden" class="alarmKey" th:value="${alarm.alarmKey}">
<input type="hidden" class="userSeq" th:value="${alarm.userSeq}">
<td>
<i class="bi bi-dot" style="color: #3d73d7"></i>
<th:block th:if="${#strings.length(alarm.alarmMsg)>20}" th:text="|${#strings.substring(alarm.alarmMsg, 0, 20)}...|"></th:block>
<th:block th:unless="${#strings.length(alarm.alarmMsg)>20}" th:text="${alarm.alarmMsg}"></th:block>
</td>
<td th:text="${#temporals.format(alarm.wrtDt, 'yyyy-MM-dd HH:mm:ss')}"></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div class="col-4 py-1" id="subPage2">
</div>
<div class="col-4 py-1" id="subPage3">
<div class="card">
<div class="card-header bg-white">
<div class="row justify-content-between">
<div class="col-auto dash-title">외사정보보고 수신문서</div>
<div class="col-auto"><a href="/faRpt/faRptBoard?activeTab=receive" class="link-dark"><i class="bi bi-list"></i></a></div>
</div>
</div>
<div class="card-body">
<table class="table table-sm table-hover">
<thead>
<tr>
<th>제목</th>
<th>작성일시</th>
</tr>
</thead>
<tbody>
<tr class="faRptTr" th:each="faRpt:${faRptList}">
<input type="hidden" class="faRptKey" th:value="${faRpt.faRptKey}">
<td><i class="bi bi-dot" style="color: #3d73d7"></i>
<th:block th:text="${faRpt.title}"></th:block>
</td>
<td th:text="${#temporals.format(faRpt.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
</tr>
</tbody>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<div class="col-4 py-1" id="subPage4"> <div class="col-4 py-1" id="subPage4">
<div class="card"> <div class="card">
<div class="card-header bg-white"> <div class="card-header gray5">
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-auto dash-title">외사경찰 견문관리</div> <div class="col-auto dash-title">외사경찰 견문관리</div>
<div class="col-auto"><a href="/affair/affairMgt/myReport?affairCategory=CAT215" class="link-dark"><i class="bi bi-list"></i></a></div> <div class="col-auto"><a href="/affair/affairMgt/myReport?affairCategory=CAT215" class="link-dark"><i class="bi bi-list"></i></a></div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body" style="height: 320px;">
<table class="table table-sm table-hover"> <table class="table table-sm table-hover">
<thead> <thead>
<tr> <tr>
@ -136,6 +88,12 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<th:block th:if="${#lists.isEmpty(affair1List)}">
<tr>
<td colspan="2">외사경찰 견문관리가 없습니다.</td>
</tr>
</th:block>
<th:block th:unless="${#lists.isEmpty(affair1List)}">
<tr class="affairTr" th:each="affair:${affair1List}"> <tr class="affairTr" th:each="affair:${affair1List}">
<input type="hidden" class="board" th:value="${affair.board}"> <input type="hidden" class="board" th:value="${affair.board}">
<input type="hidden" class="key" th:value="${affair.key}"> <input type="hidden" class="key" th:value="${affair.key}">
@ -145,7 +103,8 @@
<th:block th:if="${affair.board eq 'result'}">청산보고서</th:block> <th:block th:if="${affair.board eq 'result'}">청산보고서</th:block>
</td> </td>
<td ><i class="bi bi-dot" style="color: #3d73d7"></i> <td ><i class="bi bi-dot" style="color: #3d73d7"></i>
<th:block th:text="${affair.title}"></th:block> <th:block th:if="${#strings.length(affair.title)>25}" th:text="|${#strings.substring(affair.title,0,25)}...|"></th:block>
<th:block th:unless="${#strings.length(affair.title)>25}" th:text="${affair.title}"></th:block>
</td> </td>
<td> <td>
<th:block th:each="code:${session.commonCode.get('JT')}"> <th:block th:each="code:${session.commonCode.get('JT')}">
@ -154,6 +113,83 @@
<th:block th:text="${affair.wrtUserNm}"></th:block> <th:block th:text="${affair.wrtUserNm}"></th:block>
</td> </td>
</tr> </tr>
</th:block>
</tbody>
</table>
</div>
</div>
</div>
<div class="col-3 py-1" id="subPage1">
<div class="card">
<div class="card-header gray5">
<div class="row justify-content-between">
<div class="col-auto dash-title" th:text="${#strings.concat('미확인 수신알람(', alarmListCnt, ')')}"></div>
<div class="col-auto"><a href="/myInfo/myAlarm" class="link-dark"><i class="bi bi-list"></i></a></div>
</div>
</div>
<div class="card-body" style="height: 320px;">
<table class="table table-sm table-hover">
<thead>
<tr>
<th>메시지</th>
<th>발생일시</th>
</tr>
</thead>
<tbody>
<th:block th:if="${#lists.isEmpty(dashboardAlarmList)}">
<tr>
<td colspan="2">미확인 수신알람이 없습니다.</td>
</tr>
</th:block>
<th:block th:unless="${#lists.isEmpty(dashboardAlarmList)}">
<tr class="alarmTr" th:each="alarm:${dashboardAlarmList}">
<input type="hidden" class="alarmKey" th:value="${alarm.alarmKey}">
<input type="hidden" class="userSeq" th:value="${alarm.userSeq}">
<td>
<i class="bi bi-dot" style="color: #3d73d7"></i>
<th:block th:if="${#strings.length(alarm.alarmMsg)>11}" th:text="|${#strings.substring(alarm.alarmMsg, 0, 11)}...|"></th:block>
<th:block th:unless="${#strings.length(alarm.alarmMsg)>11}" th:text="${alarm.alarmMsg}"></th:block>
</td>
<td th:text="${#temporals.format(alarm.wrtDt, 'yyyy-MM-dd HH:mm:ss')}"></td>
</tr>
</th:block>
</tbody>
</table>
</div>
</div>
</div>
<div class="col-4 py-1" id="subPage3">
<div class="card">
<div class="card-header gray5">
<div class="row justify-content-between">
<div class="col-auto dash-title">외사정보보고 수신문서</div>
<div class="col-auto"><a href="/faRpt/faRptBoard?activeTab=receive" class="link-dark"><i class="bi bi-list"></i></a></div>
</div>
</div>
<div class="card-body" style="height: 320px;">
<table class="table table-sm table-hover">
<thead>
<tr>
<th>제목</th>
<th>작성일시</th>
</tr>
</thead>
<tbody>
<th:block th:if="${#lists.isEmpty(faRptList)}">
<tr>
<td colspan="2">외사정보보고 수신문서가 없습니다.</td>
</tr>
</th:block>
<th:block th:unless="${#lists.isEmpty(faRptList)}">
<tr class="faRptTr" th:each="faRpt:${faRptList}">
<input type="hidden" class="faRptKey" th:value="${faRpt.faRptKey}">
<td><i class="bi bi-dot" style="color: #3d73d7"></i>
<th:block th:if="${#strings.length(faRpt.title)>25}" th:text="|${#strings.substring(faRpt.title, 0, 25)}...|"></th:block>
<th:block th:unless="${#strings.length(faRpt.title)>25}" th:text="${faRpt.title}"></th:block>
</td>
<td th:text="${#temporals.format(faRpt.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
</tr>
</th:block>
</tbody> </tbody>
</table> </table>
</div> </div>
@ -161,13 +197,13 @@
</div> </div>
<div class="col-4 py-1" id="subPage5"> <div class="col-4 py-1" id="subPage5">
<div class="card"> <div class="card">
<div class="card-header bg-white"> <div class="card-header gray5">
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-auto dash-title">외사첩보망 견문관리</div> <div class="col-auto dash-title">외사첩보망 견문관리</div>
<div class="col-auto"><a href="/affair/affairMgt/myReport?affairCategory=CAT216" class="link-dark"><i class="bi bi-list"></i></a></div> <div class="col-auto"><a href="/affair/affairMgt/myReport?affairCategory=CAT216" class="link-dark"><i class="bi bi-list"></i></a></div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body" style="height: 320px;">
<table class="table table-sm table-hover"> <table class="table table-sm table-hover">
<thead> <thead>
<tr> <tr>
@ -177,6 +213,12 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<th:block th:if="${#lists.isEmpty(affair2List)}">
<tr>
<td colspan="2">외사첩보망 견문관리가 없습니다.</td>
</tr>
</th:block>
<th:block th:unless="${#lists.isEmpty(affair2List)}">
<tr class="affairTr" th:each="affair:${affair2List}"> <tr class="affairTr" th:each="affair:${affair2List}">
<input type="hidden" class="affairKey" th:value="${affair.key}"> <input type="hidden" class="affairKey" th:value="${affair.key}">
<td> <td>
@ -186,7 +228,8 @@
<th:block th:if="${affair.board eq 'fire'}">해고/연장보고</th:block> <th:block th:if="${affair.board eq 'fire'}">해고/연장보고</th:block>
</td> </td>
<td ><i class="bi bi-dot" style="color: #3d73d7"></i> <td ><i class="bi bi-dot" style="color: #3d73d7"></i>
<th:block th:text="${affair.title}"></th:block> <th:block th:if="${#strings.length(affair.title)>25}" th:text="|${#strings.substring(affair.title, 0, 25)}...|"></th:block>
<th:block th:unless="${#strings.length(affair.title)>25}" th:text="${affair.title}"></th:block>
</td> </td>
<td> <td>
<th:block th:each="code:${session.commonCode.get('JT')}"> <th:block th:each="code:${session.commonCode.get('JT')}">
@ -195,6 +238,7 @@
<th:block th:text="${affair.wrtUserNm}"></th:block> <th:block th:text="${affair.wrtUserNm}"></th:block>
</td> </td>
</tr> </tr>
</th:block>
</tbody> </tbody>
</table> </table>
</div> </div>