Commit @40b884e0e275730e05924037feb9c5cebb1216a2

최정임 2023-04-04

230404 최정임 건강관리 페이지 연결2

@40b884e0e275730e05924037feb9c5cebb1216a2

46633c6

40b884e

client/views/component/Table.jsx

--- client/views/component/Table.jsx

+++ client/views/component/Table.jsx


                           else if (view == "qna") {
                             navigate(`/QuestionConfirm/${i.qna_idx}`);
                           }
+                          else if (view == "mySeniorMedicine") {
+                            navigate("/MedicineCareSelectOne");
+                          }
+                          else if (view == "mySeniorTemperature") {
+                            navigate("/TemperatureManagementSelectOne");
+                          }
+                          else if (view == "mySeniorVisit") {
+                            navigate("/VisitSelectOne");
+                          }
                           else {
                             return;
                           }

46633c6

40b884e

client/views/pages/healthcare/Healthcare.jsx

--- client/views/pages/healthcare/Healthcare.jsx

+++ client/views/pages/healthcare/Healthcare.jsx


     const navigate = useNavigate();
     const [tapName, setTapName] = useState("복약관리")
     const thead = [
-        "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 복약률","상세페이지"
+        "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 복약률",
     ];
     const key = [
-        "No", "name", "number", "birth", "phone", "address", "average","detail"
+        "No", "name", "number", "birth", "phone", "address", "average",
     ];
     const content = [
         {

             agency: "A복지관",
             protect: "홍길동",
             average: "0%",
-            detail: (
-                <Button
-                    className={"btn-small gray-btn"}
-                    btnName={"보기"}
-                    onClick={() => {
-                        navigate("/MedicineCareSelectOne");
-                    }}
-                />
-            ),
+            // detail: (
+            //     <Button
+            //         className={"btn-small gray-btn"}
+            //         btnName={"보기"}
+            //         onClick={() => {
+            //             navigate("/MedicineCareSelectOne");
+            //         }}
+            //     />
+            // ),
         },
 
     ];
 
     const thead1 = [
-        "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 최저 온도", "최근 최고 온도","상세페이지"
+        "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 최저 온도", "최근 최고 온도",
     ];
