박정하 박정하 2023-06-22
230622 박정하 보호사 메인화면 수정
@1738fcc41d242b88d7473f79bb156bc2291c10a8
client/resources/css/main.css
--- client/resources/css/main.css
+++ client/resources/css/main.css
@@ -8,6 +8,10 @@
   height: 100%;
 }
 
+.height-50 {
+  height: 25vh;
+}
+
 .join-btn {
   background-color: transparent;
 }
@@ -24,9 +28,17 @@
   top: 2.9rem;
   position: absolute;
 }
-header .logo{display: none;}
+
+header .logo {
+  display: none;
+}
+
 /* 기관상세정보 */
-.agency-detail, .agency-detail td{border: #f2f0eb 1px solid;}
+.agency-detail,
+.agency-detail td {
+  border: #f2f0eb 1px solid;
+}
+
 /* 시행기관 장비관리 리스트 */
 .visitlist {
   height: 55vh;
@@ -57,11 +69,20 @@
   flex: 0 0 2.85% !important;
   padding: 1rem 0;
 }
-.react-calendar__month-view__days__day--neighboringMonth{color: #f0f0f0;;}
+
+.react-calendar__month-view__days__day--neighboringMonth {
+  color: #f0f0f0;
+  ;
+}
+
 /* .agency-calendar .react-calendar__month-view__days{overflow: hidden;} */
 
 /* Q&A */
-.qnaselect{margin-left: 2rem; width: 15%;}
+.qnaselect {
+  margin-left: 2rem;
+  width: 15%;
+}
+
 .question-select input {
   width: 3%;
 }
@@ -94,7 +115,11 @@
 .risk-table input {
   width: 100%;
 }
-.risk-table thead{display: none;}
+
+.risk-table thead {
+  display: none;
+}
+
 .risk-table select {
   width: 100%;
   height: 3.7rem;
@@ -105,7 +130,11 @@
   display: block;
   background-color: #f2f0eb;
 }
-.questionnaire-table td{padding: 0.5rem;}
+
+.questionnaire-table td {
+  padding: 0.5rem;
+}
+
 .questionnaire-table tr {
   padding: 1rem;
 }
@@ -115,17 +144,44 @@
 }
 
 /* 카테고리 기관 추가*/
-.hierarchy-menu p{font-size: 2.4rem;}
-.hierarchy-menu input{width: 30%;}
-.category{background-color: #f2f0eb; box-shadow: 3px -2px 5px -2px rgb(0 0 0 / 20%);     border-radius: 0.5rem 0.5rem 0 0; padding: 2rem; margin-top: 5rem;}
-.category > a{font-size: 1.2em; font-weight: bold;}
-.category img{width: 2rem;}
-.category > ul > li{margin: 2rem 0 !important;}
-.category > ul > li > a{font-size: 1.1em;}
-.categoryitem{
+.hierarchy-menu p {
+  font-size: 2.4rem;
+}
+
+.hierarchy-menu input {
+  width: 30%;
+}
+
+.category {
+  background-color: #f2f0eb;
+  box-shadow: 3px -2px 5px -2px rgb(0 0 0 / 20%);
+  border-radius: 0.5rem 0.5rem 0 0;
+  padding: 2rem;
+  margin-top: 5rem;
+}
+
+.category>a {
+  font-size: 1.2em;
+  font-weight: bold;
+}
+
+.category img {
+  width: 2rem;
+}
+
+.category>ul>li {
+  margin: 2rem 0 !important;
+}
+
+.category>ul>li>a {
+  font-size: 1.1em;
+}
+
+.categoryitem {
   width: 34%;
   font-size: 2.4rem;
 }
+
 /* hierarchy menu */
 .hierarchy-menu {
   box-shadow: 1px 1px 5px 1px rgb(0 0 0 / 20%);
@@ -135,12 +191,13 @@
   width: 100%;
   padding: 1rem 0 0 3rem;
 }
-.hierarchy-menu a { 
+
+.hierarchy-menu a {
   color: #333333;
   text-decoration: none;
 }
 
-.hierarchy-menu a span{
+.hierarchy-menu a span {
   font-size: 1.6rem;
 }
 
@@ -151,6 +208,7 @@
   padding: 10px 0 0 0;
   position: relative;
 }
+
 .hierarchy-menu ul ul:before {
   content: '';
   position: absolute;
@@ -159,19 +217,34 @@
   left: 6px;
   border-left: 1px dashed #373E4B;
 }
-.hierarchy-menu > ul ul {
+
+.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;}
+
+.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 {
+
+.hierarchy-menu>ul ul li:before {
   content: '';
   display: block;
   height: 0px;
@@ -181,7 +254,8 @@
   left: -10px;
   top: 16px;
 }
-.hierarchy-menu > ul ul li:after {
+
+.hierarchy-menu>ul ul li:after {
   content: '';
   display: block;
   height: 43px;
@@ -191,24 +265,29 @@
   left: -10px;
   top: -27px;
 }
-.hierarchy-menu > ul ul li.group-lvl:before {
+
+.hierarchy-menu>ul ul li.group-lvl:before {
   width: 50px;
 }
-.hierarchy-menu > ul ul li:first-child:after { 
+
+.hierarchy-menu>ul ul li:first-child:after {
   height: 28px;
   top: -12px;
 }
 
 /* Links */
-.hierarchy-menu ul .max-agency{
+.hierarchy-menu ul .max-agency {
   margin-left: 0px;
 }
-.hierarchy-menu ul .top-agency{
+
+.hierarchy-menu ul .top-agency {
   margin-left: 49px;
 }
-.hierarchy-menu .low-agency{
+
+.hierarchy-menu .low-agency {
   margin-left: 50px;
 }
+
 .hierarchy-menu ul a {
   display: block;
   padding: 6px 0 0 5rem;
@@ -217,15 +296,17 @@
   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 {
+.hierarchy-menu li.sub-nav>a:before {
   position: absolute;
   left: 4px;
   top: 19px;
@@ -238,22 +319,29 @@
   -webkit-transform: rotate(-45deg);
   transform: rotate(-45deg);
 }
-.hierarchy-menu li.sub-nav.open > a:before {
+
+.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 {
+
+.hierarchy-menu li.sub-nav.open>a {
   color: #333333;
 }
-.hierarchy-menu li.sub-nav > ul {
-  display: block;
-}
-.hierarchy-menu li.sub-nav.open > ul {
+
+.hierarchy-menu li.sub-nav>ul {
   display: block;
 }
 
-.max-agency input{width: 5rem;}
+.hierarchy-menu li.sub-nav.open>ul {
+  display: block;
+}
+
+.max-agency input {
+  width: 5rem;
+}
+
 .explain-table th {
   background: #ffffff;
 }
@@ -282,7 +370,9 @@
 
 
 /* -----------------------------------------------지자체 */
-.statistics-agency #RowChart>div{height: 36rem;}
+.statistics-agency #RowChart>div {
+  height: 36rem;
+}
 
 .map {
   width: 100%;
@@ -419,17 +509,39 @@
   font-size: 1.5rem;
   color: #cbc9c9;
 }
-.statistics-grid > div{height: 35rem;}
-.statistics-grid .statistics-guardian {
+
+.statistics-grid>div {
+  height: 35rem;
 }
-.statistics-grid .statistics-guardian li:nth-child(2) > div{height: 23vh !important;}
-.statistics-grid .statistics-guardian li:nth-child(1) p:nth-child(2){font-size: 2rem; font-weight: bold; margin-right: 1rem;}
-.statistics-grid .statistics-guardian li:nth-child(1) p:nth-child(3){font-size: 1.6rem; }
+
+.statistics-grid .statistics-guardian {}
+
+.statistics-grid .statistics-guardian li:nth-child(2)>div {
+  height: 23vh !important;
+}
+
+.statistics-grid .statistics-guardian li:nth-child(1) p:nth-child(2) {
+  font-size: 2rem;
+  font-weight: bold;
+  margin-right: 1rem;
+}
+
+.statistics-grid .statistics-guardian li:nth-child(1) p:nth-child(3) {
+  font-size: 1.6rem;
+}
+
 .guardian-medicine {
   height: 17vh;
 }
-.main-grid-guardian > div:nth-child(3) ul{height: 6rem;}
-.main-grid-guardian .statistics-guardian:nth-child(4) li{padding: 7.5rem 3rem;}
+
+.main-grid-guardian>div:nth-child(3) ul {
+  height: 6rem;
+}
+
+.main-grid-guardian .statistics-guardian:nth-child(4) li {
+  padding: 7.5rem 3rem;
+}
+
 .statistics-guardian li {
   padding: 1rem 3rem;
   background: #ffffff;
@@ -438,13 +550,15 @@
   position: relative;
   text-align: center;
 }
-.medicine-title{
+
+.medicine-title {
   font-weight: bold;
   font-size: 1.5rem;
   position: absolute;
   top: 87px;
   left: 22px;
 }
+
 .main-guardian-chart {
   height: 200px;
   background-color: #ffffff;
@@ -568,8 +682,15 @@
 .battery-wrap {
   height: 10rem;
 }
-.battery-mobile{display: none;}
-.battery-mobile .battery-img img{position: absolute;}
+
+.battery-mobile {
+  display: none;
+}
+
+.battery-mobile .battery-img img {
+  position: absolute;
+}
+
 .battery-img {
   position: relative;
   margin-top: 1rem;
@@ -651,7 +772,7 @@
   margin-top: 1rem;
 }
 
-.calendar-data >div:first-child {
+.calendar-data>div:first-child {
   margin-bottom: .5rem;
 }
 
@@ -875,16 +996,27 @@
 }
 
 /* 검색창 */
-.agency-search{gap: 1rem;}
+.agency-search {
+  gap: 1rem;
+}
+
 .searchselect {
   width: 30%;
 }
-.search-management button{width: 22%;}
+
+.search-management button {
+  width: 22%;
+}
+
 .searchselect label {
   width: 100%;
   margin-right: 3rem;
 }
-.searchselect input{width: auto;}
+
+.searchselect input {
+  width: auto;
+}
+
 .mobile-area-wrap {
   display: none;
 }
@@ -912,6 +1044,7 @@
 .detail-search table td {
   border-top: none;
 }
+
 .detail-search tbody select {
   height: 3.7rem;
   width: unset;
@@ -939,6 +1072,7 @@
   background-color: #f1bdb2;
   padding: 2rem;
 }
+
 .search-area button {
   width: -webkit-fill-available;
 }
@@ -1032,27 +1166,61 @@
 .medicine {
   height: 100px;
 }
-.senior-insert .gender{padding-left: 2rem; gap: 2rem;}
-.senior-insert .gender input{width: auto;}
-.medicationTime-td input{width: 2rem;}
-.medicationTime-td label{}
-/* 노인수정 */
-.senior-edit{border: #d8d3c7 1px solid;}
-.senior-detail input[type='checkbox'],
-.senior-detail input[type='checkbox']:checked{width: 10%;}
 
-.senior-edit th{
-  font-size:1.8rem
+.senior-insert .gender {
+  padding-left: 2rem;
+  gap: 2rem;
 }
+
+.senior-insert .gender input {
+  width: auto;
+}
+
+.medicationTime-td input {
+  width: 2rem;
+}
+
+.medicationTime-td label {}
+
+/* 노인수정 */
+.senior-edit {
+  border: #d8d3c7 1px solid;
+}
+
+.senior-detail input[type='checkbox'],
+.senior-detail input[type='checkbox']:checked {
+  width: 10%;
+}
+
+.senior-edit th {
+  font-size: 1.8rem
+}
+
 .medicine {
   height: 100px;
 }
-.senior-insert .gender{padding-left: 2rem;}
-.medicationTime-td input{width: 2rem;}
-.medicationTime-td label{}
+
+.senior-insert .gender {
+  padding-left: 2rem;
+}
+
+.medicationTime-td input {
+  width: 2rem;
+}
+
+.medicationTime-td label {}
+
 /* 노인 상세 정보 */
-.senior-detail{border-top: 2px solid #cccccc; border-bottom: 1px solid #cccccc; background: #ffffffba;}
-.senior-detail tr{ border-bottom: 1px solid #f4f4f2;}
+.senior-detail {
+  border-top: 2px solid #cccccc;
+  border-bottom: 1px solid #cccccc;
+  background: #ffffffba;
+}
+
+.senior-detail tr {
+  border-bottom: 1px solid #f4f4f2;
+}
+
 .senior-detail th {
   text-align: left;
   width: 15%;
@@ -1190,7 +1358,11 @@
 .equipment-search {
   margin-bottom: 1rem;
 }
-.equipment-insert td{text-align: left !important;}
+
+.equipment-insert td {
+  text-align: left !important;
+}
+
 .select100 {
   width: 100%;
 }
@@ -1248,7 +1420,9 @@
   overflow: hidden;
   overflow-y: auto;
 }
-.modal-main .board-wrap{}
+
+.modal-main .board-wrap {}
+
 .modal-main table {
   border: 1px solid #d8d3c7;
 }
@@ -1266,9 +1440,19 @@
 }
 
 /* 사용자 관리 */
-.userauthoriylist .left{width: 22%; min-width: fit-content;}
- .userauthoriylist .right{width: 100%;}
-.bSXvtB{display: none;}
+.userauthoriylist .left {
+  width: 22%;
+  min-width: fit-content;
+}
+
+.userauthoriylist .right {
+  width: 100%;
+}
+
+.bSXvtB {
+  display: none;
+}
+
 .tab-menu .tab-menu-agency {
   display: flex;
 }
@@ -1348,8 +1532,14 @@
   color: #ffffff;
 
 }
-.senior-table span{display: none;}
-.senior-table span img{display: none; }
+
+.senior-table span {
+  display: none;
+}
+
+.senior-table span img {
+  display: none;
+}
 
 
 ul.list-box {
@@ -1359,7 +1549,8 @@
   border: 1px solid #d3d3d3;
   border-radius: 5px;
 }
-ul.list-box > li {
+
+ul.list-box>li {
   padding: 0.5rem 1rem;
   text-align: left;
   font-size: 1.3rem;
@@ -1367,17 +1558,36 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-ul.list-box > li:hover {
+
+ul.list-box>li:hover {
   background: #ff5c00;
   color: #fff;
 }
-ul.list-box > li.active {
+
+ul.list-box>li.active {
   background: #f25430;
   color: #fff;
 }
 
 
-.leaflet-background-radius-icon{
+.leaflet-background-radius-icon {
   background: #f25430;
   border-radius: 50%;
+}
+
+
+.visit-data-table {
+  margin-top: 2rem;
+}
+
+.main-grid-agency2 {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 1rem;
+}
+
+@media all and (max-width: 767px) {
+  .main-grid-agency2 {
+    grid-template-columns: 1fr;
+  }
 }
(No newline at end of file)
client/resources/css/responsive.css
--- client/resources/css/responsive.css
+++ client/resources/css/responsive.css
@@ -746,6 +746,8 @@
   .protector-user {
     margin-top: 2rem;
   }
+
+  .visit-data-table{}
   .userauthoriylist {
     display: block;
   }
client/views/component/chart/Chart8.jsx
--- client/views/component/chart/Chart8.jsx
+++ client/views/component/chart/Chart8.jsx
@@ -176,7 +176,7 @@
   }, [])
 
   return (
-    <div id="Chart8" style={{ width: "100%", height: "80%" }}></div>
+    <div id="Chart8" style={{ width: "100%", height: "100%" }}></div>
   )
 
 }
(No newline at end of file)
client/views/pages/main/Main_agency.jsx
--- client/views/pages/main/Main_agency.jsx
+++ client/views/pages/main/Main_agency.jsx
@@ -9,6 +9,7 @@
 import Calendar_agency from "../../component/Calendar_agency.jsx";
 import Chart10 from "../../component/chart/Chart10.jsx";
 import Cart7 from "../../component/chart/Chart7.jsx";
+import Chart8 from "../../component/chart/Chart8.jsx";
 import tool from "../../../resources/files/images/tool.png";
 import medicinebox from "../../../resources/files/images/medicinebox.png";
 import box from "../../../resources/files/images/box.png";
@@ -86,8 +87,46 @@
       </div>
       <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"대상자 복용률 평균"} /></div>
       <div className="main-grid-agency margin-bottom2">
-        <div className="content-box combine-left-government3 visitlist">
-          <Chart10 />
+        <div className="content-box combine-left-government3">
+          <div className="height-50"><Chart10 /></div>
+          <div>
+            <table className="visit-data-table">
+              <thead>
+                <tr>
+                  <th>년도</th>
+                  <th>총계</th>
+                  <th>1월</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td>2023</td>
+                  <td>87%</td>
+                  <td>86%</td>
+                </tr>
+                <tr>
+                  <td>2022</td>
+                  <td>83%</td>
+                  <td>81%</td>
+                </tr>
+                <tr>
+                  <td>2021</td>
+                  <td>81%</td>
+                  <td>80%</td>
+                </tr>
+                <tr>
+                  <td>2020</td>
+                  <td>82%</td>
+                  <td>83%</td>
+                </tr>
+                <tr>
+                  <td>2019</td>
+                  <td>80%</td>
+                  <td>81%</td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
         </div>
       </div>
       {/* <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"방문/전화 관리 리스트"} /></div>
@@ -101,10 +140,18 @@
           </div>
         </div>
       </div> */}
-      <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"연령대별 통계"} /></div>
-      <div className="main-grid-agency">
-        <div className="content-box combine-left-government3 visitlist margin-bottom2">
-          <Cart7 />
+      <div className="main-grid-agency2">
+        <div>
+          <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"연령대별 통계"} /></div>
+          <div className="content-box combine-left-government3 visitlist margin-bottom2">
+            <Cart7 />
+          </div>
+        </div>
+        <div>
+          <div className="flex-start margin-bottom2"><img src={medicinebox} alt="" /><TitleSmall title={"시니어 복용률 순위"} /></div>
+          <div className="content-box combine-left-government3 visitlist margin-bottom2">
+            <Chart8 />
+          </div>
         </div>
       </div>
       <div>
Add a comment
List