
--- client/resources/css/common.css
+++ client/resources/css/common.css
... | ... | @@ -2,7 +2,8 @@ |
2 | 2 |
/* layout 공통 */ |
3 | 3 |
textarea{border: 1px solid #d8d3c7; border-radius: 5px;} |
4 | 4 |
em{font-style: normal;} |
5 |
-main img{margin-right: 1rem;} |
|
5 |
+main img{margin-right: 1rem; max-width: 100%; |
|
6 |
+ width: unset;} |
|
6 | 7 |
/* grid */ |
7 | 8 |
|
8 | 9 |
.main-grid-admin { |
... | ... | @@ -28,7 +29,6 @@ |
28 | 29 |
gap: 1rem; |
29 | 30 |
} |
30 | 31 |
.main-grid-agency { |
31 |
- height: 100%; |
|
32 | 32 |
display: grid; |
33 | 33 |
grid-template-columns: 1fr 1fr 1fr 1fr; |
34 | 34 |
grid-template-rows: 0.1fr; |
--- client/resources/css/layout.css
+++ client/resources/css/layout.css
... | ... | @@ -129,7 +129,6 @@ |
129 | 129 |
.logout{background: #f26e50;} |
130 | 130 |
#pages { |
131 | 131 |
max-width: 100%; |
132 |
- height: fit-content; |
|
133 | 132 |
padding: 3rem; |
134 | 133 |
background-color: #f4f4f2; |
135 | 134 |
grid-area: main; |
--- client/resources/css/main.css
+++ client/resources/css/main.css
... | ... | @@ -272,12 +272,13 @@ |
272 | 272 |
color: #cbc9c9; |
273 | 273 |
} |
274 | 274 |
|
275 |
-.statistics-guardian { |
|
276 |
- height: 100%; |
|
275 |
+.statistics-grid .statistics-guardian { |
|
276 |
+ height: 41vh; |
|
277 | 277 |
} |
278 |
- |
|
278 |
+.statistics-grid .statistics-guardian li:nth-child(1) p:nth-child(2){font-size: 2rem; font-weight: bold; margin-right: 1rem;} |
|
279 |
+.statistics-grid .statistics-guardian li:nth-child(1) p:nth-child(3){font-size: 1.6rem; } |
|
279 | 280 |
.guardian-medicine { |
280 |
- height: 16vh; |
|
281 |
+ height: 17vh; |
|
281 | 282 |
} |
282 | 283 |
|
283 | 284 |
.statistics-guardian li { |
... | ... | @@ -286,52 +287,17 @@ |
286 | 287 |
border-radius: 20px; |
287 | 288 |
margin: 0 auto; |
288 | 289 |
margin-bottom: 1rem; |
290 |
+ position: relative; |
|
289 | 291 |
} |
290 |
- |
|
291 |
-/* .statistics-guardian:nth-child(1) { |
|
292 |
- background: #fbe4e4; |
|
293 |
-} |
|
294 |
- |
|
295 |
-.statistics-guardian:nth-child(2) { |
|
296 |
- background: #edf7df; |
|
297 |
-} |
|
298 |
- |
|
299 |
-.statistics-guardian:nth-child(3) { |
|
300 |
- background: #f9f7e0; |
|
301 |
-} |
|
302 |
- |
|
303 |
-.statistics-guardian:nth-child(4) { |
|
304 |
- background: #e9e7fe; |
|
305 |
-} |
|
306 |
-.statistics-guardian li p{ |
|
307 |
- padding: 0 2rem; |
|
308 |
-} */ |
|
309 |
-.statistics-guardian li:nth-child(2), |
|
310 |
-.statistics-guardian li:nth-child(3), |
|
311 |
-.statistics-guardian li:nth-child(4), |
|
312 |
-.statistics-guardian li:nth-child(5), |
|
313 |
-.statistics-guardian li:nth-child(6), |
|
314 |
-.statistics-guardian li:nth-child(7) { |
|
315 |
- background: rgba(255, 254, 254, 0.5); |
|
316 |
-} |
|
317 |
- |
|
318 |
-.chart-guardian { |
|
319 |
- height: 77%; |
|
320 |
-} |
|
321 |
- |
|
322 |
-.statistics-guardian li p:nth-child(3) { |
|
323 |
- font-size: 1.5rem; |
|
324 |
-} |
|
325 |
- |
|
326 |
-.statistics-guardian li p:nth-of-type(1) { |
|
327 |
- position: inherit; |
|
328 |
- font-size: 1.5rem; |
|
292 |
+.medicine-title{ |
|
293 |
+ position: absolute; |
|
294 |
+ right: -13px; |
|
295 |
+ top: 78px; |
|
329 | 296 |
font-weight: bold; |
297 |
+ font-size: 1.5rem; |
|
330 | 298 |
} |
331 |
- |
|
332 |
-.statistics-guardian li p:nth-of-type(2) { |
|
333 |
- padding: 0; |
|
334 |
- font-size: 2rem; |
|
299 |
+.chart-guardian { |
|
300 |
+ height: 70%; |
|
335 | 301 |
} |
336 | 302 |
|
337 | 303 |
.guardian-table { |
... | ... | @@ -463,6 +429,8 @@ |
463 | 429 |
display: none; |
464 | 430 |
box-shadow: 1px 1px 14px 1px rgba(0, 0, 0, 0.15); |
465 | 431 |
border-radius: 20px; |
432 |
+ max-width: 100%; |
|
433 |
+ width: unset; |
|
466 | 434 |
} |
467 | 435 |
|
468 | 436 |
.battery-img img.show { |
--- client/resources/css/responsive.css
+++ client/resources/css/responsive.css
... | ... | @@ -259,11 +259,6 @@ |
259 | 259 |
} |
260 | 260 |
|
261 | 261 |
/* 사용자 관리 */ |
262 |
- .tab-menu-mobile { |
|
263 |
- display: block; |
|
264 |
- padding: 1rem; |
|
265 |
- background-color: #ffffff; |
|
266 |
- } |
|
267 | 262 |
|
268 | 263 |
.tab-menu { |
269 | 264 |
display: none; |
... | ... | @@ -576,7 +571,7 @@ |
576 | 571 |
.ittLqr{font-size: 1.3rem !important;} |
577 | 572 |
/* 공통 */ |
578 | 573 |
#layout{display: block;} |
579 |
- #pages{padding: 1rem; } |
|
574 |
+ #pages{padding: 1rem; padding-top: 12rem; background-color: #ffffff;} |
|
580 | 575 |
header { |
581 | 576 |
padding: 1rem; |
582 | 577 |
position: fixed; |
... | ... | @@ -590,7 +585,6 @@ |
590 | 585 |
box-shadow:12px -6px 10px -10px rgb(0 0 0 / 20%); |
591 | 586 |
height:91vh; |
592 | 587 |
} |
593 |
- main{padding-top: 9rem;} |
|
594 | 588 |
nav.on { |
595 | 589 |
left: 0; |
596 | 590 |
transition: 0.5s; |
... | ... | @@ -613,6 +607,22 @@ |
613 | 607 |
#RowChart>div{height: 36rem;} |
614 | 608 |
.main-grid-government .content-box{margin-bottom: 1rem;} |
615 | 609 |
.statistics-govern{margin-bottom: 1rem;} |
610 |
+ /* 보호자 메인 */ |
|
611 |
+ .main-grid-guardian{display: block;} |
|
612 |
+ .guardian-img{width: 2rem;} |
|
613 |
+ |
|
614 |
+ /* 보호자 그래프보기 */ |
|
615 |
+ #chartdiv1{height: 26vh !important;} |
|
616 |
+ #chartdiv{height: 26vh !important;} |
|
617 |
+ #chart{height: 27vh !important;} |
|
618 |
+ #Chart2{height: 27vh !important;} |
|
619 |
+ .statistics-grid{display: block;} |
|
620 |
+ .statistics-grid .statistics-guardian { |
|
621 |
+ margin-bottom: 1rem; padding: 0; height: 32vh; |
|
622 |
+ } |
|
623 |
+ .statistics-grid .statistics-guardian li{padding: 0;} |
|
624 |
+ .statistics-grid .statistics-guardian li p:nth-child(1){margin-right: 1rem;} |
|
625 |
+ .statistics-grid .statistics-guardian li:nth-child(1) p:nth-child(2){width: 20%;} |
|
616 | 626 |
/* Q&A */ |
617 | 627 |
.question-select select{width: 22%;} |
618 | 628 |
/* 권한관리 */ |
... | ... | @@ -671,6 +681,7 @@ |
671 | 681 |
} |
672 | 682 |
|
673 | 683 |
/* 사용자관리 */ |
684 |
+ .senior-search{width: 25% !important;} |
|
674 | 685 |
.searchselect label{margin-right: 2rem;} |
675 | 686 |
.protector-user{margin-top: 2rem;} |
676 | 687 |
.userauthoriylist{display: block;} |
... | ... | @@ -678,7 +689,9 @@ |
678 | 689 |
width: 100% ; |
679 | 690 |
} |
680 | 691 |
.userauthoriylist .right{margin-top: 2rem;} |
692 |
+.tab-menu {display: block;} |
|
681 | 693 |
.tab-menu li{width: 100%;} |
694 |
+.userlist{padding: 1rem !important;} |
|
682 | 695 |
.search-management { |
683 | 696 |
justify-content: space-between; |
684 | 697 |
} |
... | ... | @@ -736,7 +749,7 @@ |
736 | 749 |
|
737 | 750 |
|
738 | 751 |
/* 검색창 */ |
739 |
- |
|
752 |
+ .detail-search tbody select{margin-right: 1rem;} |
|
740 | 753 |
.area-wrap { |
741 | 754 |
display: none; |
742 | 755 |
} |
--- client/views/component/chart/LineColor.jsx
+++ client/views/component/chart/LineColor.jsx
... | ... | @@ -151,13 +151,13 @@ |
151 | 151 |
|
152 | 152 |
// Add scrollbar |
153 | 153 |
// https://www.amcharts.com/docs/v5/charts/xy-chart/scrollbars/ |
154 |
- chart.set( |
|
155 |
- "scrollbarX", |
|
156 |
- am5.Scrollbar.new(root, { |
|
157 |
- orientation: "horizontal", |
|
158 |
- marginBottom: 20, |
|
159 |
- }) |
|
160 |
- ); |
|
154 |
+ // chart.set( |
|
155 |
+ // "scrollbarX", |
|
156 |
+ // am5.Scrollbar.new(root, { |
|
157 |
+ // orientation: "horizontal", |
|
158 |
+ // marginBottom: 20, |
|
159 |
+ // }) |
|
160 |
+ // ); |
|
161 | 161 |
|
162 | 162 |
// Make stuff animate on load |
163 | 163 |
// https://www.amcharts.com/docs/v5/concepts/animations/ |
--- client/views/pages/callcenter/QuestionSelect.jsx
+++ client/views/pages/callcenter/QuestionSelect.jsx
... | ... | @@ -120,14 +120,14 @@ |
120 | 120 |
offset={offset} |
121 | 121 |
limit={limit} |
122 | 122 |
/> |
123 |
- </div> |
|
124 |
- <div> |
|
125 |
- <Pagination |
|
126 |
- total={myQnaTotal} |
|
127 |
- limit={limit} |
|
128 |
- page={page} |
|
129 |
- setPage={setPage} |
|
130 |
- /> |
|
123 |
+ <div className="margin-bottom"> |
|
124 |
+ <Pagination |
|
125 |
+ total={myQnaTotal} |
|
126 |
+ limit={limit} |
|
127 |
+ page={page} |
|
128 |
+ setPage={setPage} |
|
129 |
+ /> |
|
130 |
+ </div> |
|
131 | 131 |
</div> |
132 | 132 |
</main> |
133 | 133 |
); |
--- client/views/pages/healthcare/Healthcare.jsx
+++ client/views/pages/healthcare/Healthcare.jsx
... | ... | @@ -122,31 +122,14 @@ |
122 | 122 |
|
123 | 123 |
return ( |
124 | 124 |
<main> |
125 |
- <ContentTitle contentTitle={"건강 관리"} explanation={"대상자의 복약/댁내온도/방문 관리를 할 수 있습니다."} /> |
|
126 | 125 |
<div className="content-wrap"> |
127 |
- |
|
126 |
+ <DetailTitle contentTitle={"대상자의 복약 / 댁내온도 / 방문 관리를 할 수 있습니다."} /> |
|
128 | 127 |
<div |
129 | 128 |
style={{ height: "calc(100% - 61px)" }} |
130 | 129 |
> |
131 | 130 |
<div className="right" style={{ height: "100%", }}> |
132 | 131 |
<div style={{ height: "100%" }}> |
133 |
- <div className="tab-container"> |
|
134 |
- <ul className="tab-menu-mobile"> |
|
135 |
- <div> |
|
136 |
- <SubTitle |
|
137 |
- className="margin-bottom" |
|
138 |
- subtitle={"사용자 선택"} |
|
139 |
- explanation={"사용자 별로 선택 후 관리할 수 있습니다. "} |
|
140 |
- /> |
|
141 |
- </div> |
|
142 |
- <select name="" id="" style={{ width: "100%" }}> |
|
143 |
- <option value="사용자선택">보호자</option> |
|
144 |
- <option value="사용자선택">보호사</option> |
|
145 |
- <option value="사용자선택">병원</option> |
|
146 |
- <option value="사용자선택">지자체</option> |
|
147 |
- <option value="사용자선택">관리자</option> |
|
148 |
- </select> |
|
149 |
- </ul> |
|
132 |
+ <div className="tab-container" style={{ marginTop: "5rem", }}> |
|
150 | 133 |
<ul className="tab-menu flex-end"> |
151 | 134 |
{data.map((item) => ( |
152 | 135 |
<li |
... | ... | @@ -159,7 +142,7 @@ |
159 | 142 |
))} |
160 | 143 |
</ul> |
161 | 144 |
<div className="content-wrap userlist"> |
162 |
- <DetailTitle contentTitle={`${tapName}`} /> |
|
145 |
+ |
|
163 | 146 |
<div className="search-management flex-start margin-bottom2"> |
164 | 147 |
<DetailSearch /> |
165 | 148 |
</div> |
--- client/views/pages/healthcare/Medicalcare.jsx
+++ client/views/pages/healthcare/Medicalcare.jsx
... | ... | @@ -169,6 +169,7 @@ |
169 | 169 |
return ( |
170 | 170 |
<main> |
171 | 171 |
<div className="content-wrap"> |
172 |
+ <DetailTitle contentTitle={"대상자의 문진표 / 심전도 / 혈압 관리를 할 수 있습니다."} /> |
|
172 | 173 |
<Modal_Questionnaire open={modalOpen} close={closeModal} /> |
173 | 174 |
<Modal_MedicalHistory open={modalOpen2} close={closeModal2} /> |
174 | 175 |
<Modal_ECG open={modalOpen3} close={closeModal3} /> |
... | ... | @@ -178,7 +179,7 @@ |
178 | 179 |
> |
179 | 180 |
<div className="right" style={{ height: "100%", }}> |
180 | 181 |
<div style={{ height: "100%" }}> |
181 |
- <div className="tab-container"> |
|
182 |
+ <div className="tab-container" style={{ marginTop: "5rem", }}> |
|
182 | 183 |
<ul className="tab-menu flex-end"> |
183 | 184 |
{data.map((item) => ( |
184 | 185 |
<li |
... | ... | @@ -190,8 +191,7 @@ |
190 | 191 |
</li> |
191 | 192 |
))} |
192 | 193 |
</ul> |
193 |
- <div className="content-wrap userlist"> |
|
194 |
- <DetailTitle contentTitle={"대상자의 문진표 / 심전도 / 혈압 관리를 할 수 있습니다."} /> |
|
194 |
+ <div className="content-wrap userlist"> |
|
195 | 195 |
<div className="search-management flex-start margin-bottom2"> |
196 | 196 |
<DetailSearch /> |
197 | 197 |
</div> |
--- client/views/pages/healthcare/statistics/GuardianStatistics.jsx
+++ client/views/pages/healthcare/statistics/GuardianStatistics.jsx
... | ... | @@ -10,6 +10,10 @@ |
10 | 10 |
import Chart1 from "../../../component/chart/Chart1.jsx"; |
11 | 11 |
import LineColor from "../../../component/chart/LineColor.jsx"; |
12 | 12 |
import ContentTitle from "../../../component/ContentTitle.jsx"; |
13 |
+import battery from '../../../../resources/files/images/battery.png'; |
|
14 |
+import temperature from '../../../../resources/files/images/temperature.png'; |
|
15 |
+import medicine from '../../../../resources/files/images/medicine.png'; |
|
16 |
+import calendarBig from '../../../../resources/files/images/calendarBig.png'; |
|
13 | 17 |
|
14 | 18 |
export default function GuardianStatistics() { |
15 | 19 |
|
... | ... | @@ -18,11 +22,10 @@ |
18 | 22 |
return ( |
19 | 23 |
<> |
20 | 24 |
<main> |
21 |
- <ContentTitle contentTitle={"그래프로 한눈에 보기"} /> |
|
22 | 25 |
<div className="statistics-grid"> |
23 | 26 |
<ul className="content-box statistics-guardian"> |
24 | 27 |
<li className="flex-start"> |
25 |
- <p><AssignmentTurnedInIcon sx={{ width: "5rem", height: "5rem", color: "#bf0629", borderRadius: "50px" }} /></p> |
|
28 |
+ <p><img className="guardian-img" src={calendarBig} alt="" /></p> |
|
26 | 29 |
<p>방문 그래프</p> |
27 | 30 |
<p>이번달 보호사님이 방문한 횟수는 총 4회 입니다.</p> |
28 | 31 |
</li> |
... | ... | @@ -32,7 +35,7 @@ |
32 | 35 |
</ul> |
33 | 36 |
<ul className="content-box statistics-guardian"> |
34 | 37 |
<li className="flex-start"> |
35 |
- <p><MedicationIcon sx={{ width: "5rem", height: "5rem", color: "#0dd390", borderRadius: "50px" }} /></p> |
|
38 |
+ <p><img className="guardian-img" src={medicine} alt="" /></p> |
|
36 | 39 |
<p>복약 체크</p> |
37 | 40 |
<p>약을 잘 복용하고 계신지 체크해주세요</p> |
38 | 41 |
</li> |
... | ... | @@ -42,7 +45,7 @@ |
42 | 45 |
</ul> |
43 | 46 |
<ul className="content-box statistics-guardian"> |
44 | 47 |
<li className="flex-start"> |
45 |
- <p><DeviceThermostatIcon sx={{ width: "5rem", height: "5rem", color: "#f1de05", borderRadius: "50px" }} /></p> |
|
48 |
+ <p><img className="guardian-img" src={temperature} alt="" /></p> |
|
46 | 49 |
<p>온도 체크</p> |
47 | 50 |
<p>댁내 온도가 적절한지 체크해보세요.</p> |
48 | 51 |
</li> |
... | ... | @@ -52,7 +55,7 @@ |
52 | 55 |
</ul> |
53 | 56 |
<ul className="content-box statistics-guardian"> |
54 | 57 |
<li className="flex-start"> |
55 |
- <p><BatteryCharging20Icon sx={{ width: "5rem", height: "5rem", color: "#5f9af3", borderRadius: "50px" }} /></p> |
|
58 |
+ <p><img className="guardian-img" src={battery} alt="" /></p> |
|
56 | 59 |
<p>약상자 배터리 그래프</p> |
57 | 60 |
<p>배터리 평균</p> |
58 | 61 |
</li> |
--- client/views/pages/main/Main_guardian.jsx
+++ client/views/pages/main/Main_guardian.jsx
... | ... | @@ -30,43 +30,43 @@ |
30 | 30 |
|
31 | 31 |
export default function Main_guardian() { |
32 | 32 |
const tableHead1 = ["", "", "", "", "", ""]; |
33 |
- const Key1 = ["morning", "morning2", "lunch","lunch2", "dinner","dinner2"]; |
|
33 |
+ const Key1 = ["morning", "morning2", "lunch", "lunch2", "dinner", "dinner2"]; |
|
34 | 34 |
const content1 = [ |
35 | 35 |
{ |
36 | 36 |
morning: "아침", |
37 |
- morning2:( |
|
38 |
- <CheckCircleOutlineIcon sx={{ width: "3rem", height: "3rem", color: "#067943", borderRadius: "50px" }}/> |
|
37 |
+ morning2: ( |
|
38 |
+ <CheckCircleOutlineIcon sx={{ width: "3rem", height: "3rem", color: "#067943", borderRadius: "50px" }} /> |
|
39 | 39 |
), |
40 | 40 |
lunch: "점심", |
41 | 41 |
lunch2: ( |
42 |
- <CheckCircleOutlineIcon sx={{ width: "3rem", height: "3rem", color: "#067943", borderRadius: "50px" }}/> |
|
42 |
+ <CheckCircleOutlineIcon sx={{ width: "3rem", height: "3rem", color: "#067943", borderRadius: "50px" }} /> |
|
43 | 43 |
), |
44 | 44 |
dinner: "저녁", |
45 | 45 |
dinner2: ( |
46 |
- <CheckCircleOutlineIcon sx={{ width: "3rem", height: "3rem", color: "#067943", borderRadius: "50px" }}/> |
|
46 |
+ <CheckCircleOutlineIcon sx={{ width: "3rem", height: "3rem", color: "#067943", borderRadius: "50px" }} /> |
|
47 | 47 |
), |
48 | 48 |
} |
49 | 49 |
]; |
50 | 50 |
const tableHead2 = ["", "", "", "", "", ""]; |
51 |
- const Key2 = ["morning", "morning2", "lunch","lunch2", "dinner","dinner2"]; |
|
51 |
+ const Key2 = ["morning", "morning2", "lunch", "lunch2", "dinner", "dinner2"]; |
|
52 | 52 |
const content2 = [ |
53 | 53 |
{ |
54 | 54 |
morning: "아침", |
55 |
- morning2:( |
|
56 |
- <ClearIcon sx={{ width: "3rem", height: "3rem", color: "#bf0629", borderRadius: "50px" }}/> |
|
55 |
+ morning2: ( |
|
56 |
+ <ClearIcon sx={{ width: "3rem", height: "3rem", color: "#bf0629", borderRadius: "50px" }} /> |
|
57 | 57 |
), |
58 | 58 |
lunch: "점심", |
59 | 59 |
lunch2: ( |
60 |
- <ClearIcon sx={{ width: "3rem", height: "3rem", color: "#bf0629", borderRadius: "50px" }}/> |
|
60 |
+ <ClearIcon sx={{ width: "3rem", height: "3rem", color: "#bf0629", borderRadius: "50px" }} /> |
|
61 | 61 |
), |
62 | 62 |
dinner: "저녁", |
63 | 63 |
dinner2: ( |
64 |
- <ClearIcon sx={{ width: "3rem", height: "3rem", color: "#bf0629", borderRadius: "50px" }}/> |
|
64 |
+ <ClearIcon sx={{ width: "3rem", height: "3rem", color: "#bf0629", borderRadius: "50px" }} /> |
|
65 | 65 |
), |
66 | 66 |
} |
67 | 67 |
]; |
68 | 68 |
const tableHead3 = ["월", "화", "수", "목", "금", "토", "일"]; |
69 |
- const Key3 = ["mon", "tue", "wed","thu", "fri","sat","sun"]; |
|
69 |
+ const Key3 = ["mon", "tue", "wed", "thu", "fri", "sat", "sun"]; |
|
70 | 70 |
const content3 = [ |
71 | 71 |
{ |
72 | 72 |
mon: "24°C", |
... | ... | @@ -85,55 +85,15 @@ |
85 | 85 |
<main> |
86 | 86 |
<div className="flex-start main-guardian"><img src={Senior} alt="" /><Title title={"김복남 어르신"} explanation={"방문, 복약, 온도, 배터리 현황을 확인하세요."} /></div> |
87 | 87 |
<div className="main-grid-guardian"> |
88 |
- <div className=" statistics-guardian combine-left2 combine-middle-government"> |
|
89 |
- <div className="flex-start margin-bottom2"><img src={calendarBig} alt="" /><TitleSmall title={"방문체크"} /></div> |
|
90 |
- <ul > |
|
91 |
- <li> |
|
92 |
- <Calendar /> |
|
93 |
- </li> |
|
94 |
- </ul> |
|
95 |
- </div> |
|
96 |
- <div className=" statistics-guardian combine-right3"> |
|
97 |
- <div className="flex-start margin-bottom2"><img src={temperature} alt="" /><TitleSmall title={"온도체크"} explanation={"댁내 온도가 적절한지 체크해보세요."}/></div> |
|
98 |
- <ul > |
|
99 |
- <li> |
|
100 |
- <DateMonth /> |
|
101 |
- <Chart6 /> |
|
102 |
- </li> |
|
103 |
- </ul> |
|
104 |
- </div> |
|
105 |
- |
|
106 |
- <div className="statistics-guardian combine-right3"> |
|
107 |
- <div className="flex-start margin-bottom2"><img src={medicine} alt="" /><TitleSmall title={"복약체크"} explanation={"약을 잘 복용하고 계신지 체크해주세요."}/></div> |
|
108 |
- <ul className=""> |
|
109 |
- <li className="guardian-medicine"> |
|
110 |
- <DateDay /> |
|
111 |
- <ul className="flex"> |
|
112 |
- <li> |
|
113 |
- <img src={mornon} alt="" className="show"/> |
|
114 |
- <img src={mornoff} alt="" /> |
|
115 |
- </li> |
|
116 |
- <li> |
|
117 |
- <img src={lunchon} alt="" /> |
|
118 |
- <img src={lunchoff} alt="" className="show"/> |
|
119 |
- </li> |
|
120 |
- <li> |
|
121 |
- <img src={dinneron} alt="" /> |
|
122 |
- <img src={dinneroff} alt="" className="show"/> |
|
123 |
- </li> |
|
124 |
- </ul> |
|
125 |
- </li> |
|
126 |
- </ul> |
|
127 |
- </div> |
|
128 | 88 |
<div className="combine-left combine-all-government battery-wrap "> |
129 |
- <div className="battery flex-start"><img src={battery} alt="" /><p>현재 스마트 약상자의 배터리가 <em className="red">40</em>% 입니다.</p><p className="red">※충전이 필요합니다.</p></div> |
|
130 |
- <div className="battery-img"> |
|
89 |
+ <div className="battery flex-start"><img className="guardian-img" src={battery} alt="" /><p>현재 스마트 약상자의 배터리가 <em className="red">40</em>% 입니다.</p><p className="red">※충전이 필요합니다.</p></div> |
|
90 |
+ <div className="battery-img"> |
|
131 | 91 |
{/* 0%일때 */} |
132 |
- <img src={zeropercent} alt="" /> |
|
92 |
+ <img src={zeropercent} alt="" /> |
|
133 | 93 |
{/* 0~20%일때 */} |
134 | 94 |
<img src={twentypercent} alt="" /> |
135 | 95 |
{/* 20~40%일때 */} |
136 |
- <img src={fortypercent} alt="" className="show"/> |
|
96 |
+ <img src={fortypercent} alt="" className="show" /> |
|
137 | 97 |
{/* 40~60%일때 */} |
138 | 98 |
<img src={sixtytypercent} alt="" /> |
139 | 99 |
{/* 60~80% 일때 */} |
... | ... | @@ -143,6 +103,48 @@ |
143 | 103 |
</div> |
144 | 104 |
|
145 | 105 |
</div> |
106 |
+ <div className="statistics-guardian combine-right3"> |
|
107 |
+ <div className="flex-start margin-bottom2"><img className="guardian-img" src={medicine} alt="" /><TitleSmall title={"복약체크"} explanation={"약을 잘 복용하고 계신지 체크해주세요."} /></div> |
|
108 |
+ <ul className=""> |
|
109 |
+ <li className="guardian-medicine"> |
|
110 |
+ <DateDay /> |
|
111 |
+ <ul className="flex"> |
|
112 |
+ <li> |
|
113 |
+ <img src={mornon} alt="" className="show" /> |
|
114 |
+ <img src={mornoff} alt="" /> |
|
115 |
+ <p className="medicine-title">아침</p> |
|
116 |
+ </li> |
|
117 |
+ <li> |
|
118 |
+ <img src={lunchon} alt="" /> |
|
119 |
+ <img src={lunchoff} alt="" className="show" /> |
|
120 |
+ <p className="medicine-title">점심</p> |
|
121 |
+ </li> |
|
122 |
+ <li> |
|
123 |
+ <img src={dinneron} alt="" /> |
|
124 |
+ <img src={dinneroff} alt="" className="show" /> |
|
125 |
+ <p className="medicine-title">저녁</p> |
|
126 |
+ </li> |
|
127 |
+ </ul> |
|
128 |
+ </li> |
|
129 |
+ </ul> |
|
130 |
+ </div> |
|
131 |
+ <div className=" statistics-guardian combine-right3"> |
|
132 |
+ <div className="flex-start margin-bottom2"><img className="guardian-img" src={temperature} alt="" /><TitleSmall title={"온도체크"} explanation={"댁내 온도가 적절한지 체크해보세요."} /></div> |
|
133 |
+ <ul > |
|
134 |
+ <li> |
|
135 |
+ <DateMonth /> |
|
136 |
+ <Chart6 /> |
|
137 |
+ </li> |
|
138 |
+ </ul> |
|
139 |
+ </div> |
|
140 |
+ <div className=" statistics-guardian combine-left2 combine-middle-government"> |
|
141 |
+ <div className="flex-start margin-bottom2"><img className="guardian-img" src={calendarBig} alt="" /><TitleSmall title={"방문체크"} /></div> |
|
142 |
+ <ul > |
|
143 |
+ <li> |
|
144 |
+ <Calendar /> |
|
145 |
+ </li> |
|
146 |
+ </ul> |
|
147 |
+ </div> |
|
146 | 148 |
</div> |
147 | 149 |
</main> |
148 | 150 |
</> |
--- client/views/pages/user_management/UserAuthoriySelect_agency.jsx
+++ client/views/pages/user_management/UserAuthoriySelect_agency.jsx
... | ... | @@ -340,7 +340,7 @@ |
340 | 340 |
<option value="이름">이름</option> |
341 | 341 |
<option value="아이디">아이디</option> |
342 | 342 |
</select> |
343 |
- <input type="text" /> |
|
343 |
+ <input type="text" className="senior-search"/> |
|
344 | 344 |
<Button |
345 | 345 |
className={"btn-small gray-btn"} |
346 | 346 |
btnName={"검색"} |
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?