Commit @78d2b12a5ebddeae3a5107a1286120d83cfa4df9

90ace59

78d2b12

client/views/pages/AppRoute.jsx

--- client/views/pages/AppRoute.jsx

+++ client/views/pages/AppRoute.jsx


 import Questionnaire_government from "./healthcare/Questionnaire_government.jsx";
 import VisitSelect_government from "./visit/visit/VisitSelect_government.jsx";
 import QandA_government from "./callcenter/QandA_government.jsx";
+import EquipmentInquiry_admin from "./equipment/EquipmentInquiry_admin.jsx";
+import EquipmentManagementSelect_agency from "./equipment/EquipmentManagementSelect_agency.jsx";
 
 const AllAppMenuItems = [
   {

         ),
       },
       {
-        title: "시니어 건강 관리",
+        title: "대상자 건강 관리",
         // path: "/TemperatureManagementSelect",
         icon: (
           <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />

         icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
       },
       {
-        title: "시니어 관리",
-        path: "/UserAuthoriySelect_agency",
+        title: "대상자 관리",
+        path: "/UserAuthoriySelect_admin",
         icon: (
           <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
         ),

         ),
       },
       {
-        title: "장비 대여 관리x",
-        path: "/EquipmentInquiry",
+        title: "장비 대여 관리",
+        path: "/EquipmentManagementSelect_agency",
         icon: (
           <SettingsIcon
             sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}

         icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
       },
       {
-        title: "그래프로 보기",
+        title: "통계 데이터",
         path: "/GuardianStatistics",
         icon: <EqualizerIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
       }, 
+      {
+        title: "Q&A",
+        path: "/QandA",
+        icon: (
+          <SpeakerPhoneIcon
+            sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+          />
+        ),
+      },
     ],
   },
- 
 ];
 
 function AllAppRoute() {

       <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
     ),
   },
