From d753052d8f64ecadf7013d5fecd4622d1f41f198 Mon Sep 17 00:00:00 2001 From: thkim Date: Thu, 5 Jun 2025 15:18:28 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=B0=9C=EC=A3=BC=EC=A7=80=EA=B4=80=5F?= =?UTF-8?q?=EC=A7=80=EB=8F=84=5F=EC=B5=9C=EC=A0=81=ED=99=941?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- list.txt | 2 - .../drilling/home/DrillingHomeController.java | 78 ++++ .../impl/DrillingInputServiceImpl.java | 52 +-- .../inquiry/DrillingInquiryController.java | 2 +- .../geoinfo/main/main/MainController.java | 15 +- .../geoinfo/regi/info/InfoController.java | 2 +- .../projectList/ProjectListController.java | 2 +- .../WEB-INF/views/body/cmuboard/cmuboard.jsp | 40 +- .../views/body/cmuboard/cmuboard_read.jsp | 14 +- .../WEB-INF/views/body/notice/notice.jsp | 30 +- .../WEB-INF/views/body/notice/noticeView.jsp | 20 +- .../webapp/WEB-INF/views/body/pds/pds.jsp | 98 +++-- .../webapp/WEB-INF/views/body/pds/pdsView.jsp | 20 +- .../views/drilling/common/includeTopMenu.jsp | 351 +----------------- .../WEB-INF/views/drilling/home/center.jsp | 17 + .../views/drilling/home/drilling_index.jsp | 22 +- .../inquiry/drilling_inquiry_project.jsp | 11 +- .../webapp/WEB-INF/views/home/center_01.jsp | 26 +- .../webapp/WEB-INF/views/home/center_02.jsp | 25 +- .../webapp/WEB-INF/views/home/center_03.jsp | 25 +- .../WEB-INF/views/home/include/left_menu.jsp | 121 ++++-- src/main/webapp/WEB-INF/views/home/main.jsp | 69 +++- .../views/layouts/body/cmuboard/cmuboard.jsp | 20 +- .../webapp/WEB-INF/views/map/left/mapLeft.jsp | 11 +- src/main/webapp/js/body/psboard/situTable.js | 9 +- src/main/webapp/js/home/index.js | 50 +-- src/main/webapp/js/map/main/map.js | 96 ++--- 27 files changed, 625 insertions(+), 603 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/drilling/home/center.jsp diff --git a/list.txt b/list.txt index 55268586..8a402680 100644 --- a/list.txt +++ b/list.txt @@ -7,5 +7,3 @@ src\main\resources\egovframework\egovProps\globals.properties src\main\webapp\WEB-INF\views\web\manage\list_reg.jsp -src\main\webapp\WEB-INF\views\map\left\mapLeft.jsp -src\main\webapp\js\map\main\map.js \ No newline at end of file diff --git a/src/main/java/geoinfo/drilling/home/DrillingHomeController.java b/src/main/java/geoinfo/drilling/home/DrillingHomeController.java index 88435353..2b9782c3 100644 --- a/src/main/java/geoinfo/drilling/home/DrillingHomeController.java +++ b/src/main/java/geoinfo/drilling/home/DrillingHomeController.java @@ -12,6 +12,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -39,6 +40,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; import egovframework.rte.psl.dataaccess.util.EgovMap; import geoinfo.com.WebConfirm; @@ -50,6 +52,7 @@ import geoinfo.map.mapControl.service.MapControlService; import geoinfo.regi.selectClassInfo.service.SelectClassService; import geoinfo.regi.status.service.RegiPageService; import geoinfo.regi.util.exportGeotechnicalPointShp2; +import geoinfo.util.MobileCertificationUtil; import geoinfo.util.MyUtil; import ictway.comm.util.parseData; import ictway.comm.util.strUtil; @@ -151,6 +154,81 @@ public class DrillingHomeController { return "jsonView"; } + @RequestMapping(value = "/drilling/topMenuSelect.do") + public String memberRegi(@RequestParam HashMap params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception { + + if(request.getSession().getAttribute("USERNAME") == null){ + return "isError"; + } + + model.put("userName", String.valueOf(request.getSession().getAttribute("USERNAME"))); + model.put("cls", String.valueOf(request.getSession().getAttribute("CLS"))); + model.put("companyName", request.getSession().getAttribute("COMPANYNAME")); + + + Map map = new HashMap(); + map.put("userid", String.valueOf(request.getSession().getAttribute("USERID"))); + + model.put("isFromDrillingSystem", false); + + + + return "/home/center_01"; + } + + // 상단 메뉴 선택 + @RequestMapping(value = "/drilling/top-menu-select.do") + public ModelAndView drillingTopMenuSelect(@RequestParam Map params, HttpServletRequest request, HttpServletResponse response, @RequestParam("url") String url, + RedirectAttributes rda) throws Exception + { + ModelAndView mv = new ModelAndView(); + + Enumeration enumeration = request.getSession().getAttributeNames(); + + while (enumeration.hasMoreElements()) { + String attributeName = enumeration.nextElement(); + System.out.println(attributeName); + } + + if (request.getSession().getAttribute("USERID") == null) + { + // login 아래 btn 설정 html + mv.addObject("isLogin", false); + int joinsearchIndex = url.indexOf("joinsearch"); + int joinIndex = url.indexOf("join"); + int pwsearchIndex = url.indexOf("pwsearch"); + + if( joinsearchIndex == -1 && joinIndex == -1 && pwsearchIndex == -1) { + mv.addObject("msg", "로그인이 필요한 시버스입니다."); + } + + }else { + mv.addObject("isLogin", true); + } + + String userId = ""; + String eGovUrl = ""; + + if (url.equals("center")) { + mv.addObject("isFromDrillingSystem", false); + mv.setViewName("/drilling/home/center"); + } + + mv.addObject("userid", request.getSession().getAttribute("USERID")); + mv.addObject("username", request.getSession().getAttribute("USERNAME")); + mv.addObject("companyname", request.getSession().getAttribute("COMPANYNAME")); + mv.addObject("url", url); + mv.addObject("cls", request.getSession().getAttribute("CLS")); + + mv.addObject("partname", request.getSession().getAttribute("PARTNNAME")); + mv.addObject("phone", request.getSession().getAttribute("PHONE")); + mv.addObject("email", request.getSession().getAttribute("EMAIL")); + + mv.addObject("eGovUrl", eGovUrl); + + return mv; + } + } diff --git a/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java b/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java index aa8eda94..ea0876b8 100644 --- a/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java +++ b/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java @@ -139,19 +139,21 @@ public class DrillingInputServiceImpl implements DrillingInputService { */ EgovMap tbl = drillingInputMapper.getItemByCid( params ); - - HashMap updateProjectCodeParams = new HashMap(); - - updateProjectCodeParams.put("userId", userId); - updateProjectCodeParams.put("PROJECT_CODE", params.get("PROJECT_CODE")); - updateProjectCodeParams.put("PROJECT_STATE_CODE", params.get("PROJECT_STATE_CODE")); - updateProjectCodeParams.put("CID", params.get("CID")); - - int nResult = drillingInputMapper.updateProjectCodeAndProjectStateCodeByCid(updateProjectCodeParams); - if( nResult == 0 ) { - if( tbl.get("projectCode") != null && !tbl.get("projectCode").equals(params.get("PROJECT_CODE")) ) { - throw new Exception( "해당 프로젝트는 이미 다른 프로젝트와 연결되어 있습니다." ); + if( tbl != null ) { + HashMap updateProjectCodeParams = new HashMap(); + + updateProjectCodeParams.put("userId", userId); + updateProjectCodeParams.put("PROJECT_CODE", params.get("PROJECT_CODE")); + updateProjectCodeParams.put("PROJECT_STATE_CODE", params.get("PROJECT_STATE_CODE")); + updateProjectCodeParams.put("CID", params.get("CID")); + + int nResult = drillingInputMapper.updateProjectCodeAndProjectStateCodeByCid(updateProjectCodeParams); + if( nResult == 0 ) { + if( tbl.get("projectCode") != null && !tbl.get("projectCode").equals(params.get("PROJECT_CODE")) ) { + throw new Exception( "해당 프로젝트는 이미 다른 프로젝트와 연결되어 있습니다." ); + } } + } return params; } catch (SQLException e) { @@ -170,18 +172,20 @@ public class DrillingInputServiceImpl implements DrillingInputService { try { EgovMap tbl = drillingInputMapper.getItemByCid( params ); - - HashMap updateProjectCodeParams = new HashMap(); - - updateProjectCodeParams.put("userId", userId); - updateProjectCodeParams.put("PROJECT_CODE", params.get("PROJECT_CODE")); - updateProjectCodeParams.put("WHERE_PROJECT_CODE", params.get("WHERE_PROJECT_CODE")); - updateProjectCodeParams.put("PROJECT_STATE_CODE", params.get("PROJECT_STATE_CODE")); - updateProjectCodeParams.put("CID", params.get("CID")); - - - int nResult = drillingInputMapper.updateProjectCodeAndProjectStateCodeByProjectCode(updateProjectCodeParams); - if( nResult == 0 ) { + if( tbl != null ) { + + HashMap updateProjectCodeParams = new HashMap(); + + updateProjectCodeParams.put("userId", userId); + updateProjectCodeParams.put("PROJECT_CODE", params.get("PROJECT_CODE")); + updateProjectCodeParams.put("WHERE_PROJECT_CODE", params.get("WHERE_PROJECT_CODE")); + updateProjectCodeParams.put("PROJECT_STATE_CODE", params.get("PROJECT_STATE_CODE")); + updateProjectCodeParams.put("CID", params.get("CID")); + + + int nResult = drillingInputMapper.updateProjectCodeAndProjectStateCodeByProjectCode(updateProjectCodeParams); + if( nResult == 0 ) { + } } return params; } catch (SQLException e) { diff --git a/src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java b/src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java index 0102c48b..e55a592e 100644 --- a/src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java +++ b/src/main/java/geoinfo/drilling/inquiry/DrillingInquiryController.java @@ -117,7 +117,7 @@ public class DrillingInquiryController { HttpServletResponse response ) { - System.out.println( + System.out.println( "\n--------------------------------------------------------------\n" + request.getRequestURI() + " IN:" + "\n--------------------------------------------------------------\n" + diff --git a/src/main/java/geoinfo/main/main/MainController.java b/src/main/java/geoinfo/main/main/MainController.java index 66b4ad6b..ce8dd6f3 100644 --- a/src/main/java/geoinfo/main/main/MainController.java +++ b/src/main/java/geoinfo/main/main/MainController.java @@ -164,6 +164,14 @@ public class MainController { ModelAndView mv = new ModelAndView(); + String src = request.getParameter("src"); + + if( src != null && src.toLowerCase().equals("drilling") ) { + mv.addObject("isFromDrillingSystem", true); + } else { + mv.addObject("isFromDrillingSystem", false); + } + Enumeration enumeration = request.getSession().getAttributeNames(); while (enumeration.hasMoreElements()) { @@ -183,7 +191,7 @@ public class MainController mv.addObject("msg", "로그인이 필요한 시버스입니다."); } - }else { + } else { mv.addObject("isLogin", true); if ("admin_user".equals(request.getSession().getAttribute("USERID").toString()) == true) { @@ -284,8 +292,6 @@ public class MainController } else if (url.equals("noticeView")) { - //eGovUrl = "noticeView.do?idx=" + String.valueOf(params.get("idx")); - //mv.setViewName("home/main.jsp?url=/body/notice/notice"); eGovUrl = "noticeView.do"; mv.setViewName("home/main.jsp?url=/body/notice/noticeView"); } @@ -447,7 +453,8 @@ public class MainController mv.addObject("hdnCertNum", hdnCertNum); mv.addObject("hdnCertification", hdnCertification); - mv.addObject("userid", userId); + + mv.setViewName("home/main.jsp?url=/body/mypage/passch"); } diff --git a/src/main/java/geoinfo/regi/info/InfoController.java b/src/main/java/geoinfo/regi/info/InfoController.java index b63dd7e5..f2a8b609 100644 --- a/src/main/java/geoinfo/regi/info/InfoController.java +++ b/src/main/java/geoinfo/regi/info/InfoController.java @@ -54,7 +54,7 @@ public class InfoController { @Resource(name = "infoService") private InfoService infoService; - @Autowired + @Resource(name = "drillingInquiryService") DrillingInquiryService drillingInquiryService; /* 20231223 트랜젝션 중복문제로 제거 diff --git a/src/main/java/geoinfo/regi/projectList/ProjectListController.java b/src/main/java/geoinfo/regi/projectList/ProjectListController.java index 7cb84d07..85718136 100644 --- a/src/main/java/geoinfo/regi/projectList/ProjectListController.java +++ b/src/main/java/geoinfo/regi/projectList/ProjectListController.java @@ -43,7 +43,7 @@ public class ProjectListController { @Resource(name = "headerService") private HeaderService headerService; - @Autowired + @Resource(name = "drillingInquiryService") private DrillingInquiryService drillingInquiryService; @Autowired diff --git a/src/main/webapp/WEB-INF/views/body/cmuboard/cmuboard.jsp b/src/main/webapp/WEB-INF/views/body/cmuboard/cmuboard.jsp index 362efec0..f2beaa7a 100644 --- a/src/main/webapp/WEB-INF/views/body/cmuboard/cmuboard.jsp +++ b/src/main/webapp/WEB-INF/views/body/cmuboard/cmuboard.jsp @@ -44,24 +44,35 @@ ${row.idx} - <%-- ${row.subject} --%> - - ${row.subject} - <%-- ${row.subject} --%> + + + + ${row.subject} + + + ${row.subject} + + - - ${row.subject} - <%-- ${row.subject} --%> + + + + ${row.subject} + + + ${row.subject} + + ${row.name} ${row.datetime} - ${row.readcount} + ${row.readcount} @@ -97,7 +108,18 @@
- 글쓰기 + + + + 글쓰기 + + + + + 글쓰기 + + +
diff --git a/src/main/webapp/WEB-INF/views/body/cmuboard/cmuboard_read.jsp b/src/main/webapp/WEB-INF/views/body/cmuboard/cmuboard_read.jsp index fcd03e2f..53a2d8ba 100644 --- a/src/main/webapp/WEB-INF/views/body/cmuboard/cmuboard_read.jsp +++ b/src/main/webapp/WEB-INF/views/body/cmuboard/cmuboard_read.jsp @@ -1,4 +1,7 @@ <%@ page language="java" contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
@@ -50,8 +53,15 @@
- - list + + + list + + + list + + + ${EDIT_BTN} <%-- ${RE_BTN} --%> diff --git a/src/main/webapp/WEB-INF/views/body/notice/notice.jsp b/src/main/webapp/WEB-INF/views/body/notice/notice.jsp index f1cc600c..2ce4bfe5 100644 --- a/src/main/webapp/WEB-INF/views/body/notice/notice.jsp +++ b/src/main/webapp/WEB-INF/views/body/notice/notice.jsp @@ -5,16 +5,26 @@ + <%@ include file="/include/inc_head_2021_new.jsp" %> @@ -95,7 +96,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe ` ` + (obj.count - idx - (nCount * (nPage - 1))) + ` - ` + obj.datas[idx].constName + ` + ` + obj.datas[idx].constName + ` ` + obj.datas[idx].projectStateCodeName + ` ` + constStartDate + ` ~ ` + constEndDate + ` ` + obj.datas[idx].constStateCodeName + ` @@ -223,7 +224,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe

건설현장 관리

-

프로젝트 조회

+

관리 시추정보 현황

건설현장 조회

건설현장 입력

@@ -238,12 +239,12 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
  • -
  • 프로젝트 조회
    • +
  • 관리 시추정보 현황
도움말
-

프로젝트 조회

+

관리 시추정보 현황

diff --git a/src/main/webapp/WEB-INF/views/home/center_01.jsp b/src/main/webapp/WEB-INF/views/home/center_01.jsp index eed65c78..e502b66b 100644 --- a/src/main/webapp/WEB-INF/views/home/center_01.jsp +++ b/src/main/webapp/WEB-INF/views/home/center_01.jsp @@ -17,15 +17,35 @@ $("#center_sub_menu > li.nav-item:eq(0)").addClass("active"); }); - + - <%@ include file="include/top.jsp" %> + + + <%@ include file="include/top.jsp" %> + + + + + -
+ +
+ diff --git a/src/main/webapp/WEB-INF/views/home/center_02.jsp b/src/main/webapp/WEB-INF/views/home/center_02.jsp index cf02279f..70bdfa91 100644 --- a/src/main/webapp/WEB-INF/views/home/center_02.jsp +++ b/src/main/webapp/WEB-INF/views/home/center_02.jsp @@ -15,15 +15,36 @@ $("#center_sub_menu > li.nav-item:eq(1)").addClass("active"); }); + - <%@ include file="include/top.jsp" %> + + + <%@ include file="include/top.jsp" %> + + + + + -
+ +
+ diff --git a/src/main/webapp/WEB-INF/views/home/center_03.jsp b/src/main/webapp/WEB-INF/views/home/center_03.jsp index c0c6a10d..754ffdab 100644 --- a/src/main/webapp/WEB-INF/views/home/center_03.jsp +++ b/src/main/webapp/WEB-INF/views/home/center_03.jsp @@ -15,15 +15,36 @@ $("#center_sub_menu > li.nav-item:eq(2)").addClass("active"); }); + - <%@ include file="include/top.jsp" %> + + + <%@ include file="include/top.jsp" %> + + + + + -
+ +
+ diff --git a/src/main/webapp/WEB-INF/views/home/include/left_menu.jsp b/src/main/webapp/WEB-INF/views/home/include/left_menu.jsp index d3a58052..44e9ff77 100644 --- a/src/main/webapp/WEB-INF/views/home/include/left_menu.jsp +++ b/src/main/webapp/WEB-INF/views/home/include/left_menu.jsp @@ -9,19 +9,46 @@

센터소개

  • - - 개요 - + + + + 개요 + + + + + 개요 + + +
  • - - 주요기능 - + + + + 주요기능 + + + + + 주요기능 + + +
    • -
  • - - 오시는길 - +
  • + + + + 오시는길 + + + + + 오시는길 + + +
    • @@ -84,29 +111,75 @@

    게시판

  • - - 커뮤니티 - + + + + 커뮤니티 + + + + + 커뮤니티 + + +
  • - - 공지사항 - + + + + 공지사항 + + + + + 공지사항 + + +
  • - - 자료실 - + + + + 자료실 + + + + + 자료실 + + +
  • - - 시추정보 Q&A - + + + + 시추정보 Q&A + + + + + 시추정보 Q&A + + +
  • - - 시추정보 FAQ + + + + 시추정보 FAQ + + + + + 시추정보 FAQ + + +
    • diff --git a/src/main/webapp/WEB-INF/views/home/main.jsp b/src/main/webapp/WEB-INF/views/home/main.jsp index 9d8a9511..f0e6185f 100644 --- a/src/main/webapp/WEB-INF/views/home/main.jsp +++ b/src/main/webapp/WEB-INF/views/home/main.jsp @@ -152,16 +152,29 @@ + +
    - <%@ include file="include/top.jsp" %> + + + <%@ include file="include/top.jsp" %> + + + + + - +
    + -
    + +
    +     - +
    @@ -739,6 +780,6 @@
    - + <%@ include file="include/footer.jsp" %> diff --git a/src/main/webapp/WEB-INF/views/layouts/body/cmuboard/cmuboard.jsp b/src/main/webapp/WEB-INF/views/layouts/body/cmuboard/cmuboard.jsp index 4888666d..3463b02f 100644 --- a/src/main/webapp/WEB-INF/views/layouts/body/cmuboard/cmuboard.jsp +++ b/src/main/webapp/WEB-INF/views/layouts/body/cmuboard/cmuboard.jsp @@ -1,7 +1,6 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - - +
    → Home > @@ -27,7 +26,7 @@
    @@ -83,8 +82,21 @@
    - - + + diff --git a/src/main/webapp/WEB-INF/views/map/left/mapLeft.jsp b/src/main/webapp/WEB-INF/views/map/left/mapLeft.jsp index 1d996496..c6a3c189 100644 --- a/src/main/webapp/WEB-INF/views/map/left/mapLeft.jsp +++ b/src/main/webapp/WEB-INF/views/map/left/mapLeft.jsp @@ -1287,9 +1287,10 @@ function table3display(){ // 트리메뉴 $("#browser").treeview(); - // thkim - console.log( 'thkim:' + getQueryString("masterCompanyCode") ); - autocomplete(); + + if( !getQueryString("masterCompanyCode") ) { + autocomplete(); + } }); @@ -1336,7 +1337,9 @@ function table3display(){ $("#pcompanyame").data("kendoAutoComplete").options.noDataTemplate = ''; }else{ $("#autotxt").html('자동완성 On'); - autocompleteOn(); + if( !getQueryString("masterCompanyCode") ) { + autocompleteOn(); + } } } diff --git a/src/main/webapp/js/body/psboard/situTable.js b/src/main/webapp/js/body/psboard/situTable.js index a6dac25e..b71b1051 100644 --- a/src/main/webapp/js/body/psboard/situTable.js +++ b/src/main/webapp/js/body/psboard/situTable.js @@ -26,21 +26,16 @@ function showMe(startY,endY,currentPage,currentGroup){ mapWin.focus(); }*/ -//�������� ��Ȳ ���������� ����Ŭ���� ���� �˾� ���� + +//시추정보 사업별 현황에서 프로젝트를 지도에 보여준다. function openMapLoc(pcode) { win = 'map'; - //sizeX = screen.availwidth-10; // ���� ������ - //sizeY = screen.availheight-50; // ���� ������ sizeX=window.screen.width; sizeY=window.screen.height; - //alert("rowCount = "+rowCount); - //alert("holeCode = "+holeCode); var mapWin = window.open("/map/mapMain.do?pcode=" + pcode,"mapWin","toolbar=no,location=no,directories=no,status=yes,menubar=no,scrollbars=yes,resizable=yes,width=" + sizeX + ",height=" + sizeY + ",left=0,top=0"); mapWin.focus(); - //openDetail2(pcode); - } function openDetail2(pcode) { diff --git a/src/main/webapp/js/home/index.js b/src/main/webapp/js/home/index.js index 97606ec2..5fae48a2 100644 --- a/src/main/webapp/js/home/index.js +++ b/src/main/webapp/js/home/index.js @@ -115,53 +115,17 @@ function gourl_html(url){ } // } -function gourl_sitemap(url){ +function gourl_sitemap(url){ window.location.href="/home/" + url; } -function gourl(url){ - top.location.href="topMenuSelect.do?url=" + url; - /* - * if(url == "intro"){ - * top.location.href="https://geoinfo.or.kr/home/intro.jsp"; }else - * if(url == "info"){ - * top.location.href="https://geoinfo.or.kr/home/info_01.jsp" }else - * if(url == "info3"){ - * top.location.href="https://geoinfo.or.kr/home/info_03.jsp"; }else - * if(url == "info4"){ - * top.location.href="https://geoinfo.or.kr/home/info_04.jsp"; } else - * if(url == "form"){ - * top.location.href="https://geoinfo.or.kr/home/form_01.jsp"; }else - * if(url == "law"){ - * top.location.href="https://geoinfo.or.kr/home/law_01.jsp"; }else - * if(url == "center"){ - * - * - * top.location.href="https://geoinfo.or.kr/home/center_01.jsp"; }else - * if(url == "center2"){ - * top.location.href="https://geoinfo.or.kr/home/center_02.jsp"; }else - * if(url == "center3"){ - * top.location.href="https://geoinfo.or.kr/home/center_03.jsp"; }else - * if(url == "cmuboard"){ - * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/cmuboard/cmuboard.jsp"; - * }else if(url == "notice"){ - * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/notice/notice.jsp"; - * }else if(url == "situTable"){ - * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/jiban_info/situTable.jsp"; - * }else if(url == "pds"){ - * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/pds/pds.jsp"; - * }else if(url == "psboard"){ - * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/psboard/psboard.jsp"; } - * else if(url == "faq"){ - * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/board/main.jsp"; - * }else if(url == "join"){ - * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/join/provision.jsp"; - * }else if(url == "joinch"){ - * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/mypage/main.jsp"; - * }else if(url == "joinsearch"){ - * top.location.href="https://geoinfo.or.kr/home/main.jsp?url=/body/account/main.jsp"; } - */ +function gourl(url, src){ + var topLocationHref="topMenuSelect.do?url=" + url; + if( src ) { + topLocationHref += "&" + "src=" + src; + } + top.location.href = topLocationHref; } /* diff --git a/src/main/webapp/js/map/main/map.js b/src/main/webapp/js/map/main/map.js index 7bd06315..e3be446b 100644 --- a/src/main/webapp/js/map/main/map.js +++ b/src/main/webapp/js/map/main/map.js @@ -30,6 +30,7 @@ function addLoadEvent(func) { func(); } }, 100); + } function hole_layerOnOff() { @@ -49,6 +50,32 @@ function hole_layerOnOff() { } +function forceUncheckHoleLayerOnOff() { + + var returnValue = ""; + for (i = 1; i <= 33; i++) { + $("#browser").find("#hole"+i).prop("checked", false); + //returnValue = returnValue + "N"; + } + + + var body = $('body'); + + if (body.hasClass("page-sidebar-closed")) { + body.removeClass("page-sidebar-closed"); + + } else { + body.addClass("page-sidebar-closed"); + } + + $(window).trigger('resize'); + BASE_MAP.updateSize(); + + + changeLegend("NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNY"); + +} + // ================================================================ // 변수 : OpenLayers 관리 변수 // ================================================================ @@ -346,7 +373,7 @@ function initApp(param){ }, { singleTile : false, isBaseLayer : false, - visibility: getQueryString("masterCompanyCode") === null ? true : false, + visibility: getQueryString("masterCompanyCode") === null ? true : true, transitionEffect: "resize", buffer : 0, removeBackBufferDelay : 0 @@ -936,67 +963,16 @@ function initApp(param){ } - // select 요소를 가져옵니다. - if( gl === "국토교통부" ) { - //소속 기관 - selectOptionByText(gs, document.getElementById("cmb_sido_all")); - const getGuList2Callback = function () { - //onSichAllCheck(); - const selectedXY = getMiddleXY(document.getElementById("cmb_sido_all").value); - //BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedXY.minX, selectedXY.minY, selectedXY.maxX, selectedXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true); - } - getGuList2(getGuList2Callback); - } else if( gl === "재난관리책임기관" ) { - if( gm === "교육청" ) { - selectOptionByText(gs, document.getElementById("cmb_sido_all")); - const getGuList2Callback = function () { - if( gf === null || gf.trim() === "" ) { - //onSichAllCheck(); - const selectedXY = getMiddleXY(document.getElementById("cmb_sido_all").value); - //BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedXY.minX, selectedXY.minY, selectedXY.maxX, selectedXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true); - } else { - selectOptionByText(gf, document.getElementById("cmb_gungu_all")); - onSichAllCheck(); - //const selectedXY = getMiddleXY(document.getElementById("cmb_gungu_all").value); - //BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedXY.minX, selectedXY.minY, selectedXY.maxX, selectedXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true); - } - } - getGuList2(getGuList2Callback); - } - } else { - //지방자치단체 - selectOptionByText(gm, document.getElementById("cmb_sido_all")); - const getGuList2Callback = function () { - if( gs === null || gs.trim() === "" ) { - //onSichAllCheck(); - const selectedSidoXY = getMiddleXY(document.getElementById("cmb_sido_all").value); - //BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedSidoXY.minX, selectedSidoXY.minY, selectedSidoXY.maxX, selectedSidoXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true); - } else { - selectOptionByText(gs, document.getElementById("cmb_gungu_all")); - const getDongList2Callback = function () { - if( gf === null || gf.trim() === "" ) { - //onSichAllCheck(); - const selectedGunguXY = getMiddleXY(document.getElementById("cmb_gungu_all").value); - var move_bound = new OpenLayers.Bounds(selectedGunguXY.minX, selectedGunguXY.minY, selectedGunguXY.maxX, selectedGunguXY.maxY).transform('EPSG:5186', 'EPSG:3857'); //5174 - //BASE_MAP.zoomToExtent(move_bound, true); - } else { - selectOptionByText(gf, document.getElementById("cmb_dong_all")); - //onSichAllCheck(); - const selectedDongXY = getMiddleXY(document.getElementById("cmb_dong_all").value); - //BASE_MAP.zoomToExtent(new OpenLayers.Bounds(selectedDongXY.minX, selectedDongXY.minY, selectedDongXY.maxX, selectedDongXY.maxY).transform('EPSG:5186', 'EPSG:3857'), true); - } - } - getDongList2(getDongList2Callback); - - } - } - getGuList2(getGuList2Callback); - } - + if( masterCompanyCode ) { addDrillingHoles(masterCompanyCode); } + + if( getQueryString("masterCompanyCode") ) { + forceUncheckHoleLayerOnOff(); + } + } else { @@ -2022,8 +1998,7 @@ function changeProject(pName){ function getLegend(){ - - if (HOLE_LAYER.legend == null + if ( HOLE_LAYER.legend == null || HOLE_LAYER.legend == "undefined"){ return "YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY"; } @@ -2138,7 +2113,6 @@ function addLendLayer(param) { } function changeLegend(checkList) { - HOLE_LAYER.mergeNewParams({version : '1.3.0'}); HOLE_LAYER_M.mergeNewParams({version : '1.3.0'}); HOLE_LAYER.legend = checkList;
    + + + + + + + + + + + + +