최정임 최정임 2023-02-27
230227 최정임 css 수정
@4dc1e60e279096d655a77df30fae6121a75d5540
client/resources/css/layout.css
--- client/resources/css/layout.css
+++ client/resources/css/layout.css
@@ -39,12 +39,12 @@
 }
 .nav{
   position: relative;
-  box-shadow: 1px 1px 5px 1px rgb(0 0 0 / 20%);}
+  background: #ffffff;
+}
 .logo {  
   padding: 2rem 1rem;
   font-size: large;
   text-align: center;
-  background: #ffffff;
   font-weight: bold;
 }
 .logo img{width: 273px;}
@@ -55,7 +55,7 @@
   color: #333333;
   font-weight: bold;
   margin: 0 3rem;
-  padding: 1rem 6.2rem;
+  padding: 1rem 3.2rem;
   
 }
 
@@ -64,17 +64,14 @@
   display: block;
 }
 .sidebar-title {
-  margin: 0 auto;
-  width: 150px;
-  padding: 1rem;
+  margin: 0 3rem;
+  padding: 1rem 3.2rem;
 }
 
 .sidebar-title span {
   font-weight: bold;
-  color: #333333;
-  
-  font-family:"KoPubDotumLight";
-  
+  color: #333333;  
+  font-family:"KoPubDotumLight";  
 }
 
 .sidebar-title .toggle {
@@ -86,14 +83,15 @@
 }
 nav li{cursor: pointer;}
 .sidebar-item{font-size: 1.8rem;}
