Pārlūkot izejas kodu

수정사항 반영중

huiwonseo 4 gadi atpakaļ
vecāks
revīzija
eebddb654f

+ 0 - 2
src/main/java/com/lemon/lifecenter/controller/CenterController.java

@@ -272,10 +272,8 @@ public class CenterController extends LifeCenterController {
         StaffDTO dto = new StaffDTO();
         dto.setId(id);
         if (type.equals("staff")) {
-//            pw = LifeCenterFunction.aesEncrypt(config.aesKey, config.IV, config.staffResetPw);
             pw = LifeCenterFunction.sha256Encrypt(config.staffResetPw);
         } else {
-//            pw = LifeCenterFunction.aesEncrypt(config.aesKey, config.IV, config.centerResetPw);
             pw = LifeCenterFunction.sha256Encrypt(config.centerResetPw);
         }
         dto.setPassword(pw);

+ 0 - 2
src/main/java/com/lemon/lifecenter/controller/StaffController.java

@@ -320,10 +320,8 @@ public class StaffController extends LifeCenterController {
         StaffDTO dto = new StaffDTO();
         dto.setId(id);
         if (type.equals("staff")) {
-//            pw = LifeCenterFunction.aesEncrypt(config.aesKey, config.IV, config.staffResetPw);
             pw = LifeCenterFunction.sha256Encrypt(config.staffResetPw);
         } else {
-//            pw = LifeCenterFunction.aesEncrypt(config.aesKey, config.IV, config.centerResetPw);
             pw = LifeCenterFunction.sha256Encrypt(config.centerResetPw);
         }
         dto.setPassword(pw);

+ 1 - 1
src/main/webapp/WEB-INF/jsp/center/info.jsp

@@ -37,7 +37,7 @@ function pwReset() {
             <main class="content">
                 <form id="hiddenForm">
                     <input type="hidden" id="staffId" name="staffId" value="<c:out value="${centerInfo.staffId}" />">
-                    <input type="hidden" id="type" name="type" value="center">
+                    <input type="hidden" id="type" name="type" value="staff">
                 </form>
                 <div class="container-fluid p-0">
                     <!-- 환자관리 : 신규환자 등록 START -->

+ 1 - 1
src/main/webapp/WEB-INF/jsp/mobile/health/health1.jsp

@@ -28,7 +28,7 @@ $( function(){
         },
         onkeyup: function( element, event ) {
 //             $( "div.error-msg" ).text( "" );
-            $( element ).valid();
+//             $( element ).valid();
         },
         onfocusout: function (element) {
 //             $( "div.error-msg" ).text( "" );

+ 1 - 1
src/main/webapp/WEB-INF/jsp/mobile/health/health2.jsp

@@ -49,7 +49,7 @@ $( function(){
         },
         onkeyup: function( element, event ) {
 //             $( "div.error-msg" ).text( "" );
-            $( element ).valid();
+//             $( element ).valid();
         },
         onfocusout: function (element) {
 //             $( "div.error-msg" ).text( "" );

+ 1 - 1
src/main/webapp/WEB-INF/jsp/mobile/health/health3.jsp

@@ -23,7 +23,7 @@ $( function(){
         },
         onkeyup: function( element, event ) {
 //             $( "div.error-msg" ).text( "" );
-            $( element ).valid();
+//             $( element ).valid();
         },
         onfocusout: function (element) {
 //             $( "div.error-msg" ).text( "" );

+ 1 - 1
src/main/webapp/WEB-INF/jsp/mobile/health/health4.jsp

@@ -23,7 +23,7 @@ $( function(){
         },
         onkeyup: function( element, event ) {
 //             $( "div.error-msg" ).text( "" );
-            $( element ).valid();
+//             $( element ).valid();
         },
         onfocusout: function (element) {
 //             $( "div.error-msg" ).text( "" );

+ 8 - 0
src/main/webapp/WEB-INF/jsp/mobile/menu/menu.jsp

@@ -175,6 +175,14 @@ function searchingDevice() {
                         </a>
                     </li>
                     <li>
+                        <a href="./push/list" title="메세지 수신함 (Message received)">
+                            <div class="image" aria-hidden="true">
+<!--                                 <div class="new_icon">NEW</div> -->
+                                <img src="/resources/images/mobile/quick_6.png" alt="메세지 수신함 (Message received)" style="padding:12px;" />
+                            </div>
+                         <div class="text" aria-hidden="true">메세지 수신함</div>
+                         <div class="menu-eng" aria-hidden="true">(Message received)</div>
+                        </a>
                     </li>
                 </ul>
             </div>

+ 3 - 3
src/main/webapp/resources/css/mobile/style.css

@@ -113,15 +113,15 @@ caption {text-align:left;}
 #main .header .menu_bar a { display: block; background-image: url('../../images/mobile/menu_bar.png'); background-position: center; background-size: 28px 17px; width: 28px; height: 17px; text-indent: -9999px; }
 #main .header .alram { position: absolute; right: 20px; top: 20px; }
 #main .header .alram a { display: block; background-image: url('../../images/mobile/alram_icon.png'); background-position: center; background-size: 17px 20px; width: 17px; height: 20px; text-indent: -9999px; }
-#main .banner { background-image: url('../../images/mobile/main_bg.png'); background-position: top center; background-size: cover; padding: 100px 30px 30px 30px; }
+#main .banner { background-image: url('../../images/mobile/main_bg.png'); background-position: top center; background-size: cover; padding: 60px 30px 30px 30px; }
 #main .banner .name { font-size: 18px; color:#FFFFFF; font-weight: 700; margin-bottom: 50px; }
 #main .banner .caption { color: #FFFFFF; }
 #main .banner .caption .title { font-size: 16px; font-weight: 500; margin-bottom: 10px; }
 #main .banner .caption .info { font-size: 26px; font-weight: 700; line-height: 32px; }
 #main .banner .caption .title {}
-#main .quick_menu { margin: 5%; }
+#main .quick_menu { margin: 2%; }
 #main .quick_menu ul { font-size: 0px; text-align: center; }
-#main .quick_menu li { display: inline-block; width: 42%; margin: 5% 2%; }
+#main .quick_menu li { display: inline-block; width: 42%; margin: 2% 2%; }
 #main .quick_menu li a { display: block; font-size: 16px; font-weight: 500; }
 #main .quick_menu li a div.menu-eng { font-size: 12px; }
 #main .quick_menu li .image { position: relative; margin-bottom: 15px; }

BIN
src/main/webapp/resources/images/mobile/quick_6.png