DBNT
/
geoinfo_eGov_work
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 로그인 팝업 x버튼 위치 변경 및 배경 선택시 팝업이 안 닫히도록 수정

main
thkim 2024-06-20 18:00:53 +09:00
parent fdf1e41eca
commit 5b80b63ff2
7 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/geoinfo/com/WebConfirm.java
View File

@ -28,7 +28,8 @@ public class WebConfirm
String pw = "geoinfo"; String pw = "geoinfo";
//String url = "jdbc:oracle:thin:@192.168.0.71:1521:orcl"; //String url = "jdbc:oracle:thin:@192.168.0.71:1521:orcl";
/*String url = "jdbc:oracle:thin:@192.168.0.29:1521:xe";이전*/ /*String url = "jdbc:oracle:thin:@192.168.0.29:1521:xe";이전*/
String url = "jdbc:oracle:thin:@192.168.0.8:3452:orcl"; //String url = "jdbc:oracle:thin:@192.168.0.8:3452:orcl"; // 실서버
String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV";
/* /*
* public WebConfirm() { this.connection = null; this.connectionPool = null; * public WebConfirm() { this.connection = null; this.connectionPool = null;
* this.query = null; this.resultSet = null; this.sql = ""; this.resultCnt = 0; * this.query = null; this.resultSet = null; this.sql = ""; this.resultCnt = 0;
@ -104,7 +105,7 @@ public class WebConfirm
(query = new DatabaseQuery(sql)).setParam("PROJECT_CODE", PROJECT_CODE); (query = new DatabaseQuery(sql)).setParam("PROJECT_CODE", PROJECT_CODE);
resultSet = query.execute(connection); resultSet = query.execute(connection);
while (resultSet.next()) { while (resultSet.next()) {
Map map = wUtil.setCoordinateChgXY(resultSet.getDouble("X"), resultSet.getDouble("Y"), "4326", "5186"); Map<?, ?> map = wUtil.setCoordinateChgXY(resultSet.getDouble("X"), resultSet.getDouble("Y"), "4326", "5186");
sql = "INSERT INTO TBL_HEADER ( "; sql = "INSERT INTO TBL_HEADER ( ";
sql += " \n PROJECT_CODE, "; sql += " \n PROJECT_CODE, ";
sql += " \n HOLE_CODE, "; sql += " \n HOLE_CODE, ";

13
src/main/webapp/WEB-INF/views/home/include/header.jsp
View File

@ -114,7 +114,7 @@
============================================================== --> ============================================================== -->
<!-- 공통 script --> <!-- 공통 script -->
<script type="text/javascript" <script type="text/javascript"
src="${pageContext.request.contextPath}/com/js/common.js"></script> src="${pageContext.request.contextPath}/com/js/common.js?v=20240610_1352"></script>
<!-- 스타일 css --> <!-- 스타일 css -->
<link rel="stylesheet" <link rel="stylesheet"
@ -122,7 +122,7 @@
<!-- 전체 조합 css --> <!-- 전체 조합 css -->
<link rel="stylesheet" <link rel="stylesheet"
href="${pageContext.request.contextPath}/com/css/common.v2.0.css?v=20240610_1348" /> href="${pageContext.request.contextPath}/com/css/common.v2.0.css?v=20240610_1352" />
<!-- ============================================================== <!-- ==============================================================
IE9 HTML5 일부지원 IE9 HTML5 일부지원
@ -196,10 +196,11 @@
</script> </script>
<!-- 로그인 시작 --> <!-- 로그인 시작 -->
<div id="login" class="login-popup mfp-hide"> <div id="login" class="login-popup mfp-hide">
<button id="mfp-close" class="mfp-close">X</button>
<form name="login" method="post"> <form name="login" method="post">
<input type="hidden" name="login_param" value=""> <input type="hidden" name="login_param" value="">
<h1 class="contents-title">로그인</h1> <h1 class="contents-title"><span id="sign-in-prefix" ></span>로그인</h1>
<div class="t-center"> <div class="t-center">
<div class="account-type-wrapper" id="account-type-wrapper"> <div class="account-type-wrapper" id="account-type-wrapper">
<p>회원 유형을 선택해주세요.</p> <p>회원 유형을 선택해주세요.</p>
@ -277,6 +278,9 @@
var clsButton1 = document.getElementById("cls-button-1"); var clsButton1 = document.getElementById("cls-button-1");
var clsButton2 = document.getElementById("cls-button-2"); var clsButton2 = document.getElementById("cls-button-2");
var signInPrefix = document.getElementById("sign-in-prefix");
// 각 라디오 버튼 요소 가져오기 // 각 라디오 버튼 요소 가져오기
var radioInputs = document.getElementsByName("cls"); var radioInputs = document.getElementsByName("cls");
@ -287,10 +291,13 @@
// 클릭된 버튼에 따라 해당 라디오 버튼 선택 // 클릭된 버튼에 따라 해당 라디오 버튼 선택
if (clickedButtonId === "cls-button-0") { if (clickedButtonId === "cls-button-0") {
radioInputs[0].checked = true; radioInputs[0].checked = true;
signInPrefix.innerHTML = '개인 사용자 ';
} else if (clickedButtonId === "cls-button-1") { } else if (clickedButtonId === "cls-button-1") {
radioInputs[1].checked = true; radioInputs[1].checked = true;
signInPrefix.innerHTML = '기업 사용자 ';
} else if (clickedButtonId === "cls-button-2") { } else if (clickedButtonId === "cls-button-2") {
radioInputs[2].checked = true; radioInputs[2].checked = true;
signInPrefix.innerHTML = '발주기관 사용자 ';
} else { } else {
var loginRadioEle = document var loginRadioEle = document
.getElementById("login-radio"); .getElementById("login-radio");

42
src/main/webapp/body/jiban_info/js/SearchSitu.js
View File

@ -1,58 +1,58 @@
function output(choice,data_count,dataSyear,dataEyear,dataName) { function output(choice,data_count,dataSyear,dataEyear,dataName) {
if (choice == "1") if (choice == "1")
{ {
choice = "시추공갯수"; choice = "시추공갯수";
} }
else else
{ {
choice = "사업수"; choice = "사업수";
} }
if(dataName == 0){ if(dataName == 0){
dataName = "강원도"; dataName = "강원도";
}else if(dataName == 1){ }else if(dataName == 1){
dataName = "경기도"; dataName = "경기도";
}else if(dataName == 2){ }else if(dataName == 2){
dataName = "경상남도"; dataName = "경상남도";
}else if(dataName == 3){ }else if(dataName == 3){
dataName = "경상북도"; dataName = "경상북도";
}else if(dataName == 4){ }else if(dataName == 4){
dataName = "광주광역시"; dataName = "광주광역시";
}else if(dataName == 5){ }else if(dataName == 5){
dataName = "대구광역시"; dataName = "대구광역시";
}else if(dataName == 6){ }else if(dataName == 6){
dataName = "대전광역시"; dataName = "대전광역시";
}else if(dataName == 7){ }else if(dataName == 7){
dataName = "부산광역시"; dataName = "부산광역시";
}else if(dataName == 8){ }else if(dataName == 8){
dataName = "서울특별시"; dataName = "서울특별시";
}else if(dataName == 9){ }else if(dataName == 9){
dataName = "울산광역시"; dataName = "울산광역시";
}else if(dataName == 10){ }else if(dataName == 10){
dataName = "인천광역시"; dataName = "인천광역시";
}else if(dataName == 11){ }else if(dataName == 11){
dataName = "전라남도"; dataName = "전라남도";
}else if(dataName == 12){ }else if(dataName == 12){
dataName = "전라북도"; dataName = "전라북도";
}else if(dataName == 13){ }else if(dataName == 13){
dataName = "제주도"; dataName = "제주도";
}else if(dataName == 14){ }else if(dataName == 14){
dataName = "충청남도"; dataName = "충청남도";
}else if(dataName == 15){ }else if(dataName == 15){
dataName = "충청북도"; dataName = "충청북도";
} }
if(data_count == 0) { if(data_count == 0) {
alert('데이타가 없습니다'); alert('데이타가 없습니다');
return; return;
} }
else else
{ {
if(dataSyear == "0000" || dataEyear == "0000") if(dataSyear == "0000" || dataEyear == "0000")
{ {
alert(dataName + '의 총' + choice + '는 ' + data_count + '입니다.'); alert(dataName + '의 총' + choice + '는 ' + data_count + '입니다.');
} }
else else
{ {
alert(dataSyear + '년과 ' + dataEyear + '년 사이 ' + dataName + '의 총' + choice + '는 ' + data_count + '입니다.'); alert(dataSyear + '년과 ' + dataEyear + '년 사이 ' + dataName + '의 총' + choice + '는 ' + data_count + '입니다.');
} }
} }
} }

3
src/main/webapp/com/css/common.v2.0.css
View File

@ -1071,7 +1071,7 @@ header.sticky .global-link-wrapper {
button.mfp-close, button.mfp-close,
.mfp-close, .mfp-close,
.mfp-close:active { .mfp-close:active {
position: fixed !important; position: absolute;
right: 0px; right: 0px;
top: 0px; top: 0px;
width: 60px; width: 60px;
@ -3105,6 +3105,7 @@ ul.faq-q > li textarea {
vertical-align: middle; vertical-align: middle;
} }
.login-popup-wrapper .mfp-content .login-popup { .login-popup-wrapper .mfp-content .login-popup {
position: relative;
width: 610px; width: 610px;
height: 347px; height: 347px;
margin: 0px auto; margin: 0px auto;

2
src/main/webapp/com/css/common.v2.0.css.map
View File

File diff suppressed because one or more lines are too long

3
src/main/webapp/com/css/sass/common.v2.0.scss
View File

@ -988,7 +988,7 @@ header.sticky .global-link-wrapper {
button.mfp-close, button.mfp-close,
.mfp-close, .mfp-close,
.mfp-close:active { .mfp-close:active {
position: fixed !important; position: absolute;
right: 0px; right: 0px;
top: 0px; top: 0px;
width: 60px; width: 60px;
@ -2695,6 +2695,7 @@ ul.faq-q > li textarea {
vertical-align: middle; vertical-align: middle;
} }
.login-popup { .login-popup {
position: relative;
width: 610px; width: 610px;
height: 347px; height: 347px;
margin: 0px auto; margin: 0px auto;

8
src/main/webapp/com/js/common.js
View File

@ -309,17 +309,19 @@ $(document).ready(function () {
$('.login-btn').magnificPopup({ $('.login-btn').magnificPopup({
mainClass: 'mfp-fade', mainClass: 'mfp-fade',
closeOnBgClick: true, closeOnBgClick: false,
preloader: false, preloader: false,
fixedContentPos: false, fixedContentPos: false,
closeBtnInside: false, closeBtnInside: true,
showCloseBtn: true,
callbacks: { callbacks: {
open: function () { open: function () {
var accountTypeWrapperEle = document.getElementById("account-type-wrapper"); var accountTypeWrapperEle = document.getElementById("account-type-wrapper");
accountTypeWrapperEle.style.display="block"; accountTypeWrapperEle.style.display="block";
var signinWrapperEle = document.getElementById("signin-wrapper"); var signinWrapperEle = document.getElementById("signin-wrapper");
signinWrapperEle.style.display="none"; signinWrapperEle.style.display="none";
var signInPrefix = document.getElementById("sign-in-prefix");
signInPrefix.innerHTML = '';
$('#login').parent().addClass('login-popup-content'); $('#login').parent().addClass('login-popup-content');
if (!isMobile) { if (!isMobile) {