-   {
-    title: "시니어 건강 관리",
-    path: "/UserAuthoriySelect_agency",
+  // {
+  //   title: "대상자 관리",
+  //   path: "/UserAuthoriySelect_admin",
+  //   icon: (
+  //     <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+  //   ),
+  // },
+  // {
+  //   title: "사용자 계정 승인",
+  //   path: "/UserSelectOk",
+  //   icon: (
+  //     <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+  //   ),
+  // },
+  // {
+  //   title: "건강 관리",
+  //   prefix: "/Medicine",
+  //   icon: (
+  //     <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+  //   ),
+  //   childrens: [
+  //     {
+  //       title: "복약 관리",
+  //       path: "/MedicineCareSelect",
+  //     },
+  //     {
+  //       title: "댁내 온도 관리",
+  //       path: "/TemperatureManagementSelect",
+  //     },
+  //     {
+  //       title: "문진표 작성",
+  //       path: "/TemperatureManagementSelect",
+  //     },
+  //   ],
+  // },
+
+  // {
+  //   title: "방문 관리",
+  //   prefix: "/Visit",
+  //   icon: (
+  //     <DoorFrontIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+  //   ),
+  //   childrens: [
+  //     {
+  //       title: "방문 관리",
+  //       path: "/VisitSelect",
+  //     },
+  //   ],
+  // },
+  // {
+  //   title: "장비 관리",    
+  //   icon: (
+  //     <SettingsIcon
+  //       sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+  //     />
+  //   ),
+  //   childrens: [
+  //     {
+  //       title: "장비 조회",
+  //       path: "/EquipmentManagementSelect",
+  //     },
+  //     {
+  //       title: "장비 문의 요청",
+  //       path: "/EquipmentInquiry",
+  //     },
+  //     // {
+  //     //   title: "장비 추가 요청",
+  //     //   path: "/EquipmentManagementSelectAdd",
+  //     // },
+  //   ],
+  // },    
+  {
+    title: "문의게시판",
+    path: "/QandA",
     icon: (
        <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
      ),

     ],
   },
   {
-    title: "시니어 건강 관리",
+    title: "대상자 관리",
+    path: "/UserAuthoriySelect_admin",
+    icon: (
+      <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+    ),
+  },
+  {
+    title: "사용자 계정 승인",
+    path: "/UserSelectOk",    
+  },
+  {
+    title: "건강 관리",
+    prefix: "/Medicine",
     icon: (
       <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
     ),

90ace59

78d2b12

client/views/pages/authority/AuthorityManagement-ryu.jsx

--- client/views/pages/authority/AuthorityManagement-ryu.jsx

+++ client/views/pages/authority/AuthorityManagement-ryu.jsx

...	...	@@ -11,7 +11,7 @@
11	11	const menuList = [
12	12	{
13	13	menu: {
14		- 시니어관리: ["시니어관리"],
	14	+ 대상자관리: ["대상자관리"],
15	15	건강관리: ["복약관리", "댁내온도관리", "복약통계"],
16	16	방문관리: ["방문관리"],
17	17	장비관리: ["장비관리"],

90ace59

78d2b12

client/views/pages/callcenter/QandAConfirm.jsx

--- client/views/pages/callcenter/QandAConfirm.jsx

+++ client/views/pages/callcenter/QandAConfirm.jsx

...	...	@@ -43,25 +43,33 @@
43	43	</td>
44	44	</tr>
45	45	</table>
46		- <SubTitle explanation={"시니어 정보"} />
	46	+ <p>대상자 정보</p>
47	47	<table className="margin-bottom2 senior-insert">
48		-
49	48	<tr>
50		- <th>시니어 이름</th>
	49	+ <th>대상자 선택</th>
	50	+ <td colSpan={3} className="flex width">
	51	+ <select>
	52	+ <option value="">대상자1</option>
	53	+ <option value="">대상자2</option>
	54	+ </select>
	55	+ </td>
	56	+ </tr>
	57	+ <tr>
	58	+ <th>대상자 이름</th>
51	59	<td>
52	60	김복남
53	61	</td>
54		- <th>시니어등록번호</th>
	62	+ <th>대상자 등록번호</th>
55	63	<td>
56	64	00000001
57	65	</td>
58	66	</tr>
59	67	<tr>
60		- <th>시니어 연락처</th>
	68	+ <th>대상자 연락처</th>
61	69	<td>
62	70	010-2345-2345
63	71	</td>
64		- <th>시니어 주소</th>
	72	+ <th>대상자 주소</th>
65	73	<td>
66	74	경상북도 군위군 군위읍
67	75	</td>

90ace59

78d2b12

client/views/pages/callcenter/QandAInsert.jsx

--- client/views/pages/callcenter/QandAInsert.jsx

+++ client/views/pages/callcenter/QandAInsert.jsx

...	...	@@ -35,9 +35,10 @@
35	35	<th>구분</th>
36	36	<td colSpan={3} className="flex">
37	37	<select name="year" id="year">
38		- <option value="">추가</option>
	38	+ {/* <option value="">반납</option> */}
39	39	<option value="">교환</option>
40		- <option value="">반납</option>
	40	+ <option value="">수리</option>
	41	+ {/* <option value="">추가</option> */}
41	42	<option value="">기타</option>
42	43	</select>
43	44	</td>
...	...	@@ -49,33 +50,33 @@
49	50	</td>
50	51	</tr>
51	52	</table>
52		- <SubTitle explanation={"시니어 정보"} />
	53	+ <SubTitle explanation={"대상자 정보"} />
53	54	<table className="margin-bottom2 senior-insert">
54	55	<tr>
55		- <th>시니어 선택</th>
	56	+ <th>대상자 선택</th>
56	57	<td colSpan={3} className="flex width">
57	58	<select>
58		- <option value="">시니어1</option>
59		- <option value="">시니어2</option>
	59	+ <option value="">대상자1</option>
	60	+ <option value="">대상자2</option>
60	61	</select>
61	62	</td>
62	63	</tr>
63	64	<tr>
64		- <th>시니어 이름</th>
	65	+ <th>대상자 이름</th>
65	66	<td>
66	67	<input type="text" placeholder="자동입력부분" />
67	68	</td>
68		- <th>시니어등록번호</th>
	69	+ <th>대상자 등록번호</th>
69	70	<td>
70	71	<input type="text" placeholder="자동입력부분" />
71	72	</td>
72	73	</tr>
73	74	<tr>
74		- <th>시니어 연락처</th>
	75	+ <th>대상자 연락처</th>
75	76	<td>
76	77	<input type="text" placeholder="자동입력부분" />
77	78	</td>
78		- <th>시니어 주소</th>
	79	+ <th>대상자 주소</th>
79	80	<td>
80	81	<input type="text" placeholder="자동입력부분" />
81	82	</td>

90ace59

78d2b12

client/views/pages/callcenter/QandA_government.jsx

--- client/views/pages/callcenter/QandA_government.jsx

+++ client/views/pages/callcenter/QandA_government.jsx


       <ContentTitle contentTitle={"QnA게시판"} />
         <div className="board-wrap">
         <div className="btn-wrap flex-end">
-              <Button
-                className={"btn-small green-btn"}
-                btnName={"등록"}
-                onClick={() => {
-                  navigate("/CallInsert");
-                }}
-              />
               <Button className={"btn-small green-btn"} btnName={"삭제"} />
             </div>
           <Table className="equipment-detail" head={thead} contents={content} contentKey={key} />

78d2b12

client/views/pages/equipment/EquipmentInquiry_admin.jsx (added)

+++ client/views/pages/equipment/EquipmentInquiry_admin.jsx

...	...	@@ -0,0 +1,69 @@
	1	+import React from "react";
	2	+import Button from "../../component/Button.jsx";
	3	+import Table from "../../component/Table.jsx";
	4	+import Modal from "../../component/Modal.jsx";
	5	+import { useNavigate } from "react-router";
	6	+import ContentTitle from "../../component/ContentTitle.jsx";
	7	+
	8	+export default function EquipmentInquiry_admin() {
	9	+ const navigate = useNavigate();
	10	+ //게시판
	11	+ const thead = [
	12	+ "No",
	13	+ "장비명",
	14	+ "시리얼 넘버",
	15	+ "기관명",
	16	+ "요청자",
	17	+ "요청일자",
	18	+ "구분",
	19	+ "처리여부",
	20	+ ];
	21	+ const key = [
	22	+ "No",
	23	+ "equipment_name",
	24	+ "serialNumber",
	25	+ "agency",
	26	+ "name",
	27	+ "date",
	28	+ "category",
	29	+ "finish"
	30	+ ];
	31	+ const content = [
	32	+ {
	33	+ No: 2,
	34	+ equipment_name: "스마트약상자",
	35	+ serialNumber: "ABCD-2",
	36	+ agency: "B복지관",
	37	+ name: "정복지",
	38	+ date: "2023-02-02",
	39	+ category: "수리",
	40	+ finish: "처리중",
	41	+ },
	42	+ {
	43	+ No: 1,
	44	+ equipment_name: "스마트약상자",
	45	+ serialNumber: "ABCD-1",
	46	+ agency: "A복지관",
	47	+ name: "김상냥",
	48	+ date: "2023-01-27",
	49	+ category: "교환",
	50	+ finish: "처리완료",
	51	+ },
	52	+
	53	+ ];
	54	+ return (
	55	+ <main>
	56	+ <div className="content-wrap">
	57	+ <ContentTitle contentTitle={"장비 문의 요청"} />
	58	+ <div className="board-wrap">
	59	+ <div className="btn-wrap flex-end margin-bottom">
	60	+ <Button className={"btn-small green-btn "} btnName={"삭제"} />
	61	+ </div>
	62	+ <Table className="equipment-detail" head={thead} contents={content} contentKey={key} onClick={() => {
	63	+ navigate("/CallSelect");
	64	+ }}/>
	65	+ </div>
	66	+ </div>
	67	+ </main>
	68	+ );
	69	+}

78d2b12

client/views/pages/equipment/EquipmentManagementSelect_agency.jsx (added)

+++ client/views/pages/equipment/EquipmentManagementSelect_agency.jsx

...	...	@@ -0,0 +1,271 @@
	1	+import React from "react";
	2	+import Table from "../../component/Table.jsx";
	3	+import Button from "../../component/Button.jsx";
	4	+import SubTitle from "../../component/SubTitle.jsx";
	5	+import Modal from "../../component/Modal.jsx";
	6	+import Category from "../../component/Category.jsx";
	7	+import { useNavigate } from "react-router";
	8	+
	9	+
	10	+export default function EquipmentManagementSelect_agency() {
	11	+
	12	+ const [modalOpen, setModalOpen] = React.useState(false);
	13	+ const openModal = () => {
	14	+ setModalOpen(true);
	15	+ };
	16	+ const closeModal = () => {
	17	+ setModalOpen(false);
	18	+ };
	19	+ const navigate = useNavigate();
	20	+ const thead1 = [
	21	+ "No",
	22	+ "시리얼 넘버",
	23	+ "기기 종류",
	24	+ "모델 명",
	25	+ "대여 가능 여부",
	26	+ "기기 상태",
	27	+ "사용자",
	28	+ "기기 관리"
	29	+ ];
	30	+ const key1 = [
	31	+ "No",
	32	+ "serialNumber",
	33	+ "type",
	34	+ "equipment_name",
	35	+ "use",
	36	+ "state",
	37	+ "name",
	38	+ "management"
	39	+ ];
	40	+ const content1 = [
	41	+ {
	42	+ No: 2,
	43	+ type: "스마트약상자",
	44	+ equipment_name: "SMB-MB100",
	45	+ serialNumber: "ABCD-2",
	46	+ use: "대여 가능",
	47	+ state: "정상",
	48	+ name: "-",
	49	+ management: (
	50	+ <Button
	51	+ className={"btn-small gray-btn"}
	52	+ btnName={"매칭"}
	53	+ onClick={openModal}
	54	+ />
	55	+ )
	56	+ },
	57	+ {
	58	+ No: 1,
	59	+ type: "스마트약상자",
	60	+ equipment_name: "SMB-MB100",
	61	+ serialNumber: "ABCD-1",
	62	+ use: "대여 중",
	63	+ state: "정상",
	64	+ name: "홍길동",
	65	+ management: (
	66	+ <Button
	67	+ className={"btn-small gray-btn"}
	68	+ btnName={"반납"}
	69	+ onClick={openModal}
	70	+ />
	71	+ )
	72	+ },
	73	+ ];
	74	+
	75	+ const thead2 = [
	76	+ "No",
	77	+ "시리얼 넘버",
	78	+ "기기 종류",
	79	+ "모델 명",
	80	+ "대여 가능 여부",
	81	+ "기기 상태",
	82	+ "사용자",
	83	+ "기기 관리"
	84	+ ];
	85	+ const key2 = [
	86	+ "No",
	87	+ "serialNumber",
	88	+ "type",
	89	+ "equipment_name",
	90	+ "use",
	91	+ "state",
	92	+ "name",
	93	+ "management"
	94	+ ];
	95	+ const content2 = [
	96	+ {
	97	+ No: 1,
	98	+ type: "스마트약상자",
	99	+ equipment_name: "SMB-MB100",
	100	+ serialNumber: "ABCD-2",
	101	+ use: "대여 가능",
	102	+ state: "정상",
	103	+ name: "-",
	104	+ management: (
	105	+ <Button
	106	+ className={"btn-small gray-btn"}
	107	+ btnName={"매칭"}
	108	+ onClick={openModal}
	109	+ />
	110	+ )
	111	+ },
	112	+ ];
	113	+
	114	+ const thead3 = [
	115	+ "No",
	116	+ "장비명",
	117	+ "시리얼 넘버",
	118	+ "입고일자",
	119	+ "납품 기관",
	120	+ ];
	121	+ const key3= [
	122	+ "No",
	123	+ "equipment_name",
	124	+ "serialNumber",
	125	+ "name",
	126	+ "management",];
	127	+ const content3 = [
	128	+ {
	129	+ No: 1,
	130	+ equipment_name: "스마트약상자",
	131	+ serialNumber: "ABCD-1",
	132	+ name: "2022.12.02",
	133	+ management: (
	134	+ <Button
	135	+ className={"btn-small gray-btn"}
	136	+ btnName={"선택"}
	137	+ onClick={openModal}
	138	+ />
	139	+ )
	140	+ },
	141	+ {
	142	+ No: 2,
	143	+ equipment_name: "스마트약상자",
	144	+ serialNumber: "ABCD-1",
	145	+ name: "2022.12.02",
	146	+ management: (<Button
	147	+ className={"btn-small gray-btn"}
	148	+ btnName={"선택"}
	149	+ onClick={openModal}
	150	+ />)
	151	+ },
	152	+ ];
	153	+ const thead4 = [
	154	+ "No",
	155	+ "사용자",
	156	+ "선택하기",
	157	+ ];
	158	+ const key4 = [
	159	+ "No",
	160	+ "senior_name",
	161	+ "serialNumber",
	162	+ ];
	163	+ const content4 = [
	164	+ {
	165	+ No: 1,
	166	+ senior_name: "송창덕",
	167	+ serialNumber: (<Button
	168	+ className={"btn-small gray-btn"}
	169	+ btnName={"선택"}
	170	+ />)
	171	+
	172	+ },
	173	+ ];
	174	+
	175	+
	176	+
	177	+ const data = [
	178	+ {
	179	+ id: 1,
	180	+ title: "장비 전체(100)",
	181	+ description: (
	182	+ <div>
	183	+ <Table
	184	+ className={"caregiver-user"}
	185	+ head={thead1}
	186	+ contents={content1}
	187	+ contentKey={key1}
	188	+ />
	189	+ </div>
	190	+ ),
	191	+ },
	192	+ {
	193	+ id: 2,
	194	+ title: "재고 장비(1)",
	195	+ description: (
	196	+ <div>
	197	+ <Table
	198	+ className={"caregiver-user"}
	199	+ head={thead2}
	200	+ contents={content2}
	201	+ contentKey={key2}
	202	+ />
	203	+ </div>
	204	+ ),
	205	+ },
	206	+ ];
	207	+ const [index, setIndex] = React.useState(1);
	208	+ return (
	209	+ <main>
	210	+ <Modal open={modalOpen} close={closeModal} header="대상자 매칭">
	211	+ <div className="board-wrap">
	212	+ <div>
	213	+ <Table
	214	+ className={"caregiver-user"}
	215	+ head={thead4}
	216	+ contents={content4}
	217	+ contentKey={key4}
	218	+ />
	219	+ </div>
	220	+ <div>
	221	+ <Button
	222	+ className={"btn-100 green-btn"}
	223	+ btnName={"닫기"}
	224	+ onClick={closeModal}
	225	+ />
	226	+ </div>
	227	+ </div>
	228	+ </Modal>
	229	+ <div className="tab-container">
	230	+ <ul className="tab-menu">
	231	+ {data.map((item) => (
	232	+ <li
	233	+ key={item.id}
	234	+ className={index === item.id ? "active" : null}
	235	+ onClick={() => setIndex(item.id)}
	236	+ >
	237	+ {item.title}
	238	+ </li>
	239	+ ))}
	240	+ </ul>
	241	+ <div className="content-wrap">
	242	+ <div className="search-management flex-end margin-bottom2">
	243	+ <select name="management-agency">
	244	+ <option value="기관전체">기관전체</option>
	245	+ <option value="대구보훈병원">복지재단1</option>
	246	+ <option value="군위군청">복지재단2</option>
	247	+ <option value="군위군청">복지재단3</option>
	248	+ </select>
	249	+ <select>
	250	+ <option value="이름">이름</option>
	251	+ <option value="아이디">아이디</option>
	252	+ </select>
	253	+ <input type="text" />
	254	+ <Button
	255	+ className={"btn-small gray-btn"}
	256	+ btnName={"검색"}
	257	+ onClick={() => navigate("")}
	258	+ />
	259	+ </div>
	260	+ <ul className="tab-content">
	261	+ {data
	262	+ .filter((item) => index === item.id)
	263	+ .map((item) => (
	264	+ <li>{item.description}</li>
	265	+ ))}
	266	+ </ul>
	267	+ </div>
	268	+ </div>
	269	+ </main>
	270	+ );
	271	+}

90ace59

78d2b12

client/views/pages/healthcare/Questionnaire.jsx

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

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

...	...	@@ -25,7 +25,7 @@
25	25	setModalOpen2(false);
26	26	};
27	27	//게시판
28		- const thead = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소", "문진표", "내원기록"];
	28	+ const thead = ["No", "이름","대상자등록번호", "생년월일", "연락처", "주소", "문진표", "내원기록"];
29	29	const key = ["No", "name","number", "birth", "phone", "address", "average", "record"];
30	30	const content = [
31	31	{

90ace59

78d2b12

client/views/pages/healthcare/Questionnaire_government.jsx

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

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

...	...	@@ -25,7 +25,7 @@
25	25	setModalOpen2(false);
26	26	};
27	27	//게시판
28		- const thead = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소", "관리기관", "보호사", "문진표", "내원기록"];
	28	+ const thead = ["No", "이름","대상자등록번호", "생년월일", "연락처", "주소", "관리기관", "보호사", "문진표", "내원기록"];
29	29	const key = ["No", "name","number", "birth", "phone", "address", "agency", "protect", "average", "record"];
30	30	const content = [
31	31	{

90ace59

78d2b12

client/views/pages/healthcare/medicinecare/MedicineCareSelect.jsx

--- client/views/pages/healthcare/medicinecare/MedicineCareSelect.jsx

+++ client/views/pages/healthcare/medicinecare/MedicineCareSelect.jsx

...	...	@@ -9,8 +9,8 @@
9	9	const navigate = useNavigate();
10	10
11	11	//게시판
12		- const thead = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소","관리기관","보호사", "최근 복약률",];
13		- const key = ["No", "name","number", "birth", "phone", "address", "agency", "protect","average"];
	12	+ const thead = ["No", "이름","대상자등록번호", "생년월일", "연락처", "주소", "최근 복약률",];
	13	+ const key = ["No", "name","number", "birth", "phone", "address", "average"];
14	14	const content = [
15	15	{
16	16	No: 1,

90ace59

78d2b12

client/views/pages/healthcare/temperature/TemperatureManagementSelect.jsx

--- client/views/pages/healthcare/temperature/TemperatureManagementSelect.jsx

+++ client/views/pages/healthcare/temperature/TemperatureManagementSelect.jsx

...	...	@@ -8,8 +8,8 @@
8	8	export default function TemperatureManagementSelect_government() {
9	9	const navigate = useNavigate();
10	10	//게시판
11		- const thead = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소","관리기관","보호사", "최근 최고 온도", "최근 최저 온도"];
12		- const key = ["No", "name","number", "birth", "phone", "address","agency", "protect","high","low"];
	11	+ const thead = ["No", "이름","대상자등록번호", "생년월일", "연락처", "주소", "최근 최저 온도","최근 최고 온도",];
	12	+ const key = ["No", "name", "number","birth", "phone", "address", "low", "high"];
13	13	const content = [
14	14	{
15	15	No: 1,

90ace59

78d2b12

client/views/pages/main/Main_agency.jsx

--- client/views/pages/main/Main_agency.jsx

+++ client/views/pages/main/Main_agency.jsx


 import ElderlyIcon from '@mui/icons-material/Elderly';
 
 export default function Main2() {
-  const thead = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소", "미복약 누적 횟수",];
+  const thead = ["No", "이름","대상자등록번호", "생년월일", "연락처", "주소", "미복약 누적 횟수",];
   const key = ["No", "name","number", "birth", "phone", "address", "average"];
   const content = [
     {

       average: "6회",
     },
   ];
-  const thead2 = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소", "최근 최저 온도","최근 최고 온도"];
+  const thead2 = ["No", "이름","대상자등록번호", "생년월일", "연락처", "주소", "최근 최저 온도","최근 최고 온도"];
   const key2 = ["No", "name","number", "birth", "phone", "address", "low", "high"];
   const content2 = [
     {

         </div>
         <div className="content-box bg-2 combine-left-government2 combine-bottom-government6">
           <div className="flex">
-          <Title title={"미복약 위험 시니어 리스트"} explanation={"월별 약상자 사용 인원"} />
+          <Title title={"미복약 위험 대상자 리스트"} explanation={"월별 약상자 사용 인원"} />
             <AddCircleIcon sx={{ fontSize: 20, color: "#1976d2" }} />
           </div>
           <Table

         </div>
         <div className="content-box bg-1 combine-left-government2 combine-bottom-government7">
           <div className="flex">
-          <Title title={"댁내온도 위험 시니어 리스트"} explanation={"월별 약상자 사용 인원"} />
+          <Title title={"댁내온도 위험 대상자 리스트"} explanation={"월별 약상자 사용 인원"} />
             <AddCircleIcon sx={{ fontSize: 20, color: "#1976d2" }} />
           </div>
           <Table

         </div>
         <div className="content-box combine-right-government2 combine-bottom-government5">
           <div className="flex">
-            <Title title={"나의 관리 대상자"} explanation={"지역별 시니어 현황을 확인할 수 있습니다."} />
+            <Title title={"나의 관리 대상자"} explanation={"지역별 대상자 현황을 확인할 수 있습니다."} />
             <AddCircleIcon sx={{ fontSize: 20, color: "#1976d2" }} />
           </div>
           <Chart5_agency />

90ace59

78d2b12

client/views/pages/main/Main_government.jsx

--- client/views/pages/main/Main_government.jsx

+++ client/views/pages/main/Main_government.jsx


         </div>
         <div className="content-box combine-left-government combine-bottom-government2 main-main">
           <div className="flex">
-            <Title title={"지역별 케어 노인 분포 현황"} explanation={"지역 선택 시 해당 지역의 시니어리스트가 보여집니다."} />
+            <Title title={"지역별 케어 대상자 분포 현황"} explanation={"지역 선택 시 해당 지역의 대상자리스트가 보여집니다."} />
             <AddCircleIcon sx={{ fontSize: 20, color: "#1976d2" }} />
           </div>
           <Map setCityName={setCityName} />

         </div>
         <div className="content-box combine-right-government2">
         <div className="flex">
-            <Title title={`기관별 시니어 등록 현황`} explanation={"약상자 사용자의 데이터 차트가 보여집니다."} />
+            <Title title={`기관별 대상자 등록 현황`} explanation={"약상자 사용자의 데이터 차트가 보여집니다."} />
             <AddCircleIcon sx={{ fontSize: 20, color: "#1976d2" }} />
           </div>
           <Chart5 />         

90ace59

78d2b12

client/views/pages/senior_management/SeniorInsert.jsx

--- client/views/pages/senior_management/SeniorInsert.jsx

+++ client/views/pages/senior_management/SeniorInsert.jsx


   return (
     <main>
       <div className="content-wrap row">
-      <ContentTitle contentTitle={"시니어 등록"} />
+      <ContentTitle contentTitle={"대상자 등록"} />
           <table className="margin-bottom2 senior-insert">
             <tr>
               <th>이름</th>

               </td>
             </tr>
             <tr>
-              <th>시니어등록번호</th>
+              <th>대상자등록번호</th>
               <td colSpan={3} className="flex">
                 <input type="text" placeholder="생성하기 버튼 클릭 시 자동으로 생성됩니다."/>
                 <Button

90ace59

78d2b12

client/views/pages/senior_management/SeniorSelect.jsx

--- client/views/pages/senior_management/SeniorSelect.jsx

+++ client/views/pages/senior_management/SeniorSelect.jsx


   return (
     <main>
       <div className="content-wrap">
-        <ContentTitle contentTitle={"시니어 조회"} />
+        <ContentTitle contentTitle={"대상자 조회"} />
         <div>
           <DetailSearch />
           <div className="board-wrap">

90ace59

78d2b12

client/views/pages/setting/AuthorityManagement.jsx

--- client/views/pages/setting/AuthorityManagement.jsx

+++ client/views/pages/setting/AuthorityManagement.jsx

...	...	@@ -11,7 +11,7 @@
11	11	const menuList = [
12	12	{
13	13	menu: {
14		- 시니어관리: ["시니어관리"],
	14	+ 대상자관리: ["대상자관리"],
15	15	건강관리: ["복약관리", "댁내온도관리", "복약통계"],
16	16	방문관리: ["방문관리"],
17	17	장비관리: ["장비관리"],

90ace59

78d2b12

client/views/pages/user_management/AgencySelect.jsx

--- client/views/pages/user_management/AgencySelect.jsx

+++ client/views/pages/user_management/AgencySelect.jsx

...	...	@@ -15,7 +15,7 @@
15	15	"기관명",
16	16	"담당 부서 연락처(담당자)",
17	17	"관리 장비 개수",
18		- "관리 시니어 인원",
	18	+ "관리 대상자 인원",
19	19	"주소",
20	20	"사용자관리",
21	21	"기관통계보기",
...	...	@@ -95,7 +95,7 @@
95	95	<div className="flex">
96	96	<div className="total flex">
97	97	<p className="total-equip">총 장비 개수 : 500대</p>
98		- <p className="total-senior">전체 시니어(노인)인원 : 500명</p>
	98	+ <p className="total-senior">전체 대상자(사용자)인원 : 500명</p>
99	99	</div>
100	100	<div className="btn-wrap flex-end margin-bottom ">
101	101	<Button

90ace59

78d2b12

client/views/pages/user_management/UserAuthoriySelect.jsx

--- client/views/pages/user_management/UserAuthoriySelect.jsx

+++ client/views/pages/user_management/UserAuthoriySelect.jsx

...	...	@@ -71,7 +71,7 @@
71	71	const thead1 = [
72	72	"No",
73	73	"이름",
74		- "시니어등록번호",
	74	+ "대상자등록번호",
75	75	"생년월일",
76	76	"성별",
77	77	"연락처",
...	...	@@ -131,7 +131,7 @@
131	131	const data = [
132	132	{
133	133	id: 1,
134		- title: "시니어(사용자)",
	134	+ title: "대상자(사용자)",
135	135	description: (
136	136	<Table
137	137	className={"protector-user"}

90ace59

78d2b12

client/views/pages/user_management/UserAuthoriySelect_agency.jsx

--- client/views/pages/user_management/UserAuthoriySelect_agency.jsx

+++ client/views/pages/user_management/UserAuthoriySelect_agency.jsx

...	...	@@ -39,13 +39,13 @@
39	39
40	40	const thead1 = [
41	41	"No",
42		- "시니어 이름",
43		- "시니어 등록번호",
44		- "시니어 연락처",
	42	+ "대상자 이름",
	43	+ "대상자 등록번호",
	44	+ "대상자 연락처",
45	45	"성별",
46	46	"생년월일",
47	47	"주소",
48		- "시니어 보호자",
	48	+ "대상자 보호자",
49	49	];
50	50	const key1 = ["No", "name", "Id","call", "gender", "birth", "address", "management"];
51	51	const content1 = [
...	...	@@ -69,14 +69,14 @@
69	69
70	70	const thead2 = [
71	71	"No",
72		- "시니어 이름",
73		- "시니어 등록번호",
74		- "시니어 연락처",
	72	+ "대상자 이름",
	73	+ "대상자 등록번호",
	74	+ "대상자 연락처",
75	75	"성별",
76	76	"생년월일",
77	77	"주소",
78		- "시니어 담당자",
79		- "시니어 보호자",
	78	+ "담당자 매칭",
	79	+ "보호자 매칭",
80	80	];
81	81	const key2 = [
82	82	"No", "name", "Id","call", "gender", "birth", "address", "worker", "guardian"
...	...	@@ -209,7 +209,7 @@
209	209	const data = [
210	210	{
211	211	id: 1,
212		- title: "내가 관리하는 시니어(노인)",
	212	+ title: "내가 관리하는 대상자(사용자)",
213	213	description: (
214	214	<Table
215	215	className={"protector-user"}
...	...	@@ -221,7 +221,7 @@
221	221	},
222	222	{
223	223	id: 2,
224		- title: "전체 시니어(노인)",
	224	+ title: "전체 대상자(사용자)",
225	225	description: (
226	226	<Table
227	227	className={"caregiver-user"}
...	...	@@ -312,7 +312,7 @@
312	312	<div className="search-management flex-start margin-bottom2">
313	313	<select name="management-agency">
314	314	<option value="기관전체">전체</option>
315		- <option value="군위군청">시니어</option>
	315	+ <option value="군위군청">대상자</option>
316	316	<option value="대구보훈병원">복지사</option>
317	317	<option value="대구보훈병원">보호자</option>
318	318	</select>

90ace59

78d2b12

client/views/pages/visit/visit/VisitSelect.jsx

--- client/views/pages/visit/visit/VisitSelect.jsx

+++ client/views/pages/visit/visit/VisitSelect.jsx

...	...	@@ -11,7 +11,7 @@
11	11
12	12	//게시판
13	13	const thead = [
14		- "No", "이름","시니어등록번호", "생년월일", "연락처", "주소", ,"최근 방문일","방문목적","상세사유",
	14	+ "No", "이름","대상자등록번호", "생년월일", "연락처", "주소", ,"최근 방문일","방문목적","상세사유",
15	15	];
16	16	const key = [
17	17	"No", "name","number", "birth", "phone", "address","visit","reason" ,"reason_detail"

...	...	@@ -60,6 +60,8 @@
60	60	import Questionnaire_government from "./healthcare/Questionnaire_government.jsx";
61	61	import VisitSelect_government from "./visit/visit/VisitSelect_government.jsx";
62	62	import QandA_government from "./callcenter/QandA_government.jsx";
	63	+import EquipmentInquiry_admin from "./equipment/EquipmentInquiry_admin.jsx";
	64	+import EquipmentManagementSelect_agency from "./equipment/EquipmentManagementSelect_agency.jsx";
63	65
64	66	const AllAppMenuItems = [
65	67	{
...	...	@@ -80,7 +82,7 @@
80	82	),
81	83	},
82	84	{
83		- title: "시니어 건강 관리",
	85	+ title: "대상자 건강 관리",
84	86	// path: "/TemperatureManagementSelect",
85	87	icon: (
86	88	<Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
...	...	@@ -198,8 +200,8 @@
198	200	icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
199	201	},
200	202	{
201		- title: "시니어 관리",
202		- path: "/UserAuthoriySelect_agency",
	203	+ title: "대상자 관리",
	204	+ path: "/UserAuthoriySelect_admin",
203	205	icon: (
204	206	<PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
205	207	),
...	...	@@ -242,8 +244,8 @@
242	244	),
243	245	},
244	246	{
245		- title: "장비 대여 관리x",
246		- path: "/EquipmentInquiry",
	247	+ title: "장비 대여 관리",
	248	+ path: "/EquipmentManagementSelect_agency",
247	249	icon: (
248	250	<SettingsIcon
249	251	sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
...	...	@@ -272,13 +274,21 @@
272	274	icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
273	275	},
274	276	{
275		- title: "그래프로 보기",
	277	+ title: "통계 데이터",
276	278	path: "/GuardianStatistics",
277	279	icon: <EqualizerIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
278	280	},
	281	+ {
	282	+ title: "Q&A",
	283	+ path: "/QandA",
	284	+ icon: (
	285	+ <SpeakerPhoneIcon
	286	+ sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
	287	+ />
	288	+ ),
	289	+ },
279	290	],
280	291	},
281		-
282	292	];
283	293
284	294	function AllAppRoute() {
...	...	@@ -374,9 +384,80 @@
374	384	<PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
375	385	),
376	386	},
377		- {
378		- title: "시니어 건강 관리",
379		- path: "/UserAuthoriySelect_agency",
	387	+ // {
	388	+ // title: "대상자 관리",
	389	+ // path: "/UserAuthoriySelect_admin",
	390	+ // icon: (
	391	+ // <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
	392	+ // ),
	393	+ // },
	394	+ // {
	395	+ // title: "사용자 계정 승인",
	396	+ // path: "/UserSelectOk",
	397	+ // icon: (
	398	+ // <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
	399	+ // ),
	400	+ // },
	401	+ // {
	402	+ // title: "건강 관리",
	403	+ // prefix: "/Medicine",
	404	+ // icon: (
	405	+ // <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
	406	+ // ),
	407	+ // childrens: [
	408	+ // {
	409	+ // title: "복약 관리",
	410	+ // path: "/MedicineCareSelect",
	411	+ // },
	412	+ // {
	413	+ // title: "댁내 온도 관리",
	414	+ // path: "/TemperatureManagementSelect",
	415	+ // },
	416	+ // {
	417	+ // title: "문진표 작성",
	418	+ // path: "/TemperatureManagementSelect",
	419	+ // },
	420	+ // ],
	421	+ // },
	422	+
	423	+ // {
	424	+ // title: "방문 관리",
	425	+ // prefix: "/Visit",
	426	+ // icon: (
	427	+ // <DoorFrontIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
	428	+ // ),
	429	+ // childrens: [
	430	+ // {
	431	+ // title: "방문 관리",
	432	+ // path: "/VisitSelect",
	433	+ // },
	434	+ // ],
	435	+ // },
	436	+ // {
	437	+ // title: "장비 관리",
	438	+ // icon: (
	439	+ // <SettingsIcon
	440	+ // sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
	441	+ // />
	442	+ // ),
	443	+ // childrens: [
	444	+ // {
	445	+ // title: "장비 조회",
	446	+ // path: "/EquipmentManagementSelect",
	447	+ // },
	448	+ // {
	449	+ // title: "장비 문의 요청",
	450	+ // path: "/EquipmentInquiry",
	451	+ // },
	452	+ // // {
	453	+ // // title: "장비 추가 요청",
	454	+ // // path: "/EquipmentManagementSelectAdd",
	455	+ // // },
	456	+ // ],
	457	+ // },
	458	+ {
	459	+ title: "문의게시판",
	460	+ path: "/QandA",
380	461	icon: (
381	462	<Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
382	463	),
...	...	@@ -501,7 +582,19 @@
501	582	],
502	583	},
503	584	{
504		- title: "시니어 건강 관리",
	585	+ title: "대상자 관리",
	586	+ path: "/UserAuthoriySelect_admin",
	587	+ icon: (
	588	+ <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
	589	+ ),
	590	+ },
	591	+ {
	592	+ title: "사용자 계정 승인",
	593	+ path: "/UserSelectOk",
	594	+ },
	595	+ {
	596	+ title: "건강 관리",
	597	+ prefix: "/Medicine",
505	598	icon: (
506	599	<Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
507	600	),

...	...	@@ -48,13 +48,6 @@
48	48	<ContentTitle contentTitle={"QnA게시판"} />
49	49	<div className="board-wrap">
50	50	<div className="btn-wrap flex-end">
51		- <Button
52		- className={"btn-small green-btn"}
53		- btnName={"등록"}
54		- onClick={() => {
55		- navigate("/CallInsert");
56		- }}
57		- />
58	51	<Button className={"btn-small green-btn"} btnName={"삭제"} />
59	52	</div>
60	53	<Table className="equipment-detail" head={thead} contents={content} contentKey={key} />

...	...	@@ -17,7 +17,7 @@
17	17	import ElderlyIcon from '@mui/icons-material/Elderly';
18	18
19	19	export default function Main2() {
20		- const thead = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소", "미복약 누적 횟수",];
	20	+ const thead = ["No", "이름","대상자등록번호", "생년월일", "연락처", "주소", "미복약 누적 횟수",];
21	21	const key = ["No", "name","number", "birth", "phone", "address", "average"];
22	22	const content = [
23	23	{
...	...	@@ -30,7 +30,7 @@
30	30	average: "6회",
31	31	},
32	32	];
33		- const thead2 = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소", "최근 최저 온도","최근 최고 온도"];
	33	+ const thead2 = ["No", "이름","대상자등록번호", "생년월일", "연락처", "주소", "최근 최저 온도","최근 최고 온도"];
34	34	const key2 = ["No", "name","number", "birth", "phone", "address", "low", "high"];
35	35	const content2 = [
36	36	{
...	...	@@ -86,7 +86,7 @@
86	86	</div>
87	87	<div className="content-box bg-2 combine-left-government2 combine-bottom-government6">
88	88	<div className="flex">
89		- <Title title={"미복약 위험 시니어 리스트"} explanation={"월별 약상자 사용 인원"} />
	89	+ <Title title={"미복약 위험 대상자 리스트"} explanation={"월별 약상자 사용 인원"} />
90	90	<AddCircleIcon sx={{ fontSize: 20, color: "#1976d2" }} />
91	91	</div>
92	92	<Table
...	...	@@ -101,7 +101,7 @@
101	101	</div>
102	102	<div className="content-box bg-1 combine-left-government2 combine-bottom-government7">
103	103	<div className="flex">
104		- <Title title={"댁내온도 위험 시니어 리스트"} explanation={"월별 약상자 사용 인원"} />
	104	+ <Title title={"댁내온도 위험 대상자 리스트"} explanation={"월별 약상자 사용 인원"} />
105	105	<AddCircleIcon sx={{ fontSize: 20, color: "#1976d2" }} />
106	106	</div>
107	107	<Table
...	...	@@ -116,7 +116,7 @@
116	116	</div>
117	117	<div className="content-box combine-right-government2 combine-bottom-government5">
118	118	<div className="flex">
119		- <Title title={"나의 관리 대상자"} explanation={"지역별 시니어 현황을 확인할 수 있습니다."} />
	119	+ <Title title={"나의 관리 대상자"} explanation={"지역별 대상자 현황을 확인할 수 있습니다."} />
120	120	<AddCircleIcon sx={{ fontSize: 20, color: "#1976d2" }} />
121	121	</div>
122	122	<Chart5_agency />

...	...	@@ -123,7 +123,7 @@
123	123	</div>
124	124	<div className="content-box combine-left-government combine-bottom-government2 main-main">
125	125	<div className="flex">
126		- <Title title={"지역별 케어 노인 분포 현황"} explanation={"지역 선택 시 해당 지역의 시니어리스트가 보여집니다."} />
	126	+ <Title title={"지역별 케어 대상자 분포 현황"} explanation={"지역 선택 시 해당 지역의 대상자리스트가 보여집니다."} />
127	127	<AddCircleIcon sx={{ fontSize: 20, color: "#1976d2" }} />
128	128	</div>
129	129	<Map setCityName={setCityName} />
...	...	@@ -137,7 +137,7 @@
137	137	</div>
138	138	<div className="content-box combine-right-government2">
139	139	<div className="flex">
140		- <Title title={`기관별 시니어 등록 현황`} explanation={"약상자 사용자의 데이터 차트가 보여집니다."} />
	140	+ <Title title={`기관별 대상자 등록 현황`} explanation={"약상자 사용자의 데이터 차트가 보여집니다."} />
141	141	<AddCircleIcon sx={{ fontSize: 20, color: "#1976d2" }} />
142	142	</div>
143	143	<Chart5 />

...	...	@@ -8,7 +8,7 @@
8	8	return (
9	9	<main>
10	10	<div className="content-wrap row">
11		- <ContentTitle contentTitle={"시니어 등록"} />
	11	+ <ContentTitle contentTitle={"대상자 등록"} />
12	12	<table className="margin-bottom2 senior-insert">
13	13	<tr>
14	14	<th>이름</th>
...	...	@@ -57,7 +57,7 @@
57	57	</td>
58	58	</tr>
59	59	<tr>
60		- <th>시니어등록번호</th>
	60	+ <th>대상자등록번호</th>
61	61	<td colSpan={3} className="flex">
62	62	<input type="text" placeholder="생성하기 버튼 클릭 시 자동으로 생성됩니다."/>
63	63	<Button

...	...	@@ -87,7 +87,7 @@
87	87	return (
88	88	<main>
89	89	<div className="content-wrap">
90		- <ContentTitle contentTitle={"시니어 조회"} />
	90	+ <ContentTitle contentTitle={"대상자 조회"} />
91	91	<div>
92	92	<DetailSearch />
93	93	<div className="board-wrap">

Delete comment