
--- client/resources/css/common.css
+++ client/resources/css/common.css
... | ... | @@ -5,7 +5,7 @@ |
5 | 5 |
main img{margin-right: 1rem; |
6 | 6 |
width: unset;} |
7 | 7 |
/* grid */ |
8 |
- |
|
8 |
+.gap{gap: 1rem;} |
|
9 | 9 |
.main-grid-admin { |
10 | 10 |
height: 100%; |
11 | 11 |
display: grid; |
--- client/resources/css/main.css
+++ client/resources/css/main.css
... | ... | @@ -1284,7 +1284,6 @@ |
1284 | 1284 |
|
1285 | 1285 |
.search-management select { |
1286 | 1286 |
height: 3.6rem; |
1287 |
- margin-right: 1rem; |
|
1288 | 1287 |
} |
1289 | 1288 |
|
1290 | 1289 |
.search-management input { |
--- client/resources/css/responsive.css
+++ client/resources/css/responsive.css
... | ... | @@ -1108,6 +1108,8 @@ |
1108 | 1108 |
.join-inner .id > div{ text-align: end; } |
1109 | 1109 |
.join-inner .id button{margin-left: 1rem;} |
1110 | 1110 |
.join-inner #id{margin: 0; width: 100%;} |
1111 |
- |
|
1111 |
+ /* 복약상세페이지 */ |
|
1112 |
+ .medicine-grid{display: block;} |
|
1113 |
+ .medicine-grid > div{height: max-content;} |
|
1112 | 1114 |
|
1113 | 1115 |
} |
--- client/views/component/DetailSearch.jsx
+++ client/views/component/DetailSearch.jsx
... | ... | @@ -197,7 +197,7 @@ |
197 | 197 |
<tr> |
198 | 198 |
<th>조회 구분</th> |
199 | 199 |
<td colSpan={3}> |
200 |
- <div className="flex-start"> |
|
200 |
+ <div className="flex-start gap"> |
|
201 | 201 |
<select name="" id=""> |
202 | 202 |
<option value="">사용자관리번호</option> |
203 | 203 |
<option value="">사용자 이름</option> |
--- client/views/pages/healthcare/Healthcare.jsx
+++ client/views/pages/healthcare/Healthcare.jsx
... | ... | @@ -8,6 +8,7 @@ |
8 | 8 |
import { width } from "@mui/system"; |
9 | 9 |
import DetailSearch from "../../component/DetailSearch.jsx"; |
10 | 10 |
import DetailTitle from "../../component/DetailTitle.jsx"; |
11 |
+import person from "../../../resources/files/icon/person.png"; |
|
11 | 12 |
|
12 | 13 |
export default function Healthcare() { |
13 | 14 |
const navigate = useNavigate(); |
... | ... | @@ -20,15 +21,27 @@ |
20 | 21 |
]; |
21 | 22 |
const content = [ |
22 | 23 |
{ |
23 |
- No: 1, |
|
24 |
- name: "김복남", |
|
25 |
- number: "00000001", |
|
26 |
- birth: "1948.11.15", |
|
27 |
- phone: "010-1234-5678", |
|
28 |
- address: "경상북도 군위군 삼국유사면", |
|
29 |
- agency: "A복지관", |
|
30 |
- protect: "홍길동", |
|
31 |
- average: "0%", |
|
24 |
+ No: ( |
|
25 |
+ <p><span><img src={person} alt="" />{thead[0]}</span> 1</p> |
|
26 |
+ ), |
|
27 |
+ name: ( |
|
28 |
+ <p><span>{thead[1]}</span> 김복남</p> |
|
29 |
+ ), |
|
30 |
+ number: ( |
|
31 |
+ <p><span>{thead[2]}</span> 00000001</p> |
|
32 |
+ ), |
|
33 |
+ birth: ( |
|
34 |
+ <p><span>{thead[3]}</span> 1948.11.15</p> |
|
35 |
+ ), |
|
36 |
+ phone: ( |
|
37 |
+ <p><span>{thead[4]}</span> 010-1234-5678</p> |
|
38 |
+ ), |
|
39 |
+ address: ( |
|
40 |
+ <p><span>{thead[5]}</span> 경상북도 군위군 삼국유사면</p> |
|
41 |
+ ), |
|
42 |
+ average: ( |
|
43 |
+ <p><span>{thead[6]}</span> 0%</p> |
|
44 |
+ ), |
|
32 | 45 |
// detail: ( |
33 | 46 |
// <Button |
34 | 47 |
// className={"btn-small gray-btn"} |
... | ... | @@ -49,16 +62,30 @@ |
49 | 62 |
]; |
50 | 63 |
const content1 = [ |
51 | 64 |
{ |
52 |
- No: 1, |
|
53 |
- name: "김복남", |
|
54 |
- number: "00000001", |
|
55 |
- birth: "1948.11.15", |
|
56 |
- phone: "010-1234-5678", |
|
57 |
- address: "경상북도 군위군 삼국유사면", |
|
58 |
- agency: "A복지관", |
|
59 |
- protect: "홍길동", |
|
60 |
- high: "18°C", |
|
61 |
- low: "18°C", |
|
65 |
+ No: ( |
|
66 |
+ <p><span><img src={person} alt="" />{thead1[0]}</span> 1</p> |
|
67 |
+ ), |
|
68 |
+ name: ( |
|
69 |
+ <p><span>{thead1[1]}</span> 김복남</p> |
|
70 |
+ ), |
|
71 |
+ number: ( |
|
72 |
+ <p><span>{thead1[2]}</span> 00000001</p> |
|
73 |
+ ), |
|
74 |
+ birth: ( |
|
75 |
+ <p><span>{thead1[3]}</span> 1948.11.15</p> |
|
76 |
+ ), |
|
77 |
+ phone: ( |
|
78 |
+ <p><span>{thead1[4]}</span> 010-1234-5678</p> |
|
79 |
+ ), |
|
80 |
+ address: ( |
|
81 |
+ <p><span>{thead1[5]}</span> 경상북도 군위군 삼국유사면</p> |
|
82 |
+ ), |
|
83 |
+ high: ( |
|
84 |
+ <p><span>{thead1[6]}</span> 18°C</p> |
|
85 |
+ ), |
|
86 |
+ low: ( |
|
87 |
+ <p><span>{thead1[7]}</span> 18°C</p> |
|
88 |
+ ), |
|
62 | 89 |
// detail: ( |
63 | 90 |
// <Button |
64 | 91 |
// className={"btn-small gray-btn"} |
... | ... | @@ -71,22 +98,42 @@ |
71 | 98 |
} |
72 | 99 |
]; |
73 | 100 |
const thead2 = [ |
74 |
- "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", , "최근 방문일", "방문목적", "상세사유", |
|
101 |
+ "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 방문일", "방문목적", "상세사유", |
|
75 | 102 |
]; |
76 | 103 |
const key2 = [ |
77 | 104 |
"No", "name", "number", "birth", "phone", "address", "visit", "reason", "reason_detail", |
78 | 105 |
]; |
79 | 106 |
const content2 = [ |
80 | 107 |
{ |
81 |
- No: 1, |
|
82 |
- name: "김복남", |
|
83 |
- number: "00000001", |
|
84 |
- birth: "1948.11.15", |
|
85 |
- phone: "010-1234-5678", |
|
86 |
- address: "경상북도 군위군 삼국유사면", |
|
87 |
- visit: "2023.02.08", |
|
88 |
- reason: "정기방문", |
|
89 |
- reason_detail: "정기방문일", |
|
108 |
+ No: ( |
|
109 |
+ <p><span><img src={person} alt="" />{thead2[0]}</span> 1</p> |
|
110 |
+ ), |
|
111 |
+ name: ( |
|
112 |
+ <p><span>{thead2[1]}</span> 김복남</p> |
|
113 |
+ ), |
|
114 |
+ number: |
|
115 |
+ ( |
|
116 |
+ <p><span>{thead2[2]}</span> 00000001</p> |
|
117 |
+ ), |
|
118 |
+ birth: |
|
119 |
+ ( |
|
120 |
+ <p><span>{thead2[3]}</span> 1948.11.15</p> |
|
121 |
+ ), |
|
122 |
+ phone: ( |
|
123 |
+ <p><span>{thead2[4]}</span> 010-1234-5678</p> |
|
124 |
+ ), |
|
125 |
+ address: ( |
|
126 |
+ <p><span>{thead2[5]}</span> 경상북도 군위군 삼국유사면</p> |
|
127 |
+ ), |
|
128 |
+ visit: ( |
|
129 |
+ <p><span>{thead2[6]}</span> 2023.02.08</p> |
|
130 |
+ ), |
|
131 |
+ reason: ( |
|
132 |
+ <p><span>{thead2[7]}</span> 정기방문</p> |
|
133 |
+ ), |
|
134 |
+ reason_detail: ( |
|
135 |
+ <p><span>{thead2[8]}</span> 정기방문일</p> |
|
136 |
+ ), |
|
90 | 137 |
// detail: ( |
91 | 138 |
// <Button |
92 | 139 |
// className={"btn-small gray-btn"} |
... | ... | @@ -104,7 +151,7 @@ |
104 | 151 |
title: "복약관리", |
105 | 152 |
description: ( |
106 | 153 |
<Table |
107 |
- className={"protector-user"} |
|
154 |
+ className={"protector-user senior-table"} |
|
108 | 155 |
head={thead} |
109 | 156 |
contents={content} |
110 | 157 |
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?