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

Merge branch 'master' of http://192.168.0.157:3000/DBNT/GGWEB 

# Conflicts:
#	src/main/webapp/css/style.css
master
강석 최 2022-03-11 16:56:20 +09:00
parent bd461f29f2 06554b23a3
commit 74263cf57d
5 changed files with 560 additions and 451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/mca/cmmn/web/CommonController.java
View File

@ -110,7 +110,7 @@ public class CommonController {
*/ */
@RequestMapping(value="/userIdCheck") @RequestMapping(value="/userIdCheck")
@ResponseBody @ResponseBody
public String checkId(@RequestParam("checkId")String checkId) throws Exception { public String userIdCheck(@RequestParam("checkId")String checkId) throws Exception {
try { try {
int cnt = userService.selectUserIdCheck(checkId); int cnt = userService.selectUserIdCheck(checkId);
if(cnt > 0) { if(cnt > 0) {
@ -177,24 +177,19 @@ public class CommonController {
} }
// 아이디 찾기 페이지 이동 // 아이디 찾기 페이지 이동
@RequestMapping(value = "findId") @RequestMapping(value = "findId")
public String findIdView(){ public String findIdView(){ return "anonymous/html/findId"; }
return "anonymous/html/findId";
}
// 아이디 찾기 실행 // 아이디 찾기 실행
@RequestMapping(value = "findId", method = RequestMethod.POST) @RequestMapping(value = "searchUserInfo")
public String findIdAction(UserVO userVO, Model model) { @ResponseBody
UserVO user = userService.findId(userVO); public String searchUserInfo(UserVO userVO) {
userVO = userService.findId(userVO);
if (user == null) { if (userVO == null ) {
model.addAttribute("check", 1); return "userNull";
} else {
model.addAttribute("check", 2);
model.addAttribute("id", user.getUserid());
} }
return "anonymous/html/findId"; return userVO.getUserid();
} }
//pw찾기 페이지 이동 //pw찾기 페이지 이동

7
src/main/resources/egovframework/sqlmap/mappers/user/user.xml
View File

@ -140,9 +140,12 @@
WHERE userid = #{userid} WHERE userid = #{userid}
</update> </update>
<!--아이디 비밀번호찾기--> <!--아이디 비밀번호 찾기-->
<select id="findId" resultType="userVO"> <select id="findId" resultType="userVO">
select * from t_user where name=#{name} and phonenum=#{phonenum} select userid
from t_user
where
name=#{name} and company=#{company} and email=#{email}
</select> </select>
<select id="findPwd" resultType="userVO"> <select id="findPwd" resultType="userVO">

2
src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
View File

@ -42,7 +42,6 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table class="detail_table"> <table class="detail_table">
<tbody> <tbody>
<tr> <tr>
@ -140,6 +139,7 @@
</tbody> </tbody>
</table> </table>
</div>
<c:choose> <c:choose>
<c:when test="${useRequestVO.status eq '99'}"> <c:when test="${useRequestVO.status eq '99'}">
<table class="detail_table" style="margin-right: 1em"> <table class="detail_table" style="margin-right: 1em">

80
src/main/webapp/WEB-INF/jsp/anonymous/findId.jsp
View File

@ -3,3 +3,83 @@
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<script type="text/javascript">
$(document).on('click', '#checkId', function (){
checkId();
})
function checkId(){
if(inputCheck()){
$.ajax({
url: "/searchUserInfo",
type: "GET",
data: {
name: $("#username").val(),
company: $("#company").val(),
email: $("#email").val()
},
success: function (result) {
checkIdAfter(result)
},
error: function (request, status, error) {
alert("가입정보가 일치 하지 않습니다.\n 관리자에게 문의해주세요.");
}
});
}
}
function inputCheck(){
if(!$("#username").val()){
alert("이름을 입력해주세요.")
return false;
}
if(!$("#company").val()){
alert("회사명을 입력해주세요.")
return false;
}
if(!$("#email").val()){
alert("이메일을 입력해주세요.")
return false;
}
return true;
}
function checkIdAfter(result) {
if(result==="userNull"){
alert("입력된 가입 정보가 없습니다.")
}else{
alert("해당 정보로 가입된 ID는 "+result+" 입니다.")
}
}
</script>
<div class="row justify-content-end">
<div class="col-12 row m-1">
<label for="username" class="col-4 text-end">이름</label>
<div class="col-8">
<input type="text" class="form-control" id="username">
</div>
</div>
<div class="col-12 row m-1">
<label for="username" class="col-4 text-end">회사명</label>
<div class="col-8">
<input type="text" class="form-control" id="company">
</div>
</div>
<div class="col-12 row m-1">
<label for="username" class="col-4 text-end">email</label>
<div class="col-8">
<input type="email" class="form-control" id="email">
</div>
</div>
<div class="col-8">
<button type="button" id="checkId" class="btn btn-primary m-3">가입정보 확인</button>
</div>
</div>

351
src/main/webapp/css/style.css
View File

@ -10,6 +10,10 @@ a {
color: #000; color: #000;
} }
.bg-white {
border-radius: 10px;
}
.text-page { .text-page {
text-align: center; text-align: center;
padding-top: 10px; padding-top: 10px;
@ -18,8 +22,9 @@ a {
.text-center { .text-center {
text-align: center; text-align: center;
} }
.point-cursor{
cursor:pointer; .point-cursor {
cursor: pointer;
} }
.header { .header {
@ -65,18 +70,21 @@ a {
box-sizing: border-box; box-sizing: border-box;
} }
.header_info>a { .header_info > a {
color: #fff; color: #fff;
font-size: 17px; font-size: 17px;
} }
.htmlBody{
.htmlBody {
background-color: rgb(247, 247, 247); background-color: rgb(247, 247, 247);
} }
.section { .section {
margin-top: 70px; margin-top: 70px;
margin-left: 200px; margin-left: 200px;
} }
@media (max-width: 576px){
@media (max-width: 576px) {
.section { .section {
margin-left: 0; margin-left: 0;
} }
@ -84,24 +92,22 @@ a {
.loginWrap { .loginWrap {
width: 400px; width: 400px;
height: 100%;
margin: 0 auto; margin: 0 auto;
height: 100%;
position: absolute; position: absolute;
left: 50%; left: 50%;
transform: translate(-50%); transform: translate(-50%);
background-color: rgba(55, 55, 55, 1); /*background-color: rgba(55, 55, 55, 1);*/
border: 1px solid #ccc;
border-top: none;
border-bottom: none;
box-shadow: 5px 5px 20px grey;
} }
.login_title{
.login_title {
float: left; float: left;
font-size: 24px; font-size: 24px;
font-weight: bold; font-weight: bold;
padding-left: 20px; padding-left: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
.login_text { .login_text {
margin: 2% 5%; margin: 2% 5%;
text-align: center; text-align: center;
@ -109,7 +115,10 @@ a {
.loginBox { .loginBox {
overflow: hidden; overflow: hidden;
padding: 75% 0; background-color: rgba(55, 55, 55, 1);
margin-top: 60%;
padding: 30px;
border-radius: 20px;
} }
.login_text input { .login_text input {
@ -141,7 +150,7 @@ a {
.header_menu > ul { .header_menu > ul {
list-style: none; list-style: none;
padding:0; padding: 0;
} }
.header_menu > ul > li { .header_menu > ul > li {
@ -149,7 +158,7 @@ a {
cursor: pointer; cursor: pointer;
height: 60px; height: 60px;
line-height: 60px; line-height: 60px;
padding : 0px 5px; padding: 0px 5px;
box-sizing: border-box; box-sizing: border-box;
font-weight: bold; font-weight: bold;
} }
@ -175,19 +184,18 @@ a {
margin-top: 20px; margin-top: 20px;
} }
.section_btn2>p { .section_btn2 > p {
text-align: center; text-align: center;
} }
.fieldDataTable {
.fieldDataTable{ width: 100%;
width:100%;
box-sizing: border-box; box-sizing: border-box;
} }
.fieldDataTable>thead>tr:first-child>th { .fieldDataTable > thead > tr:first-child > th {
border: 1px solid #ccc; border: 1px solid #ccc;
background-color: #ccc; background-color: #ccc;
padding: 10px 5px; padding: 10px 5px;
@ -195,46 +203,46 @@ a {
color: #fff; color: #fff;
} }
.fieldDataTable > tbody> tr > th{ .fieldDataTable > tbody > tr > th {
background-color: #f1f1f1; background-color: #f1f1f1;
border: 1px solid #ccc; border: 1px solid #ccc;
text-align: center; text-align: center;
} }
.fieldDataTable > tbody> tr > td{ .fieldDataTable > tbody > tr > td {
padding: 5px 5px; padding: 5px 5px;
border: 1px solid #ccc; border: 1px solid #ccc;
text-align: center; text-align: center;
width:170px; width: 170px;
word-break: break-all; word-break: break-all;
} }
.fieldDataTable > tbody> tr:last-child > th{ .fieldDataTable > tbody > tr:last-child > th {
border-bottom: 0px; border-bottom: 0px;
} }
.fieldDataTable > tbody> tr:last-child > td{ .fieldDataTable > tbody > tr:last-child > td {
border-bottom: 0px; border-bottom: 0px;
} }
.fieldDataPaging{ .fieldDataPaging {
padding:0; padding: 0;
padding-top: 20px; padding-top: 20px;
text-align: center; text-align: center;
} }
.fieldDataPaging > li{
.fieldDataPaging > li {
display: inline-block; display: inline-block;
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 2px 7px; padding: 2px 7px;
cursor: pointer; cursor: pointer;
} }
.fieldPagingOn{ .fieldPagingOn {
font-weight: bold; font-weight: bold;
} }
.setting_wrap { .setting_wrap {
margin-top: 50px; margin-top: 50px;
padding-bottom: 20px; padding-bottom: 20px;
@ -270,7 +278,7 @@ a {
margin-top: 20px; margin-top: 20px;
} }
#paging>a { #paging > a {
text-decoration: none; text-decoration: none;
color: #000; color: #000;
} }
@ -287,7 +295,7 @@ a {
text-align: center; text-align: center;
} }
#fieldPaging>li { #fieldPaging > li {
width: 25px; width: 25px;
height: 25px; height: 25px;
line-height: 25px; line-height: 25px;
@ -297,7 +305,7 @@ a {
cursor: pointer; cursor: pointer;
} }
#fieldPaging>li:hover { #fieldPaging > li:hover {
background-color: #ccc; background-color: #ccc;
} }
@ -308,38 +316,38 @@ a {
.field_table { .field_table {
border: 1px solid #ccc; border: 1px solid #ccc;
} }
.field_table { .field_table {
width: 100%; width: 100%;
} }
.field_table>tbody>tr>th { .field_table > tbody > tr > th {
width: 70px; width: 70px;
padding: 20px 5px; padding: 20px 5px;
} }
.field_table>tbody>tr>td { .field_table > tbody > tr > td {
width: 350px; width: 350px;
padding: 20px 5px; padding: 20px 5px;
} }
.field_table>tbody>tr>td>input { .field_table > tbody > tr > td > input {
height: 27px; height: 27px;
line-height: 27px; line-height: 27px;
} }
.field_table>tbody>tr>td>select {
.field_table > tbody > tr > td > select {
width: 100%; width: 100%;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
.label{ .label {
font-size:14px; font-size: 14px;
} }
.fieldBtn { .fieldBtn {
width: 140px; width: 140px;
padding: 5px 0px; padding: 5px 0px;
@ -364,48 +372,52 @@ a {
vertical-align: middle; vertical-align: middle;
} }
.join>img { .join > img {
vertical-align: middle; vertical-align: middle;
} }
/*회원가입 */ /*회원가입 */
.join_section{ .join_section {
margin-top: 90px; margin-top: 90px;
min-width: 1160px; min-width: 1160px;
min-height: 100px; min-height: 100px;
overflow: hidden; overflow: hidden;
} }
.join_top{
.join_top {
padding: 0 0 10px; padding: 0 0 10px;
line-height:30px; line-height: 30px;
margin: 0 auto 15px; margin: 0 auto 15px;
} }
.join_table{
.join_table {
border-collapse: collapse; border-collapse: collapse;
border-top: 2px solid #d9d9d9; border-top: 2px solid #d9d9d9;
margin: 0 auto; margin: 0 auto;
} }
.join_bottom{
.join_bottom {
padding: 0 0 10px; padding: 0 0 10px;
line-height:30px; line-height: 30px;
margin: 0 auto 15px; margin: 0 auto 15px;
} }
.join_top h2{ .join_top h2 {
margin-top: 40px; margin-top: 40px;
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 20px;
color: #222; color: #222;
} }
.join_top > h2 > img { .join_top > h2 > img {
vertical-align: middle; vertical-align: middle;
padding-right: 10px; padding-right: 10px;
} }
.join_table > tbody > tr > th{
.join_table > tbody > tr > th {
width: 20px; width: 20px;
height: 35px; height: 35px;
vertical-align: middle; vertical-align: middle;
@ -415,36 +427,38 @@ a {
padding: 16px 10px; padding: 16px 10px;
} }
.join_table td{ .join_table td {
padding: 14px 10px; padding: 14px 10px;
border-bottom: 1px solid #d9d9d9; border-bottom: 1px solid #d9d9d9;
width: 100px; width: 100px;
vertical-align: middle; vertical-align: middle;
} }
.txtinput{ .txtinput {
padding : 0 5px; padding: 0 5px;
height: 35px; height: 35px;
width:55%; width: 55%;
border : 1px solid #bbbbbb; border: 1px solid #bbbbbb;
vertical-align: middle; vertical-align: middle;
line-height: 35px; line-height: 35px;
} }
.txtinput.half{
.txtinput.half {
width: 26%; width: 26%;
} }
.div_join{ .div_join {
width:55%; width: 55%;
padding-top: 25px; padding-top: 25px;
text-align: center; text-align: center;
} }
.btn_join{ .btn_join {
font-size: 20px; font-size: 20px;
padding: 12px 60px; padding: 12px 60px;
} }
.btn_join.big.on{
.btn_join.big.on {
color: #FFF; color: #FFF;
background: #042f6c; background: #042f6c;
} }
@ -458,19 +472,21 @@ a {
line-height: 23px; line-height: 23px;
display: inline-block; display: inline-block;
} }
.join_bottom_p{
text-align:center; .join_bottom_p {
text-align: center;
} }
/* 공용 쓰기 */ /* 공용 쓰기 */
.div_write{ .div_write {
font-size: 20px; font-size: 20px;
padding: 12px 10px; padding: 12px 10px;
float:right; float: right;
} }
.btn_write{
.btn_write {
font-size: 15px; font-size: 15px;
padding: 6px 20px; padding: 6px 20px;
color: #042f6c; color: #042f6c;
@ -479,41 +495,41 @@ a {
line-height: 23px; line-height: 23px;
display: inline-block; display: inline-block;
} }
.btn_write.on { .btn_write.on {
color: #FFF; color: #FFF;
background: #042f6c; background: #042f6c;
} }
.field_data_content{ .field_data_content {
width:100%; width: 100%;
margin-top:30px; margin-top: 30px;
overflow: hidden; overflow: hidden;
} }
.map{ .map {
width: 100%; width: 100%;
height:450px; height: 450px;
float:left; float: left;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
.fieldDataPaging{ .fieldDataPaging {
list-style: none; list-style: none;
clear:both; clear: both;
} }
.fieldDataDiv{
float:left; .fieldDataDiv {
width:50%; float: left;
height:495px; width: 50%;
height: 495px;
margin-left: 2%; margin-left: 2%;
overflow-y: scroll; overflow-y: scroll;
border-bottom:1px solid #ccc; border-bottom: 1px solid #ccc;
} }
/* 지도권한관리 */ /* 지도권한관리 */
.tabmenu-box ul li { .tabmenu-box ul li {
float: left; float: left;
@ -521,6 +537,7 @@ a {
width: 162.5px; width: 162.5px;
font-size: 105%; font-size: 105%;
} }
.tabmenu-box ul li.on a { .tabmenu-box ul li.on a {
border: 1px solid #337ab7; border: 1px solid #337ab7;
color: #fff; color: #fff;
@ -536,40 +553,40 @@ a {
} }
.search_div {
width: 100%;
.search_div{
width:100%;
overflow: hidden; overflow: hidden;
} }
.search_menu{
width:50%; .search_menu {
float:left; width: 50%;
float: left;
} }
.search_keyword{
width:50%; .search_keyword {
float:left; width: 50%;
float: left;
text-align: right; text-align: right;
} }
.search_ul{
.search_ul {
padding: 0; padding: 0;
} }
.search_ul > li{
display:inline; .search_ul > li {
display: inline;
} }
.searchCondition{ .searchCondition {
width:100px; width: 100px;
height:40px; height: 40px;
} }
.addedArea{ .addedArea {
margin-top: 15px; margin-top: 15px;
} }
.addedAreaWrap{ .addedAreaWrap {
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 20px; border-radius: 20px;
padding: 5px 10px; padding: 5px 10px;
@ -577,36 +594,43 @@ a {
display: inline-block; display: inline-block;
} }
.search_selectbox{ .search_selectbox {
width:110px; width: 110px;
float:left; float: left;
} }
.search_inputbox{
width:330px; .search_inputbox {
margin-left:5px; width: 330px;
float:left; margin-left: 5px;
float: left;
} }
.td_center{
text-align: center; .td_center {
}
.td_title{
text-align:left;
width:50%;
}
.td_date{
text-align: center; text-align: center;
} }
.td_name{ .td_title {
text-align: left;
width: 50%;
}
.td_date {
text-align: center; text-align: center;
} }
.td_company{
.td_name {
text-align: center; text-align: center;
} }
.td_status{
.td_company {
text-align: center; text-align: center;
} }
.td_area{
.td_status {
text-align: center;
}
.td_area {
text-align: center; text-align: center;
} }
@ -616,85 +640,93 @@ a {
margin-top: 20px; margin-top: 20px;
} }
.list-table>thead>tr:first-child>th { .list-table > thead > tr:first-child > th {
border: 1px solid #ccc; border: 1px solid #ccc;
background-color: #337ab7; background-color: #337ab7;
padding: 10px 5px; padding: 10px 5px;
color: #fff; color: #fff;
} }
.list-table>thead>tr>th { .list-table > thead > tr > th {
border: 1px solid #ccc; border: 1px solid #ccc;
background-color: #f8f8f8; background-color: #f8f8f8;
padding: 10px 5px; padding: 10px 5px;
text-align: center; text-align: center;
} }
.list-table>tbody>tr>td { .list-table > tbody > tr > td {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
padding: 10px 5px; padding: 10px 5px;
text-align:center; text-align: center;
} }
.list-table>tbody>tr:hover { .list-table > tbody > tr:hover {
background-color: #eaeaea background-color: #eaeaea
} }
.detail_table{ .detail_table {
width:100%; width: 100%;
margin-top: 20px; margin-top: 20px;
margin-outside: 5px; margin-outside: 5px;
} }
.detail_table > tbody> tr >th { .detail_table > tbody > tr > th {
height:auto; height: auto;
width:100px; width: 100px;
border: 1px solid #ccc; border: 1px solid #ccc;
background-color: #f8f8f8; background-color: #f8f8f8;
padding: 10px 5px; padding: 10px 5px;
text-align: center; text-align: center;
}
.detail_table > tbody> tr >td {
border:1px solid #ccc;
padding:10px;
} }
.title-td{ .detail_table > tbody > tr > td {
width:50%; border: 1px solid #ccc;
padding: 10px;
} }
.input-datepicker{ .title-td {
width:120px; width: 50%;
display:inline; }
cursor:pointer !important;
.input-datepicker {
width: 120px;
display: inline;
cursor: pointer !important;
background-color: #fff !important; background-color: #fff !important;
text-align:center; text-align: center;
}
.input-area-select{
width:155px;
display:inline;
} }
.areaSelctBox{ .input-area-select {
width:150px; width: 155px;
display: inline;
} }
.layer-label{ .areaSelctBox {
width:140px; width: 150px;
}
.layer-label {
width: 140px;
display: inline-block; display: inline-block;
line-height: 50px; line-height: 50px;
margin-left: 20px; margin-left: 20px;
} }
.auth-label{
width:75px; .auth-label {
width: 75px;
} }
.mapWrap{
.mapWrap {
width: 48%; width: 48%;
float:left; float: left;
} }
.map-title{
.map-title {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
background-color: #ccc; background-color: #ccc;
padding: 10px 5px; padding: 10px 5px;
@ -707,19 +739,19 @@ a {
vertical-align: middle; vertical-align: middle;
font-size: 19px; font-size: 19px;
background-color: #337ab7; background-color: #337ab7;
color:#fff; color: #fff;
} }
.clickAbleObj:hover{ .clickAbleObj:hover {
cursor:pointer; cursor: pointer;
} }
input[type=checkbox]:disabled:checked { input[type=checkbox]:disabled:checked {
outline : solid 2px gray; outline: solid 2px gray;
} }
.col-form-label-warning{ .col-form-label-warning {
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
color: #ffc107; color: #ffc107;
} }
@ -748,7 +780,6 @@ input[type=checkbox]:disabled:checked {
border: 1px solid rgba(0, 0, 0, 0.125); border: 1px solid rgba(0, 0, 0, 0.125);
border-radius: 0.25rem; border-radius: 0.25rem;
margin: 0.375rem 0.75rem; margin: 0.375rem 0.75rem;
} }
.card-default { .card-default {