feat:시추정보 보유현황 경기평택항만공사 경기도 편입

main
thkim 2025-02-04 16:30:49 +09:00
parent 5667560c1c
commit f7bbe0d62f
9 changed files with 1949 additions and 1998 deletions

View File

@ -1,65 +1,4 @@
#src\main\resources\egovframework\egovProps\globals.properties #src\main\resources\egovframework\egovProps\globals.properties
src\main\webapp\com\css\common.v2.0.css src\main\webapp\com\css\common.v2.0.css
src\main\webapp\com\css\common.v2.0.css.map src\main\webapp\com\css\common.v2.0.css.map
src\main\java\geoinfo\main\login\LoginController.java src\main\webapp\WEB-INF\views\home\index.jsp
src\main\webapp\WEB-INF\views\drilling\common\includeTopMenu.jsp
src\main\webapp\js\home\index.js
src\main\webapp\WEB-INF\views\drilling\home\drilling_index.jsp
src\main\webapp\WEB-INF\views\drilling\common\includeTopMenu.jsp
src\main\webapp\WEB-INF\views\drilling\input\drilling_input.jsp
src\main\webapp\WEB-INF\views\drilling\inquiry\drilling_inquiry_project.jsp
src\main\webapp\WEB-INF\views\drilling\inquiry\drilling_inquiry.jsp
src\main\webapp\com\js\drilling\drilling-common.js
#src\main\webapp\com\img\drilling\banner_0308_02_1.jpg
#src\main\webapp\com\img\drilling\banner_0410_01_3.jpg
#src\main\webapp\com\img\drilling\banner_0818_01_1.jpg
#src\main\webapp\com\img\drilling\banner_180703_02_1.jpg
#src\main\webapp\com\img\drilling\banner_190226_02_3.jpg
#src\main\webapp\com\img\drilling\banner_190328_02_3.jpg
#src\main\webapp\com\img\drilling\banner_190328_04.jpg
#src\main\webapp\com\img\drilling\icons\bg_iconset.png
#src\main\webapp\com\img\drilling\icons\buttons\01.svg
#src\main\webapp\com\img\drilling\icons\buttons\02.svg
#src\main\webapp\com\img\drilling\icons\buttons\03.svg
#src\main\webapp\com\img\drilling\icons\buttons\04.svg
#src\main\webapp\com\img\drilling\icons\buttons\wrap_service_ic01.png
#src\main\webapp\com\img\drilling\icons\buttons\wrap_service_ic02.png
#src\main\webapp\com\img\drilling\icons\buttons\wrap_service_ic03.png
#src\main\webapp\com\img\drilling\icons\buttons\wrap_service_ic04.png
#src\main\webapp\com\img\drilling\info.jpg
#src\main\webapp\com\img\drilling\logos\01.png
#src\main\webapp\com\img\drilling\logos\02.png
#src\main\webapp\com\img\drilling\logos\03.png
#src\main\webapp\com\img\drilling\logos\04.png
#src\main\webapp\com\img\drilling\logos\05.png
src\main\webapp\com\img\drilling\logos\geoinfo-logo.png
#src\main\webapp\com\img\drilling\maps\00.svg
#src\main\webapp\com\img\drilling\maps\00_for_inkscape.svg
#src\main\webapp\com\img\drilling\maps\01.png
#src\main\webapp\com\img\drilling\maps\01.svg
#src\main\webapp\com\img\drilling\maps\01_active.svg
#src\main\webapp\com\img\drilling\maps\01_active_alone.svg
#src\main\webapp\com\img\drilling\maps\01_alone.svg
#src\main\webapp\com\img\drilling\maps\02.png
#src\main\webapp\com\img\drilling\maps\02.svg
#src\main\webapp\com\img\drilling\maps\02_active.svg
#src\main\webapp\com\img\drilling\maps\02_active_alone.svg
#src\main\webapp\com\img\drilling\maps\02_alone.svg
#src\main\webapp\com\img\drilling\maps\03.png
#src\main\webapp\com\img\drilling\maps\03.svg
#src\main\webapp\com\img\drilling\maps\03_active.svg
#src\main\webapp\com\img\drilling\maps\03_active_alone.svg
#src\main\webapp\com\img\drilling\maps\03_alone.svg
#src\main\webapp\com\img\drilling\maps\04.png
#src\main\webapp\com\img\drilling\maps\04.svg
#src\main\webapp\com\img\drilling\maps\04_active.svg
#src\main\webapp\com\img\drilling\maps\04_active_alone.svg
#src\main\webapp\com\img\drilling\maps\04_alone.svg
#src\main\webapp\com\img\drilling\maps\05.png
#src\main\webapp\com\img\drilling\maps\05.svg
#src\main\webapp\com\img\drilling\maps\05_active.svg
#src\main\webapp\com\img\drilling\maps\05_active_alone.svg
#src\main\webapp\com\img\drilling\maps\05_alone.svg
#src\main\webapp\com\img\drilling\maps\dokdo.svg
#src\main\webapp\com\img\drilling\maps\uleungdo.svg
#src\main\webapp\com\img\drilling\visual.png

