최정임 최정임 2023-04-06
230406 최정임 관리기관 css 수정
@c2f5bbb0ae1867a074d7307bfbd4864515acb223
client/resources/css/common.css
--- client/resources/css/common.css
+++ client/resources/css/common.css
@@ -379,8 +379,8 @@
 input[type='radio']:checked {
   background-color: #f25430;
 }
-input[type='date']{width: 24%;}
-.senior-insert input[type='date']{width: 39%;}
+input[type='date']{width: -webkit-fill-available;}
+.senior-insert input[type='date']{width: -webkit-fill-available;}
 /* margin */
 .margin-bottom {
   margin-bottom: 1rem;
client/resources/css/responsive.css
--- client/resources/css/responsive.css
+++ client/resources/css/responsive.css
@@ -186,7 +186,7 @@
     height: 26vh !important;
   }
   #chart {
-    height: 27vh !important;
+    /* height: 27vh !important; */
   }
   #Chart2 {
     height: 27vh !important;
@@ -674,14 +674,15 @@
     height: 26vh !important;
   }
   #chartdiv {
-    height: 26vh !important;
+    /* height: 26vh !important; */
   }
   #chart {
-    height: 27vh !important;
+    /* height: 27vh !important; */
   }
   #Chart2 {
     height: 27vh !important;
   }
+  input[type='date']{width: -webkit-fill-available;}
   .statistics-grid {
     display: block;
   }
@@ -1112,4 +1113,23 @@
  .medicine-grid{display: block;}
  .medicine-grid > div{height: max-content;}
 
