diff --git a/src/pages/booking/bookedList/BookedList.js b/src/pages/booking/bookedList/BookedList.js index 848047a..9460bef 100644 --- a/src/pages/booking/bookedList/BookedList.js +++ b/src/pages/booking/bookedList/BookedList.js @@ -54,6 +54,13 @@ export const BookedLineTr = styled.tr` border-bottom: #E1E0E2 solid 1px; ` +export const NoLineTr = styled.tr` + color: #4c4c4c; + text-align: center; + height: 60px; + border-bottom: #E1E0E2 solid 1px; +` + const optionList = BookingCategoryList.map((category) => ()) function BookedList(props) { diff --git a/src/pages/manager/resourceManage/ResourceManage.js b/src/pages/manager/resourceManage/ResourceManage.js index c2dd3f5..45025f5 100644 --- a/src/pages/manager/resourceManage/ResourceManage.js +++ b/src/pages/manager/resourceManage/ResourceManage.js @@ -1,7 +1,7 @@ import React from "react"; import { useState, useEffect } from "react"; import { RightContainer, TitleText, WhiteContainer } from "components/rightContainer/RightContainer"; -import { Bar, BookedTable, BookedThead, TableContainer } from "../../booking/bookedList/BookedList"; +import {Bar, BookedTable, BookedThead, NoLineTr, TableContainer} from "../../booking/bookedList/BookedList"; import ResourceManageTableCell from "./ResourceManageTableCell"; import ManageSearchBar from "components/searchBar/ManageSearchBar"; import { getToken } from "utils/IsLoginUtil"; @@ -57,9 +57,9 @@ function ResourceManage(props) { { resources.length === 0 ? - + 장비 내역이 없습니다. - + : resources.map((resource) => : null } - {props.title} + 직원 관리 @@ -54,7 +54,7 @@ function UserManage(props) { - 성명 + 성명 이메일 연락처 부서 @@ -64,11 +64,12 @@ function UserManage(props) { {users.length === 0 ? - + 직원이 없습니다. - - : users.map((user, index) => - + : users.map((user) => +