feat: 장바구니 사용법 안내추가

main
thkim 2025-04-10 16:42:43 +09:00
parent f73b31ce57
commit 3c4ef38e71
12 changed files with 921 additions and 830 deletions

View File

@ -1,7 +1,11 @@
#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.map
#src\main\java\geoinfo\regi\manageList\ManageExcelUploadProc01Controller.java
#src\main\webapp\WEB-INF\views\web\input\excel_step00.jsp
#src\main\webapp\WEB-INF\views\web\input\excel_step31.jsp
src\main\webapp\js\map\main\map.js
src\main\webapp\com\css\common.v2.0.css
src\main\webapp\com\css\common.v2.0.css.map
src\main\webapp\WEB-INF\views\home\index.jsp
src\main\webapp\WEB-INF\views\web\manage\createZip.jsp
src\main\java\geoinfo\regi\basicInfo\BasicController.java
src\main\webapp\WEB-INF\views\web\input\basic\labInfoFieldPressuremeter.jsp
src\main\webapp\js\map\main\left\left.js

1
open_css.bat Normal file
View File

@ -0,0 +1 @@
explorer .\src\main\webapp\com\css\sass

View File

@ -1,47 +1,17 @@
package geoinfo.drilling.common;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.annotation.Resource;
import java.util.HashMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jfree.util.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.ModelAndView;
import egovframework.rte.psl.dataaccess.util.EgovMap;
import geoinfo.com.WebConfirm;
import geoinfo.map.mapControl.service.MapControlService;
import geoinfo.regi.selectClassInfo.service.SelectClassService;
import geoinfo.regi.status.service.RegiPageService;
import geoinfo.regi.util.exportGeotechnicalPointShp2;
import ictway.comm.util.parseData;
import ictway.comm.util.strUtil;
import ictway.comm.web.WebUtil;
import ictway.whois.whoisSMS;
@Controller
public class DrillingCommonController {

View File

@ -5,6 +5,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.net.MalformedURLException;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@ -49,6 +50,7 @@ import geoinfo.regi.basicInfo.service.BasicService;
import geoinfo.regi.common.service.CommonService;
import geoinfo.regi.selectClassInfo.service.SelectClassService;
import geoinfo.regi.status.RegiController;
import geoinfo.util.MyUtil;
import ictway.comm.util.strUtil;
import ictway.comm.web.WebUtil;
@ -1048,8 +1050,30 @@ public class BasicController {
params.put("reportType", oREPORT_TYPE);
List<EgovMap> items = basicService.selectTempFieldPressuremeter(params);
Iterator<EgovMap> iteratorItems = items.iterator();
List<EgovMap> newItems = new ArrayList<>();
// Iterator를 사용하여 리스트의 요소들을 순회할 수 있습니다.
while (iteratorItems.hasNext()) {
EgovMap item = iteratorItems.next();
String key = "fieldpresInspectedBy";
Object itemValue = item.get(key);
if( itemValue != null ) {
item.put(key, MyUtil.getStringFromObject( itemValue ).replaceAll("\t", "") );
}
key = "fieldpresCheckedBy";
itemValue = item.get(key);
if( itemValue != null ) {
item.put(key, MyUtil.getStringFromObject( itemValue ).replaceAll("\t", "") );
}
newItems.add(item);
}
JSONObject json = new JSONObject();
json.put("items", items);
json.put("items", newItems);
model.put("params", params);
model.put("items", items);

View File

@ -80,6 +80,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
<p class="check-title">기관명이 없을 시, 연락 바랍니다. 연락처: <span class="contact-tel">031-995-0934</span></p>
</div>
<button class="btn-green" type="button">엑셀자료입력</button>
<button class="btn-green btn-excel-download" type="button">엑셀 양식 다운로드</button>
</div>
<div id="table-container">
</div>

View File

@ -390,7 +390,7 @@
<div class="status-count-box">
<span class="count-title">시추정보 보유현황</span>
<div class="value-group">
<span class="status-count"><fmt:formatNumber value="390197" pattern="#,###" />공 <span style="font-size : 12px; vertical-align: middle; line-height: 50px;">(2023년 12월 31일 기준)</span></span>
<span class="status-count"><fmt:formatNumber value="422552" pattern="#,###" />공 <span style="font-size : 12px; vertical-align: middle; line-height: 50px;">(2024년 12월 기준)</span></span>
<a href="#status-id" class="btn status-btn">자세히보기</a>
</div>
</div>
@ -646,7 +646,7 @@
<div class="contents-title"><span class="contents-title-text">시추정보 DB 구축 현황</span></div>
<div class="provision-box">
<span class="textR comma-number hole">390197</span><span>의 시추정보DB가 구축되어 있습니다.(2023년 12월 31일 기준)</span>
<span class="textR comma-number hole">422552</span><span>의 시추정보DB가 구축되어 있습니다.(2024년 12월 기준)</span>
</div>
<h3 class="page-title-3depth marT10 padB10"><span>발주처별 구축현황</span></h3>
@ -674,24 +674,24 @@
<td class="td-head" rowspan="17">국토교통부</td>
<td class="td-head" rowspan="7">소속기관</td>
<td class="td-head">서울지방국토관리청</td>
<td class="t-right"><span class="comma-number hole">9493</span></td>
<td class="t-right"><span class="comma-number hole">9783</span></td>
<td rowspan="8">국토교통부 보유</td>
</tr>
<tr>
<td class="td-head">부산지방국토관리청</td>
<td class="t-right"><span class="comma-number hole">22772</span></td>
<td class="t-right"><span class="comma-number hole">23075</span></td>
</tr>
<tr>
<td class="td-head">대전지방국토관리청</td>
<td class="t-right"><span class="comma-number hole">17020</span></td>
<td class="t-right"><span class="comma-number hole">17088</span></td>
</tr>
<tr>
<td class="td-head">익산지방국토관리청</td>
<td class="t-right"><span class="comma-number hole">14563</span></td>
<td class="t-right"><span class="comma-number hole">14705</span></td>
</tr>
<tr>
<td class="td-head">원주지방국토관리청</td>
<td class="t-right"><span class="comma-number hole">6178</span></td>
<td class="t-right"><span class="comma-number hole">6263</span></td>
</tr>
<tr>
<td class="td-head">행정중심복합도시건설청</td>
@ -703,48 +703,48 @@
</tr>
<tr>
<td class="td-head td-total" colspan="2">합계</td>
<td class="t-right"><span class="comma-number hole">72117</span></td>
<td class="t-right"><span class="comma-number hole">73005</span></td>
</tr>
<tr>
<td class="td-head" rowspan="7">산하기관</td>
<td class="td-head">한국토지주택공사</td>
<td class="t-right"><span class="comma-number hole">94879</span></td>
<td class="t-right"><span class="comma-number hole">96764</span></td>
<td rowspan="9">국토교통부 보유</td>
</tr>
<tr>
<td class="td-head">한국도로공사</td>
<td class="t-right"><span class="comma-number hole">37399</span></td>
<td class="t-right"><span class="comma-number hole">39137</span></td>
</tr>
<tr>
<td class="td-head">한국수자원공사</td>
<td class="t-right"><span class="comma-number hole">7013</span></td>
<td class="t-right"><span class="comma-number hole">8163</span></td>
</tr>
<tr>
<td class="td-head">한국철도시설공단</td>
<td class="t-right"><span class="comma-number hole">24208</span></td>
<td class="t-right"><span class="comma-number hole">26351</span></td>
</tr>
<tr>
<td class="td-head">한국수력원자력</td>
<td class="t-right"><span class="comma-number hole">227</span></td>
<td class="t-right"><span class="comma-number hole">279</span></td>
</tr>
<tr>
<td class="td-head">한국공항공사</td>
<td class="t-right"><span class="comma-number hole">94공</span></td>
<td class="t-right"><span class="comma-number hole">246</span></td>
</tr>
<tr>
<td class="td-head">한국철도공사</td>
<td class="t-right"><span class="comma-number hole">519</span></td>
<td class="t-right"><span class="comma-number hole">537</span></td>
</tr>
<tr>
<td class="td-head td-total" colspan="2">합계</td>
<td class="t-right"><span class="comma-number hole">164491</span></td>
<td class="t-right"><span class="comma-number hole">171477</span></td>
</tr>
<tr>
<td class="td-head td-total" colspan="2">국토교통부 및 산하기관 총 합계</td>
<td class="t-right"><span class="comma-number hole">236608</span></td>
<td class="t-right"><span class="comma-number hole">244482</span></td>
</tr>
<tr>
<td class="td-head" rowspan="20">해양수산부</td>
<td class="td-head" rowspan="21">해양수산부</td>
<tr>
<td class="td-head">직속</td>
<td class="td-head">어촌어항과</td>
@ -753,8 +753,8 @@
</tr>
<td class="td-head" rowspan="11">소속기관</td>
<td class="td-head">부산항만청</td>
<td class="t-right"><span class="comma-number hole">2501</span></td>
<td rowspan="18">해양수산부 보유</td>
<td class="t-right"><span class="comma-number hole">2592</span></td>
<td rowspan="19">해양수산부 보유</td>
</tr>
<tr>
<td class="td-head">인천항만청</td>
@ -762,7 +762,7 @@
</tr>
<tr>
<td class="td-head">여수항만청</td>
<td class="t-right"><span class="comma-number hole">1131</span></td>
<td class="t-right"><span class="comma-number hole">1160</span></td>
</tr>
<tr>
<td class="td-head">울산항만청</td>
@ -770,7 +770,7 @@
</tr>
<tr>
<td class="td-head">포항항만청</td>
<td class="t-right"><span class="comma-number hole">406</span></td>
<td class="t-right"><span class="comma-number hole">414</span></td>
</tr>
<tr>
<td class="td-head">목포항만청</td>
@ -790,29 +790,33 @@
</tr>
<tr>
<td class="td-head">대산항만청</td>
<td class="t-right"><span class="comma-number hole">226</span></td>
<td class="t-right"><span class="comma-number hole">235</span></td>
</tr>
<tr>
<td class="td-head">평택항만청</td>
<td class="t-right"><span class="comma-number hole">793</span></td>
<td class="t-right"><span class="comma-number hole">841</span></td>
</tr>
<tr>
<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">11310</span></td>
</tr>
<tr>
<td class="td-head" rowspan="4">산하기관</td>
<td class="td-head" rowspan="5">산하기관</td>
<td class="td-head">부산항만공사</td>
<td class="t-right"><span class="comma-number hole">603</span></td>
</tr>
<tr>
<td class="td-head">경기평택항만공사</td>
<td class="t-right"><span class="comma-number hole">52</span></td>
</tr>
<tr>
<td class="td-head">울산항만공사</td>
<td class="t-right"><span class="comma-number hole">245</span></td>
</tr>
<tr>
<td class="td-head">인천항만공사</td>
<td class="t-right"><span class="comma-number hole">407</span></td>
<td class="t-right"><span class="comma-number hole">417</span></td>
</tr>
<tr>
<td class="td-head">여수광양항만공사</td>
@ -820,104 +824,104 @@
</tr>
<tr>
<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">1441</span></td>
</tr>
<tr>
<td class="td-head td-total" colspan="2">해양수산부 및 산하기관 총 합계</td>
<td class="t-right"><span class="comma-number hole">12556</span></td>
<td class="t-right"><span class="comma-number hole">12751</span></td>
</tr>
<tr>
<td class="td-head" rowspan="18">지자체</td>
<td class="td-head" rowspan="8">광역자치단체</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">17948</span></td>
<td rowspan="17">-</td>
</tr>
<tr>
<td class="td-head">부산광역시</td>
<td class="t-right"><span class="comma-number hole">5364</span></td>
<td class="t-right"><span class="comma-number hole">5666</span></td>
</tr>
<tr>
<td class="td-head">대구광역시</td>
<td class="t-right"><span class="comma-number hole">3024</span></td>
<td class="t-right"><span class="comma-number hole">3218</span></td>
</tr>
<tr>
<td class="td-head">인천광역시</td>
<td class="t-right"><span class="comma-number hole">2012</span></td>
<td class="t-right"><span class="comma-number hole">2199</span></td>
</tr>
<tr>
<td class="td-head">광주광역시</td>
<td class="t-right"><span class="comma-number hole">1118</span></td>
<td class="t-right"><span class="comma-number hole">1236</span></td>
</tr>
<tr>
<td class="td-head">대전광역시</td>
<td class="t-right"><span class="comma-number hole">532</span></td>
<td class="t-right"><span class="comma-number hole">612</span></td>
</tr>
<tr>
<td class="td-head">울산광역시</td>
<td class="t-right"><span class="comma-number hole">867</span></td>
<td class="t-right"><span class="comma-number hole">1012</span></td>
</tr>
<tr>
<td class="td-head">세종특별자치시</td>
<td class="t-right"><span class="comma-number hole">315</span></td>
<td class="t-right"><span class="comma-number hole">328</span></td>
</tr>
<tr>
<td class="td-head" rowspan="9">기초자치단체</td>
<td class="td-head">경기도</td>
<td class="t-right"><span class="comma-number hole">9954</span></td>
<td class="t-right"><span class="comma-number hole">10211</span></td>
</tr>
<tr>
<td class="td-head">강원도</td>
<td class="t-right"><span class="comma-number hole">4161</span></td>
<td class="td-head">강원특별자치도</td>
<td class="t-right"><span class="comma-number hole">4754</span></td>
</tr>
<tr>
<td class="td-head">충청남도</td>
<td class="t-right"><span class="comma-number hole">3050</span></td>
<td class="t-right"><span class="comma-number hole">3182</span></td>
</tr>
<tr>
<td class="td-head">충청북도</td>
<td class="t-right"><span class="comma-number hole">1341</span></td>
<td class="t-right"><span class="comma-number hole">1530</span></td>
</tr>
<tr>
<td class="td-head">경상남도</td>
<td class="t-right"><span class="comma-number hole">2182</span></td>
<td class="t-right"><span class="comma-number hole">2320</span></td>
</tr>
<tr>
<td class="td-head">경상북도</td>
<td class="t-right"><span class="comma-number hole">2632</span></td>
<td class="t-right"><span class="comma-number hole">2976</span></td>
</tr>
<tr>
<td class="td-head">전라남도</td>
<td class="t-right"><span class="comma-number hole">4764</span></td>
<td class="t-right"><span class="comma-number hole">5759</span></td>
</tr>
<tr>
<td class="td-head">전북도</td>
<td class="t-right"><span class="comma-number hole">733</span></td>
<td class="td-head">전북특별자치도</td>
<td class="t-right"><span class="comma-number hole">821</span></td>
</tr>
<tr>
<td class="td-head">제주특별자치도</td>
<td class="t-right"><span class="comma-number hole">227</span></td>
<td class="t-right"><span class="comma-number hole">247</span></td>
</tr>
<tr>
<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">64019</span></td>
<td>-</td>
</tr>
<tr>
<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">14250</span></td>
<td>-</td>
</tr>
<tr>
<td class="td-head" colspan="3">민간기관</td>
<td class="t-right"><span class="comma-number hole">68907</span></td>
<td class="t-right"><span class="comma-number hole">87050</span></td>
<td>-</td>
</tr>
<tr>
<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">422552</span></td>
<td>-</td>
</tr>
</tbody>

View File

@ -1696,7 +1696,7 @@ function fn_HoleLoad(){
<tr>
<th class="td-head">케이싱심도(m) </th>
<td colspan="3">(-) :
<input name="HOLE_CASING_DEPTH" id="HOLE_CASING_DEPTH" type="text" style="width:200px;" maxlength="11" value="${mapHeader.holeCasingDepth == -999 ? '-' : mapHeader.holeCasingDepth}" valid="notnull" validNm="케이싱심도"/> m (케이싱심도 ≤ 굴진심도) <span style="color:blue">[값이 없는 경우, <span style="color:red; "> - </span>(하이픈) 입력]</span>
<input name="HOLE_CASING_DEPTH" id="HOLE_CASING_DEPTH" type="text" style="width:200px;" maxlength="11" value="${mapHeader.holeCasingDepth == -999 ? '-' : mapHeader.holeCasingDepth}" valid="notnull" validNm="케이싱심도"/> m (케이싱심도 ≤ 굴진심도) <span style="color:blue">[값이 없는 경우, <span style="color:red; font-size: 28px;"> - </span>(하이픈) 입력]</span>
</td>
</tr>
<tr>

File diff suppressed because it is too large Load Diff

View File

@ -6038,6 +6038,29 @@ ul.faq-q > li textarea {
float: right;
margin-bottom: 10px;
}
.drilling .btn-excel-download {
padding: 4px 14px 4px 46px;
position: relative;
font-size: 14px;
height: 34px;
font-weight: bold;
box-sizing: border-box;
background-color: #19b3e5;
border: 1px solid #19b3e5;
color: #fff;
margin-right: 10px;
}
.drilling .btn-excel-download::before {
display: inline-block;
position: absolute;
top: 3px;
left: 12px;
content: "";
background: url(/com/img/common/icon/ico_parallax_btn_06_dark.png) no-repeat 50% 50%;
background-size: contain;
width: 26px;
height: 26px;
}
.drilling .table-scrollable {
border-top: 2px solid #114672;
border-bottom: 1px solid #114672;

File diff suppressed because one or more lines are too long

View File

@ -4248,6 +4248,29 @@ ul.faq-q > li textarea {
float:right;
margin-bottom: 10px;
}
.btn-excel-download {
padding: 4px 14px 4px 46px;
position: relative;
font-size: 14px;
height: 34px;
font-weight: bold;
box-sizing: border-box;
background-color: #19b3e5;
border:1px solid #19b3e5;
color: #fff;
margin-right: 10px;
&::before {
display: inline-block;
position: absolute;
top: 3px;
left: 12px;
content: "";
background: url(/com/img/common/icon/ico_parallax_btn_06_dark.png) no-repeat 50% 50%;
background-size: contain;
width: 26px;
height: 26px;
}
}
.table-scrollable {
border-top: 2px solid #114672;
border-bottom: 1px solid #114672;
@ -4391,6 +4414,7 @@ ul.faq-q > li textarea {
}
}
/* ====================================== */
// -

View File

@ -1024,13 +1024,18 @@ function showCartInfo() {
}
//cart 시추 add
function addCartSich(){
var size = $('input[name=totalGrid]:checked').length;
var checkedTotalGridEle = $('input[name=totalGrid]:checked');
var size = checkedTotalGridEle.length;
if( size == 0 ) {
alert("선택된 프로젝트가 없습니다. '통합 검색'에서 '검색'버튼을 눌러서 원하시는 프로젝트 검색 후 '검색 결과'에서 체크하여 프로젝트를 담아주세요.");
return false;
}
var sichHole ="";
for(var i =0; i < size; i++){
if(i == 0){
sichHole = $('input[name=totalGrid]:checked')[i].value;
sichHole = checkedTotalGridEle[i].value;
}else{
sichHole += ","+$('input[name=totalGrid]:checked')[i].value;
sichHole += ","+checkedTotalGridEle[i].value;
}
}