diff --git a/WebContent/WEB-INF/lib/javax.activation-api-1.2.0.jar b/WebContent/WEB-INF/lib/javax.activation-api-1.2.0.jar new file mode 100644 index 0000000..986c365 Binary files /dev/null and b/WebContent/WEB-INF/lib/javax.activation-api-1.2.0.jar differ diff --git a/WebContent/WEB-INF/lib/javax.servlet-api-4.0.1.jar b/WebContent/WEB-INF/lib/javax.servlet-api-4.0.1.jar new file mode 100644 index 0000000..844ec7f Binary files /dev/null and b/WebContent/WEB-INF/lib/javax.servlet-api-4.0.1.jar differ diff --git a/WebContent/WEB-INF/view/login.jsp b/WebContent/WEB-INF/view/login.jsp index 6099252..c1f1cc8 100644 --- a/WebContent/WEB-INF/view/login.jsp +++ b/WebContent/WEB-INF/view/login.jsp @@ -1,72 +1,86 @@ -<%@page import="com.pms.common.utils.*"%> -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ page import="java.util.*, com.pms.common.utils.CommonUtils" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@page import="com.pms.common.utils.*"%> <%@ page language="java" +contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page +import="java.util.*, com.pms.common.utils.CommonUtils" %> <%@ taglib prefix="c" +uri="http://java.sun.com/jsp/jstl/core" %> - - + + <%=Constants.SYSTEM_NAME %> - + - + - - -
-
+ + +
+ - - \ No newline at end of file + +
+ + diff --git a/WebContent/css/basic.css b/WebContent/css/basic.css index b8125bb..a2ce04f 100644 --- a/WebContent/css/basic.css +++ b/WebContent/css/basic.css @@ -319,7 +319,7 @@ header h1 {display:flex; align-items:center; height: 100%} .loginLogo_new {display: block; width: 246px; height: 100px; background: url(/images/loginLogo_kumho.png) left bottom no-repeat;background-size:contain; margin-bottom:10px;margin-left:-80px;} .slogun_box_new {position: relative; margin:144px 0px 0px 330px; width:50%; height:640px; background:#E7E9F0; border-radius: 25px 0px 0px 25px; z-index:1;} .slogun_box_new2 {display: block; width:78%; height:90%; background: url(/images/Intops-loginpage_last1.png) left bottom no-repeat; background-size:contain; margin-left:7%;padding-top:0;} -header h1 .mainLogo_new {display:block; margin-left:8px; width:180px; height:40px; background: url(/images/logo.png) center center no-repeat; +header h1 .mainLogo_new {display:block; margin-left:8px; width:223px; height:40px; background: url(/images/logo.png) center center no-repeat; background-size: contain; margin-top:0px; } /*로그인 페이지 (intops) @@ -2755,32 +2755,41 @@ a,a:visited,a:hover,a:active { /* 우성SE */ /* basic.css 에 아래 코드 추가 */ -#loginBack_woosungse { background: url(/images/loginPage_woosungse.png) no-repeat bottom; width:100%; height:100%; background-size: cover; position:absolute; top:0;} -#loginBack_woosungse > form#loginForm {height:100%;} -#loginBack_woosungse .login_layout {display:flex; height:100%;} -#loginBack_woosungse .logo_slogan_box {display:flex; padding:150px 120px; flex:4; background-color:rgba(255,255,255,0);} -#loginBack_woosungse #loginWrap { +#loginBack_ilshin { background: url(/images/loginPage_ilshin.jpg) no-repeat bottom; width:100%; height:100%; background-size: cover; position:absolute; top:0;} +#loginBack_ilshin > form#loginForm {height:100%;} +#loginBack_ilshin .login_layout {display:flex; height:100%;} +#loginBack_ilshin .logo_slogan_box {display:flex; padding:150px 120px; flex:4; background-color:rgba(255,255,255,0);} +#loginBack_ilshin #loginWrap { display:flex; justify-content:center; align-items:center; flex: 2; - min-width:400px; + max-width:400px; background: rgb(255 255 255); box-shadow: 0 8px 32px 0 rgba(37, 37, 42, 0.37); backdrop-filter: blur( 8px ); -webkit-backdrop-filter: blur( 8px ); border-left: 1px solid rgba( 255, 255, 255, 0.1 ); } -#loginBack_woosungse #login_box {padding:0px 100px 100px 100px; display: flex; flex-direction: column; align-items: center; - width: unset; top: unset; right: unset; position: unset; margin-top: 460px;} -#loginBack_woosungse #login_box input[type="button"] { border-radius: 5px; border: 1px solid #0B0D33; background: #0B0D33; width:100%; display: block; color:#fff; font-size:11px; font-weight:normal; margin-top:15px; text-transform:uppercase;} -#loginBack_woosungse input {height: 34px !important; font-size:14px !important; width: 100%} -.loginLogo_woosungse {display: block; width: 200px; height: 100px; background: url(/images/loginLogo_woosungse.png) center center no-repeat;background-size:contain; margin-bottom:50px;} -.slogun_box_woosungse {background: url(/images/slogan_woosungse.png) no-repeat; background-size: contain; width: 380px;} -header h1 .mainLogo_woosungse {display:block; margin-left:18px; width:197px; height:33px; background: url(/images/mainLogo_woosungse.png) left center no-repeat; background-size: contain; margin-top:16px; } +#loginBack_ilshin #login_box { + padding: 0px 42px 100px 42px; + display: flex; + flex-direction: column; + align-items: center; + width: unset; + top: unset; + right: unset; + position: unset; + margin-top: 460px; + } +#loginBack_ilshin #login_box input[type="button"] { border-radius: 5px; border: 1px solid #0B0D33; background: #0B0D33; width:100%; display: block; color:#fff; font-size:11px; font-weight:normal; margin-top:15px; text-transform:uppercase;} +#loginBack_ilshin input {height: 34px !important; font-size:14px !important; width: 100%} +.loginLogo_ilshin {display: block;width: 312px;height: 118px;background: url(/images/loginLogo_ilshin.png) center center no-repeat;background-size: 302px;margin-bottom: 50px;position: relative;top: 9px;} +.slogun_box_ilshin { background-size: contain; width: 380px;} +header h1 .mainLogo_ilshin {display:block; margin-left:18px; width:197px; height:33px; background: url(/images/mainLogo_ilshin.png) left center no-repeat; background-size: contain; margin-top:16px; } @media screen and (max-width: 1200px) { - #loginBack_woosungse .logo_slogan_box { display:none; } - #loginBack_woosungse #loginWrap { + #loginBack_ilshin .logo_slogan_box { display:none; } + #loginBack_ilshin #loginWrap { padding: 100px; box-shadow: initial; justify-content: center; diff --git a/WebContent/images/loginLogo_ilshin.png b/WebContent/images/loginLogo_ilshin.png new file mode 100644 index 0000000..822267f Binary files /dev/null and b/WebContent/images/loginLogo_ilshin.png differ diff --git a/WebContent/images/loginPage_ilshin.jpg b/WebContent/images/loginPage_ilshin.jpg new file mode 100644 index 0000000..bc8faf5 Binary files /dev/null and b/WebContent/images/loginPage_ilshin.jpg differ diff --git a/WebContent/images/loginPage_ilshin.png b/WebContent/images/loginPage_ilshin.png new file mode 100644 index 0000000..d307c24 Binary files /dev/null and b/WebContent/images/loginPage_ilshin.png differ diff --git a/WebContent/images/logo.png b/WebContent/images/logo.png index e9d14f5..ad9992d 100644 Binary files a/WebContent/images/logo.png and b/WebContent/images/logo.png differ diff --git a/WebContent/js/common.js b/WebContent/js/common.js index f2ea24b..52d2fa6 100644 --- a/WebContent/js/common.js +++ b/WebContent/js/common.js @@ -1077,7 +1077,8 @@ function fnc_getCodeListAppend(codeId,selectboxId,selectedVal){ for (var i = 0; i < resultList.length; i++) { var commonCodeId = resultList[i].CODE_ID; var commonCodeName = resultList[i].CODE_NAME; - $("#"+selectboxId).append(""); + var commonRemark = resultList[i].REMARK; + $("#"+selectboxId).append(""); } $("#"+selectboxId).val(selectedVal); } diff --git a/WebContent/manual/ILSHIN_USER_MANUAL.pptx b/WebContent/manual/ILSHIN_USER_MANUAL.pptx new file mode 100644 index 0000000..791dab8 Binary files /dev/null and b/WebContent/manual/ILSHIN_USER_MANUAL.pptx differ diff --git a/WebContent/template/BOM_REPORT_EXCEL_IMPORT_TEMPLATE.xlsx b/WebContent/template/BOM_REPORT_EXCEL_IMPORT_TEMPLATE.xlsx index e763b48..5289f5f 100644 Binary files a/WebContent/template/BOM_REPORT_EXCEL_IMPORT_TEMPLATE.xlsx and b/WebContent/template/BOM_REPORT_EXCEL_IMPORT_TEMPLATE.xlsx differ diff --git a/WebContent/template/PART_EXCEL_IMPORT_TEMPLATE.xlsx b/WebContent/template/PART_EXCEL_IMPORT_TEMPLATE.xlsx index fcee375..d24326c 100644 Binary files a/WebContent/template/PART_EXCEL_IMPORT_TEMPLATE.xlsx and b/WebContent/template/PART_EXCEL_IMPORT_TEMPLATE.xlsx differ diff --git a/run-windows.bat b/run-windows.bat index c36ce8f..8ee3b3f 100644 --- a/run-windows.bat +++ b/run-windows.bat @@ -19,7 +19,7 @@ docker-compose -f docker-compose.win.yml up --build --force-recreate -d if %errorlevel% equ 0 ( echo. echo PLM started successfully! - echo Web: http://localhost:7777 + echo Web: http://localhost:8989 echo. @REM set /p "run_git=Would you like to run git operations? (Y/N) [N]: " @@ -31,7 +31,7 @@ if %errorlevel% equ 0 ( @REM ) timeout /t 5 /nobreak >nul - start http://localhost:7777 + start http://localhost:8989 ) else ( echo. echo PLM start failed!