-.sidebar-item:hover{background: #f25430; color: #ffffff;}
+.sidebar-item:hover{background: #f25430; color: #ffffff; width: 90%; border-top-right-radius: 50px; border-bottom-right-radius: 50px; }
 .sidebar-item:hover a{color: #ffffff;}
 .sidebar-item:hover span, .sidebar-item:hover .toggle{color: #ffffff;}
+.sidebar-item:hover span, .sidebar-item:hover .MuiSvgIcon-root{color: #ffffff;}
 .sidebar-content {
   display: none;
   color: #ffffff;
 }
-.sidebar-content a{padding: 1rem 0 1rem 6rem;}
+.sidebar-content a{padding: 1rem 0 1rem 5rem;}
 .sidebar-item.open>.sidebar-content {
   height: auto;
   display: block;
@@ -106,6 +104,8 @@
 
 .sidebar-content .sidebar-item:hover a {
   font-weight: bold;
+  background: #f1bdb1;
+  color: #ffffff;
 }
 .info-wrap .usericon{width: 5rem; height: 5rem; border: 1px solid #f25430; border-radius: 50px; margin-right: 2rem;}
 .header-info-id{font-size: 1.6rem; margin-right: 2rem; color: #733c1d; font-weight: 600;}
client/resources/css/main.css
--- client/resources/css/main.css
+++ client/resources/css/main.css
@@ -17,12 +17,15 @@
   background-color: #18924e;
 }
 
+/* 기관조회 */
 
 /* Q&A */
 .title{text-decoration: underline; cursor: pointer;}
 .question-select input{width: 3%;}
 .question-select label{width: 10%;}
-.question-select select{width: 16%;}
+.question-select select{width: 16%; height: 3.7rem;}
+.qna-insert select{height: 3.7rem;}
+.qna-insert th{font-size: 1.8rem; color: #733c1d;}
 /* 담당자배정 */
 .protectorlist input{width: 20rem;}
 /* 위험기준관리 */
@@ -39,7 +42,8 @@
 /* 카테고리 기관 추가*/
 .explain-table th{background: #ffffff;}
 .react-calendar{width: 100%;}
-.total p{font-size: 1.6rem;}
+.total p{font-size: 1.6rem; font-weight: 600;}
+.total{color: #733c1d; }
 .total-equip::before{
   content: "";
   border-left: 20px solid #5a70df;
@@ -542,11 +546,6 @@
   width: 100%;
   margin-bottom: 2rem;
 }
-
-.search-group .btn-box {
-  padding-bottom: 0.5rem;
-}
-
 .detail-search table {
   border-top: none;
   border-bottom: none;
@@ -560,7 +559,7 @@
 }
 
 .detail-search table th {
-  width: 14%;
+  width: 20%;
 }
 
 .detail-search table td {
@@ -569,6 +568,9 @@
 
 .detail-search tbody tr:nth-of-type(2) select {
   width: 24.4%;
+}
+.detail-search tbody select {
+  height: 3.7rem;
 }
 
 .detail-search tbody tr:nth-of-type(3) td {
@@ -597,7 +599,7 @@
 .search-area {
   padding: 2rem;
 }
-
+.search-area button{width: 100%;}
 .search-area details {
   margin-top: 1rem;
 }
@@ -689,8 +691,11 @@
 }
 
 .senior-insert label {
-  padding: 0 4rem 0 1rem;
-
+  padding: 0 0rem 0 1rem;
+  width: 5rem;
+}
+.senior-insert tr:nth-child(5) input{
+  width: 2rem;
 }
 .senior-insert select{padding: 1rem;}
 .senior-insert tr:nth-child(2) .gender {
@@ -931,7 +936,7 @@
 
 .search-management input {
   width: 20%;
-  height: 3rem;
+  height: 3.7rem;
   margin-right: 1rem;
 }
 .tab-container>div>div:nth-child(2) {
client/resources/css/reset.css
--- client/resources/css/reset.css
+++ client/resources/css/reset.css
@@ -1,7 +1,7 @@
-@font-face {
+/* @font-face {
   font-family: "KoPubDotumLight";
   src: url(../files/font/KoPubDotumLight_0.ttf);
-}
+} */
 
 :root{
   --font-KoPubDotumLight:"KoPubDotumLight"
@@ -45,6 +45,7 @@
   width: 100%;
   border-collapse: collapse;
   font-family:"AuctionGothic_Medium";
+  border: 1px solid #d8d3c7;
 }
 thead{
   font-weight: bold;
 
client/resources/files/images/0percent.png (Binary) (added)
+++ client/resources/files/images/0percent.png
Binary file is not shown
 
client/resources/files/images/100percent.png (Binary) (added)
+++ client/resources/files/images/100percent.png
Binary file is not shown
 
client/resources/files/images/20percent.png (Binary) (added)
+++ client/resources/files/images/20percent.png
Binary file is not shown
 
client/resources/files/images/40percent.png (Binary) (added)
+++ client/resources/files/images/40percent.png
Binary file is not shown
 
client/resources/files/images/60percent.png (Binary) (added)
+++ client/resources/files/images/60percent.png
Binary file is not shown
 
client/resources/files/images/80percent.png (Binary) (added)
+++ client/resources/files/images/80percent.png
Binary file is not shown
 
client/resources/files/images/battery.png (Binary) (added)
+++ client/resources/files/images/battery.png
Binary file is not shown
 
client/resources/files/images/calendar.png (Binary) (added)
+++ client/resources/files/images/calendar.png
Binary file is not shown
 
client/resources/files/images/medicine.png (Binary) (added)
+++ client/resources/files/images/medicine.png
Binary file is not shown
 
client/resources/files/images/temperature.png (Binary) (added)
+++ client/resources/files/images/temperature.png
Binary file is not shown
client/views/component/AgencySearch.jsx
--- client/views/component/AgencySearch.jsx
+++ client/views/component/AgencySearch.jsx
@@ -190,8 +190,8 @@
 
   return (
     <div className="search-group">
-      <div className="search-area flex">
-        <div className="detail-search" style={{padding:"0 5rem", width:"100%"}}>
+      <div className="search-area flex" style={{ width:"50%"}}>
+        <div className="detail-search" style={{ width:"85%"}}>
           <table>
             <tbody>
               <tr>
@@ -212,8 +212,8 @@
             </tbody>
           </table>
         </div>
-        <div className="btn-box flex-center">
-              <Button className={"btn-large green-btn"} btnName={"조회"} />
+        <div className="btn-box flex-center"  style={{ width:"15%"}}>
+              <Button className={"btn-small gray-btn"} btnName={"조회"} />
             </div>
       </div>
     </div>
client/views/pages/App.jsx
--- client/views/pages/App.jsx
+++ client/views/pages/App.jsx
@@ -26,8 +26,8 @@
   };
 
 
-  const menuItems = GovernmentApp.menuItems;  //AdminApp, GovernmentApp, AllApp, AgencyApp, GuardianApp 
-  const AppRoute = GovernmentApp.AppRoute;
+  const menuItems = GuardianApp.menuItems;  //AdminApp, GovernmentApp, AllApp, AgencyApp, GuardianApp 
+  const AppRoute = GuardianApp.AppRoute;
 
 
   const { title } = menuItems.find(
client/views/pages/AppRoute.jsx
--- client/views/pages/AppRoute.jsx
+++ client/views/pages/AppRoute.jsx
@@ -622,8 +622,11 @@
 function AgencyAppRoute() {
   return (
     <Routes>
+      <Route path="/Medicalcare" element={<Medicalcare />}></Route>
+      <Route path="/Healthcare" element={<Healthcare />}></Route>
       <Route path="/Join" element={<Join />}></Route>
       <Route path="/QuestionSelect" element={<QuestionSelect />}></Route>
+      <Route path="/QuestionInsert" element={<QuestionInsert />}></Route>
       <Route path="/Main_agency" element={<Main_agency />}></Route>
       <Route path="/UserAuthoriySelect_agency" element={<UserAuthoriySelect_agency />}></Route>
       <Route path="/SeniorInsert" element={<SeniorInsert />}></Route>
client/views/pages/callcenter/QandAInsert.jsx
--- client/views/pages/callcenter/QandAInsert.jsx
+++ client/views/pages/callcenter/QandAInsert.jsx
@@ -11,7 +11,7 @@
       <div className="content-wrap row">
         <ContentTitle contentTitle={"문의글 작성"} />
         <SubTitle explanation={"작성자 정보"} />
-        <table className="margin-bottom2 senior-insert">
+        <table className="margin-bottom2 qna-insert">
           <tr>
             <th>작성자</th>
             <td>
@@ -51,7 +51,7 @@
             </tr>
         </table>
         <SubTitle explanation={"대상자 정보"} />
-        <table className="margin-bottom2 senior-insert">
+        <table className="margin-bottom2 qna-insert">
           <tr>
             <th>대상자 선택</th>
             <td colSpan={3} className="flex width">
@@ -102,7 +102,7 @@
             }}
           />
           <Button
-            className={"btn-large green-btn"}
+            className={"btn-large red-btn"}
             btnName={"등록"}
             onClick={() => {
               navigate("/QandASelect");
client/views/pages/callcenter/QuestionInsert.jsx
--- client/views/pages/callcenter/QuestionInsert.jsx
+++ client/views/pages/callcenter/QuestionInsert.jsx
@@ -4,14 +4,14 @@
 import SubTitle from "../../component/SubTitle.jsx";
 import { useNavigate } from "react-router";
 
-export default function QandAInsert() {
+export default function QuestionInsert() {
   const navigate = useNavigate();
   return (
     <main>
       <div className="content-wrap row">
         <ContentTitle contentTitle={"문의글 작성"} />
         <SubTitle explanation={"작성자 정보"} />
-        <table className="margin-bottom2 senior-insert">
+        <table className="margin-bottom2 qna-insert">
           <tr>
             <th>작성자</th>
             <td>
client/views/pages/callcenter/QuestionSelect.jsx
--- client/views/pages/callcenter/QuestionSelect.jsx
+++ client/views/pages/callcenter/QuestionSelect.jsx
@@ -51,7 +51,7 @@
             <option value="답변완료">답변완료</option>
           </select>
           <Button
-            className={"btn-small green-btn"}
+            className={"btn-small gray-btn"}
             btnName={"작성하기"}
             onClick={() => {
               navigate("/QuestionInsert");
client/views/pages/equipment/EquipmentManagementSelect.jsx
--- client/views/pages/equipment/EquipmentManagementSelect.jsx
+++ client/views/pages/equipment/EquipmentManagementSelect.jsx
@@ -710,7 +710,7 @@
 						<SubTitle explanation={"장비 클릭 시 지난 매칭이력을 확인할 수 있습니다."} />
 						<div className="btn-wrap flex-end margin-bottom ">
 							<Button
-								className={"btn-small green-btn"}
+								className={"btn-small gray-btn"}
 								btnName={"등록"}
 								onClick={openModal3}
 							/>
@@ -745,12 +745,12 @@
 											{
 												item['senior_id'] == null
 													? <Button
-														className={"btn-small green-btn"}
+														className={"btn-small gray-btn"}
 														btnName={"등록"}
 														onClick={() => seniorMatchInsertModalOpen(item)}
 													/>
 													: <Button
-														className={"btn-small green-btn"}
+														className={"btn-small gray-btn"}
 														btnName={"반납"}
 														onClick={seniorMatchDelete}
 													/>
@@ -800,7 +800,7 @@
 						<SubTitle explanation={"장비 클릭 시 지난 매칭이력을 확인할 수 있습니다."} />
 						<div className="btn-wrap flex-end margin-bottom ">
 							<Button
-								className={"btn-small green-btn"}
+								className={"btn-small gray-btn"}
 								btnName={"LOG"}
 								onClick={logCheck}
 							/>
@@ -845,12 +845,12 @@
 											{
 												item['equipment_rental_state'] == 'RENTABLE'
 													? <Button
-														className={"btn-small green-btn"}
+														className={"btn-small gray-btn"}
 														btnName={"등록"}
 														onClick={() => seniorMatchInsertModalOpen(item)}
 													/>
 													: <Button
-														className={"btn-small green-btn"}
+														className={"btn-small gray-btn"}
 														btnName={"반납"}
 														onClick={() => seniorMatchReturnModalOpen(item)}
 													/>
@@ -891,7 +891,7 @@
 										<td>
 											{
 												<Button
-													className={"btn-small green-btn"}
+													className={"btn-small gray-btn"}
 													btnName={"반납"}
 													onClick={() => seniorMatchReturnModalOpen(item)}
 												/>
@@ -932,7 +932,7 @@
 										<td>
 											{
 												<Button
-													className={"btn-small green-btn"}
+													className={"btn-small gray-btn"}
 													btnName={"등록"}
 													onClick={() => seniorMatchInsertModalOpen(item)}
 												/>
@@ -965,7 +965,7 @@
 					</div>
 					<div>
 						<Button
-							className={"btn-100 green-btn"}
+							className={"btn-100 gray-btn"}
 							btnName={"닫기"}
 							onClick={closeModal}
 						/>
@@ -999,9 +999,9 @@
 							</tbody>
 						</table>
 					</div>
-					<div>
+					<div className="flex-center">
 						<Button
-							className={"btn-100 green-btn"}
+							className={"btn-small gray-btn"}
 							btnName={"저장"}
 							onClick={closeModal3}
 						/>
@@ -1051,7 +1051,7 @@
 					</div>
 					<div>
 						<Button
-							className={"btn-100 green-btn"}
+							className={"btn-100 gray-btn"}
 							btnName={"닫기"}
 							onClick={seniorMatchInsertModalClose}
 						/>
@@ -1096,7 +1096,7 @@
 					</div>
 					<div>
 						<Button
-							className={"btn-100 green-btn"}
+							className={"btn-100 gray-btn"}
 							btnName={"닫기"}
 							onClick={seniorMatchInsertModalClose}
 						/>
@@ -1141,7 +1141,7 @@
 					</div>
 					<div>
 						<Button
-							className={"btn-100 green-btn"}
+							className={"btn-100 gray-btn"}
 							btnName={"닫기"}
 							onClick={seniorMatchInsertModalClose}
 						/>
client/views/pages/main/Main_guardian.jsx
--- client/views/pages/main/Main_guardian.jsx
+++ client/views/pages/main/Main_guardian.jsx
@@ -9,6 +9,7 @@
 import AssignmentTurnedInIcon from '@mui/icons-material/AssignmentTurnedIn';
 import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline';
 import ErrorIcon from '@mui/icons-material/Error';
+import
 
 export default function Main_guardian() {
   const tableHead1 = ["", "", "", "", "", ""];
@@ -65,7 +66,7 @@
   return (
     <>
       <main>
-        <div><h2></h2></div>
+        <div><Title title={"김복남 어르신"} explanation={"방문, 복약, 온도, 배터리 현황을 확인하세요."} /></div>
         <div className="main-grid-guardian">
           <ul className="content-box statistics-guardian">
             <li className="flex-start">
@@ -135,7 +136,7 @@
             </li>
           </ul>
           <div className="content-box combine-left combine-all-government">
-            <Title title={"김복남 어르신"} explanation={"방문, 복약, 온도, 배터리 현황을 확인하세요."} />
+            
 
           </div>
         </div>
client/views/pages/setting/AuthorityManagement.jsx
--- client/views/pages/setting/AuthorityManagement.jsx
+++ client/views/pages/setting/AuthorityManagement.jsx
@@ -176,7 +176,7 @@
             </tbody>
             </table>
             <div className="btn-wrap flex-end">
-              <Button className={"btn-small green-btn"} btnName={"저장"} />
+              <Button className={"btn-small gray-btn"} btnName={"저장"} />
             </div>
             <SubTitle className="margin-bottom" explanation={"각 메뉴에 대한 설명"} />
             <table className="explain-table">
client/views/pages/setting/RiskSet.jsx
--- client/views/pages/setting/RiskSet.jsx
+++ client/views/pages/setting/RiskSet.jsx
@@ -139,7 +139,7 @@
                 />          
           <div className="btn-wrap flex-end margin-bottom ">
             <Button
-              className={"btn-small green-btn"}
+              className={"btn-small gray-btn"}
               btnName={"저장"}
             />
           </div>
client/views/pages/user_management/AgencySelect.jsx
--- client/views/pages/user_management/AgencySelect.jsx
+++ client/views/pages/user_management/AgencySelect.jsx
@@ -144,7 +144,7 @@
               </div>
               <div className="btn-wrap flex-end margin-bottom ">
                 <Button
-                  className={"btn-small green-btn"}
+                  className={"btn-small gray-btn"}
                   btnName={"등록"}
                   onClick={openModal}
                 />
client/views/pages/user_management/UserAuthoriySelect_agency.jsx
--- client/views/pages/user_management/UserAuthoriySelect_agency.jsx
+++ client/views/pages/user_management/UserAuthoriySelect_agency.jsx
@@ -207,7 +207,7 @@
     if (id == 2) {
       return (
         <Button
-          className={"btn-small green-btn"}
+          className={"btn-small gray-btn"}
           btnName={"등록"}
           onClick={() => {
             navigate("/SeniorInsert");
@@ -461,7 +461,7 @@
           </table>
           <div className="btn-wrap flex-center margin-bottom5">
             <Button
-              className={"btn-small green-btn"}
+              className={"btn-small gray-btn"}
               btnName={"추가"}
               onClick={() => {
                 navigate("/SeniorInsert");
@@ -490,7 +490,7 @@
             </datalist>
             <div className="btn-wrap">
               <Button
-                className={"btn-small green-btn"}
+                className={"btn-small gray-btn"}
                 btnName={"등록"}
               />
             </div>
@@ -593,7 +593,7 @@
           </table>
           <div className="btn-wrap flex-center">
             <Button
-              className={"btn-small green-btn"}
+              className={"btn-small gray-btn"}
               btnName={"등록"}
               onClick={() => {
                 InsertSenior(userName, gender, brith, telNum, homeAddress, note, medicineM, medicineL, medicineD)
@@ -635,7 +635,7 @@
             />
           </div>
           <div className="btn-wrap flex-end">
-            <Button className={"btn-small green-btn"} btnName={"등록"} onClick={openModal3} />
+            <Button className={"btn-small gray-btn"} btnName={"등록"} onClick={openModal3} />
           </div>
           <ul className="tab-content">
             {data
Add a comment
List