diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index a3b4b113..d21362ab 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -1,8 +1,14 @@ package com.dbnt.faisp.config; import com.dbnt.faisp.main.codeMgt.model.CodeMgt; +import com.dbnt.faisp.main.faRpt.model.FaRptBoard; +import com.dbnt.faisp.main.faRpt.service.FaRptService; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; 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.UserInfo; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; @@ -25,6 +31,9 @@ public class BaseController { private final CodeMgtService codeMgtService; private final OrganConfigService organConfigService; private final MenuMgtService menuMgtService; + private final PublicBoardService publicBoardService; + private final FaRptService faRptService; + private final AffairService affairService; @GetMapping("/") public ModelAndView loginCheck(@AuthenticationPrincipal UserInfo loginUser) { @@ -57,8 +66,27 @@ public class BaseController { } @GetMapping("/dashboard") - public ModelAndView dashboard() { + public ModelAndView dashboard(@AuthenticationPrincipal UserInfo loginUser) { ModelAndView mav = new ModelAndView("login/dashboard"); + PublicBoard noticeParams = new PublicBoard(); + noticeParams.setPublicType("PLB001"); + noticeParams.setRowCnt(5); + noticeParams.setDownOrganCdList(loginUser.getDownOrganCdList()); + noticeParams.setUpOrganCdList(loginUser.getUpOrganCdList()); + mav.addObject("noticeList", publicBoardService.selectContentList(noticeParams)); + FaRptBoard faRpt = new FaRptBoard(); + faRpt.setActiveTab("receive"); + faRpt.setRowCnt(5); + faRpt.setStatus("DST007"); + faRpt.setReceiveUserSeq(loginUser.getUserSeq()); + mav.addObject("faRptList", faRptService.selectFaRptList(faRpt)); + AffairBoard affair = new AffairBoard(); + affair.setAffairCategory("CAT215"); + affair.setRatingOrgan(loginUser.getOgCd()); + affair.setRowCnt(5); + mav.addObject("affair1List", affairService.selectAffairBoardList(affair)); + affair.setAffairCategory("CAT216"); + mav.addObject("affair2List", affairService.selectAffairBoardList(affair)); return mav; } diff --git a/src/main/resources/static/Crosseditor/config/xmls/Config.xml b/src/main/resources/static/Crosseditor/config/xmls/Config.xml index 46bbab87..21e4e1c1 100644 --- a/src/main/resources/static/Crosseditor/config/xmls/Config.xml +++ b/src/main/resources/static/Crosseditor/config/xmls/Config.xml @@ -102,7 +102,7 @@ 1.0.0.23 1.0.0.3 1.0.0.19 - 1 + 0 diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js index f42700e1..91ae98aa 100644 --- a/src/main/resources/static/js/common.js +++ b/src/main/resources/static/js/common.js @@ -194,7 +194,7 @@ function setEditor(divId, editorHeight){ CrossEditor.params.NewToolbar = true; CrossEditor.params.UploadFileExecutePath = "/Crosseditor/uploadImg"; CrossEditor.params.FullScreen = false; - $("#editor").show(); + $("#"+divId).show(); CrossEditor.EditorStart(); } diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html index df4db2d9..2abe81cf 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html @@ -4,142 +4,148 @@
국제범죄검거 현황
-
-
- - +
- - - - -
- -
- +
+ + +
+
+ + + + +
+
+
+ + + + + +
+
+ + +
+ +
+
+ + + +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+
-
- -
- -
- -
- -
+ +
+
-
-
- -
- -
- -
- -
- -
-
- -
- + +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+
-
- -
-
- - -
- - -
- -
- -
- -
- -
- -
- -
- -
-
- -
- -
- -
- -
- -
- -
-
-
- -
- -
-
-
- -
-
- + + +
@@ -147,193 +153,161 @@
- - + - +
-
- - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- - -
-
-
-
- - - -
-
- - -
- + +
+
- -
- -
- -
- +
+ + +
+
+
+
+ + + +
+
+ + +
+
+ + +
+ +
+ +
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ +
+
+ +
+ + +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+ + + +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+ + +
+ +
- -
- - -
- -
- - -
- - -
- -
- -
- -
- - -
- -
- -
-
-
- -
- -
- -
- -
-
- - - -
- -
- -
-
- -
-
- -
- -
- -
- -
- -
- - -
- -
- -
+
+
+ +
+
-
- -
-
-
-
- +
diff --git a/src/main/resources/templates/login/dashboard.html b/src/main/resources/templates/login/dashboard.html index c3ad2b9c..d5c4dcdb 100644 --- a/src/main/resources/templates/login/dashboard.html +++ b/src/main/resources/templates/login/dashboard.html @@ -3,30 +3,174 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - +

대시보드

- 대시보드 편집 +
-
-
-
-
-
-
+
+ + +
+
+
+
공지사항
+
+
+
+
+ + + + + + + + + + + + + + + + +
제목작성자작성일시
+ + +
+
+
+
+ +
+ +
+
+
+
외사정보보고 수신문서
+
+
+
+
+ + + + + + + + + + + + + + +
제목작성일시
+
+
+
+
+ +
+
+
+
외사경찰 견문관리
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
제목작성일시상태
+
+
+
+
+
+
+
+
외사첩보망 견문관리
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
제목작성일시상태
+
+
+
+ + + + + +
\ No newline at end of file diff --git a/src/main/resources/templates/user/myInfo.html b/src/main/resources/templates/user/myInfo.html index c786627e..8e69b256 100644 --- a/src/main/resources/templates/user/myInfo.html +++ b/src/main/resources/templates/user/myInfo.html @@ -25,7 +25,7 @@