-    const key1 = ["No", "name", "number", "birth", "phone", "address", "low", "high","detail"
+    const key1 = ["No", "name", "number", "birth", "phone", "address", "low", "high",
     ];
     const content1 = [
         {

             protect: "홍길동",
             high: "18°C",
             low: "18°C",
-            detail: (
-                <Button
-                    className={"btn-small gray-btn"}
-                    btnName={"보기"}
-                    onClick={() => {
-                        navigate("/TemperatureManagementSelectOne");
-                    }}
-                />
-            ),
+            // detail: (
+            //     <Button
+            //         className={"btn-small gray-btn"}
+            //         btnName={"보기"}
+            //         onClick={() => {
+            //             navigate("/TemperatureManagementSelectOne");
+            //         }}
+            //     />
+            // ),
         }
     ];
     const thead2 = [
-        "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", , "최근 방문일", "방문목적", "상세사유","방문기록"
+        "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", , "최근 방문일", "방문목적", "상세사유",
     ];
     const key2 = [
-        "No", "name", "number", "birth", "phone", "address", "visit", "reason", "reason_detail","detail"
+        "No", "name", "number", "birth", "phone", "address", "visit", "reason", "reason_detail",
     ];
     const content2 = [
         {

             visit: "2023.02.08",
             reason: "정기방문",
             reason_detail: "정기방문일",
-            detail: (
-                <Button
-                    className={"btn-small gray-btn"}
-                    btnName={"보기"}
-                    onClick={() => {
-                        navigate("/VisitSelectOne");
-                    }}
-                />
-            ),
+            // detail: (
+            //     <Button
+            //         className={"btn-small gray-btn"}
+            //         btnName={"보기"}
+            //         onClick={() => {
+            //             navigate("/VisitSelectOne");
+            //         }}
+            //     />
+            // ),
         },
     ];
     const data = [

                     head={thead}
                     contents={content}
                     contentKey={key}
+                    view={"mySeniorMedicine"}
                     onClick={() => {
                         navigate("/MedicineCareSelectOne");
                     }}

                     head={thead1}
                     contents={content1}
                     contentKey={key1}
+                    view={"mySeniorTemperature"}
                     onClick={() => {
                         navigate("/TemperatureManagementSelectOne");
                     }}

                     head={thead2}
                     contents={content2}
                     contentKey={key2}
+                    view={"mySeniorVisit"}
                     onClick={() => {
                         navigate("/VisitSelectOne");
                     }}

                                     <div className="search-management flex-start margin-bottom2">
                                         <DetailSearch />
                                     </div>
-                                    <div className="flex-end">
-                                        {/* <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom" /> */}
+                                    <div className="flex">
+                                        <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom" />
                                         <div className="flex searchselect">
                                             <input type="radio"/>
                                             <label htmlFor="">나의 대상자 보기</label>

Add a comment

Open 0
Closed 0

List

...	...	@@ -132,6 +132,15 @@
132	132	else if (view == "qna") {
133	133	navigate(`/QuestionConfirm/${i.qna_idx}`);
134	134	}
	135	+ else if (view == "mySeniorMedicine") {
	136	+ navigate("/MedicineCareSelectOne");
	137	+ }
	138	+ else if (view == "mySeniorTemperature") {
	139	+ navigate("/TemperatureManagementSelectOne");
	140	+ }
	141	+ else if (view == "mySeniorVisit") {
	142	+ navigate("/VisitSelectOne");
	143	+ }
135	144	else {
136	145	return;
137	146	}

...	...	@@ -13,10 +13,10 @@
13	13	const navigate = useNavigate();
14	14	const [tapName, setTapName] = useState("복약관리")
15	15	const thead = [
16		- "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 복약률","상세페이지"
	16	+ "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 복약률",
17	17	];
18	18	const key = [
19		- "No", "name", "number", "birth", "phone", "address", "average","detail"
	19	+ "No", "name", "number", "birth", "phone", "address", "average",
20	20	];
21	21	const content = [
22	22	{
...	...	@@ -29,23 +29,23 @@
29	29	agency: "A복지관",
30	30	protect: "홍길동",
31	31	average: "0%",
32		- detail: (
33		- <Button
34		- className={"btn-small gray-btn"}
35		- btnName={"보기"}
36		- onClick={() => {
37		- navigate("/MedicineCareSelectOne");
38		- }}
39		- />
40		- ),
	32	+ // detail: (
	33	+ // <Button
	34	+ // className={"btn-small gray-btn"}
	35	+ // btnName={"보기"}
	36	+ // onClick={() => {
	37	+ // navigate("/MedicineCareSelectOne");
	38	+ // }}
	39	+ // />
	40	+ // ),
41	41	},
42	42
43	43	];
44	44
45	45	const thead1 = [
46		- "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 최저 온도", "최근 최고 온도","상세페이지"
	46	+ "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 최저 온도", "최근 최고 온도",
47	47	];
48		- const key1 = ["No", "name", "number", "birth", "phone", "address", "low", "high","detail"
	48	+ const key1 = ["No", "name", "number", "birth", "phone", "address", "low", "high",
49	49	];
50	50	const content1 = [
51	51	{
...	...	@@ -59,22 +59,22 @@
59	59	protect: "홍길동",
60	60	high: "18°C",
61	61	low: "18°C",
62		- detail: (
63		- <Button
64		- className={"btn-small gray-btn"}
65		- btnName={"보기"}
66		- onClick={() => {
67		- navigate("/TemperatureManagementSelectOne");
68		- }}
69		- />
70		- ),
	62	+ // detail: (
	63	+ // <Button
	64	+ // className={"btn-small gray-btn"}
	65	+ // btnName={"보기"}
	66	+ // onClick={() => {
	67	+ // navigate("/TemperatureManagementSelectOne");
	68	+ // }}
	69	+ // />
	70	+ // ),
71	71	}
72	72	];
73	73	const thead2 = [
74		- "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", , "최근 방문일", "방문목적", "상세사유","방문기록"
	74	+ "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", , "최근 방문일", "방문목적", "상세사유",
75	75	];
76	76	const key2 = [
77		- "No", "name", "number", "birth", "phone", "address", "visit", "reason", "reason_detail","detail"
	77	+ "No", "name", "number", "birth", "phone", "address", "visit", "reason", "reason_detail",
78	78	];
79	79	const content2 = [
80	80	{
...	...	@@ -87,15 +87,15 @@
87	87	visit: "2023.02.08",
88	88	reason: "정기방문",
89	89	reason_detail: "정기방문일",
90		- detail: (
91		- <Button
92		- className={"btn-small gray-btn"}
93		- btnName={"보기"}
94		- onClick={() => {
95		- navigate("/VisitSelectOne");
96		- }}
97		- />
98		- ),
	90	+ // detail: (
	91	+ // <Button
	92	+ // className={"btn-small gray-btn"}
	93	+ // btnName={"보기"}
	94	+ // onClick={() => {
	95	+ // navigate("/VisitSelectOne");
	96	+ // }}
	97	+ // />
	98	+ // ),
99	99	},
100	100	];
101	101	const data = [
...	...	@@ -108,6 +108,7 @@
108	108	head={thead}
109	109	contents={content}
110	110	contentKey={key}
	111	+ view={"mySeniorMedicine"}
111	112	onClick={() => {
112	113	navigate("/MedicineCareSelectOne");
113	114	}}
...	...	@@ -123,6 +124,7 @@
123	124	head={thead1}
124	125	contents={content1}
125	126	contentKey={key1}
	127	+ view={"mySeniorTemperature"}
126	128	onClick={() => {
127	129	navigate("/TemperatureManagementSelectOne");
128	130	}}
...	...	@@ -138,6 +140,7 @@
138	140	head={thead2}
139	141	contents={content2}
140	142	contentKey={key2}
	143	+ view={"mySeniorVisit"}
141	144	onClick={() => {
142	145	navigate("/VisitSelectOne");
143	146	}}
...	...	@@ -173,8 +176,8 @@
173	176	<div className="search-management flex-start margin-bottom2">
174	177	<DetailSearch />
175	178	</div>
176		- <div className="flex-end">
177		- {/* <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom" /> */}
	179	+ <div className="flex">
	180	+ <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom" />
178	181	<div className="flex searchselect">
179	182	<input type="radio"/>
180	183	<label htmlFor="">나의 대상자 보기</label>

Delete comment