+ /* 문진표 */
+ .questionnaire-table td{padding: 0 !important;}
+ .questionnaire-table input[type="text"]{width: auto;}
+
+ .caregiver-user{}
+
+ .medicine-detail-table th{display: none;}
+ .medicine-detail-table tbody tr{background-color: #f2f0eb; border-radius: 5px; padding: 0.5rem; margin-bottom: 1rem;}
+ .medicine-detail-table td{text-align: right; position: relative; padding-left: 50%;}
+ .medicine-detail-table td:nth-child(odd){background-color: #ffffff;}
+ .medicine-detail-table td::before{
+  content: attr(data-label);
+  position: absolute;
+  left: 0;
+  width: 34%;
+  text-align: left;
+  border-left: 8px solid #d8d3c7;
+    padding-left: 1rem;
+ }
 }
client/views/component/Modal_MedicalHistory.jsx
--- client/views/component/Modal_MedicalHistory.jsx
+++ client/views/component/Modal_MedicalHistory.jsx
@@ -1,6 +1,7 @@
 import React from "react";
 import Button from "./Button.jsx";
 import Table from "./Table.jsx";
+import AssignmentIcon from '@mui/icons-material/Assignment';
 
 export default function Modal_MedicalHistory({ open, close, }) {
   const thead1 = [
@@ -13,11 +14,21 @@
   const key1 = ["No", "date", "reason","content", "name"];
   const content1 = [
     {
-      No: 1,
-      date: "2023-01-25",
-      reason: "정기 내원",
-      content: "건강검진 진행, 이상 없음",
-      name: "정간호",
+      No: (
+        <p><span><AssignmentIcon sx={{ fontSize: 20 }} />{thead1[0]}</span> 1</p>
+      ),
+      date:  (
+        <p><span>{thead1[1]}</span>  1948.11.15</p>
+      ),
+      reason:  (
+        <p><span>{thead1[2]}</span>  정기 내원</p>
+      ),
+      content:  (
+        <p><span>{thead1[3]}</span>  건강검진 진행, 이상 없음</p>
+      ),
+      name:  (
+        <p><span>{thead1[4]}</span> 정간호</p>
+      ),
     },
   ];
   return (
@@ -30,7 +41,7 @@
           </div>
           <div className="modal-main">
           <div className="board-wrap">
-        <table className="margin-bottom2 senior-insert">
+        <table className="margin-bottom2 senior-insert ">
             <tr>
               <th>진료일자</th>
               <td>
@@ -61,7 +72,7 @@
             </div>
           <div>
             <Table
-              className={"caregiver-user"}
+              className={"caregiver-user senior-insert  senior-table"}
               head={thead1}
               contents={content1}
               contentKey={key1}
client/views/layout/Menu.jsx
--- client/views/layout/Menu.jsx
+++ client/views/layout/Menu.jsx
@@ -4,6 +4,7 @@
 import { useNavigate } from "react-router";
 import logo from "../../resources/files/images/logo.png";
 import MenuIcon from "@mui/icons-material/Menu";
+import CloseIcon from '@mui/icons-material/Close';
 
 export default function Sidebar({items}) {
   const [menuToggle, setMenuToggle] = React.useState(false);
@@ -11,7 +12,6 @@
     setMenuToggle(!menuToggle)
   }
   const navigate = useNavigate();
-
   //로그아웃
   const logout = () => {
     fetch("/user/logout.json", {
@@ -31,13 +31,24 @@
       console.log('logout() /user/logout.json error : ', error);
     });
   };
-
+  const [iconIndex, setIconIndex] = React.useState(0);
+  const icons = [<MenuIcon sx={{ fontSize: 40, }}/>, <CloseIcon sx={{ fontSize: 40, }}/>];
+  const handleClick = () => {
+    setIconIndex((iconIndex + 1) % icons.length);   
+  };
   return (
  <>
       <nav
         className={menuToggle? "nav on" : "nav"}        
       >
-        <div className="menuicon" onClick={onClickshow}><MenuIcon sx={{ width:35, height:35,color:"#7a7f87"}}/></div >
+        <div className="menuicon"  onClick={() => {
+                  onClickshow();
+                  // count();
+                  handleClick();
+                  }}>
+                    {icons[iconIndex]}
+                    {/* <MenuIcon sx={{ width:35, height:35,color:"#7a7f87"}}/> */}
+                    </div >
         <h1 className="logo"><img src={logo} alt="" /></h1>
         <div className="flex-align-column" style={{ marginTop: `3rem` }}>
           <ul >
client/views/pages/healthcare/Medicalcare.jsx
--- client/views/pages/healthcare/Medicalcare.jsx
+++ client/views/pages/healthcare/Medicalcare.jsx
@@ -12,6 +12,7 @@
 import Modal_MedicalHistory from "../../component/Modal_MedicalHistory.jsx";
 import Modal_Blood from "../../component/Modal_Blood.jsx";
 import Modal_ECG from "../../component/Modal_ECG.jsx";
+import person from "../../../resources/files/icon/person.png";
 
 export default function UserAuthoriySelect() {
     const navigate = useNavigate();
@@ -53,26 +54,38 @@
     ];
     const content = [
         {
-            No: 1,
-            name: "김복남",
-            number: "00000001",
-            birth: "1948.11.15",
-            phone: "010-1234-5678",
-            address: "경상북도 군위군 삼국유사면",
+            No: (
+                <p><span><img src={person} alt="" />{thead[0]}</span> 1</p>
+              ),
+            name: (
+                <p><span>{thead[1]}</span> 김복남</p>
+              ),
+            number: (
+                <p><span>{thead[2]}</span>  0000001</p>
+              ),
+            birth: (
+                <p><span>{thead[3]}</span>  1948.11.15</p>
+              ),
+            phone: (
+                <p><span>{thead[4]}</span>  010-1234-1234</p>
+              ),
+            address: (
+                <p><span>{thead[5]}</span> 경상북도 군위군 삼국유사면</p>
+              ),
             average: (
-                <Button
-                    className={"btn-small gray-btn"}
-                    btnName={"작성하기"}
-                    onClick={openModal}
-                />
-            ),
+                <p><span>{thead[6]}</span> <Button
+                className={"btn-small gray-btn"}
+                btnName={"작성하기"}
+                onClick={openModal}
+            /></p>
+              ),
             record: (
-                <Button
-                    className={"btn-small gray-btn"}
-                    btnName={"진료 내역"}
-                    onClick={openModal2}
-                />
-            ),
+                <p><span>{thead[7]}</span>  <Button
+                className={"btn-small gray-btn"}
+                btnName={"진료 내역"}
+                onClick={openModal2}
+            /></p>
+              ),
         },
 
     ];
@@ -84,19 +97,31 @@
     ];
     const content1 = [
         {
-            No: 1,
-            name: "김복남",
-            number: "00000001",
-            birth: "1948.11.15",
-            phone: "010-1234-5678",
-            address: "경상북도 군위군 삼국유사면",
+            No: (
+                <p><span><img src={person} alt="" />{thead1[0]}</span> 1</p>
+              ),
+            name: (
+                <p><span>{thead1[1]}</span> 김복남</p>
+              ),
+            number: (
+                <p><span>{thead1[2]}</span>  0000001</p>
+              ),
+            birth:  (
+                <p><span>{thead1[3]}</span>  1948.11.15</p>
+              ),
+            phone: (
+                <p><span>{thead1[4]}</span>  010-1234-1234</p>
+              ),
+            address: (
+                <p><span>{thead1[5]}</span> 경상북도 군위군 삼국유사면</p>
+              ),
             ECG: (
-                <Button
-                    className={"btn-small gray-btn"}
-                    btnName={"등록"}
-                    onClick={openModal3}
-                />
-            ),
+                <p><span>{thead1[6]}</span> <Button
+                className={"btn-small gray-btn"}
+                btnName={"등록"}
+                onClick={openModal3}
+            /></p>
+              ),
         }
     ];
     const thead2 = [
@@ -107,22 +132,43 @@
     ];
     const content2 = [
         {
-            No: 1,
-            name: "김복남",
-            number: "00000001",
-            birth: "1948.11.15",
-            phone: "010-1234-5678",
-            address: "경상북도 군위군 삼국유사면",
-            recent: "2020-01-05",
-            high: "130",
-            low: "90",
-            pulse: "60",
-            average: (
-                <Button
-                    className={"btn-small gray-btn"}
-                    btnName={"등록"}
-                    onClick={openModal4}
-                />
+            No: (
+                <p><span><img src={person} alt="" />{thead2[0]}</span> 1</p>
+              ),
+            name:  (
+                <p><span>{thead2[1]}</span> 김복남</p>
+              ),
+            number: (
+                <p><span>{thead2[2]}</span>  0000001</p>
+              ),
+            birth: (
+                <p><span>{thead2[3]}</span>  1948.11.15</p>
+              ),
+            phone: (
+                <p><span>{thead2[4]}</span>  010-1234-1234</p>
+              ),
+            address: (
+                <p><span>{thead2[5]}</span> 경상북도 군위군 삼국유사면</p>
+              ),
+            recent: (
+                <p><span>{thead2[6]}</span>  1948.11.15</p>
+              ),
+            high: (
+                <p><span>{thead2[7]}</span>  130</p>
+              ),
+            low: (
+                <p><span>{thead2[8]}</span>  90</p>
+              ),
+            pulse:(
+                <p><span>{thead2[9]}</span>  60</p>
+              ), 
+            average:(
+                <p><span>{thead2[10]}</span> <Button
+                className={"btn-small gray-btn"}
+                btnName={"등록"}
+                onClick={openModal4}
+            /></p>
+              
             ),
         },
     ];
@@ -132,7 +178,7 @@
             title: "문진표 관리",
             description: (
                 <Table
-                    className={"protector-user"}
+                    className={"protector-user senior-table"}
                     head={thead}
                     contents={content}
                     contentKey={key}
client/views/pages/healthcare/medicinecare/MedicineCareSelectOne.jsx
--- client/views/pages/healthcare/medicinecare/MedicineCareSelectOne.jsx
+++ client/views/pages/healthcare/medicinecare/MedicineCareSelectOne.jsx
@@ -10,6 +10,7 @@
 import SubTitle from "../../../component/SubTitle.jsx";
 import Donut2 from "../../../component/chart/Donut2.jsx";
 import LineColor_medicine from "../../../component/chart/LineColor_medicine.jsx";
+import MedicationIcon from '@mui/icons-material/Medication';
 
 export default function MedicineCareSelectOne() {
   const navigate = useNavigate();
@@ -121,7 +122,7 @@
                 border: "1px solid #eeeeee",
                 borderRadius: "0.5rem",
                 padding: "1rem",
-                height: "17vh",
+                height: "20vh",
               }}
             >
               <Donut2 />
@@ -137,7 +138,7 @@
                 border: "1px solid #eeeeee",
                 borderRadius: "0.5rem",
                 padding: "1rem",
-                height: "17vh",
+                height: "20vh",
               }}
             >
               <Chart3 />
