From 3a8f9f700ee52dcd09fbc3ca5b670f19974524b1 Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 4 Mar 2024 10:12:27 +0900 Subject: [PATCH 1/6] =?UTF-8?q?style:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20?= =?UTF-8?q?=EC=9C=84=EC=9B=90=ED=9A=8C=20=EC=BD=94=EB=93=9C=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/list/ListCreateUpdateDelete.jsx | 6 ++++-- .../src/pages/admin/config/CommitteeCodeMgt.jsx | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/components/list/ListCreateUpdateDelete.jsx b/egovframe-template-simple-react-contribution/src/components/list/ListCreateUpdateDelete.jsx index 4701648..09eeb11 100644 --- a/egovframe-template-simple-react-contribution/src/components/list/ListCreateUpdateDelete.jsx +++ b/egovframe-template-simple-react-contribution/src/components/list/ListCreateUpdateDelete.jsx @@ -115,13 +115,15 @@ function ListCreateUpdateDelete(props) { - + {generate( props.items, - {alert('수정 클릭')}}> + { + props.setIsPopupOpen(true); + }}> { diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx index 6761a63..00ff49b 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/config/CommitteeCodeMgt.jsx @@ -30,6 +30,9 @@ function CommitteeCodeMgt(props) { const [confirm, setConfirm] = React.useState(); + const [editCreateMode, setEditCreateMode] = React.useState(); // 생성 or 수정 여부 + + // 위원회 코드 등록 팝업을 보이거나 닫는다. const [isCommitteeCodeRegistrationPopupOpen, setIsCommitteeCodeRegistrationPopupOpen] = React.useState(false); @@ -324,7 +327,7 @@ function CommitteeCodeMgt(props) { /> - { true && + { false && Date: Mon, 4 Mar 2024 11:13:40 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=ED=8A=B8=EA=B4=80=EB=A6=AC=20>=20=EC=BB=A8?= =?UTF-8?q?=ED=85=90=EC=B8=A0=EA=B4=80=EB=A6=AC=20>=20=ED=8C=9D=EC=97=85?= =?UTF-8?q?=20=EA=B4=80=EB=A6=AC=EC=97=90=20=EB=B2=88=ED=98=B8=EB=A5=BC=20?= =?UTF-8?q?PK=EA=B0=92=EC=9D=B4=20=EC=95=84=EB=8B=8C=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=EA=B8=80=20=EB=B2=88=ED=98=B8=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EA=B1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/admin/contents/PopUp.jsx | 58 +++++++++++++++---- .../service/impl/PopUpApiServiceImpl.java | 7 ++- 2 files changed, 52 insertions(+), 13 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx index 90cdf8a..ead34b9 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx @@ -13,9 +13,42 @@ import EgovPagingPaginationInfo from 'components/EgovPagingPaginationInfo'; import styled from "styled-components"; const StyledDiv = styled.div` + + .BRD008 { + .head > span:nth-child(3) { + width: 180px; + } + .result .list_item > div:nth-child(3) { + width: 180px; + } + } + .board_btn_area { margin: 12px 0px; } + + .board-bot { + margin-top: 20px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; + align-items: stretch; + justify-content: center; + + & > *:nth-child(1) { + width: 16%; + justify-content: left; + } + & > *:nth-child(2) { + width: 68%; + justify-content: center; + } + & > *:nth-child(3) { + width: 16%; + justify-content: right; + } + } `; const label = { inputProps: { 'aria-label': '사용여부' } }; @@ -112,14 +145,6 @@ function PopUp(props) {

팝업 관리

- - {/* */} -
-
- 팝업 추가 -
-
- {/* */} {/* */}
@@ -146,13 +171,24 @@ function PopUp(props) {
{/* */} -
- {/* */} + + + + + {/* */} +
+
{ getList({ ...searchCondition, pageIndex: passedPage }) }} /> - {/* */} +
+ 등록 +
+
+ {/* */} + + {/* */}
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java index 93bdbbf..00266c3 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java @@ -24,6 +24,7 @@ import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @Service("popUpApiService") @@ -47,13 +48,14 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU ); - Long totalRecordCount = tnPopupMngRepositoryWithoutPopupContents.count(); + Long totalRecordCount = tnPopupMngRepositoryWithoutPopupContents.count(); + AtomicInteger index = new AtomicInteger(); //List> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(Sort.by(Sort.Direction.DESC, "popupSeq")) List> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(pageable) .stream() .map(item -> { Map codeMap = new HashMap<>(); - codeMap.put("seq", item.getPopupSeq()); + codeMap.put("seq", totalRecordCount - pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement()); codeMap.put("popupTitle", item.getPopupTitle()); codeMap.put("startDate", item.getPopupStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); codeMap.put("endDate", item.getPopupEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); @@ -65,6 +67,7 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU codeMap.put("createDate", item.getFrstCrtDt()); codeMap.put("updateDate", item.getLastChgDt()); codeMap.put("base64String", null); + //nCount ++; return codeMap; }) .collect(Collectors.toList()); From 26351bd5498cb90c70c961496266c89680b828a2 Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 4 Mar 2024 11:21:02 +0900 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=ED=8A=B8=EA=B4=80=EB=A6=AC=20>=20=EC=BB=A8?= =?UTF-8?q?=ED=85=90=EC=B8=A0=EA=B4=80=EB=A6=AC=20>=20=EA=B1=B4=EC=84=A4?= =?UTF-8?q?=EA=B8=B0=EC=A4=80=EC=97=B0=EA=B5=AC=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=97=90=20=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EB=B2=88=ED=98=B8?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EA=B1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/admin/contents/PopUp.jsx | 2 +- .../src/pages/admin/contents/StandardResearch.jsx | 2 +- .../contents/popUp/service/impl/PopUpApiServiceImpl.java | 4 ++-- .../service/impl/AdminStandardResearchServiceImpl.java | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx index ead34b9..f3b6046 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx @@ -161,7 +161,7 @@ function PopUp(props) { } {listPopup.map((it)=>(
-
{it.seq}
+
{it.number}
{it.popupTitle}
{it.startDate} ~ {it.endDate}
{it.useYn === 'Y' ? onChangeActivationSwitch(e, it.seq)} defaultChecked /> : onChangeActivationSwitch(e, it.seq)} {...label} />}
diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx index 82d9d9b..d82b48b 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx @@ -134,7 +134,7 @@ function StandardResearch(props) { } {list.map((it)=>(
-
{it.id}
+
{it.number}
{it.title}
{it.researchStartDate} ~ {it.researchEndDate}
{it.director}
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java index 00266c3..c6664cc 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java @@ -55,7 +55,8 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU .stream() .map(item -> { Map codeMap = new HashMap<>(); - codeMap.put("seq", totalRecordCount - pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement()); + codeMap.put("number", totalRecordCount - (long) pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement()); + codeMap.put("seq", item.getPopupSeq()); codeMap.put("popupTitle", item.getPopupTitle()); codeMap.put("startDate", item.getPopupStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); codeMap.put("endDate", item.getPopupEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); @@ -67,7 +68,6 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU codeMap.put("createDate", item.getFrstCrtDt()); codeMap.put("updateDate", item.getLastChgDt()); codeMap.put("base64String", null); - //nCount ++; return codeMap; }) .collect(Collectors.toList()); diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java index 6547cbc..d2095c3 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java @@ -31,6 +31,7 @@ import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @Service("adminStandardResearchService") @@ -55,10 +56,12 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im long totalRecordCount = tnResearchRepositoryLightweight.countByUseYn("Y"); + AtomicInteger index = new AtomicInteger(); List> list = tnResearchRepositoryLightweight.findByUseYn("Y", pageable) .stream() .map(item -> { Map codeMap = new HashMap<>(); + codeMap.put("number", totalRecordCount - (long) pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement()); codeMap.put("id", item.getRsSeq()); codeMap.put("title", item.getRsTitle()); codeMap.put("researchStartDate", item.getRsStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); From bc9f30c502216b0c56cfb6088b1e2043401a21f5 Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 4 Mar 2024 11:42:44 +0900 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=EA=B4=80=EB=A6=AC=20=EB=94=94=EC=9E=90?= =?UTF-8?q?=EC=9D=B8=20=EB=B3=80=EA=B2=BD=20=EA=B1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/admin/contents/PopUp.jsx | 4 -- .../pages/admin/contents/StandardResearch.jsx | 62 +++++++++++++++---- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx index f3b6046..4dcc0fb 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx @@ -23,10 +23,6 @@ const StyledDiv = styled.div` } } - .board_btn_area { - margin: 12px 0px; - } - .board-bot { margin-top: 20px; display: flex; diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx index d82b48b..7d1a67a 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch.jsx @@ -13,8 +13,36 @@ import EgovPagingPaginationInfo from 'components/EgovPagingPaginationInfo'; import styled from "styled-components"; const StyledDiv = styled.div` - .board_btn_area { - margin: 12px 0px; + .BRD008 { + .head > span:nth-child(3) { + width: 200px; + } + .result .list_item > div:nth-child(3) { + width: 200px; + } + } + + .board-bot { + margin-top: 20px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; + align-items: stretch; + justify-content: center; + + & > *:nth-child(1) { + width: 16%; + justify-content: left; + } + & > *:nth-child(2) { + width: 68%; + justify-content: center; + } + & > *:nth-child(3) { + width: 16%; + justify-content: right; + } } `; @@ -110,14 +138,10 @@ function StandardResearch(props) {

건설기준연구 관리

-
- {/* */} -
-
- 글 작성 -
- {/* */} + + + {/* */}
@@ -144,13 +168,27 @@ function StandardResearch(props) {
{/* */} -
- {/* */} + + + + + {/* */} +
+
{ getList({ ...searchCondition, pageIndex: passedPage }) }} /> - {/* */} +
+ 등록 +
+
+ {/* */} + + + + + {/* */}
From cf69ff4893286daa2a6b660d72da33747c23db55 Mon Sep 17 00:00:00 2001 From: "Lim\\jun" Date: Mon, 4 Mar 2024 11:48:52 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=ED=98=84=ED=99=A9=20=EC=8B=9C/=EB=B6=84=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/admin/logs/PrivacyLogs.jsx | 5 +++-- .../dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java | 6 +----- .../kcscbackend/admin/logs/service/AdminLogsService.java | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/logs/PrivacyLogs.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/logs/PrivacyLogs.jsx index 0351568..1d633ef 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/logs/PrivacyLogs.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/logs/PrivacyLogs.jsx @@ -8,6 +8,7 @@ import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin'; import EgovPaging from 'components/EgovPaging'; import { itemIdxByPage } from 'utils/calc'; +import {format} from "date-fns"; function PrivacyConnections(props) { // console.group("EgovAdminPrivacyList"); @@ -66,7 +67,7 @@ function PrivacyConnections(props) {
{item.targetUserId}
{item.accessType === "PRV_LIST" ? "사용자현황 조회" : item.accessType === "PRV_VIEW" ? "User 상세조회" : "User 수정"}
{item.ipAddress}
-
{item.accessDt}
+
{item.accessDt ? format(item.accessDt, "yyyy-MM-dd HH:mm") : ""}
); } @@ -122,7 +123,7 @@ function PrivacyConnections(props) { 수정 ID 타입 접속IP - 변경일자 + 일자
{listTag} diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java index 62403e0..bea3b4c 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/entity/ThPrivacyLog.java @@ -3,17 +3,14 @@ package com.dbnt.kcscbackend.admin.logs.entity; import java.io.Serializable; import com.dbnt.kcscbackend.config.common.BoardParams; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; -import java.time.LocalDate; import java.time.LocalDateTime; @Getter @@ -45,8 +42,7 @@ public class ThPrivacyLog extends BoardParams implements Serializable { private String ipAddress; @Column(name = "access_dt") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate accessDt; + private LocalDateTime accessDt; @Column(name = "session_id") private String sessionId; diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/service/AdminLogsService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/service/AdminLogsService.java index 5ac6529..d8b30df 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/service/AdminLogsService.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/logs/service/AdminLogsService.java @@ -47,7 +47,7 @@ public class AdminLogsService extends EgovAbstractServiceImpl { public void insertPrivacyLog(String userId, String ipAddress, String accessType, String targetUserId){ ThPrivacyLog log = new ThPrivacyLog(); log.setUserId(userId); - log.setAccessDt(LocalDate.now()); + log.setAccessDt(LocalDateTime.now()); log.setIpAddress(ipAddress); log.setAccessType(accessType); log.setTargetUserId(targetUserId); From c3582ed28c1624b9d3dc52d301785141d1fd090a Mon Sep 17 00:00:00 2001 From: thkim Date: Mon, 4 Mar 2024 13:28:34 +0900 Subject: [PATCH 6/6] =?UTF-8?q?style:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20?= =?UTF-8?q?=EC=9C=84=EC=9B=90=ED=9A=8C=20=EC=9D=BC=EC=A0=95=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EA=B1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/admin/committee/Schedules.jsx | 185 +++++++++++------- 1 file changed, 113 insertions(+), 72 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx index 7e9447b..1d07793 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/committee/Schedules.jsx @@ -1,12 +1,50 @@ +/* eslint-disable jsx-a11y/heading-has-content */ import React, { useState, useEffect, useCallback } from 'react'; import { Link, useLocation } from 'react-router-dom'; +import styled from "styled-components"; + + import * as EgovNet from 'api/egovFetch'; import URL from 'constants/url'; import CODE from 'constants/code'; import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin'; +const StyledDiv = styled.div` + .calendar_list table { + thead tr th { + height: auto; + line-height: 35px; + text-align: left; + } + tbody td { + padding: 0px 5px; + text-align: left; + font-size: 12px; + .day { + display: inline-block; + font-size: 14px; + padding-bottom: 7px; + } + .title { + &:link { + color: #647ea3; + } + &:visited { + color: #647ea3; + } + &::hover { + color: #345ef3; + } + &::active { + color: #345ef3; + } + + } + } + } +`; function Schedules(props) { @@ -154,7 +192,7 @@ function Schedules(props) { if (scheduleList.length > 0) {//일정 있는 경우 return ( - {day}
{ scheduleList.map((schedule, scheduleIdx) => { @@ -168,8 +206,9 @@ function Schedules(props) { return ( <> {schedule.schdulNm} + className="title" + state={{schdulId: schedule.schdulId}} + key={keyIdx++}>{schedule.schdulNm}
@@ -241,77 +280,79 @@ function Schedules(props) {

위원회 일정 관리

-

- {/* */} -
-
    - {false && -
  • - +
    • + } + +
  • +
    • - } - -
  • - - {searchCondition.year} - -
    • -
  • - - {(searchCondition.month + 1)} - -
    • -
-
- {/* */} + > + {searchCondition.year} + + +
  • + + {(searchCondition.month + 1)} + +
    • + + + {/* */} -
    - - - - - - - - - - - - - - {true && calendarTag} - -
    일월화수목금토
    -
    +
    + + + + + + + + + + + + + + {true && calendarTag} + +
    일월화수목금토
    +
    + {/* */}