diff --git a/frontend/public/index.html b/frontend/public/index.html
index 815d182..c7d00a3 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -1,16 +1,16 @@
-
-
-
-
-
-
- hubez-admin-web
-
-
-
-
-
-
-
+
+
+
+
+
+
+ hubez-admin-web
+
+
+
+
+
+
+
diff --git a/frontend/public/logo.png b/frontend/public/logo.png
new file mode 100644
index 0000000..f3d2503
Binary files /dev/null and b/frontend/public/logo.png differ
diff --git a/frontend/src/assets/css/style.css b/frontend/src/assets/css/style.css
index c956be6..0f95dd3 100644
--- a/frontend/src/assets/css/style.css
+++ b/frontend/src/assets/css/style.css
@@ -560,15 +560,31 @@ header .user_wrap .user_info .logout {
margin-left: 10px;
}
+/*******************20220715 퍼블 수정*******************/
+
.contents .input_box.cal input {
display: inline-block;
- width: 70%;
+ width: 100%;
float: left;
- background: #fff url(../images/icon-calender.png) no-repeat right 6% center;
+ background: url(../images/icon-calender.png) no-repeat right 6% center;
+ background-color:#fff;
}
+
+.contents .input_box.cal .term span:nth-of-type(1){
+ margin-right: 4%;
+}
+
+.contents .input_box.cal .term span:nth-of-type(2){
+ margin-left: 4%;
+}
+
+/*******************************************/
+
+
+/***** 20220715 퍼블 삭제
.contents .input_box.cal input + input{
margin-left: 5%;
-}
+} **/
.contents .input_box.cal.one{
width: 13.67%;
@@ -588,9 +604,10 @@ header .user_wrap .user_info .logout {
align-items: center;
}
+/** 20220715 퍼블 삭제
.contents .input_box.cal .term input:nth-child(1){
margin-right: 4%;
-}
+} ***********/
.contents .input_box .search-box {
background: #fff url(../images/icon-search.png) no-repeat 6% center/14px auto;
@@ -1463,22 +1480,25 @@ header .user_wrap .user_info .logout {
padding: 0;
}
-.popup.popup_form .popup-btn2.bulk button:nth-child(1)::before{
- content: '';
+/**********************20220715 퍼블 수정**********************/
+.popup.popup_form .popup-btn2.bulk button:nth-of-type(1)::before{
+ content: '';
background: url(../images/icon-f-download.png) no-repeat 0 0;
width: 23px;
height: 23px;
margin: 2px 5px 0 15px;
}
-.popup.popup_form .popup-btn2.bulk button:nth-child(2)::before{
- content: '';
+.popup.popup_form .popup-btn2.bulk button:nth-of-type(2)::before{
+ content: '';
background: url(../images/icon-f-upload.png) no-repeat 0 0;
width: 23px;
height: 23px;
- margin: 2px 5px 0 15px;
+ margin: 2px 5px 0 15px;
}
+/****************************************************************/
+
.popup.popup_form .attach{
display: flex;
align-items: center;
@@ -1656,37 +1676,53 @@ header .user_wrap .user_info .logout {
width: 300px;
}
+
+/********** 20220715 퍼블 수정 ************/
+
.popup.popup_form table .registration{
- padding-left:20px;
+ padding: 10px 20px 0 20px;
}
.popup.popup_form table .registration ul{
- display: flex;
+ display: flex;
+ width: 100%;
+ flex-wrap: wrap;
}
.popup.popup_form table .registration ul li{
- display: inline-flex;
- align-items: center;
- width: 100px;
- position: relative;
- border: 1px solid #000;
- padding: 0 10px;
- border-radius: 5px;
- margin-right: 15px;
- min-height: 30px;
- font-size: 16px;
+ width: 32%;
+ max-width: 144px;
+ margin-right: 2%;
+ font-size: 16px;
+ margin-bottom: 2%;
}
-.popup.popup_form table .registration ul li:last-child{
- margin-right: 0;
+.popup.popup_form table .registration ul li:nth-child(3n){
+ margin-right: 0;
+}
+
+.popup.popup_form table .registration ul li span{
+ min-height: 30px;
+ max-height: 160px;
+ overflow: hidden;
+ border: 1px solid #000;
+ padding: 5px 10px;
+ border-radius: 5px;
+ position: relative;
+ white-space: normal;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 7;
}
.popup.popup_form table .registration ul li span a img{
- position: absolute;
+ position: absolute;
right: 0px;
- top: 2px;
+ top: 4px;
}
+/*********************/
+
.popup.popup_form table .input_add{
display: flex;
justify-content: space-between;
@@ -1708,7 +1744,8 @@ header .user_wrap .user_info .logout {
}
.essential span{
- padding-right: 3px;
+ /*color:#eb008b;*/
+ padding-right: 3px;
}
textarea{
@@ -1726,8 +1763,8 @@ textarea:focus{
outline: 1px solid #000;
}
-/*toggle*/
-.contents .table table input[type="checkbox"] + label.toggle_switch { width: 72px; height: 28px; border-radius: 14px; border: 1px solid #b7b9be; background: #cecece; transition: all 0.3s; }
+/*toggle*/ /***************20220715 퍼블 수정******************/
+.contents .table table input[type="checkbox"] + label.toggle_switch { width: 72px; height: 28px; border-radius: 14px; border: 1px solid #b7b9be; background: #cecece; transition: all 0.3s; cursor: default;}
.contents .table table input[type="checkbox"] + label.toggle_switch:before { content:"미사용";position: absolute; display: block; width: 100%; height:100%; font-size: 14px; color:#fff; line-height: 28px; padding: 0 0 0 15px; font-family: 'SpoqaHanSansNeo', sans-serif; box-sizing: border-box; transition: all 0.3s; }
.contents .table table input[type="checkbox"] + label.toggle_switch:after { content:""; position: absolute; display: block; width:14px; height: 14px; top:50%; left: 7px; transform: translateY(-50%); background: #fff; border-radius: 100%; transition: all 0.5s; }
.contents .table table input[type="checkbox"]:checked + label.toggle_switch { border-color:#eb008b; background:#fff; }
@@ -1746,7 +1783,7 @@ textarea:focus{
.datepicker .datepicker-calender tr td:first-child a{color:#ff2e76;}
.datepicker .datepicker-head .datepicker-btn span{position: relative;}
.datepicker .datepicker-head .datepicker-prev span::after{position: absolute; left: 70px; top: 10px; content: ''; width: 10px; height: 10px; border-top: 2px solid #5f5f5f; border-right: 2px solid #5f5f5f; transform: rotate(225deg);}
-.datepicker .datepicker-head .datepicker-next span::after{position: absolute; left: 185px; top: 10px; content: ''; width: 10px; height: 10px; border-top: 2px solid #5f5f5f; border-right: 2px solid #5f5f5f; transform: rotate(45deg);}
+.datepicker .datepicker-head .datepicker-next span::after{position: absolute; left: 70px; top: 10px; content: ''; width: 10px; height: 10px; border-top: 2px solid #5f5f5f; border-right: 2px solid #5f5f5f; transform: rotate(45deg);}
.datepicker .datepicker-calender td:hover:not(.disabled){background-color: #efefef; border-radius: 50%;}
.datepicker .datepicker-calender td:hover a{color:#000;}
.datepicker .datepicker-calender .today{background-color: #7c7c7c; border-radius: 50%;}
@@ -1754,4 +1791,4 @@ textarea:focus{
.datepicker .datepicker-calender .click a, .datepicker .datepicker-calender .today a{color: #fff;}
.datepicker .datepicker-calender .disabled a{color:#c9c9c9 !important;}
-/*# sourceMappingURL=style.css.map */
\ No newline at end of file
+/*# sourceMappingURL=style.css.map */
\ No newline at end of file
diff --git a/src/main/resources/mapper/mysql/channelMgt/channelMgt-mapper.xml b/src/main/resources/mapper/mysql/channelMgt/channelMgt-mapper.xml
index e2e9df2..8739657 100644
--- a/src/main/resources/mapper/mysql/channelMgt/channelMgt-mapper.xml
+++ b/src/main/resources/mapper/mysql/channelMgt/channelMgt-mapper.xml
@@ -54,6 +54,7 @@
inner join hubez_common.EZ_CUST_INFO eci
on eci.CUST_SEQ = esi.CUST_SEQ
+ ORDER BY eat.CHG_DT DESC
LIMIT #{page}, #{pagePerRows}) A,
( SELECT @ROWNUM := #{page} ) AS R
diff --git a/src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml b/src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml
index 30141e7..b4cfae0 100644
--- a/src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml
+++ b/src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml
@@ -47,6 +47,7 @@
on eci.CUST_SEQ = esu.CUST_SEQ
where esu.USER_TP_CD ='01'
+ ORDER BY ekc.REG_DT DESC
LIMIT #{page}, #{pagePerRows}) A,
( SELECT @ROWNUM := #{page} ) AS R
diff --git a/src/main/resources/mapper/mysql/servMgt/servMgt-mapper.xml b/src/main/resources/mapper/mysql/servMgt/servMgt-mapper.xml
index d971466..77d922d 100644
--- a/src/main/resources/mapper/mysql/servMgt/servMgt-mapper.xml
+++ b/src/main/resources/mapper/mysql/servMgt/servMgt-mapper.xml
@@ -27,8 +27,8 @@ SELECT
, eci.BIZRNO as bRegNo
, esu.USER_ID
, esu.AUTHCD_080
- , case when esi.SUBS_STTUS_CD = '99' then 'N'
- else 'Y'
+ , case when esi.SUBS_STTUS_CD = '99' then '폐기'
+ else '사용'
end as useYN
, DATE_FORMAT(esi.OPN_DT, '%Y-%m-%d') as regDt
, case when esi.SUBS_STTUS_CD = '99' then DATE_FORMAT(esi.CHG_DT, '%Y-%m-%d')
@@ -45,6 +45,7 @@ SELECT
+ ORDER BY esi.OPN_DT DESC
LIMIT #{page}, #{pagePerRows}) A,
( SELECT @ROWNUM := #{page} ) AS R