@@ -153,7 +154,7 @@
                 border: "1px solid #eeeeee",
                 borderRadius: "0.5rem",
                 padding: "1rem",
-                height: "17vh",
+                height: "20vh",
               }}
             >
               <Chart />
@@ -169,7 +170,7 @@
                 border: "1px solid #eeeeee",
                 borderRadius: "0.5rem",
                 padding: "1rem",
-                height: "17vh",
+                height: "20vh",
               }}
             >
               <LineColor_medicine />
@@ -198,39 +199,17 @@
             </thead>
             <tbody>
               <tr>
-                <td>2</td>
-                <td>2022.08.10</td>
-                <td>미복약</td>
-                <td>미복약</td>
-                <td>미복약</td>
-                <td>3회</td>
-                <td>0%</td>
-                <td>3일간 미복약으로 확인 되어 전화드림( 아들내 방문 중 )외출</td>
-                <td>김대상</td>
-                <td>2022.12.27</td>
-                <td>
-                  <div className="btn-wrap flex-center">
-                    <Button
-                      className={"btn-small lightgray-btn"}
-                      btnName={"수정"}
-                      onClick={openModal}
-                    />
-                    <Button className={"btn-small gray-btn"} btnName={"삭제"} onClick={function() {alert('정말 삭제하시겠습니까?')}}/>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <td>1</td>
-                <td>2022.08.09</td>
-                <td>복약</td>
-                <td>미복약</td>
-                <td>복약</td>
-                <td>3회</td>
-                <td>90%</td>
-                <td>-</td>
-                <td>-</td>
-                <td>-</td>
-                <td>
+                <td data-label="No">1</td>
+                <td data-label="날짜">2022.08.10</td>
+                <td data-label="복약상태(아침)">미복약</td>
+                <td data-label="복약상태(점심)">미복약</td>
+                <td data-label="복약상태(저녁)">미복약</td>
+                <td data-label="필요 복용 횟수">3회</td>
+                <td data-label="복약률">0%</td>
+                <td data-label="수정 상세 사유">3일간 미복약으로 확인 되어 전화드림( 아들내 방문 중 )외출</td>
+                <td data-label="수정자">김대상</td>
+                <td data-label="수정일시">2022.12.27</td>
+                <td data-label="관리">
                   <div className="btn-wrap flex-center">
                     <Button
                       className={"btn-small lightgray-btn"}
client/views/pages/healthcare/statistics/MedicineStatistics.jsx
--- client/views/pages/healthcare/statistics/MedicineStatistics.jsx
+++ client/views/pages/healthcare/statistics/MedicineStatistics.jsx
@@ -29,12 +29,12 @@
                   height: "calc(100% - 47px)",
                 }}
               >
-                <div className="flex-end">
+                <div className="flex-end gap">
                   <div className="flex flex30">
                     <input type="date" name="" id="" />
                   </div>
-                  <div className="flex10">
-                    <Button className={"green-btn"} btnName={"검색"} />
+                  <div className="">
+                    <Button className={"gray-btn"} btnName={"검색"} />
                   </div>
                 </div>
                 <Donut2 />
Add a comment
List