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

대시보드 수정.

master
강석 최 2023-01-28 13:33:49 +09:00
parent 30a86f97fe
commit fa34b34a24
3 changed files with 55 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/dbnt/faisp/config/BaseController.java
View File

@ -9,9 +9,11 @@ import com.dbnt.faisp.main.menuMgt.service.MenuMgtService;
import com.dbnt.faisp.main.organMgt.service.OrganConfigService;
import com.dbnt.faisp.main.publicBoard.model.PublicBoard;
import com.dbnt.faisp.main.publicBoard.service.PublicBoardService;
import com.dbnt.faisp.main.userInfo.model.UserAlarm;
import com.dbnt.faisp.main.userInfo.model.UserInfo;
import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
import com.dbnt.faisp.main.userInfo.service.UserAlarmService;
import com.dbnt.faisp.main.userInfo.service.UserInfoService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
@ -34,6 +36,7 @@ public class BaseController {
private final PublicBoardService publicBoardService;
private final FaRptService faRptService;
private final AffairService affairService;
private final UserAlarmService userAlarmService;
@GetMapping("/")
public ModelAndView loginCheck(@AuthenticationPrincipal UserInfo loginUser) {
@ -74,6 +77,13 @@ public class BaseController {
noticeParams.setDownOrganCdList(loginUser.getDownOrganCdList());
noticeParams.setUpOrganCdList(loginUser.getUpOrganCdList());
mav.addObject("noticeList", publicBoardService.selectContentList(noticeParams));
UserAlarm alarm = new UserAlarm();
alarm.setUserSeq(loginUser.getUserSeq());
alarm.setViewYn("N");
alarm.setRowCnt(7);
mav.addObject("alarmList", userAlarmService.selectAlarmList(alarm));
mav.addObject("alarmListCnt", userAlarmService.selectAlarmListCnt(alarm));
FaRptBoard faRpt = new FaRptBoard();
faRpt.setActiveTab("receive");
faRpt.setRowCnt(7);

4
src/main/resources/templates/adminPage/menuMgt/menuMgt.html
View File

@ -78,7 +78,7 @@
<thead>
<tr class="table-secondary">
<th><input type="checkbox" class="allChk"></th>
<th>menuKey</th>
<!--<th>menuKey</th>-->
<th>대분류</th>
<th>중분류</th>
<th>소분류</th>
@ -100,7 +100,7 @@
<td>
<input type="checkbox" class="menuCheckBox" th:value="${menuMgt.menuKey}">
</td>
<td th:text="${menuMgt.menuKey}"></td>
<!--<td th:text="${menuMgt.menuKey}"></td>-->
<th:block th:if="${menuMgt.cat1RowspanCnt ne 0}" th:each="commonCode:${session.commonCode.get('CAT1')}">
<th:block th:if="${commonCode.itemCd eq menuMgt.cat1Cd}">
<td th:text="${commonCode.itemValue}" th:rowspan="${menuMgt.cat1RowspanCnt}"></td>

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

@ -20,7 +20,7 @@
<div class="col-12 card bg-lightB-card">
<div class="card-body">
<div class="row">
<div class="col-6 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/notice.js}"></script>
<div class="card">
@ -42,9 +42,10 @@
<tbody>
<tr class="noticeTr" th:each="notice:${noticeList}">
<input type="hidden" class="publicKey" th:value="${notice.publicKey}">
<td><i class="bi bi-dot" style="color: #3d73d7"></i>
<th:block th:if="${#strings.length(notice.title)>35}" th:text="|${#strings.substring(notice.title, 0, 35)}...|"></th:block>
<th:block th:unless="${#strings.length(notice.title)>35}" th:text="${notice.title}"></th:block>
<td>
<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:unless="${#strings.length(notice.title)>20}" th:text="${notice.title}"></th:block>
</td>
<td th:text="${notice.wrtUserNm}"></td>
<td th:text="${#temporals.format(notice.wrtDt, 'yyyy-MM-dd')}"></td>
@ -54,8 +55,41 @@
</div>
</div>
</div>
<div class="col-6 py-1" id="subPage1">
<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:${alarmList}">
<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">
<script type="text/javascript" th:src="@{/js/faRpt/faRpt.js}"></script>
<div class="card">
<div class="card-header bg-white">
@ -65,7 +99,7 @@
</div>
</div>
<div class="card-body">
<table class="table table-hover">
<table class="table table-sm table-hover">
<thead>
<tr>
<th>제목</th>
@ -85,7 +119,7 @@
</div>
</div>
</div>
<div class="col-6 py-1" id="subPage2">
<div class="col-4 py-1" id="subPage4">
<script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/affair/affairMgt.js}"></script>
<div class="card">
<div class="card-header bg-white">
@ -119,7 +153,7 @@
</div>
</div>
</div>
<div class="col-6 py-1" id="subPage3">
<div class="col-4 py-1" id="subPage5">
<div class="card">
<div class="card-header bg-white">
<div class="row justify-content-between">