View File

@ -70,7 +70,7 @@ public class DrillingHomeController {
public String drillingInquiry(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception { public String drillingInquiry(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
if(request.getSession().getAttribute("USERNAME") == null){ if(request.getSession().getAttribute("USERNAME") == null){
return "isError"; return "redirect:/index.do";
} }

View File

@ -67,7 +67,7 @@ public class DrillingInputController {
public String memberRegi(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception { public String memberRegi(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
if(request.getSession().getAttribute("USERNAME") == null){ if(request.getSession().getAttribute("USERNAME") == null){
return "isError"; return "redirect:/index.do";
} }
return "/drilling/input/drilling_input"; return "/drilling/input/drilling_input";

View File

@ -66,7 +66,7 @@ public class DrillingInquiryController {
public String drillingInquiry(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception { public String drillingInquiry(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
if(request.getSession().getAttribute("USERNAME") == null){ if(request.getSession().getAttribute("USERNAME") == null){
return "isError"; return "redirect:/index.do";
} }
return "/drilling/inquiry/drilling_inquiry"; return "/drilling/inquiry/drilling_inquiry";
@ -77,7 +77,7 @@ public class DrillingInquiryController {
ModelAndView mv = new ModelAndView("/drilling/inquiry/drilling_inquiry_project"); ModelAndView mv = new ModelAndView("/drilling/inquiry/drilling_inquiry_project");
if(request.getSession().getAttribute("USERNAME") == null){ if(request.getSession().getAttribute("USERNAME") == null){
mv.setViewName("isError"); mv.setViewName("redirect:/index.do?cntyn=0");
return mv; return mv;
} }

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="geoinfo.drilling.home.service.DrillingHomeMapper">
</mapper>

View File

@ -643,7 +643,7 @@
<!-- 시추정보 보유현황 팝업 시작 --> <!-- 시추정보 보유현황 팝업 시작 -->
<div id="status-id" class="status-popup mfp-hide"> <div id="status-id" class="status-popup mfp-hide">
<h1 class="contents-title"><span class="contents-title-text">시추정보 DB 구축 현황</span></h1> <div class="contents-title"><span class="contents-title-text">시추정보 DB 구축 현황</span></div>
<div class="provision-box"> <div class="provision-box">
<span class="textR comma-number hole">390197</span><span>의 시추정보DB가 구축되어 있습니다.(2023년 12월 31일 기준)</span> <span class="textR comma-number hole">390197</span><span>의 시추정보DB가 구축되어 있습니다.(2023년 12월 31일 기준)</span>
@ -744,17 +744,17 @@
<td class="t-right"><span class="comma-number hole">236608</span></td> <td class="t-right"><span class="comma-number hole">236608</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head" rowspan="21">해양수산부</td> <td class="td-head" rowspan="20">해양수산부</td>
<tr> <tr>
<td class="td-head">직속</td> <td class="td-head">직속</td>
<td class="td-head">어촌어항과</td> <td class="td-head">어촌어항과</td>
<td class="t-right"><span class="comma-number hole">847</span></td> <td class="t-right"><span class="comma-number hole">847</span></td>
<td>-</td> <td>-</td>
</tr> </tr>
<td class="td-head" rowspan="12">소속기관</td> <td class="td-head" rowspan="11">소속기관</td>
<td class="td-head">부산항만청</td> <td class="td-head">부산항만청</td>
<td class="t-right"><span class="comma-number hole">2501</span></td> <td class="t-right"><span class="comma-number hole">2501</span></td>
<td rowspan="19">해양수산부 보유</td> <td rowspan="18">해양수산부 보유</td>
</tr> </tr>
<tr> <tr>
<td class="td-head">인천항만청</td> <td class="td-head">인천항만청</td>
@ -798,18 +798,14 @@
</tr> </tr>
<tr> <tr>
<td class="td-head td-total">합계</td> <td class="td-head td-total" colspan="2">합계</td>
<td class="t-right"><span class="comma-number hole">11125</span></td> <td class="t-right"><span class="comma-number hole">11125</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head" rowspan="6">산하기관</td> <td class="td-head" rowspan="4">산하기관</td>
<td class="td-head">부산항만공사</td> <td class="td-head">부산항만공사</td>
<td class="t-right"><span class="comma-number hole">603</span></td> <td class="t-right"><span class="comma-number hole">603</span></td>
</tr> </tr>
<tr>
<td class="td-head">경기평택항만공사</td>
<td class="t-right"><span class="comma-number hole">52</span></td>
</tr>
<tr> <tr>
<td class="td-head">울산항만공사</td> <td class="td-head">울산항만공사</td>
<td class="t-right"><span class="comma-number hole">245</span></td> <td class="t-right"><span class="comma-number hole">245</span></td>
@ -823,7 +819,7 @@
<td class="t-right"><span class="comma-number hole">124</span></td> <td class="t-right"><span class="comma-number hole">124</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head td-total">합계</td> <td class="td-head td-total" colspan="2">합계</td>
<td class="t-right"><span class="comma-number hole">1431</span></td> <td class="t-right"><span class="comma-number hole">1431</span></td>
</tr> </tr>
@ -832,7 +828,7 @@
<td class="t-right"><span class="comma-number hole">12556</span></td> <td class="t-right"><span class="comma-number hole">12556</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head" rowspan="17">지자체</td> <td class="td-head" rowspan="18">지자체</td>
<td class="td-head" rowspan="8">광역자치단체</td> <td class="td-head" rowspan="8">광역자치단체</td>
<td class="td-head">서울특별시</td> <td class="td-head">서울특별시</td>
<td class="t-right"><span class="comma-number hole">17410</span></td> <td class="t-right"><span class="comma-number hole">17410</span></td>
@ -869,7 +865,7 @@
<tr> <tr>
<td class="td-head" rowspan="9">기초자치단체</td> <td class="td-head" rowspan="9">기초자치단체</td>
<td class="td-head">경기도</td> <td class="td-head">경기도</td>
<td class="t-right"><span class="comma-number hole">9902</span></td> <td class="t-right"><span class="comma-number hole">9954</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head">강원도</td> <td class="td-head">강원도</td>
@ -904,12 +900,13 @@
<td class="t-right"><span class="comma-number hole">227</span></td> <td class="t-right"><span class="comma-number hole">227</span></td>
</tr> </tr>
<tr> <tr>
<td class="td-head td-total" colspan="3">지자체 총 합계</td> <td class="td-head td-total" colspan="2">지자체 총 합계</td>
<td class="t-right"><span class="comma-number hole">59634</span></td> <td class="t-right"><span class="comma-number hole">59634</span></td>
<td>-</td>
</tr> </tr>
<tr> <tr>
<td class="td-head" colspan="2">행정안전부</td> <td class="td-head">행정안전부</td>
<td class="td-head">재난관리책임기관</td> <td class="td-head" colspan="2">재난관리책임기관</td>
<td class="t-right"><span class="comma-number hole">12492</span></td> <td class="t-right"><span class="comma-number hole">12492</span></td>
<td>-</td> <td>-</td>
</tr> </tr>
@ -921,7 +918,7 @@
<tr> <tr>
<td class="td-head td-total" colspan="3">전체 총 합계</td> <td class="td-head td-total" colspan="3">전체 총 합계</td>
<td class="t-right"><span class="comma-number hole">390197</span></td> <td class="t-right"><span class="comma-number hole">390197</span></td>
<td></td> <td>-</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View File

@ -175,42 +175,7 @@ body,
/* cbp-spmenu popup 끝 */ /* cbp-spmenu popup 끝 */
/* ====================================== */ /* ====================================== */
.contents-title { .page-title {
position: relative;
margin-bottom: 20px;
text-align: center;
}
.contents-title .contents-title-text::after {
content: "";
position: absolute;
top: 2px;
left: 0px;
width: 113px;
height: 12px;
margin-top: 8px;
background: url(../img/common/bu/bu_main_title.png) no-repeat 50% 50%;
}
.contents-title .contents-title-text::before {
content: "";
position: absolute;
top: 2px;
right: 0px;
display: block;
width: 113px;
height: 12px;
margin-top: 8px;
background: url(../img/common/bu/bu_main_title.png) no-repeat 50% 50%;
}
.contents-title-text {
font-weight: bold;
position: relative;
padding: 0px 140px;
}
.page-title {
position: relative; position: relative;
padding: 40px 0px 25px 0px; padding: 40px 0px 25px 0px;
margin-bottom: 40px; margin-bottom: 40px;
@ -281,6 +246,39 @@ body,
background: none; background: none;
} }
.contents-title {
font-size: 34px;
position: relative;
margin-bottom: 32px;
text-align: center;
}
.contents-title .contents-title-text {
font-weight: bold;
position: relative;
padding: 0px 140px;
}
.contents-title .contents-title-text::before {
content: "";
position: absolute;
top: 13px;
right: 0px;
display: block;
width: 113px;
height: 12px;
margin-top: 8px;
background: url(../img/common/bu/bu_main_title.png) no-repeat 50% 50%;
}
.contents-title .contents-title-text::after {
content: "";
position: absolute;
top: 13px;
left: 0px;
width: 113px;
height: 12px;
margin-top: 8px;
background: url(../img/common/bu/bu_main_title.png) no-repeat 50% 50%;
}
/* 컨텐츠 큰제목 끝 */ /* 컨텐츠 큰제목 끝 */
/* UL블릿 시작 */ /* UL블릿 시작 */
ul.content-ul-list > li { ul.content-ul-list > li {

File diff suppressed because one or more lines are too long

View File

@ -198,37 +198,12 @@ body,
// //
/* ====================================== */ /* ====================================== */
/* 컨텐츠 큰제목 시작 */ /* 컨텐츠 큰제목 시작 */
.contents-title {
position: relative;
margin-bottom: 20px;
text-align: center;
}
.contents-title .contents-title-text::after {
content: "";
position: absolute;
top: 2px;
left: 0px;
width: 113px;
height: 12px;
margin-top: 8px;
background: url(../img/common/bu/bu_main_title.png) no-repeat 50% 50%;
}
.contents-title .contents-title-text::before {
content: "";
position: absolute;
top: 2px;
right: 0px;
display: block;
width: 113px;
height: 12px;
margin-top: 8px;
background: url(../img/common/bu/bu_main_title.png) no-repeat 50% 50%;
}
.contents-title-text {
font-weight: bold;
position: relative;
padding: 0px 140px;
}
.page-title { .page-title {
position: relative; position: relative;
padding: 40px 0px 25px 0px; padding: 40px 0px 25px 0px;
@ -291,6 +266,42 @@ body,
padding-left: 0px; padding-left: 0px;
background: none; background: none;
} }
.contents-title {
font-size: 34px;
position: relative;
margin-bottom: 32px;
text-align: center;
.contents-title-text {
font-weight: bold;
position: relative;
padding: 0px 140px;
&::before {
content: "";
position: absolute;
top: 13px;
right: 0px;
display: block;
width: 113px;
height: 12px;
margin-top: 8px;
background: url(../img/common/bu/bu_main_title.png) no-repeat 50% 50%;
}
&::after {
content: "";
position: absolute;
top: 13px;
left: 0px;
width: 113px;
height: 12px;
margin-top: 8px;
background: url(../img/common/bu/bu_main_title.png) no-repeat 50% 50%;
}
}
}
/* 컨텐츠 큰제목 끝 */ /* 컨텐츠 큰제목 끝 */
/* UL블릿 시작 */ /* UL블릿 시작 */