diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index dc01ad34..177b1686 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -3,7 +3,9 @@ package com.dbnt.faisp.config; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.codeMgt.model.CodeMgt; import com.dbnt.faisp.main.faRpt.model.FaRptBoard; +import com.dbnt.faisp.main.faRpt.model.Sri; import com.dbnt.faisp.main.faRpt.service.FaRptService; +import com.dbnt.faisp.main.faRpt.service.SriService; import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; import com.dbnt.faisp.main.fpiMgt.affair.model.DashboardAffair; import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; @@ -17,6 +19,7 @@ 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 com.dbnt.faisp.main.userInfo.service.UserLogService; import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; @@ -38,9 +41,11 @@ public class BaseController { private final MenuMgtService menuMgtService; private final PublicBoardService publicBoardService; private final FaRptService faRptService; + private final SriService sriService; private final AffairService affairService; private final UserAlarmService userAlarmService; private final AuthMgtService authMgtService; + private final UserLogService userLogService; @GetMapping("/") public ModelAndView loginCheck(@AuthenticationPrincipal UserInfo loginUser) { @@ -78,34 +83,42 @@ public class BaseController { setSession(loginUser, session); - PublicBoard noticeParams = new PublicBoard(); - noticeParams.setPublicType("PLB001"); - noticeParams.setRowCnt(8); - noticeParams.setDownOrganCdList(loginUser.getDownOrganCdList()); - noticeParams.setUpOrganCdList(loginUser.getUpOrganCdList()); - mav.addObject("noticeList", publicBoardService.selectContentList(noticeParams)); + mav.addObject("lastLoginDt", userLogService.selectLastLoginDt((String) session.getAttribute("belongValue"))); + + DashboardAffair affair = new DashboardAffair(); + affair.setUserSeq(loginUser.getUserSeq()); + affair.setOgCd(loginUser.getOgCd()); + mav.addObject("apprvStayList", affairService.selectApprvStayList(affair)); + UserAlarm alarm = new UserAlarm(); alarm.setUserSeq(loginUser.getUserSeq()); alarm.setViewYn("N"); - alarm.setRowCnt(8); + alarm.setRowCnt(9); mav.addObject("dashboardAlarmList", userAlarmService.selectAlarmList(alarm)); FaRptBoard faRpt = new FaRptBoard(); faRpt.setActiveTab("receive"); - faRpt.setRowCnt(8); + faRpt.setRowCnt(9); faRpt.setStatus("DST007"); faRpt.setReceiveUserSeq(loginUser.getUserSeq()); mav.addObject("faRptList", faRptService.selectFaRptList(faRpt)); + Sri sri = new Sri(); + sri.setActiveTab("receive"); + sri.setRowCnt(9); + sri.setStatus("DST007"); + sri.setReceiveUserSeq(loginUser.getUserSeq()); + mav.addObject("sriList", sriService.selectSriList(sri)); + + PublicBoard params = new PublicBoard(); + params.setPublicType("PLB001"); + params.setRowCnt(12); + params.setDownOrganCdList(loginUser.getDownOrganCdList()); + params.setUpOrganCdList(loginUser.getUpOrganCdList()); + mav.addObject("noticeList", publicBoardService.selectContentList(params)); + params.setPublicType("PLB003"); + params.setRowCnt(6); + mav.addObject("referenceList", publicBoardService.selectContentList(params)); - DashboardAffair affair = new DashboardAffair(); - affair.setPlanApprv(authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getApprovalAuth()); - affair.setAffairApprv(authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt/myReport?affairCategory=CAT215").get(0).getApprovalAuth()); - affair.setResultApprv(authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getApprovalAuth()); - affair.setUserSeq(loginUser.getUserSeq()); - affair.setOgCd(loginUser.getOgCd()); - mav.addObject("affair1List", affairService.selectDashboardAffairList(affair)); - affair.setAffairApprv(authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt/myReport?affairCategory=CAT216").get(0).getApprovalAuth()); - mav.addObject("affair2List", affairService.selectDashboardIntelligenceNetworkList(affair)); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java index 2b3580cc..dfc69928 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java @@ -22,4 +22,6 @@ public interface AffairMapper { List selectDashboardAffairList(DashboardAffair affair); List selectDashboardIntelligenceNetworkList(DashboardAffair affair); + + List selectApprvStayList(DashboardAffair affair); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/DashboardAffair.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/DashboardAffair.java index c7cec4be..2cd67c8b 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/DashboardAffair.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/DashboardAffair.java @@ -4,6 +4,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @NoArgsConstructor @@ -13,10 +15,15 @@ public class DashboardAffair{ private String title; private String wrtUserNm; private String wrtUserGrd; + private LocalDateTime wrtDt; - private String planApprv; - private String affairApprv; + private String plan1Apprv; + private String affair1Apprv; private String resultApprv; + private String plan2Apprv; + private String affair2Apprv; + private String analyzeApprv; + private String fireExtensionApprv; private Integer userSeq; private String ogCd; } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java index 015be3c3..8b150260 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java @@ -352,4 +352,7 @@ public class AffairService extends BaseService { // 견문보고 return affairRating; } + public List selectApprvStayList(DashboardAffair affair) { + return affairMapper.selectApprvStayList(affair); + } } diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/repository/UserInoutLogRepository.java b/src/main/java/com/dbnt/faisp/main/userInfo/repository/UserInoutLogRepository.java index fdce3fdb..fa121338 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/repository/UserInoutLogRepository.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/repository/UserInoutLogRepository.java @@ -3,6 +3,9 @@ package com.dbnt.faisp.main.userInfo.repository; import com.dbnt.faisp.main.userInfo.model.UserInoutLog; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface UserInoutLogRepository extends JpaRepository { + List findTop2ByUserBelongOrderByWrtDtDesc(String belongValue); } diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/service/UserLogService.java b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserLogService.java index acb3f3e2..7f832566 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/service/UserLogService.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserLogService.java @@ -50,4 +50,13 @@ public class UserLogService { public Integer selectInoutLogListCnt(UserInoutLog inoutLog) { return userInfoMapper.selectInoutLogListCnt(inoutLog); } + + public LocalDateTime selectLastLoginDt(String belongValue) { + List inoutLog = inoutLogRepository.findTop2ByUserBelongOrderByWrtDtDesc(belongValue); + if(inoutLog.size()==2){ + return inoutLog.get(inoutLog.size()-1).getWrtDt(); + }else{ + return null; + } + } } diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index fe4fd337..5ee2a9a4 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -288,4 +288,7 @@ order by wrt_dt desc limit 8 + \ No newline at end of file diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 9c2c5f00..3f6f3677 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -257,4 +257,4 @@ body { .view-modal-content{ height: 300px; overflow-y: auto; -} \ No newline at end of file +} diff --git a/src/main/resources/static/css/dashboard/dashboard.css b/src/main/resources/static/css/dashboard/dashboard.css new file mode 100644 index 00000000..43759f77 --- /dev/null +++ b/src/main/resources/static/css/dashboard/dashboard.css @@ -0,0 +1,147 @@ + +tr:hover{ + cursor: pointer; +} + +@font-face { + font-family: 'Pretendard-Thin'; + src: url("font/Pretendard-Thin.otf"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'Pretendard-Regular'; + src: url("font/Pretendard-Regular.otf"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'Pretendard-Medium'; + src: url("font/Pretendard-Medium.otf"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'Pretendard-Light'; + src: url("font/Pretendard-Light.otf"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'Montserrat-Medium'; + src: url("font/Montserrat-Medium.ttf"); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Pretendard-SemiBold'; + src: url("font/Pretendard-SemiBold.otf"); + font-weight: normal; + font-style: normal; +} + + + + + +.bg-light {font-family: 'Pretendard-Regular';--bs-bg-opacity: 0;} + + +h4 {color:#16169E; font-size:24px;} + +.allpadding {padding:40px 30px;} + +.accordion{box-shadow:rgba(149,157,165,0.2)3px 3px 8px;} +.accordion dt{ + border:1px solid #E0E7EE; padding:18px 24px; + background:#F8FBFF url(img/dashboard/acco_arrow.png) no-repeat 95% 50%; + margin:-1px; + font-size:16px; font-weight:550; + border-radius:4px; + text-transform:uppercase; + +} +.accordion dt.closed {cursor:pointer; background:#F8FBFF url(img/dashboard/acco_arrow_closed.png) no-repeat 95% 50%; color:#000000; border:1px solid #E0E7EE; padding:18px 24px; font-size:16px; font-weight:550; margin:-1px;} + + +.accordion dt img {display:inline-block; margin-right:10px;} + + +.accordion dt .new {display:inline-block; width:6px; height:6px; background:#FF4600; border-radius:6px; margin-bottom:3px; margin-left:8px;} + + +.accordion dd{ + padding:8px 10px 12px; + border:none; + background:#FBFDFF; + margin:2px 0 3px; +} + +.accordion dd.closed {display:none;} + +.accordion dd table {width:92%; margin:0 auto;} + + + + + + + +.dashtit {padding:32px 32px 0px; font-size:20px; font-weight:600; color:#363858;} +.dashtit2 {padding-top:14px;} + +.card {border:1px solid #E0E7EE; border-radius:4px; box-shadow:rgba(149,157,165,0.2)3px 3px 8px; } + + +.card-body {padding:26px; padding-top:0;} +.card-body table {margin:20px 32px;} + +.table-hover th {color:#888;} +.table-hover td {color:#333;} +.col-4 {width:33%;} + +.card-body table>:not(caption)>*>* {padding:12px 0;} + + + + +.dashTr td:nth-child(2) {display: block; + width:260px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + + +.dashTr td {cursor:pointer;} +.dashTr:hover {background:#fafafa;} + + + + +.iconmenu {margin-top:10px;} +.iconmenu ul {list-style:none; width:96%; margin:0 auto;} +.iconmenu ul:after {content:''; display:block; clear:both;} +.iconmenu ul li { + float:left; + width:48%; + padding:6px 0 ; + background:url('img/dashboard/iconmenuarrow.png')no-repeat 80% 50%; + margin:0 1%; +} +.iconmenu ul a {display:block; color:#000; text-decoration:none; line-height:14px;} +.iconmenu ul a img {display:inline-block; width:40px; margin:0 auto; width:40px; margin:12px 14px 12px 0; } + +.style2 ul {padding:10px 0 18px 0;} +.style2 ul li {width:25%; background:none; border-right:1px solid #E0E7EE; margin:14px 0; height:70px; line-height:70px;} +.style2 ul li:last-child { border-right:none; } +.style2 ul a {text-align:center; } +.style2 ul a img {display:block; width:40px; margin:0 auto 5px; } + +.style2 ul li:last-child a img {width:60px; } + + + + +#footerRow {position:absolute; bottom:0; left:300px;} \ No newline at end of file diff --git a/src/main/resources/static/font/Montserrat-BlackItalic.ttf b/src/main/resources/static/font/Montserrat-BlackItalic.ttf new file mode 100644 index 00000000..172e2498 Binary files /dev/null and b/src/main/resources/static/font/Montserrat-BlackItalic.ttf differ diff --git a/src/main/resources/static/font/Montserrat-BoldItalic.ttf b/src/main/resources/static/font/Montserrat-BoldItalic.ttf new file mode 100644 index 00000000..b7d8031b Binary files /dev/null and b/src/main/resources/static/font/Montserrat-BoldItalic.ttf differ diff --git a/src/main/resources/static/font/Montserrat-ExtraBold.ttf b/src/main/resources/static/font/Montserrat-ExtraBold.ttf new file mode 100644 index 00000000..30595072 Binary files /dev/null and b/src/main/resources/static/font/Montserrat-ExtraBold.ttf differ diff --git a/src/main/resources/static/font/Montserrat-ExtraBoldItalic.ttf b/src/main/resources/static/font/Montserrat-ExtraBoldItalic.ttf new file mode 100644 index 00000000..c21a396b Binary files /dev/null and b/src/main/resources/static/font/Montserrat-ExtraBoldItalic.ttf differ diff --git a/src/main/resources/static/font/Montserrat-ExtraLight.ttf b/src/main/resources/static/font/Montserrat-ExtraLight.ttf new file mode 100644 index 00000000..f1b405ec Binary files /dev/null and b/src/main/resources/static/font/Montserrat-ExtraLight.ttf differ diff --git a/src/main/resources/static/font/Montserrat-ExtraLightItalic.ttf b/src/main/resources/static/font/Montserrat-ExtraLightItalic.ttf new file mode 100644 index 00000000..382293d2 Binary files /dev/null and b/src/main/resources/static/font/Montserrat-ExtraLightItalic.ttf differ diff --git a/src/main/resources/static/font/Montserrat-Italic.ttf b/src/main/resources/static/font/Montserrat-Italic.ttf new file mode 100644 index 00000000..eee45ba9 Binary files /dev/null and b/src/main/resources/static/font/Montserrat-Italic.ttf differ diff --git a/src/main/resources/static/font/Montserrat-Light.ttf b/src/main/resources/static/font/Montserrat-Light.ttf new file mode 100644 index 00000000..c5dfdb76 Binary files /dev/null and b/src/main/resources/static/font/Montserrat-Light.ttf differ diff --git a/src/main/resources/static/font/Montserrat-LightItalic.ttf b/src/main/resources/static/font/Montserrat-LightItalic.ttf new file mode 100644 index 00000000..5bdce7fb Binary files /dev/null and b/src/main/resources/static/font/Montserrat-LightItalic.ttf differ diff --git a/src/main/resources/static/font/Montserrat-Medium.ttf b/src/main/resources/static/font/Montserrat-Medium.ttf new file mode 100644 index 00000000..dfc7e2fc Binary files /dev/null and b/src/main/resources/static/font/Montserrat-Medium.ttf differ diff --git a/src/main/resources/static/font/Montserrat-MediumItalic.ttf b/src/main/resources/static/font/Montserrat-MediumItalic.ttf new file mode 100644 index 00000000..ce56883a Binary files /dev/null and b/src/main/resources/static/font/Montserrat-MediumItalic.ttf differ diff --git a/src/main/resources/static/font/Montserrat-Regular.ttf b/src/main/resources/static/font/Montserrat-Regular.ttf new file mode 100644 index 00000000..aa9033a8 Binary files /dev/null and b/src/main/resources/static/font/Montserrat-Regular.ttf differ diff --git a/src/main/resources/static/font/Montserrat-SemiBold.ttf b/src/main/resources/static/font/Montserrat-SemiBold.ttf new file mode 100644 index 00000000..cbf44db9 Binary files /dev/null and b/src/main/resources/static/font/Montserrat-SemiBold.ttf differ diff --git a/src/main/resources/static/font/Montserrat-SemiBoldItalic.ttf b/src/main/resources/static/font/Montserrat-SemiBoldItalic.ttf new file mode 100644 index 00000000..7f9153d2 Binary files /dev/null and b/src/main/resources/static/font/Montserrat-SemiBoldItalic.ttf differ diff --git a/src/main/resources/static/font/Montserrat-Thin.ttf b/src/main/resources/static/font/Montserrat-Thin.ttf new file mode 100644 index 00000000..7c90a547 Binary files /dev/null and b/src/main/resources/static/font/Montserrat-Thin.ttf differ diff --git a/src/main/resources/static/font/Montserrat-ThinItalic.ttf b/src/main/resources/static/font/Montserrat-ThinItalic.ttf new file mode 100644 index 00000000..94bcf553 Binary files /dev/null and b/src/main/resources/static/font/Montserrat-ThinItalic.ttf differ diff --git a/src/main/resources/static/font/Pretendard-Black.otf b/src/main/resources/static/font/Pretendard-Black.otf new file mode 100644 index 00000000..04cc09dd Binary files /dev/null and b/src/main/resources/static/font/Pretendard-Black.otf differ diff --git a/src/main/resources/static/font/Pretendard-Bold.otf b/src/main/resources/static/font/Pretendard-Bold.otf new file mode 100644 index 00000000..a52ef399 Binary files /dev/null and b/src/main/resources/static/font/Pretendard-Bold.otf differ diff --git a/src/main/resources/static/font/Pretendard-ExtraBold.otf b/src/main/resources/static/font/Pretendard-ExtraBold.otf new file mode 100644 index 00000000..33d4371a Binary files /dev/null and b/src/main/resources/static/font/Pretendard-ExtraBold.otf differ diff --git a/src/main/resources/static/font/Pretendard-ExtraLight.otf b/src/main/resources/static/font/Pretendard-ExtraLight.otf new file mode 100644 index 00000000..8952156f Binary files /dev/null and b/src/main/resources/static/font/Pretendard-ExtraLight.otf differ diff --git a/src/main/resources/static/font/Pretendard-Light.otf b/src/main/resources/static/font/Pretendard-Light.otf new file mode 100644 index 00000000..fefa7853 Binary files /dev/null and b/src/main/resources/static/font/Pretendard-Light.otf differ diff --git a/src/main/resources/static/font/Pretendard-Medium.otf b/src/main/resources/static/font/Pretendard-Medium.otf new file mode 100644 index 00000000..a2dc009f Binary files /dev/null and b/src/main/resources/static/font/Pretendard-Medium.otf differ diff --git a/src/main/resources/static/font/Pretendard-Regular.otf b/src/main/resources/static/font/Pretendard-Regular.otf new file mode 100644 index 00000000..c940185a Binary files /dev/null and b/src/main/resources/static/font/Pretendard-Regular.otf differ diff --git a/src/main/resources/static/font/Pretendard-SemiBold.otf b/src/main/resources/static/font/Pretendard-SemiBold.otf new file mode 100644 index 00000000..c375b545 Binary files /dev/null and b/src/main/resources/static/font/Pretendard-SemiBold.otf differ diff --git a/src/main/resources/static/font/Pretendard-Thin.otf b/src/main/resources/static/font/Pretendard-Thin.otf new file mode 100644 index 00000000..a8c24dd7 Binary files /dev/null and b/src/main/resources/static/font/Pretendard-Thin.otf differ diff --git a/src/main/resources/static/img/dashboard/acco_arrow.png b/src/main/resources/static/img/dashboard/acco_arrow.png new file mode 100644 index 00000000..4eefdc5d Binary files /dev/null and b/src/main/resources/static/img/dashboard/acco_arrow.png differ diff --git a/src/main/resources/static/img/dashboard/acco_arrow_closed.png b/src/main/resources/static/img/dashboard/acco_arrow_closed.png new file mode 100644 index 00000000..4ed52906 Binary files /dev/null and b/src/main/resources/static/img/dashboard/acco_arrow_closed.png differ diff --git a/src/main/resources/static/img/dashboard/accordionicon.png b/src/main/resources/static/img/dashboard/accordionicon.png new file mode 100644 index 00000000..9321fcdf Binary files /dev/null and b/src/main/resources/static/img/dashboard/accordionicon.png differ diff --git a/src/main/resources/static/img/dashboard/auction.svg b/src/main/resources/static/img/dashboard/auction.svg new file mode 100644 index 00000000..19bdca65 --- /dev/null +++ b/src/main/resources/static/img/dashboard/auction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/resources/static/img/dashboard/bell.png b/src/main/resources/static/img/dashboard/bell.png new file mode 100644 index 00000000..e6441b76 Binary files /dev/null and b/src/main/resources/static/img/dashboard/bell.png differ diff --git a/src/main/resources/static/img/dashboard/folder.svg b/src/main/resources/static/img/dashboard/folder.svg new file mode 100644 index 00000000..7ae528b8 --- /dev/null +++ b/src/main/resources/static/img/dashboard/folder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/resources/static/img/dashboard/handshake.svg b/src/main/resources/static/img/dashboard/handshake.svg new file mode 100644 index 00000000..1380c59d --- /dev/null +++ b/src/main/resources/static/img/dashboard/handshake.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/static/img/dashboard/iconmenuarrow.png b/src/main/resources/static/img/dashboard/iconmenuarrow.png new file mode 100644 index 00000000..900cc9b2 Binary files /dev/null and b/src/main/resources/static/img/dashboard/iconmenuarrow.png differ diff --git a/src/main/resources/static/img/dashboard/plus.png b/src/main/resources/static/img/dashboard/plus.png new file mode 100644 index 00000000..8537c44f Binary files /dev/null and b/src/main/resources/static/img/dashboard/plus.png differ diff --git a/src/main/resources/static/img/dashboard/police-hat.svg b/src/main/resources/static/img/dashboard/police-hat.svg new file mode 100644 index 00000000..e139ca8f --- /dev/null +++ b/src/main/resources/static/img/dashboard/police-hat.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/resources/static/img/dashboard/방첩정보포털 아이콘.png b/src/main/resources/static/img/dashboard/방첩정보포털 아이콘.png new file mode 100644 index 00000000..a4e8507c Binary files /dev/null and b/src/main/resources/static/img/dashboard/방첩정보포털 아이콘.png differ diff --git a/src/main/resources/static/img/dashboard/형사사법 정보시스템 아이콘.png b/src/main/resources/static/img/dashboard/형사사법 정보시스템 아이콘.png new file mode 100644 index 00000000..1b24dfc1 Binary files /dev/null and b/src/main/resources/static/img/dashboard/형사사법 정보시스템 아이콘.png differ diff --git a/src/main/resources/static/js/dashboard.js b/src/main/resources/static/js/dashboard.js index e7da813c..e1f103db 100644 --- a/src/main/resources/static/js/dashboard.js +++ b/src/main/resources/static/js/dashboard.js @@ -1,3 +1,29 @@ +$(document).ready(function(){ + + $('.accordion').each(function(){ + const dl = $(this); + const allDt = dl.find('dt'); + const allDd = dl.find('dd'); + function closeAll(){ + allDt.addClass('closed'); + allDd.addClass('closed'); + } + + function open(a,b){ + a.removeClass('closed'); + b.removeClass('closed'); + } + closeAll(); + + allDt.click(function(){ + var dt = $(this); + var dd = dt.next(); + closeAll(); + open(dt,dd); + }); + }); +}); + $(document).on('click', '.faRptTr', function (){ location.href = "/faRpt/faRptBoard?activeTab=receive&refDocKey="+$(this).find('.faRptKey').val(); }) diff --git a/src/main/resources/static/js/publicBoard/reference.js b/src/main/resources/static/js/publicBoard/reference.js index ca54399b..e80e14b9 100644 --- a/src/main/resources/static/js/publicBoard/reference.js +++ b/src/main/resources/static/js/publicBoard/reference.js @@ -1,23 +1,24 @@ +$(document).on('click', '.referenceTab', function (){ + location.href = "/publicBoard/referencePage?tabStatus="+$(this).attr('data-tabcd') +}) + $(document).on('click', '#addReferenceBtn', function (){ getEditModal(null, "PLB003") }) -$(document).on('click', '.planTr', function (){ - $(".trChkBox").prop("checked", false); - $(this).find(".trChkBox").prop("checked", true); - getViewModal(Number($(this).find(".planKey").val()), "PLB003"); -}) - $(document).on('click', '#saveBtn', function (){ savePublicBoard("referenceEditForm", "PLB003") }) +$(document).on('click', '.referenceTr', function (){ + $(".trChkBox").prop("checked", false); + $(this).find(".trChkBox").prop("checked", true); + getViewModal(Number($(this).find(".publicKey").val()), "PLB003"); +}) + $(document).on('click', '#editBtn', function (){ $("#viewModal").modal('hide') getEditModal($("#viewModalPublicKey").val(), "PLB003") }) -$(document).on('click', '.referenceTab', function (){ - location.href = "/publicBoard/referencePage?tabStatus="+$(this).attr('data-tabcd') -}) diff --git a/src/main/resources/templates/counterIntelligence/ciaSafetyDemandviewModal.html b/src/main/resources/templates/counterIntelligence/ciaSafetyDemandviewModal.html index 4cb9620d..395cae5f 100644 --- a/src/main/resources/templates/counterIntelligence/ciaSafetyDemandviewModal.html +++ b/src/main/resources/templates/counterIntelligence/ciaSafetyDemandviewModal.html @@ -4,8 +4,6 @@
치안수요 열람
- -