최정임 최정임 2023-03-10
230210 최정임 게시판 수정
@4ca2701277bd5601832ad7f362e44d85ba5d3dc7
client/resources/css/main.css
--- client/resources/css/main.css
+++ client/resources/css/main.css
@@ -1,4 +1,5 @@
 /* 공통 */
+
 header>div {
   height: 100%;
 }
@@ -20,6 +21,8 @@
   position: absolute;
 }
 header .logo{display: none;}
+/* 기관상세정보 */
+.agency-detail, .agency-detail td{border: #f2f0eb 1px solid;}
 /* 시행기관 장비관리 리스트 */
 .visitlist {
   height: 55vh;
@@ -106,6 +109,140 @@
 }
 
 /* 카테고리 기관 추가*/
+.hierarchy-menu p{font-size: 2.4rem;}
+.hierarchy-menu input{width: 30%;}
+.categoryitem{
+  width: 34%;
+  font-size: 2.4rem;
+}
+/* hierarchy menu */
+.hierarchy-menu {
+  box-shadow: 1px 1px 5px 1px rgb(0 0 0 / 20%);
+  color: #733c1d;
+  overflow-y: auto;
+  height: 55rem;
+  width: 100%;
+  padding: 1rem 0 0 3rem;
+}
+.hierarchy-menu a { 
+  color: #333333;
+  text-decoration: none;
+}
+
+.hierarchy-menu a span{
+  font-size: 1.6rem;
+}
+
+/* List */
+.hierarchy-menu ul {
+  list-style: none;
+  margin: 0;
+  padding: 10px 0 0 0;
+  position: relative;
+}
+.hierarchy-menu ul ul:before {
+  content: '';
+  position: absolute;
+  top: 0;
+  bottom: 27px;
+  left: 6px;
+  border-left: 1px dashed #373E4B;
+}
+.hierarchy-menu > ul ul {
+  padding-left: 16px;
+}
+.hierarchy-menu > ul > li > ul > li{margin-left: 0;}
+.hierarchy-menu > ul > li > ul {margin-left: 0rem;}
+.hierarchy-menu > ul > li > ul > li > div{margin-left: 8rem;}
+.margin-left{margin-left: 10rem;}
+/* List items */
+.hierarchy-menu ul li {
+  display: block;
+  position: relative;
+}
+.hierarchy-menu > ul ul li:before {
+  content: '';
+  display: block;
+  height: 0px;
+  width: 80px;
+  border-bottom: 1px solid #7A7F87;
+  position: absolute;
+  left: -10px;
+  top: 16px;
+}
+.hierarchy-menu > ul ul li:after {
+  content: '';
+  display: block;
+  height: 43px;
+  width: 0;
+  border-left: 1px solid #7A7F87;
+  position: absolute;
+  left: -10px;
+  top: -27px;
+}
+.hierarchy-menu > ul ul li.group-lvl:before {
+  width: 50px;
+}
+.hierarchy-menu > ul ul li:first-child:after { 
+  height: 28px;
+  top: -12px;
+}
+
+/* Links */
+.hierarchy-menu ul .max-agency{
+  margin-left: 0px;
+}
+.hierarchy-menu ul .top-agency{
+  margin-left: 49px;
+}
+.hierarchy-menu .low-agency{
+  margin-left: 50px;
+}
+.hierarchy-menu ul a {
+  display: block;
+  padding: 6px 0 0 5rem;
+  height: 44px;
+  position: relative;
+  color: #333333;
+  transition: 100ms;
+}
+.hierarchy-menu ul a:hover {
+  color: #7e9d9c;
+}
+.hierarchy-menu ul a.active {
+  color: #333333;
+  font-weight: bold;
+}
+
+.hierarchy-menu li.sub-nav > a:before {
+  position: absolute;
+  left: 4px;
+  top: 19px;
+  content: '';
+  width: 7px;
+  height: 7px;
+  border-bottom: 1px solid #333333;
+  border-right: 1px solid #333333;
+  -ms-transform: rotate(-45deg);
+  -webkit-transform: rotate(-45deg);
+  transform: rotate(-45deg);
+}
+.hierarchy-menu li.sub-nav.open > a:before {
+  -ms-transform: rotate(45deg);
+  -webkit-transform: rotate(45deg);
+  transform: rotate(45deg);
+}
+.hierarchy-menu li.sub-nav.open > a {
+  color: #333333;
+}
+.hierarchy-menu li.sub-nav > ul {
+  display: block;
+}
+.hierarchy-menu li.sub-nav.open > ul {
+  display: block;
+}
+
+.max-agency input{width: 5rem;}
 .explain-table th {
   background: #ffffff;
 }
@@ -712,7 +849,7 @@
 .searchselect {
   width: 25%;
 }
-
+.search-management button{width: 22%;}
 .searchselect label {
   width: 100%;
   margin-right: 3rem;
@@ -865,7 +1002,18 @@
 
 }
 
-/* 노인등록 */
+/* 노인등록수정 */
+.medicine {
+  height: 100px;
+}
+.senior-insert .gender{padding-left: 2rem;}
+.medicationTime-td input{width: 2rem;}
+.medicationTime-td label{}
+/* 노인수정 */
+.senior-edit{border: #d8d3c7 1px solid;}
+.senior-edit th{
+  font-size:1.8rem
+}
 .medicine {
   height: 100px;
 }
client/views/pages/join/Join.jsx
--- client/views/pages/join/Join.jsx
+++ client/views/pages/join/Join.jsx
@@ -6,9 +6,9 @@
   return (
       <div className="container row flex-center join-login">
         <div className="join-group">
-          <h3>회원가입</h3>
+          <h3>계정생성</h3>
           <div className="join-inner">
-            <div>
+            {/* <div>
               <div className="flex-start margin-bottom2">
                 <label className="flex25">구분</label>
                 <select name="division" id="section">
@@ -19,15 +19,19 @@
                   <option value="government">지자체</option>
                 </select>
               </div>
-            </div>
+            </div> */}
             <div>
               <div className="flex-start margin-bottom2">
                 <label className="flex25" htmlFor="name">
                   기관명
                 </label>
-                <select name="division" id="section">
-                  <option value="manager">기관명</option>
-                </select>
+                <input
+                  type="text"
+                  name="name"
+                  placeholder=""
+                  autocomplete="off"
+                  id="name"
+                />
               </div>
             </div>
             <div>
client/views/pages/senior_management/SeniorEdit.jsx
--- client/views/pages/senior_management/SeniorEdit.jsx
+++ client/views/pages/senior_management/SeniorEdit.jsx
@@ -106,7 +106,7 @@
   return (
     <main>
       <div className="board-wrap">
-          <SubTitle explanation={"회원 등록 시 ID는 연락처, 패스워드는 생년월일 8자리입니다."} className="margin-bottom" />
+          <SubTitle explanation={"수정페이지"} className="margin-bottom" />
           <table className="margin-bottom2 senior-insert">
             {/* <tr>
               <th>대상자등록번호</th>
client/views/pages/user_management/UserAuthoriySelect.jsx
--- client/views/pages/user_management/UserAuthoriySelect.jsx
+++ client/views/pages/user_management/UserAuthoriySelect.jsx
@@ -1,13 +1,17 @@
 import React, { useState } from "react";
+import { useNavigate } from "react-router";
 import ContentTitle from "../../component/ContentTitle.jsx";
 import SubTitle from "../../component/SubTitle.jsx";
 import Modal from "../../component/Modal.jsx";
 import Table from "../../component/Table.jsx";
 import Button from "../../component/Button.jsx";
 import Category from "../../component/Category.jsx";
+import Modal_SeniorInsert from "../../component/Modal_SeniorInsert.jsx";
 import { width } from "@mui/system";
+import Modal_Guardian from "../../component/Modal_Guardian.jsx";
 
 export default function UserAuthoriySelect() {
+  const navigate = useNavigate();
   const [agencyName, setAgencyName] = useState("시행기관")
   const [modalOpen, setModalOpen] = React.useState(false);
   const openModal = () => {
@@ -56,6 +60,7 @@
 
   const thead1 = [
     "No",
+    "소속기관명", //관리기관 클릭시 보이게
     "이름",
     "대상자등록번호",
     "생년월일",
@@ -66,6 +71,7 @@
   ];
   const key1 = ["No",
     "name",
+    "center",
     "management_number",
     "birth",
     "gender",
@@ -76,6 +82,7 @@
   const content1 = [
     {
       No: 1,
+      center: "A복지관",
       name: "김복남",
       management_number: 2022080101,
       birth: "1950.02.03",
@@ -119,30 +126,108 @@
       id: 1,
       title: "대상자(사용자)",
       description: (
-        <Table
-          className={"protector-user"}
-          head={thead1}
-          contents={content1}
-          contentKey={key1}
-          onClick={() => {
-            navigate("/SeniorSelectOne");
-          }}
-        />
+        <div>
+          <div className="search-management flex-start margin-bottom2">
+            <select>
+              <option value="이름">이름</option>
+              <option value="아이디">사용자등록번호</option>
+              <option value="아이디">ID</option>
+            </select>
+            <input type="text" />
+            <Button
+              className={"btn-small gray-btn"}
+              btnName={"검색"}
+              onClick={() => navigate("/SeniorInsert")}
+            />
+          </div>
+          <div className="btn-wrap flex-end margin-bottom">
+            <Button
+              className={"btn-small gray-btn"}
+              btnName={"등록"}
+              onClick={openModal2}
+            />
+            <Button className={"btn-small red-btn"} btnName={"삭제"} />
+          </div>
+          <Table
+            className={"protector-user"}
+            head={thead1}
+            contents={content1}
+            contentKey={key1}
+            onClick={() => {
+              navigate("/SeniorSelectOne");
+            }}
+          />
+        </div>
+
       ),
     },
     {
       id: 2,
       title: "복지사(간호사)",
       description: (
-        <Table
-          className={"senior-table"}
-          head={thead}
-          contents={content}
-          contentKey={key}
-          onClick={() => {
-            navigate("/SeniorSelectOne");
-          }}
-        />
+        <div>
+          <div className="search-management flex-start margin-bottom2">
+            <select>
+              <option value="이름">이름</option>
+              <option value="아이디">사용자등록번호</option>
+              <option value="아이디">ID</option>
+            </select>
+            <input type="text" />
+            <Button
+              className={"btn-small gray-btn"}
+              btnName={"검색"}
+              onClick={() => navigate("/SeniorInsert")}
+            />
+          </div>
+          <div className="btn-wrap flex-end margin-bottom">
+            <Button
+              className={"btn-small gray-btn"}
+              btnName={"등록"}
+              onClick={() => {
+                navigate("/Join");
+              }}
+            />
+            <Button className={"btn-small red-btn"} btnName={"삭제"} />
+          </div>
+          <Table
+            className={"senior-table"}
+            head={thead}
+            contents={content}
+            contentKey={key}
+            onClick={() => {
+              navigate("/SeniorSelectOne");
+            }}
+          />
+        </div>
+
+      ),
+    },
+    {
+      id: 3,
+      title: "기관상세정보",
+      description: (
+        <div>
+          <table className="agency-detail">
+            <tbody>
+              <tr>
+                <td>회사명</td>
+                <td>군위군ㅊ청</td>
+              </tr>
+              <tr>
+                <td>주소</td>
+                <td>군위군 군위읍</td>
+              </tr>
+              <tr>
+                <td>담당직원</td>
+                <td>김직원</td>
+              </tr>
+              <tr>
+                <td>전화번호</td>
+                <td>053-855-8555</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
       ),
     },
   ]
@@ -150,7 +235,7 @@
 
   return (
     <main>
-      <Modal open={modalOpen} close={closeModal} header="'김복남'님의 가족">
+      <Modal_Guardian open={modalOpen} close={closeModal} header="'김복남'님의 가족">
         <div className="board-wrap">
           <SubTitle explanation={"최초 로그인 ID는 연락처, PW는 생년월일 8자리입니다."} className="margin-bottom" />
           <table className="margin-bottom2 senior-insert">
@@ -205,104 +290,12 @@
             />
           </div>
         </div>
-      </Modal>
-      <Modal open={modalOpen2} close={closeModal2} header="대상자(사용자) 등록">
-        <div className="board-wrap">
-          <SubTitle explanation={"회원 등록 시 ID는 연락처, 패스워드는 생년월일 8자리입니다."} className="margin-bottom" />
-          <table className="margin-bottom2 senior-insert">
-            <tr>
-              <th>대상자등록번호</th>
-              <td colSpan={3} className="flex">
-                <input type="text" placeholder="생성하기 버튼 클릭 시 자동으로 생성됩니다." />
-                <Button
-                  className={"btn-short red-btn margin-left"}
-                  btnName={"생성"}
-                />
-              </td>
-            </tr>
-            <tr>
-              <th>이름</th>
-              <td>
-                <input type="text" />
-              </td>              
-            </tr>
-            <tr>
-            <th>성별</th>
-              <td className="flex-start gender">
-                <div className="flex-start">
-                  <input type="radio" name="genderSelect"></input>
-                  <label for="gender">남</label>
-                </div>
-                <div className="flex-start">
-                  <input type="radio" name="genderSelect"></input>
-                  <label for="gender">여</label>
-                </div>
-              </td>
-            </tr>
-            <tr>
-              <th>생년월일</th>
-              <td>
-                <div className="flex">
-                  <select name="year" id="year">
-                    <option value="">년</option>
-                  </select>
-                  <select name="month" id="month">
-                    <option value="">월</option>
-                  </select>
-                  <select name="days" id="days">
-                    <option value="">일</option>
-                  </select>
-                </div>
-              </td>
-              {/* <th>요양등급</th>
-              <td>
-              <input type="text" />
-              </td> */}
-
-            </tr>
-            <tr>
-              <th>연락처</th>
-              <td colSpan={3}>
-                <input type="text" />
-              </td>
-            </tr>
-            <tr>
-              <th>주소</th>
-              <td colSpan={3}>
-                <input type="text" />
-              </td>
-            </tr>
-            <tr>
-              <th>비고</th>
-              <td colSpan={3}>
-                <textarea className="medicine" cols="30" rows="2"></textarea>
-              </td>
-            </tr>
-            {/* <tr>
-              <th>복용중인 약</th>
-              <td colSpan={3}>
-                <textarea className="medicine" cols="30" rows="2"></textarea>
-              </td>
-            </tr>
-            <tr>
-              <th>기저질환</th>
-              <td colSpan={3}>
-                <textarea cols="30" rows="10"></textarea>
-              </td>
-            </tr> */}
-          </table>
-          <div className="flex-center">
-            <Button
-              className={"btn-small red-btn"}
-              btnName={"등록"}
-              onClick={closeModal2}
-            />
-          </div>
-        </div>
-      </Modal>
-      <ContentTitle  explanation={"사용자 관리"} />
+      </Modal_Guardian>
+      <Modal_SeniorInsert open={modalOpen2} close={closeModal2} header="대상자(사용자) 등록" >
+      </Modal_SeniorInsert>
+      <ContentTitle explanation={"사용자 관리"} />
       <div className="content-wrap">
-        
+
         <div
           className="flex-align-start userauthoriylist"
           style={{ height: "calc(100% - 61px)" }}
@@ -313,7 +306,7 @@
                 explanation={"관리기관 리스트"}
                 className="margin-bottom"
               />
-                <Category />
+              <Category />
             </div>
           </div>
           <div className="right" style={{ height: "100%", }}>
@@ -335,27 +328,6 @@
                   ))}
                 </ul>
                 <div className="content-wrap userlist">
-                  <div className="search-management flex-start margin-bottom2">
-                    <select>
-                      <option value="이름">이름</option>
-                      <option value="아이디">사용자등록번호</option>
-                      <option value="아이디">ID</option>
-                    </select>
-                    <input type="text" />
-                    <Button
-                      className={"btn-small gray-btn"}
-                      btnName={"검색"}
-                      onClick={() => navigate("/SeniorInsert")}
-                    />
-                  </div>
-                  <div className="btn-wrap flex-end margin-bottom">
-                    <Button
-                      className={"btn-small gray-btn"}
-                      btnName={"등록"}
-                      onClick={openModal2}
-                    />
-                    <Button className={"btn-small red-btn"} btnName={"삭제"} />
-                  </div>
                   <ul className="tab-content">
                     {data
                       .filter((item) => index === item.id)
Add a comment
List