
--- client/resources/css/common.css
+++ client/resources/css/common.css
... | ... | @@ -139,6 +139,7 @@ |
139 | 139 |
display: flex; |
140 | 140 |
justify-content: space-between; |
141 | 141 |
align-items: center; |
142 |
+ |
|
142 | 143 |
} |
143 | 144 |
|
144 | 145 |
.flex-align-start { |
... | ... | @@ -163,6 +164,7 @@ |
163 | 164 |
display: flex; |
164 | 165 |
justify-content: flex-start; |
165 | 166 |
align-items: center; |
167 |
+ |
|
166 | 168 |
} |
167 | 169 |
|
168 | 170 |
.flex-center { |
--- client/resources/css/main.css
+++ client/resources/css/main.css
... | ... | @@ -1244,8 +1244,8 @@ |
1244 | 1244 |
} |
1245 | 1245 |
|
1246 | 1246 |
/* 사용자 관리 */ |
1247 |
-.userauthoriylist .left{width: 27%;} |
|
1248 |
- .userauthoriylist .right{width: 70%; } |
|
1247 |
+.userauthoriylist .left{width: 33%;} |
|
1248 |
+ .userauthoriylist .right{width: 100%;} |
|
1249 | 1249 |
.bSXvtB{display: none;} |
1250 | 1250 |
.tab-menu .tab-menu-agency { |
1251 | 1251 |
display: flex; |
... | ... | @@ -1325,4 +1325,6 @@ |
1325 | 1325 |
background-color: #ff7f50; |
1326 | 1326 |
color: #ffffff; |
1327 | 1327 |
|
1328 |
-}(No newline at end of file) |
|
1328 |
+} |
|
1329 |
+.senior-table span{display: none;} |
|
1330 |
+.senior-table span img{display: none; }(No newline at end of file) |
--- client/resources/css/reset.css
+++ client/resources/css/reset.css
... | ... | @@ -45,7 +45,6 @@ |
45 | 45 |
width: 100%; |
46 | 46 |
border-collapse: collapse; |
47 | 47 |
} |
48 |
-table span{display: none;} |
|
49 | 48 |
thead{ |
50 | 49 |
font-weight: bold; |
51 | 50 |
background: #d8d3c7; |
... | ... | @@ -53,7 +52,7 @@ |
53 | 52 |
text-align: center; |
54 | 53 |
} |
55 | 54 |
thead tr{border-radius: 10px;} |
56 |
-th{background-color: #d8d3c7; padding: 0.5rem;} |
|
55 |
+th{background-color: #f7f7f7; padding: 0.5rem;} |
|
57 | 56 |
|
58 | 57 |
td { |
59 | 58 |
padding: 0.5rem; |
--- client/resources/css/responsive.css
+++ client/resources/css/responsive.css
... | ... | @@ -445,7 +445,7 @@ |
445 | 445 |
.userauthoriylist .right { |
446 | 446 |
margin-top: 2rem; |
447 | 447 |
} |
448 |
- |
|
448 |
+.userauthoriylist .category{width: -webkit-fill-available;} |
|
449 | 449 |
.modal .modal-inner { |
450 | 450 |
width: 100%; |
451 | 451 |
border-radius: 0; |
... | ... | @@ -751,6 +751,7 @@ |
751 | 751 |
.userauthoriylist .right { |
752 | 752 |
margin-top: 2rem; |
753 | 753 |
} |
754 |
+ .userauthoriylist .category{width: -webkit-fill-available !important; margin-top: 1rem;} |
|
754 | 755 |
.tab-menu { |
755 | 756 |
display: block; |
756 | 757 |
} |
... | ... | @@ -873,7 +874,7 @@ |
873 | 874 |
} |
874 | 875 |
.senior-detail th, |
875 | 876 |
.senior-detail td { |
876 |
- display: inline-table; |
|
877 |
+ display: flex; |
|
877 | 878 |
margin: 0.5rem; |
878 | 879 |
} |
879 | 880 |
|
... | ... | @@ -890,15 +891,14 @@ |
890 | 891 |
|
891 | 892 |
.senior-detail td span { |
892 | 893 |
width: 100%; |
893 |
- font-size: 1.2rem; |
|
894 |
+ font-size: 1.6rem; |
|
894 | 895 |
text-align: center; |
895 | 896 |
} |
896 |
- |
|
897 | 897 |
/* 시니어 등록창 */ |
898 | 898 |
.senior-insert { |
899 | 899 |
display: grid; |
900 | 900 |
} |
901 |
- |
|
901 |
+ .senior-insert span{display: revert;} |
|
902 | 902 |
.senior-insert th { |
903 | 903 |
font-size: 1.4rem; |
904 | 904 |
width: 50%; |
... | ... | @@ -1089,14 +1089,14 @@ |
1089 | 1089 |
.total-equip { |
1090 | 1090 |
margin-bottom: 0.5rem; |
1091 | 1091 |
} |
1092 |
- |
|
1092 |
+ /* 복약상세 (컴포넌트 테이블)*/ |
|
1093 | 1093 |
.senior-table { |
1094 | 1094 |
overflow-x: auto; |
1095 | 1095 |
-webkit-overflow-scrolling: touch; |
1096 | 1096 |
} |
1097 | 1097 |
.senior-table thead{display: none;} |
1098 |
- .senior-table span{border-bottom: 1px solid #e4dccf; font-weight: bold; padding: 0.5rem; margin-bottom: 0.5rem; } |
|
1099 |
- .senior-table span img{width: 2rem; } |
|
1098 |
+ .senior-table span{border-bottom: 1px solid #e4dccf; font-weight: bold; padding: 0.5rem; margin-bottom: 0.5rem; display: block;} |
|
1099 |
+ .senior-table span img{width: 2rem;} |
|
1100 | 1100 |
.senior-table tr{background-color: #f2f0eb; padding: 1rem; margin-bottom: 1rem;} |
1101 | 1101 |
.senior-table td{background-color: #ffffffde; |
1102 | 1102 |
border-radius: 5px; margin-bottom: 0.5rem;} |
... | ... | @@ -1115,14 +1115,14 @@ |
1115 | 1115 |
|
1116 | 1116 |
/* 문진표 */ |
1117 | 1117 |
.questionnaire-table td{padding: 0 !important;} |
1118 |
- .questionnaire-table input[type="text"]{width: auto;} |
|
1118 |
+ .questionnaire-table input[type="text"]{width: -webkit-fill-available;} |
|
1119 | 1119 |
|
1120 | 1120 |
.caregiver-user{} |
1121 | 1121 |
|
1122 |
+ |
|
1122 | 1123 |
.medicine-detail-table th{display: none;} |
1123 | 1124 |
.medicine-detail-table tbody tr{background-color: #f2f0eb; border-radius: 5px; padding: 0.5rem; margin-bottom: 1rem;} |
1124 |
- .medicine-detail-table td{text-align: right; position: relative; padding-left: 50%;} |
|
1125 |
- .medicine-detail-table td:nth-child(odd){background-color: #ffffff;} |
|
1125 |
+ .medicine-detail-table td{text-align: right; position: relative; padding-left: 50%; background-color: #ffffff; border-bottom: 1px solid #f2f0eb} |
|
1126 | 1126 |
.medicine-detail-table td::before{ |
1127 | 1127 |
content: attr(data-label); |
1128 | 1128 |
position: absolute; |
... | ... | @@ -1131,5 +1131,27 @@ |
1131 | 1131 |
text-align: left; |
1132 | 1132 |
border-left: 8px solid #d8d3c7; |
1133 | 1133 |
padding-left: 1rem; |
1134 |
+ margin-left: 1rem; |
|
1134 | 1135 |
} |
1136 |
+ .protector-user th{display: none;} |
|
1137 |
+ .protector-user tbody tr{background-color: #f2f0eb; border-radius: 5px; padding: 0.5rem; margin-bottom: 1rem;} |
|
1138 |
+ .protector-user td{text-align: right; position: relative; padding-left: 50%; min-height: 3rem; border-bottom: 1px solid #f2f0eb; background-color: #ffffff;} |
|
1139 |
+ /* .protector-user td:nth-child(odd){background-color: #ffffff;} */ |
|
1140 |
+ .protector-user td::before{ |
|
1141 |
+ content: attr(data-label); |
|
1142 |
+ position: absolute; |
|
1143 |
+ left: 0; |
|
1144 |
+ width: 34%; |
|
1145 |
+ text-align: left; |
|
1146 |
+ border-left: 8px solid #d8d3c7; |
|
1147 |
+ padding-left: 1rem; |
|
1148 |
+ margin-left: 1rem; |
|
1149 |
+ } |
|
1150 |
+ |
|
1151 |
+ .join-group h3{margin-bottom: 3rem;} |
|
1135 | 1152 |
} |
1153 |
+ |
|
1154 |
+ |
|
1155 |
+/* 반응형 그냥 테이블 protector-user / medicine-detail-table |
|
1156 |
+ 컴포넌트 senior-table |
|
1157 |
+ 상세페이지 questionnaire-table */(No newline at end of file) |
--- client/views/pages/healthcare/Healthcare.jsx
+++ client/views/pages/healthcare/Healthcare.jsx
... | ... | @@ -151,7 +151,7 @@ |
151 | 151 |
title: "복약관리", |
152 | 152 |
description: ( |
153 | 153 |
<Table |
154 |
- className={"protector-user senior-table"} |
|
154 |
+ className={" senior-table"} |
|
155 | 155 |
head={thead} |
156 | 156 |
contents={content} |
157 | 157 |
contentKey={key} |
--- client/views/pages/healthcare/Medicalcare.jsx
+++ client/views/pages/healthcare/Medicalcare.jsx
... | ... | @@ -107,7 +107,7 @@ |
107 | 107 |
<p><span>{thead1[2]}</span> 0000001</p> |
108 | 108 |
), |
109 | 109 |
birth: ( |
110 |
- <p><span>{thead1[3]}</span> 1948.11.15</p> |
|
110 |
+ <p><span><img src={person} alt="" />{thead1[0]}</span> 1</p> |
|
111 | 111 |
), |
112 | 112 |
phone: ( |
113 | 113 |
<p><span>{thead1[4]}</span> 010-1234-1234</p> |
... | ... | @@ -178,7 +178,7 @@ |
178 | 178 |
title: "문진표 관리", |
179 | 179 |
description: ( |
180 | 180 |
<Table |
181 |
- className={"protector-user senior-table"} |
|
181 |
+ className={" senior-table"} |
|
182 | 182 |
head={thead} |
183 | 183 |
contents={content} |
184 | 184 |
contentKey={key} |
--- client/views/pages/healthcare/medicinecare/MedicineCareSelectOne.jsx
+++ client/views/pages/healthcare/medicinecare/MedicineCareSelectOne.jsx
... | ... | @@ -25,7 +25,7 @@ |
25 | 25 |
<main> |
26 | 26 |
<Modal open={modalOpen} close={closeModal} header="복약 내역 수정"> |
27 | 27 |
<div> |
28 |
- <table className="margin-bottom medicine-revise"> |
|
28 |
+ <table className="margin-bottom medicine-revise questionnaire-table"> |
|
29 | 29 |
<tr> |
30 | 30 |
<th>대상자명</th> |
31 | 31 |
<td></td> |
--- client/views/pages/healthcare/temperature/TemperatureManagementSelectOne.jsx
+++ client/views/pages/healthcare/temperature/TemperatureManagementSelectOne.jsx
... | ... | @@ -13,7 +13,7 @@ |
13 | 13 |
<ClusteredColumnChart /> |
14 | 14 |
</div> |
15 | 15 |
<div className="board-wrap"> |
16 |
- <table className="table-border margin-bottom2 temperature-modal"> |
|
16 |
+ <table className="table-border margin-bottom2 temperature-modal medicine-detail-table"> |
|
17 | 17 |
<thead> |
18 | 18 |
<tr> |
19 | 19 |
<th rowSpan="2">No</th> |
... | ... | @@ -29,20 +29,20 @@ |
29 | 29 |
</thead> |
30 | 30 |
<tbody> |
31 | 31 |
<tr> |
32 |
- <td>2</td> |
|
33 |
- <td>2022.08.10</td> |
|
34 |
- <td>18 ℃</td> |
|
35 |
- <td>5 ℃</td> |
|
36 |
- <td>10 ℃</td> |
|
37 |
- <td>13 ℃</td> |
|
32 |
+ <td data-label="No" >2</td> |
|
33 |
+ <td data-label="날짜">2022.08.10</td> |
|
34 |
+ <td data-label="댁내온도(02:00)">18 ℃</td> |
|
35 |
+ <td data-label="댁내온도(10:00)">5 ℃</td> |
|
36 |
+ <td data-label="댁내온도(14:00)">10 ℃</td> |
|
37 |
+ <td data-label="댁내온도(23:00)">13 ℃</td> |
|
38 | 38 |
</tr> |
39 | 39 |
<tr> |
40 |
- <td>1</td> |
|
41 |
- <td>2022.08.09</td> |
|
42 |
- <td>18 ℃</td> |
|
43 |
- <td>5 ℃</td> |
|
44 |
- <td>10 ℃</td> |
|
45 |
- <td>13 ℃</td> |
|
40 |
+ <td data-label="No">1</td> |
|
41 |
+ <td data-label="날짜">2022.08.09</td> |
|
42 |
+ <td data-label="댁내온도(02:00)">18 ℃</td> |
|
43 |
+ <td data-label="댁내온도(10:00)">5 ℃</td> |
|
44 |
+ <td data-label="댁내온도(14:00)">10 ℃</td> |
|
45 |
+ <td data-label="댁내온도(23:00)">13 ℃</td> |
|
46 | 46 |
</tr> |
47 | 47 |
</tbody> |
48 | 48 |
</table> |
--- client/views/pages/login/Login.jsx
+++ client/views/pages/login/Login.jsx
... | ... | @@ -77,7 +77,7 @@ |
77 | 77 |
</div> |
78 | 78 |
<div className="btn-wrap"> |
79 | 79 |
<Button |
80 |
- className={"btn-100 green-btn"} |
|
80 |
+ className={"btn-100 gray-btn"} |
|
81 | 81 |
btnName={"로그인"} |
82 | 82 |
onClick={login} |
83 | 83 |
/> |
--- client/views/pages/senior_management/SeniorSelectOne.jsx
+++ client/views/pages/senior_management/SeniorSelectOne.jsx
... | ... | @@ -263,18 +263,18 @@ |
263 | 263 |
<tbody> |
264 | 264 |
{guardianListBySenior.map((item, idx) => { return ( |
265 | 265 |
<tr key={idx}> |
266 |
- <td>{idx + 1}</td> |
|
267 |
- <td>{item['user_name']}</td> |
|
268 |
- <td>{item['senior_relationship']}</td> |
|
269 |
- <td>{item['user_phonenumber']}</td> |
|
270 |
- <td>{item['user_birth']}</td> |
|
271 |
- <td>{item['user_address']}</td> |
|
272 |
- <td> |
|
266 |
+ <td data-label="No">{idx + 1}</td> |
|
267 |
+ <td data-label="이름">{item['user_name']}</td> |
|
268 |
+ <td data-label="관계">{item['senior_relationship']}</td> |
|
269 |
+ <td data-label="연락처">{item['user_phonenumber']}</td> |
|
270 |
+ <td data-label="생년월일">{item['user_birth']}</td> |
|
271 |
+ <td data-label="주소">{item['user_address']}</td> |
|
272 |
+ <td data-label="가입승인"> |
|
273 | 273 |
{item['is_accept'] ? "승인완료" : |
274 | 274 |
<button className={"btn-small red-btn"} onClick={() => {userUpdate(item, guardianSelectListBySenior)}}>가입승인</button> |
275 | 275 |
} |
276 | 276 |
</td> |
277 |
- <td> |
|
277 |
+ <td data-label="관리"> |
|
278 | 278 |
<button className={"btn-small lightgray-btn"} onClick={() => guardianBySeniorManagement(item)}>정보 수정</button> |
279 | 279 |
</td> |
280 | 280 |
</tr> |
... | ... | @@ -291,7 +291,7 @@ |
291 | 291 |
|
292 | 292 |
<SubTitle explanation={"대상자의 보호사"} className="margin-bottom" /> |
293 | 293 |
<div className="margin-bottom5"> |
294 |
- <table className={"senior-user"}> |
|
294 |
+ <table className={"senior-user protector-user"}> |
|
295 | 295 |
<thead> |
296 | 296 |
<tr> |
297 | 297 |
<th>No</th> |
... | ... | @@ -309,16 +309,16 @@ |
309 | 309 |
<tbody> |
310 | 310 |
{agent.agentListBySenior.map((item, idx) => { return ( |
311 | 311 |
<tr key={idx}> |
312 |
- <td>{idx + 1}</td> |
|
313 |
- <td>{item['government_name']}</td> |
|
314 |
- <td>{item['agency_name']}</td> |
|
315 |
- <td>{item['user_name']}</td> |
|
316 |
- <td>{item['user_phonenumber']}</td> |
|
317 |
- <td>{item['user_email']}</td> |
|
318 |
- <td>{item['agent_match_state'] ? <span className="green">현재 보호사</span> : <span className="grey">이전 보호사</span>}</td> |
|
319 |
- <td>{item['agent_match_start_date']}</td> |
|
320 |
- <td>{item['agent_match_end_date']}</td> |
|
321 |
- <td> |
|
312 |
+ <td data-label="No">{idx + 1}</td> |
|
313 |
+ <td data-label="관리기관명">{item['government_name']}</td> |
|
314 |
+ <td data-label="소속기관명">{item['agency_name']}</td> |
|
315 |
+ <td data-label="이름">{item['user_name']}</td> |
|
316 |
+ <td data-label="연락처">{item['user_phonenumber']}</td> |
|
317 |
+ <td data-label="이메일">{item['user_email']}</td> |
|
318 |
+ <td data-label="상태">{item['agent_match_state'] ? <span className="green">현재 보호사</span> : <span className="grey">이전 보호사</span>}</td> |
|
319 |
+ <td data-label="배정시작일">{item['agent_match_start_date']}</td> |
|
320 |
+ <td data-label="배정종료일">{item['agent_match_end_date']}</td> |
|
321 |
+ <td data-label="상세보기"> |
|
322 | 322 |
<button className={"btn-small lightgray-btn"} onClick={() => {navigate("/AgentSelectOne", {state: {'agent_id': item['agent_id']}})}}>상세 페이지 이동</button> |
323 | 323 |
</td> |
324 | 324 |
</tr> |
--- client/views/pages/user_management/UserAuthoriySelect.jsx
+++ client/views/pages/user_management/UserAuthoriySelect.jsx
... | ... | @@ -344,7 +344,7 @@ |
344 | 344 |
className="margin-bottom" |
345 | 345 |
/> |
346 | 346 |
{/* 카테고리 디자인 필요 (a.active 클래스 필요) */} |
347 |
- <div style={{width: '100%', fontSize: '16px'}} className="category"> |
|
347 |
+ <div style={{width: '88%', fontSize: '16px'}} className="category"> |
|
348 | 348 |
{/* <a className={() => {return "active"}} onClick={adminChange}>올잇메디</a> */} |
349 | 349 |
<a onClick={adminChange} |
350 | 350 |
className={userSearch['government_id'] == null && userSearch['agency_id'] == null ? "active" : ""}> |
... | ... | @@ -434,13 +434,13 @@ |
434 | 434 |
<tbody> |
435 | 435 |
{senior.userList.map((item, idx) => { return ( |
436 | 436 |
<tr key={idx} onClick={() => {navigate("/SeniorSelectOne", {state: {'senior_id': item['user_id']}})}}> |
437 |
- <td>{senior.userListCount - idx - (senior.search.currentPage - 1) * senior.search.perPage}</td> |
|
438 |
- <td>{item['agency_name']}</td> |
|
439 |
- <td>{item['user_name']}</td> |
|
440 |
- <td>{item['user_birth']}</td> |
|
441 |
- <td>{item['user_gender']}</td> |
|
442 |
- <td>{item['user_phonenumber']}</td> |
|
443 |
- <td>{item['user_address']}</td> |
|
437 |
+ <td data-label="No">{senior.userListCount - idx - (senior.search.currentPage - 1) * senior.search.perPage}</td> |
|
438 |
+ <td data-label="No">{item['agency_name']}</td> |
|
439 |
+ <td data-label="소속기관명">{item['user_name']}</td> |
|
440 |
+ <td data-label="생년월일">{item['user_birth']}</td> |
|
441 |
+ <td data-label="성별">{item['user_gender']}</td> |
|
442 |
+ <td data-label="연락처">{item['user_phonenumber']}</td> |
|
443 |
+ <td data-label="주소">{item['user_address']}</td> |
|
444 | 444 |
</tr> |
445 | 445 |
)})} |
446 | 446 |
{senior.userList == null || senior.userList.length == 0 ? |
... | ... | @@ -486,7 +486,7 @@ |
486 | 486 |
<button className={"btn-small gray-btn"} onClick={join}>등록</button> |
487 | 487 |
</div> |
488 | 488 |
|
489 |
- <table className={"senior-user"}> |
|
489 |
+ <table className={"senior-user protector-user"}> |
|
490 | 490 |
<thead> |
491 | 491 |
<tr> |
492 | 492 |
<th>No</th> |
... | ... | @@ -502,18 +502,18 @@ |
502 | 502 |
<tbody> |
503 | 503 |
{agent.userList.map((item, idx) => { return ( |
504 | 504 |
<tr key={idx}> |
505 |
- <td>{agent.userListCount - idx - (agent.search.currentPage - 1) * agent.search.perPage}</td> |
|
506 |
- <td>{item['government_name']}</td> |
|
507 |
- <td>{item['agency_name']}</td> |
|
508 |
- <td>{item['user_name']}</td> |
|
509 |
- <td>{item['user_phonenumber']}</td> |
|
510 |
- <td>{item['user_email']}</td> |
|
511 |
- <td> |
|
505 |
+ <td data-label="No">{agent.userListCount - idx - (agent.search.currentPage - 1) * agent.search.perPage}</td> |
|
506 |
+ <td data-label="관리기관명">{item['government_name']}</td> |
|
507 |
+ <td data-label="소속기관명">{item['agency_name']}</td> |
|
508 |
+ <td data-label="이름">{item['user_name']}</td> |
|
509 |
+ <td data-label="연락처">{item['user_phonenumber']}</td> |
|
510 |
+ <td data-label="이메일">{item['user_email']}</td> |
|
511 |
+ <td data-label="가입승인"> |
|
512 | 512 |
{item['is_accept'] ? "승인완료" : |
513 | 513 |
<button className={"btn-small red-btn"} onClick={() => {userUpdate(item, agentSelectList)}}>가입승인</button> |
514 | 514 |
} |
515 | 515 |
</td> |
516 |
- <td> |
|
516 |
+ <td data-label="상세보기"> |
|
517 | 517 |
<button className={"btn-small lightgray-btn"} onClick={() => {navigate("/AgentSelectOne", {state: {'agent_id': item['user_id']}})}}>상세 페이지 이동</button> |
518 | 518 |
</td> |
519 | 519 |
</tr> |
... | ... | @@ -561,7 +561,7 @@ |
561 | 561 |
<button className={"btn-small gray-btn"} onClick={join}>등록</button> |
562 | 562 |
</div> |
563 | 563 |
|
564 |
- <table className={"senior-user"}> |
|
564 |
+ <table className={"senior-user protector-user"}> |
|
565 | 565 |
<thead> |
566 | 566 |
<tr> |
567 | 567 |
<th>No</th> |
... | ... | @@ -576,17 +576,17 @@ |
576 | 576 |
<tbody> |
577 | 577 |
{government.userList.map((item, idx) => { return ( |
578 | 578 |
<tr key={idx}> |
579 |
- <td>{government.userListCount - idx - (government.search.currentPage - 1) * government.search.perPage}</td> |
|
580 |
- <td>{item['government_name']}</td> |
|
581 |
- <td>{item['user_name']}</td> |
|
582 |
- <td>{item['user_phonenumber']}</td> |
|
583 |
- <td>{item['user_email']}</td> |
|
584 |
- <td> |
|
579 |
+ <td data-label="No">{government.userListCount - idx - (government.search.currentPage - 1) * government.search.perPage}</td> |
|
580 |
+ <td data-label="소속기관명">{item['government_name']}</td> |
|
581 |
+ <td data-label="이름">{item['user_name']}</td> |
|
582 |
+ <td data-label="연락처">{item['user_phonenumber']}</td> |
|
583 |
+ <td data-label="이메일">{item['user_email']}</td> |
|
584 |
+ <td data-label="가입승인"> |
|
585 | 585 |
{item['is_accept'] ? "승인완료" : |
586 | 586 |
<button className={"btn-small red-btn"} onClick={() => {userUpdate(item, governmentSelectList)}}>가입승인</button> |
587 | 587 |
} |
588 | 588 |
</td> |
589 |
- <td> |
|
589 |
+ <td data-label="관리"> |
|
590 | 590 |
<button className={"btn-small lightgray-btn"} onClick={() => {navigate("/UserEdit", {state: {'user_id': item['user_id']}})}}>정보 수정</button> |
591 | 591 |
</td> |
592 | 592 |
</tr> |
... | ... | @@ -628,7 +628,7 @@ |
628 | 628 |
<button className={"btn-small gray-btn"} onClick={join}>등록</button> |
629 | 629 |
</div> |
630 | 630 |
|
631 |
- <table className={"senior-user"}> |
|
631 |
+ <table className={"senior-user protector-user"}> |
|
632 | 632 |
<thead> |
633 | 633 |
<tr> |
634 | 634 |
<th>No</th> |
... | ... | @@ -642,16 +642,16 @@ |
642 | 642 |
<tbody> |
643 | 643 |
{admin.userList.map((item, idx) => { return ( |
644 | 644 |
<tr key={idx}> |
645 |
- <td>{admin.userListCount - idx - (admin.search.currentPage - 1) * admin.search.perPage}</td> |
|
646 |
- <td>{item['user_name']}</td> |
|
647 |
- <td>{item['user_phonenumber']}</td> |
|
648 |
- <td>{item['user_email']}</td> |
|
649 |
- <td> |
|
645 |
+ <td data-label="No">{admin.userListCount - idx - (admin.search.currentPage - 1) * admin.search.perPage}</td> |
|
646 |
+ <td data-label="이름">{item['user_name']}</td> |
|
647 |
+ <td data-label="연락처">{item['user_phonenumber']}</td> |
|
648 |
+ <td data-label="이메일">{item['user_email']}</td> |
|
649 |
+ <td data-label="가입승인"> |
|
650 | 650 |
{item['is_accept'] ? "승인완료" : |
651 | 651 |
<button className={"btn-small red-btn"} onClick={() => {userUpdate(item, adminSelectList)}}>가입승인</button> |
652 | 652 |
} |
653 | 653 |
</td> |
654 |
- <td> |
|
654 |
+ <td data-label="관리"> |
|
655 | 655 |
<button className={"btn-small lightgray-btn"} onClick={() => {navigate("/UserEdit", {state: {'user_id': item['user_id']}})}}>정보 수정</button> |
656 | 656 |
</td> |
657 | 657 |
</tr> |
--- client/views/pages/visit/visit/VisitSelectOne.jsx
+++ client/views/pages/visit/visit/VisitSelectOne.jsx
... | ... | @@ -8,6 +8,7 @@ |
8 | 8 |
import Chart2 from "../../../component/chart/Chart2.jsx"; |
9 | 9 |
import Button from "../../../component/Button.jsx"; |
10 | 10 |
import Modal from "../../../component/Modal.jsx"; |
11 |
+import person from "../../../../resources/files/icon/person.png"; |
|
11 | 12 |
|
12 | 13 |
export default function MedicineCareSelect() { |
13 | 14 |
const navigate = useNavigate(); |
... | ... | @@ -23,16 +24,18 @@ |
23 | 24 |
const key = ["No", "birth", "phone", "address", ]; |
24 | 25 |
const content = [ |
25 | 26 |
{ |
26 |
- No: 1, |
|
27 |
- birth: "2023.02.08", |
|
28 |
- phone: "정기방문", |
|
29 |
- address: "정기방문일", |
|
30 |
- }, |
|
31 |
- { |
|
32 |
- No: 2, |
|
33 |
- birth: "2023.01.08", |
|
34 |
- phone: "정기방문", |
|
35 |
- address: "정기방문일", |
|
27 |
+ No: ( |
|
28 |
+ <p><span><img src={person} alt="" />{thead[0]}</span> 1</p> |
|
29 |
+ ), |
|
30 |
+ birth: ( |
|
31 |
+ <p><span>{thead[1]}</span> 2020.03.04</p> |
|
32 |
+ ), |
|
33 |
+ phone: ( |
|
34 |
+ <p><span>{thead[2]}</span> 정기방문</p> |
|
35 |
+ ), |
|
36 |
+ address: ( |
|
37 |
+ <p><span>{thead[3]}</span> 정기방문일</p> |
|
38 |
+ ), |
|
36 | 39 |
}, |
37 | 40 |
]; |
38 | 41 |
|
... | ... | @@ -40,7 +43,7 @@ |
40 | 43 |
<main> |
41 | 44 |
<Modal open={modalOpen} close={closeModal} header="방문 등록"> |
42 | 45 |
<div className="board-wrap"> |
43 |
- <table className="flex70 margin-bottom"> |
|
46 |
+ <table className="flex70 margin-bottom questionnaire-table"> |
|
44 | 47 |
<tbody> |
45 | 48 |
<tr> |
46 | 49 |
<th>대상자</th> |
... | ... | @@ -103,7 +106,7 @@ |
103 | 106 |
/> |
104 | 107 |
</div> |
105 | 108 |
<Table |
106 |
- className={"medicine-table"} |
|
109 |
+ className={"medicine-table senior-table"} |
|
107 | 110 |
head={thead} |
108 | 111 |
contents={content} |
109 | 112 |
contentKey={key} |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?