feat: 검색 유통의 지도에서 선택된 시추공의 라벨이 보이도록 개선
parent
18eb6b9b91
commit
697d9603f6
|
|
@ -63,7 +63,11 @@ public class CommunityController {
|
|||
List<Map<String, Object>> row = communityService.selectRow(page);
|
||||
mv.addObject("rows", row);
|
||||
|
||||
mv = GeoinfoCommon.setPage(Integer.parseInt(rowCount.get("lastpage").toString()) - 1, page, mv, "cmuboard");
|
||||
if( rowCount != null ) {
|
||||
mv = GeoinfoCommon.setPage(Integer.parseInt(rowCount.get("lastpage").toString()) - 1, page, mv, "cmuboard");
|
||||
} else {
|
||||
mv = GeoinfoCommon.setPage(-1, page, mv, "cmuboard");
|
||||
}
|
||||
|
||||
return mv;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -691,7 +691,7 @@ public class MainController
|
|||
startDate = (String)params.get("startDate");
|
||||
}else {
|
||||
startDate = Integer.toString(thisYear);
|
||||
startDate = "2014";
|
||||
startDate = GeoinfoCommon.parseData(String.valueOf(params.get("startDate")));
|
||||
}
|
||||
|
||||
if(!"".equals(endDate) && endDate != null && !"null".equals(endDate) && !"undefined".equals(endDate)) {
|
||||
|
|
|
|||
|
|
@ -30,8 +30,10 @@ import org.apache.commons.io.FileUtils;
|
|||
import org.apache.commons.io.FilenameUtils;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.jfree.util.Log;
|
||||
import org.json.simple.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
|
@ -43,6 +45,7 @@ import org.springframework.web.servlet.ModelAndView;
|
|||
|
||||
import egovframework.com.cmm.service.EgovProperties;
|
||||
import egovframework.rte.psl.dataaccess.util.EgovMap;
|
||||
import geoinfo.api.geoinfo.service.GeoinfoApiV1Service;
|
||||
import geoinfo.com.GeoInfoSessionMgrListener;
|
||||
import geoinfo.com.GeoinfoCommon;
|
||||
import geoinfo.com.MultiLoginPreventor;
|
||||
|
|
@ -76,11 +79,14 @@ public class MapLeftController {
|
|||
|
||||
@Resource(name = "headerService")
|
||||
private HeaderService headerService;
|
||||
|
||||
|
||||
|
||||
|
||||
@Resource(name = "drillingHomeService")
|
||||
private DrillingHomeService drillingHomeService;
|
||||
|
||||
@Autowired
|
||||
private GeoinfoApiV1Service geoinfoApiV1Service;
|
||||
|
||||
|
||||
|
||||
private final static Logger logger = LoggerFactory.getLogger(GeoInfoSessionMgrListener.class);
|
||||
|
|
@ -259,6 +265,17 @@ public class MapLeftController {
|
|||
model.put("bbox", bbox);
|
||||
model.put("locationDataYn", locationDataYn);*/
|
||||
model.put("userId", request.getSession().getAttribute("USERID"));
|
||||
|
||||
JSONObject jsonResponse = new JSONObject();
|
||||
HashMap<String, Object> handleApiServiceParams = new HashMap<String, Object>();
|
||||
handleApiServiceParams.put("holeCode", params.get("hcode"));
|
||||
geoinfoApiV1Service.handleApiService(request, handleApiServiceParams, "sp-get-selectclass-info-h", jsonResponse);
|
||||
ArrayList<HashMap<String, Object>> dataList = (ArrayList<HashMap<String, Object>>)jsonResponse.get("data");
|
||||
if( dataList != null && 0 < dataList.size() ) {
|
||||
model.put("data", dataList.get(0));
|
||||
} else {
|
||||
model.put("data", new HashMap<String, Object>());
|
||||
}
|
||||
|
||||
return "jsonView";
|
||||
}
|
||||
|
|
@ -303,13 +320,13 @@ public class MapLeftController {
|
|||
String sidoSub = "";
|
||||
String gugunSub = "";
|
||||
String dongSub = "";
|
||||
|
||||
|
||||
// 발주기관 프로젝트 코드만 조회
|
||||
String masterCompanyCode = null;
|
||||
String masterCompanyProjectCodes = null;
|
||||
if( params.get("masterCompanyCode") != null ) {
|
||||
masterCompanyCode = GeoinfoCommon.parseData(params.get("masterCompanyCode").toString().trim());
|
||||
|
||||
|
||||
HashMap<String, Object> paramsMasterCompanyCode = new HashMap<String, Object>();
|
||||
paramsMasterCompanyCode.put("COM_CODE", masterCompanyCode);
|
||||
masterCompanyProjectCodes = drillingHomeService.projectCodesByProjectMasterCompanyCodeAsComma(paramsMasterCompanyCode);
|
||||
|
|
@ -317,7 +334,7 @@ public class MapLeftController {
|
|||
params.put("masterCompanyCode", masterCompanyCode);
|
||||
params.put("masterCompanyProjectCodes", masterCompanyProjectCodes);
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (!(sido.equals("all"))) {
|
||||
sidoSub = sido.substring(0, 4);
|
||||
|
|
@ -644,22 +661,15 @@ public class MapLeftController {
|
|||
@RequestMapping(value = "/map/mapSichInformation.do")
|
||||
public String mapSichInformation(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, Object> params) throws Exception {
|
||||
|
||||
/*List<EgovMap> result = mapControlService.selectSichInformation(params);*/
|
||||
/*List<EgovMap> hole = mapLeftService.selectHeaderFromProjectCode(params);*/
|
||||
|
||||
params.put("pcodePer", params.get("pcode") +"%");
|
||||
EgovMap bbox = mapLeftService.selectTblHeaderBBOX(params);
|
||||
/*EgovMap project = mapLeftService.selectProjectInfo2(params);*/
|
||||
logger.debug("-------------------동작확인1");
|
||||
/*EgovMap locationDataYn = mapLeftService.getLoYn(params);*/
|
||||
/*EgovMap project = mapLeftService.selectProjectInfo(params);*/
|
||||
|
||||
logger.debug("-------------------동작확인2");
|
||||
/* List<EgovMap> projectYn = mapLeftService.selectTblProjectInformationYn(params);*/
|
||||
logger.debug("-------------------동작확인3");
|
||||
/*model.put("locationDataYn", locationDataYn);*/
|
||||
|
||||
|
||||
EgovMap bbox = mapLeftService.selectTblHeaderBBOX(params);
|
||||
|
||||
JSONObject jsonResponse = new JSONObject();
|
||||
|
||||
HashMap<String, Object> handleApiServiceParams = new HashMap<String, Object>();
|
||||
handleApiServiceParams.put("projCode", params.get("pcode"));
|
||||
geoinfoApiV1Service.handleApiService(request, handleApiServiceParams, "sp-get-selectclass-info-p", jsonResponse);
|
||||
|
||||
EgovMap projectCount = mapLeftService.selectTblProjectCount(params);
|
||||
|
||||
params.put("stanSpt", projectCount.get("stanSpt"));
|
||||
|
|
@ -692,26 +702,23 @@ public class MapLeftController {
|
|||
params.put("sampleInfo", projectCount.get("sampleInfo"));
|
||||
|
||||
|
||||
model.put("projectCount", projectCount);
|
||||
model.put("projectCount", projectCount);
|
||||
model.put("data", jsonResponse.get("data"));
|
||||
|
||||
EgovMap project = mapLeftService.selectProjectInfo(params);
|
||||
model.put("project", project);
|
||||
|
||||
// projectYn에 시추공 별 시험여부가 들어간다.
|
||||
List<EgovMap> projectYn = mapLeftService.selectTblProjectInformationYn(params);
|
||||
logger.debug("-------------------동작확인4");
|
||||
geoinfoApiV1Service.handleApiService(request, handleApiServiceParams, "sp-get-selectclass-info-ph", jsonResponse);
|
||||
model.put("testCountsPerBorehole", jsonResponse.get("data"));
|
||||
|
||||
|
||||
|
||||
|
||||
logger.debug("-------------------동작확인5");
|
||||
model.put("projectYn", projectYn);
|
||||
|
||||
model.put("userId", request.getSession().getAttribute("USERID"));
|
||||
/*model.put("hole", hole);*/
|
||||
model.put("bbox", bbox);
|
||||
/*model.put("result", result);*/
|
||||
|
||||
/*model.put("projectYn", projectYn);*/
|
||||
|
||||
|
||||
return "jsonView";
|
||||
}
|
||||
|
||||
|
|
@ -917,6 +924,47 @@ public class MapLeftController {
|
|||
return "map/left/include/mapSearchArea";
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/map/mapSearchDis.do")
|
||||
public String mapSearchDist(ModelMap model, HttpServletRequest request, HttpServletResponse response, @RequestParam Map<String, Object> params) throws Exception {
|
||||
params.put("viewPage", viewPage);
|
||||
EgovMap result = mapLeftService.selectProjectListByDist( params );
|
||||
|
||||
|
||||
if (params.get("page")!= null) {
|
||||
pageIndex = Integer.parseInt(GeoinfoCommon.parseData(String.valueOf(params.get("page")))); // 현재페이지번호
|
||||
} else {
|
||||
pageIndex = 0;
|
||||
}
|
||||
|
||||
int lastPage = Integer.parseInt(result.get("count").toString()) / viewPage;
|
||||
// if (!lastPage) {
|
||||
lastPageIndex = lastPage - 1;
|
||||
|
||||
pageIndex = (pageIndex > 0) ? pageIndex : 0;
|
||||
lastPageIndex = (lastPageIndex > 0) ? lastPageIndex : 0;
|
||||
pageIndex = (pageIndex > lastPageIndex) ? lastPageIndex : pageIndex;
|
||||
// }
|
||||
|
||||
|
||||
initPageIndex(pageIndex, lastPageIndex);
|
||||
|
||||
|
||||
params.put("pageIndex", nowPage+1);
|
||||
|
||||
EgovMap rtn_result = mapLeftService.selectProjectListByDist( params );
|
||||
|
||||
model.addAttribute("result", rtn_result.get("datas"));
|
||||
model.addAttribute("params", params);
|
||||
model.addAttribute("startPage", startPage);
|
||||
model.addAttribute("endPage", endPage);
|
||||
model.addAttribute("nowPage", nowPage);
|
||||
model.addAttribute("nextPage", next);
|
||||
model.addAttribute("prePage", pre);
|
||||
|
||||
// 발주처 검색
|
||||
return "map/left/include/mapSearchDist";
|
||||
}
|
||||
|
||||
int pageIndex = 0; // 현재페이지번호
|
||||
int lastPageIndex = 0; // 마지막페이지번호
|
||||
int viewPage = Integer.parseInt(EgovProperties.getGeoinfoProperty("Globals.VIEWPAGE")) - 1; // 한번에
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ public interface MapLeftMapper {
|
|||
|
||||
EgovMap selectProjectInfo2(Map<String, Object> params) throws Exception;
|
||||
|
||||
EgovMap selectTempProjectInfo(Map<String, Object> params) throws Exception;
|
||||
|
||||
EgovMap selectGetHoleCodeInfo(Map<String, Object> params) throws Exception;
|
||||
|
||||
EgovMap selectGetHoleCodeDetailInfo(Map<String, Object> params) throws Exception;
|
||||
|
|
@ -107,4 +109,8 @@ public interface MapLeftMapper {
|
|||
|
||||
EgovMap selectTblProjectCount(Map<String, Object> params) throws Exception;
|
||||
|
||||
Long sPCntTblCsiByKeyword(Map<String, Object> params) throws Exception;
|
||||
|
||||
List<EgovMap> spGetTblCsiByKeyword(Map<String, Object> params) throws Exception;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -111,5 +111,7 @@ public interface MapLeftService {
|
|||
|
||||
EgovMap selectTblProjectCount(Map<String, Object> params) throws Exception;
|
||||
|
||||
EgovMap selectProjectListByDist(Map<String, Object> params) throws Exception;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import java.io.FileNotFoundException;
|
|||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.GregorianCalendar;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
|
@ -24,6 +25,7 @@ import org.springframework.web.multipart.MultipartRequest;
|
|||
|
||||
import egovframework.com.cmm.service.EgovProperties;
|
||||
import egovframework.rte.psl.dataaccess.util.EgovMap;
|
||||
import geoinfo.com.GeoinfoCommon;
|
||||
import geoinfo.com.file.FileCmmn;
|
||||
import geoinfo.map.left.service.MapLeftMapper;
|
||||
import geoinfo.map.left.service.MapLeftService;
|
||||
|
|
@ -59,7 +61,12 @@ public class MapLeftServiceImpl implements MapLeftService{
|
|||
|
||||
@Override
|
||||
public EgovMap selectProjectInfo(Map<String, Object> params) throws Exception {
|
||||
return mapLeftMapper.selectProjectInfo(params);
|
||||
EgovMap resultMap = new EgovMap();
|
||||
resultMap = mapLeftMapper.selectProjectInfo(params);
|
||||
if (resultMap == null) {
|
||||
resultMap = mapLeftMapper.selectTempProjectInfo(params);
|
||||
}
|
||||
return resultMap;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -516,4 +523,31 @@ public class MapLeftServiceImpl implements MapLeftService{
|
|||
return mapLeftMapper.selectTblProjectCount(params);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public EgovMap selectProjectListByDist(Map<String, Object> params) throws Exception {
|
||||
EgovMap resultMap = new EgovMap();
|
||||
|
||||
params.put("constTag", "P");
|
||||
params.put("masterCompanyOCode", GeoinfoCommon.parseData(params.get("o").toString()));
|
||||
params.put("masterCompanyTwCode", GeoinfoCommon.parseData(params.get("tw").toString()));
|
||||
params.put("masterCompanyThCode", GeoinfoCommon.parseData(params.get("th").toString()));
|
||||
params.put("masterCompanyName", "");
|
||||
params.put("nPage", params.get("pageIndex"));
|
||||
params.put("nCount", params.get("viewPage"));
|
||||
|
||||
Long count = mapLeftMapper.sPCntTblCsiByKeyword(params);
|
||||
List<EgovMap> datas = mapLeftMapper.spGetTblCsiByKeyword(params);
|
||||
|
||||
if (datas.size() < 1) {
|
||||
datas = new ArrayList<EgovMap>();
|
||||
}
|
||||
|
||||
|
||||
resultMap.put("count", count);
|
||||
resultMap.put("datas", datas);
|
||||
return resultMap;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -906,5 +906,19 @@ public class MapContorlController {
|
|||
}
|
||||
return crosses % 2 > 0;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 시추공번호로 사용자가 입력한 시추명을 가져온다.
|
||||
* @param params
|
||||
* @param model
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping(value = "/map/hole-name-by-user.do", method = RequestMethod.GET)
|
||||
public String holeNameByUser(@RequestParam Map<String, Object> params, ModelMap model) throws Exception {
|
||||
model.put("data", mapControlService.holeNameByUser(params));
|
||||
return "jsonView";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,4 +76,5 @@ public interface MapControlMapper {
|
|||
|
||||
List<EgovMap> selectHeaderSichInformation(Map<String, Object> params) throws Exception;
|
||||
|
||||
List<EgovMap> holeNameByUser(Map<String, Object> params) throws Exception;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,5 +74,7 @@ public interface MapControlService {
|
|||
List<EgovMap> selectSichInformation(Map<String, Object> params) throws Exception;
|
||||
|
||||
List<EgovMap> selectHeaderSichInformation(Map<String, Object> params) throws Exception;
|
||||
|
||||
List<EgovMap> holeNameByUser(Map<String, Object> params) throws Exception;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -184,5 +184,8 @@ public class MapContorlServiceImpl implements MapControlService{
|
|||
return mapControlMapper.selectHeaderSichInformation(params);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<EgovMap> holeNameByUser(Map<String, Object> params) throws Exception {
|
||||
return mapControlMapper.holeNameByUser(params);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import geoinfo.com.GeoinfoCommon;
|
|||
import geoinfo.map.projectSearch.service.MapProjectSearchService;
|
||||
|
||||
import java.net.URLDecoder;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
|
@ -38,6 +39,7 @@ public class MapProjectSearchController {
|
|||
String dsf = GeoinfoCommon.parseData(String.valueOf(params.get("dsf")));//
|
||||
String slickenside = GeoinfoCommon.parseData(String.valueOf(params.get("slickenside")));
|
||||
String q = GeoinfoCommon.parseData(String.valueOf(params.get("q")));
|
||||
String cone = GeoinfoCommon.parseData(String.valueOf(params.get("cone")));
|
||||
String rmr = GeoinfoCommon.parseData(String.valueOf(params.get("rmr")));
|
||||
|
||||
String classification9 = GeoinfoCommon.parseData(String.valueOf(params.get("classification9")));
|
||||
|
|
@ -61,6 +63,7 @@ public class MapProjectSearchController {
|
|||
String rock_resonant_usual = GeoinfoCommon.parseData(String.valueOf(params.get("rock_resonant_usual")));
|
||||
|
||||
String density = GeoinfoCommon.parseData(String.valueOf(params.get("density")));
|
||||
String ps = GeoinfoCommon.parseData(String.valueOf(params.get("ps")));
|
||||
String downhole = GeoinfoCommon.parseData(String.valueOf(params.get("downhole")));
|
||||
String refraction_survey = GeoinfoCommon.parseData(String.valueOf(params.get("refraction_survey")));
|
||||
String resistivity_survey = GeoinfoCommon.parseData(String.valueOf(params.get("resistivity_survey")));
|
||||
|
|
@ -92,6 +95,11 @@ public class MapProjectSearchController {
|
|||
} else if (q.equals("on") || q.equals("1")) {
|
||||
q = "1";
|
||||
}
|
||||
if (cone == null) {
|
||||
cone = "0";
|
||||
} else if (cone.equals("on") || cone.equals("1")) {
|
||||
cone = "1";
|
||||
}
|
||||
if (rmr == null) {
|
||||
rmr = "0";
|
||||
} else if (rmr.equals("on") || rmr.equals("1")) {
|
||||
|
|
@ -185,6 +193,11 @@ public class MapProjectSearchController {
|
|||
else if ((density.equals("on")) || (density.equals("1"))) {
|
||||
density = "1";
|
||||
}
|
||||
if (ps == null) {
|
||||
ps = "0";
|
||||
} else if ((ps.equals("on")) || (ps.equals("1"))) {
|
||||
ps = "1";
|
||||
}
|
||||
if (downhole == null)
|
||||
downhole = "0";
|
||||
else if ((downhole.equals("on")) || (downhole.equals("1"))) {
|
||||
|
|
@ -262,7 +275,12 @@ public class MapProjectSearchController {
|
|||
params.put("firstRow", pageIndex * viewPage);
|
||||
params.put("lastRow", (pageIndex + 1) * viewPage);
|
||||
|
||||
List<EgovMap> items = mapProjectSearchService.selectItems(params);
|
||||
List<EgovMap> items = null;
|
||||
if( lastPage == null) {
|
||||
items = new ArrayList<EgovMap>();
|
||||
} else {
|
||||
items = mapProjectSearchService.selectItems(params);
|
||||
}
|
||||
Iterator<EgovMap> iter = items.iterator();
|
||||
|
||||
if (!userId.equals(particularId1) && !userId.equals("admin_user")) {
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ import com.clipsoft.clipreport.oof.OOFDocument;
|
|||
import com.clipsoft.clipreport.oof.OOFFile;
|
||||
import com.clipsoft.clipreport.server.service.ReportUtil;
|
||||
|
||||
import egovframework.com.cmm.service.EgovProperties;
|
||||
import egovframework.rte.psl.dataaccess.util.EgovMap;
|
||||
import geoinfo.regi.common.service.CommonService;
|
||||
import geoinfo.regi.rock.service.RockService;
|
||||
|
|
@ -41,6 +42,8 @@ public class CommonController {
|
|||
|
||||
@Resource(name = "rockService")
|
||||
private RockService rockService;
|
||||
|
||||
public String filePath = EgovProperties.getProperty("Geoinfo.FilePath");
|
||||
|
||||
//지반정보등록 (관리자)
|
||||
@RequestMapping(value="/provider_info.do")
|
||||
|
|
@ -60,6 +63,30 @@ public class CommonController {
|
|||
|
||||
return "/web/common/provider_info";
|
||||
}
|
||||
|
||||
private String getImagePath(String path, String imagePath) {
|
||||
|
||||
// 1. imagePath가 null인 경우 null을 반환합니다.
|
||||
if (imagePath == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
File imageFile = new File(imagePath);
|
||||
|
||||
// 2. 파일이 존재하는지 확인합니다.
|
||||
if (imageFile.exists()) {
|
||||
// 2-1. 파일이 존재하지만 크기가 0바이트인 경우
|
||||
if (imageFile.length() == 0) {
|
||||
return path + "/web/images/no_image_zero_byte.png";
|
||||
} else {
|
||||
// 2-2. 파일이 정상적으로 존재하는 경우
|
||||
return imagePath;
|
||||
}
|
||||
} else {
|
||||
// 3. 파일이 존재하지 않는 경우
|
||||
return path + "/web/images/no_image_not_found.png";
|
||||
}
|
||||
}
|
||||
|
||||
@RequestMapping(value="/com/includeFooterInput")
|
||||
public String includeFooterInput(@RequestParam HashMap<String,Object> params, ModelMap model,HttpServletRequest request, HttpServletResponse response) throws Exception{
|
||||
|
|
@ -247,7 +274,8 @@ public class CommonController {
|
|||
if("noImage".equals(boreholeWaveImage[0]) || "noImage".equals(boreholeWaveImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + boreholeWaveHolecode[i] + "/BOREHOLE_WAVE/" + boreholeWaveImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + boreholeWaveHolecode[i] + "/BOREHOLE_WAVE/" + boreholeWaveImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
|
||||
OOFFile file4 = oof.addFile("reb.root", realPath+"web\\preview\\BOREHOLE_WAVE.reb");
|
||||
|
|
@ -299,7 +327,8 @@ public class CommonController {
|
|||
if("noImage".equals(densityImage[0]) || "noImage".equals(densityImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + densityHolecode[i] + "/DENSITY/" + densityImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + densityHolecode[i] + "/DENSITY/" + densityImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
|
||||
OOFFile file5 = oof.addFile("reb.root", realPath+"web\\preview\\DENSITY.reb");
|
||||
|
|
@ -325,7 +354,8 @@ public class CommonController {
|
|||
if("noImage".equals(downholeImage[0]) || "noImage".equals(downholeImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + downholeHolecode[i] + "/DOWNHOLE/" + downholeImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + downholeHolecode[i] + "/DOWNHOLE/" + downholeImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
|
||||
OOFFile file6 = oof.addFile("reb.root", realPath+"web\\preview\\DOWNHOLE.reb");
|
||||
|
|
@ -381,7 +411,8 @@ public class CommonController {
|
|||
if("noImage".equals(coneImage[0]) || "noImage".equals(coneImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + coneHolecode[i] + "/CONE/" + coneImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + coneHolecode[i] + "/CONE/" + coneImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file29 = oof.addFile("reb.root", realPath+"web\\preview\\FIELD_CONE_PENETRATION.reb");
|
||||
file29.addConnectionData("*", "oracle1");
|
||||
|
|
@ -401,7 +432,8 @@ public class CommonController {
|
|||
if("noImage".equals(cone_image) ){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + cone_holecode + "/CONE/" + cone_image;
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + cone_holecode + "/CONE/" + cone_image;
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file29 = oof.addFile("reb.root", realPath+"web\\preview\\FIELD_CONE_PENETRATION.reb");
|
||||
file29.addConnectionData("*", "oracle1");
|
||||
|
|
@ -426,7 +458,8 @@ public class CommonController {
|
|||
if("noImage".equals(permeabilityImage[0]) || "noImage".equals(permeabilityImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + permeabilityHolecode[i] + "/PERMEABILITY/" + permeabilityImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + permeabilityHolecode[i] + "/PERMEABILITY/" + permeabilityImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file8 = oof.addFile("reb.root", realPath+"web\\preview\\FIELD_PERMEABILITY.reb");
|
||||
file8.addConnectionData("*", "oracle1");
|
||||
|
|
@ -454,7 +487,8 @@ public class CommonController {
|
|||
if("noImage".equals(permeabilityImage[i]) ||"null".equals(permeabilityImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + permeabilityHolecode[i] + "/PERMEABILITY/" + permeabilityImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + permeabilityHolecode[i] + "/PERMEABILITY/" + permeabilityImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file30 = oof.addFile("reb.root", realPath+"web\\preview\\FIELD_PERMEABILITY.reb");
|
||||
file30.addConnectionData("*", "oracle1");
|
||||
|
|
@ -480,7 +514,8 @@ public class CommonController {
|
|||
if("noImage".equals(pressuremeterImage[0]) || "noImage".equals(pressuremeterImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + pressuremeterHolecode[i] + "/PRESSUREMETER/" + pressuremeterImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + pressuremeterHolecode[i] + "/PRESSUREMETER/" + pressuremeterImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file9 = oof.addFile("reb.root", realPath+"web\\preview\\FIELD_PRESSUREMETER.reb");
|
||||
file9.addConnectionData("*", "oracle1");
|
||||
|
|
@ -507,7 +542,8 @@ public class CommonController {
|
|||
if("noImage".equals(waterpressureImage[0]) || "noImage".equals(waterpressureImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + waterpressureHolecode[i] + "/WATERPRESSURE/" + waterpressureImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + waterpressureHolecode[i] + "/WATERPRESSURE/" + waterpressureImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file10 = oof.addFile("reb.root", realPath+"web\\preview\\FIELD_WATERPRESSURE.reb");
|
||||
file10.addConnectionData("*", "oracle1");
|
||||
|
|
@ -538,7 +574,8 @@ public class CommonController {
|
|||
if("noImage".equals(waterpressureImage[i]) || "null".equals(waterpressureImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + waterpressureHolecode[i] + "/WATERPRESSURE/" + waterpressureImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + waterpressureHolecode[i] + "/WATERPRESSURE/" + waterpressureImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file31 = oof.addFile("reb.root", realPath+"web\\preview\\FIELD_WATERPRESSURE.reb");
|
||||
file31.addConnectionData("*", "oracle1");
|
||||
|
|
@ -566,7 +603,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockRepeatTriImage[0]) || "noImage".equals(rockRepeatTriImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockRepeatTriHolecode[i] + "/ROCK_REPEATED/" + rockRepeatTriImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockRepeatTriHolecode[i] + "/ROCK_REPEATED/" + rockRepeatTriImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file12 = oof.addFile("reb.root", realPath+"web\\preview\\REPEATED_U.reb");
|
||||
file12.addConnectionData("*", "oracle1");
|
||||
|
|
@ -596,7 +634,8 @@ public class CommonController {
|
|||
if("noImage".equals(repeatTriImage[0]) || "noImage".equals(repeatTriImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + repeatTriHolecode[i] + "/SAND_REPEATED/" + repeatTriImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + repeatTriHolecode[i] + "/SAND_REPEATED/" + repeatTriImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file13 = oof.addFile("reb.root", realPath+"web\\preview\\REPEATED.reb");
|
||||
file13.addConnectionData("*", "oracle1");
|
||||
|
|
@ -625,7 +664,8 @@ public class CommonController {
|
|||
if("noImage".equals(resonantImage[0]) || "noImage".equals(resonantImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + resonantHolecode[i] + "/SAND_RESONANT/" + resonantImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + resonantHolecode[i] + "/SAND_RESONANT/" + resonantImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file15 = oof.addFile("reb.root", realPath+"web\\preview\\RESONANT.reb");
|
||||
file15.addConnectionData("*", "oracle1");
|
||||
|
|
@ -653,7 +693,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockResonantImage[0]) || "noImage".equals(rockResonantImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockResonantHolecode[i] + "/ROCK_RESONANT/" + rockResonantImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockResonantHolecode[i] + "/ROCK_RESONANT/" + rockResonantImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file16 = oof.addFile("reb.root", realPath+"web\\preview\\RESONANT_ROCK.reb");
|
||||
file16.addConnectionData("*", "oracle1");
|
||||
|
|
@ -686,7 +727,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockJointshearImage)){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockJointshearHolecode + "/ROCK_JOINTSHEAR/" + rockJointshearImage;
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockJointshearHolecode + "/ROCK_JOINTSHEAR/" + rockJointshearImage;
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file17 = oof.addFile("reb.root", realPath+"web\\preview\\ROCK_JOINTSHEAR.reb");
|
||||
file17.addConnectionData("*", "oracle1");
|
||||
|
|
@ -738,7 +780,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockPointloadImage) ){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockPointloadHolecode + "/ROCK_POINTLOAD/" + rockPointloadImage;
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockPointloadHolecode + "/ROCK_POINTLOAD/" + rockPointloadImage;
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file18 = oof.addFile("reb.root", realPath+"web\\preview\\ROCK_POINTLOAD.reb");
|
||||
file18.addConnectionData("*", "oracle1");
|
||||
|
|
@ -783,7 +826,8 @@ public class CommonController {
|
|||
if("noImage".equals((String)rockTri.get(0).get("graphImage")) || "noImage".equals(rockTriImage)){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockTriHolecode + "/ROCK_TRIAXIAL/" + rockTriImage;
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockTriHolecode + "/ROCK_TRIAXIAL/" + rockTriImage;
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file19 = oof.addFile("reb.root", realPath+"web\\preview\\ROCK_TRIAXIAL.reb");
|
||||
file19.addConnectionData("*", "oracle1");
|
||||
|
|
@ -839,12 +883,14 @@ public class CommonController {
|
|||
if("noImage".equals(rockUni_image1)){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockUni_holecode + "/ROCK_UNIAXIAL/" + rockUni_image1;
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockUni_holecode + "/ROCK_UNIAXIAL/" + rockUni_image1;
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(rockUni_image2) ){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = Path + "/files/web/CH/" + projectCode + "/" + rockUni_holecode + "/ROCK_UNIAXIAL/" +rockUni_image2;
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/" + rockUni_holecode + "/ROCK_UNIAXIAL/" +rockUni_image2;
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
|
||||
OOFFile file20 = oof.addFile("reb.root", realPath+"web\\preview\\ROCK_UNIAXIAL.reb");
|
||||
|
|
@ -887,12 +933,14 @@ public class CommonController {
|
|||
if("noImage".equals(cbrCompacImage1[0]) || "noImage".equals(cbrCompacImage1[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + cbrCompacHolecode[i] + "/SAND_CBR/" + cbrCompacImage1[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + cbrCompacHolecode[i] + "/SAND_CBR/" + cbrCompacImage1[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(cbrCompacImage2[0]) || "noImage".equals(cbrCompacImage2[i])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = Path + "/files/web/CH/" + projectCode + "/" + cbrCompacHolecode[i] + "/SAND_CBR/" + cbrCompacImage2[i];
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/" + cbrCompacHolecode[i] + "/SAND_CBR/" + cbrCompacImage2[i];
|
||||
imagePath2 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file21 = oof.addFile("reb.root", realPath+"web\\preview\\SOIL_CBR.reb");
|
||||
file21.addConnectionData("*", "oracle1");
|
||||
|
|
@ -941,7 +989,8 @@ public class CommonController {
|
|||
if("noImage".equals(classificationImage[0]) || "noImage".equals(classificationImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + classificationHolecode[i] + "/SAND_CLASSIFICATION/" + classificationImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + classificationHolecode[i] + "/SAND_CLASSIFICATION/" + classificationImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file22 = oof.addFile("reb.root", realPath+"web\\preview\\SOIL_CLASSIFICATION.reb");
|
||||
file22.addConnectionData("*", "oracle1");
|
||||
|
|
@ -995,7 +1044,8 @@ public class CommonController {
|
|||
if("noImage".equals(classificationImage2[0]) || "noImage".equals(classificationImage2[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + classificationHolecode2[i] + "/SAND_CLASSIFICATION/" + classificationImage2[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + classificationHolecode2[i] + "/SAND_CLASSIFICATION/" + classificationImage2[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file30 = oof.addFile("reb.root", realPath+"web\\preview\\SOIL_CLASSIFICATION.reb");
|
||||
file30.addConnectionData("*", "oracle1");
|
||||
|
|
@ -1022,7 +1072,8 @@ public class CommonController {
|
|||
if("noImage".equals(consolidationImage[0]) || "noImage".equals(consolidationImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + consolidationHolecode[i] + "/SAND_CONSOLIDATION/" + consolidationImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + consolidationHolecode[i] + "/SAND_CONSOLIDATION/" + consolidationImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
|
||||
OOFFile file23 = oof.addFile("reb.root", realPath+"web\\preview\\SOIL_CONSOLIDATION.reb");
|
||||
|
|
@ -1064,12 +1115,14 @@ public class CommonController {
|
|||
if("noImage".equals(triCuImage1[0]) || "noImage".equals(triCuImage1[0])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triCuImage1[0];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triCuImage1[0];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(triCuImage2[0]) || "noImage".equals(triCuImage2[0])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = Path + "/files/web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triCuImage2[0];
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triCuImage2[0];
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
OOFFile file23 = oof.addFile("reb.root", realPath+"web\\preview\\SOIL_TRIAXIAL_CU.reb");
|
||||
file23.addConnectionData("*", "oracle1");
|
||||
|
|
@ -1138,12 +1191,14 @@ public class CommonController {
|
|||
if("noImage".equals(triUuImage1[0]) || "noImage".equals(triUuImage1[0])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triUuImage1[0];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triUuImage1[0];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(triUuImage2[0]) || "noImage".equals(triUuImage2[0])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = Path + "/files/web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triUuImage2[0];
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triUuImage2[0];
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
OOFFile file24 = oof.addFile("reb.root", realPath+"web\\preview\\SOIL_TRIAXIAL_UU.reb");
|
||||
file24.addConnectionData("*", "oracle1");
|
||||
|
|
@ -1197,7 +1252,8 @@ public class CommonController {
|
|||
if("noImage".equals(unconfineImage[0]) || "noImage".equals(unconfineImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + unconfineHolecode[i] + "/SAND_UNCONFINED/" + unconfineImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + unconfineHolecode[i] + "/SAND_UNCONFINED/" + unconfineImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
|
||||
OOFFile file25 = oof.addFile("reb.root", realPath+"web\\preview\\SOIL_UNCONFINED.reb");
|
||||
|
|
@ -1208,10 +1264,6 @@ public class CommonController {
|
|||
file25.addField("sample_code", unconfineSamplecode[i]);
|
||||
file25.addField("image1", imagePath1);
|
||||
|
||||
|
||||
params.put("TEST_INFO_CODE", "SAND_UNCONFINED_USUAL");
|
||||
params.put("HOLE_CODE", unconfineHolecode[i]);
|
||||
|
||||
// 단위중량의 단위를 구한다.
|
||||
params.put("INI_UNIT", "kN/㎥");
|
||||
params.put("ITEM_INFO_CODE", "UNCONF_UNDISTURB_RT");
|
||||
|
|
@ -1238,10 +1290,6 @@ public class CommonController {
|
|||
|
||||
String holeCode_ = (String)result.get("holecode");
|
||||
String holeCodeSplit[] = holeCode_.split(",");
|
||||
if( holeCode != null && holeCode.split(",").length == 1) {
|
||||
// holeCode가 parameter로 넘어왔고 시추공 수가 한개라면 해당 시추공만 보여준다.
|
||||
holeCodeSplit = holeCode.split(",");
|
||||
}
|
||||
int holeCodeCnt = holeCodeSplit.length;
|
||||
|
||||
for(int i=0; i<holeCodeCnt; i++){
|
||||
|
|
@ -1317,7 +1365,8 @@ public class CommonController {
|
|||
if("noImage".equals(densityImage[0]) || "noImage".equals(densityImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + densityHolecode[i] + "/DENSITY/" + densityImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + densityHolecode[i] + "/DENSITY/" + densityImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
|
||||
OOFFile file33 = oof.addFile("reb.root", realPath+"web\\service\\DENSITY.reb");
|
||||
|
|
@ -1344,7 +1393,8 @@ public class CommonController {
|
|||
if("noImage".equals(downholeImage[0]) || "noImage".equals(downholeImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + downholeHolecode[i] + "/DOWNHOLE/" + downholeImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + downholeHolecode[i] + "/DOWNHOLE/" + downholeImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
|
||||
OOFFile file34 = oof.addFile("reb.root", realPath+"web\\service\\DOWNHOLE.reb");
|
||||
|
|
@ -1390,7 +1440,8 @@ public class CommonController {
|
|||
if("noImage".equals(boreholeWaveImage[0]) || "noImage".equals(boreholeWaveImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + boreholeWaveHolecode[i] + "/BOREHOLE_WAVE/" + boreholeWaveImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + boreholeWaveHolecode[i] + "/BOREHOLE_WAVE/" + boreholeWaveImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
|
||||
OOFFile file35 = oof.addFile("reb.root", realPath+"web\\service\\BOREHOLE_WAVE.reb");
|
||||
|
|
@ -1453,7 +1504,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockRepeatTriImage[0]) || "noImage".equals(rockRepeatTriImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockRepeatTriHolecode[i] + "/ROCK_REPEATED/" + rockRepeatTriImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockRepeatTriHolecode[i] + "/ROCK_REPEATED/" + rockRepeatTriImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file36 = oof.addFile("reb.root", realPath+"web\\service\\REPEATED_U.reb");
|
||||
file36.addConnectionData("*", "oracle1");
|
||||
|
|
@ -1485,7 +1537,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockRepeatTriImage[0]) || "noImage".equals(rockRepeatTriImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockRepeatTriHolecode[i] + "/ROCK_REPEATED/" + rockRepeatTriImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockRepeatTriHolecode[i] + "/ROCK_REPEATED/" + rockRepeatTriImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file72 = oof.addFile("reb.root", realPath+"web\\service\\REPEATED_U.reb");
|
||||
file72.addConnectionData("*", "oracle1");
|
||||
|
|
@ -1541,7 +1594,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockResonantImage[0]) || "noImage".equals(rockResonantImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockResonantHolecode[i] + "/ROCK_RESONANT/" + rockResonantImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockResonantHolecode[i] + "/ROCK_RESONANT/" + rockResonantImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file37 = oof.addFile("reb.root", realPath+"web\\service\\RESONANT_ROCK.reb");
|
||||
file37.addConnectionData("*", "oracle1");
|
||||
|
|
@ -1614,7 +1668,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockResonantImage[0]) || "noImage".equals(rockResonantImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockResonantHolecode[i] + "/ROCK_RESONANT/" + rockResonantImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockResonantHolecode[i] + "/ROCK_RESONANT/" + rockResonantImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file71 = oof.addFile("reb.root", realPath+"web\\service\\RESONANT_ROCK.reb");
|
||||
file71.addConnectionData("*", "oracle1");
|
||||
|
|
@ -1685,7 +1740,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockJointshearImage[0]) || "noImage".equals(rockJointshearImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockJointshearHolecode[i] + "/ROCK_JOINTSHEAR/" + rockJointshearImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockJointshearHolecode[i] + "/ROCK_JOINTSHEAR/" + rockJointshearImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file39 = oof.addFile("reb.root", realPath+"web\\service\\ROCK_JOINTSHEAR.reb");
|
||||
file39.addConnectionData("*", "oracle1");
|
||||
|
|
@ -1764,7 +1820,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockJointshearImage[0]) || "noImage".equals(rockJointshearImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockJointshearHolecode[i] + "/ROCK_JOINTSHEAR/" + rockJointshearImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockJointshearHolecode[i] + "/ROCK_JOINTSHEAR/" + rockJointshearImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file70 = oof.addFile("reb.root", realPath+"web\\service\\ROCK_JOINTSHEAR.reb");
|
||||
file70.addConnectionData("*", "oracle1");
|
||||
|
|
@ -1841,7 +1898,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockPointloadImage[0]) || "noImage".equals(rockPointloadImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockPointloadHolecode[i] + "/ROCK_POINTLOAD/" + rockPointloadImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockPointloadHolecode[i] + "/ROCK_POINTLOAD/" + rockPointloadImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file40 = oof.addFile("reb.root", realPath+"web\\service\\ROCK_POINTLOAD.reb");
|
||||
file40.addConnectionData("*", "oracle1");
|
||||
|
|
@ -1904,7 +1962,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockPointloadImage[0]) || "noImage".equals(rockPointloadImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockPointloadHolecode[i] + "/ROCK_POINTLOAD/" + rockPointloadImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockPointloadHolecode[i] + "/ROCK_POINTLOAD/" + rockPointloadImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file69 = oof.addFile("reb.root", realPath+"web\\service\\ROCK_POINTLOAD.reb");
|
||||
file69.addConnectionData("*", "oracle1");
|
||||
|
|
@ -1977,7 +2036,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockTriImage[0]) || "noImage".equals(rockTriImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockTriHolecode[i] + "/ROCK_TRIAXIAL/" + rockTriImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockTriHolecode[i] + "/ROCK_TRIAXIAL/" + rockTriImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file41 = oof.addFile("reb.root", realPath+"web\\service\\ROCK_TRIAXIAL.reb");
|
||||
file41.addConnectionData("*", "oracle1");
|
||||
|
|
@ -2054,7 +2114,8 @@ public class CommonController {
|
|||
if("noImage".equals(rockTriImage[0]) || "noImage".equals(rockTriImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockTriHolecode[i] + "/ROCK_TRIAXIAL/" + rockTriImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockTriHolecode[i] + "/ROCK_TRIAXIAL/" + rockTriImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file68 = oof.addFile("reb.root", realPath+"web\\service\\ROCK_TRIAXIAL.reb");
|
||||
file68.addConnectionData("*", "oracle1");
|
||||
|
|
@ -2126,12 +2187,14 @@ public class CommonController {
|
|||
if("noImage".equals(rockUniImage1[0]) || "noImage".equals(rockUniImage1[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockUniHolecode[i] + "/ROCK_UNIAXIAL/" + rockUniImage1[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockUniHolecode[i] + "/ROCK_UNIAXIAL/" + rockUniImage1[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(rockUniImage2[0]) || "noImage".equals(rockUniImage2[i])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = Path + "/files/web/CH/" + projectCode + "/" + rockUniHolecode[i] + "/ROCK_UNIAXIAL/" + rockUniImage2[i];
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/" + rockUniHolecode[i] + "/ROCK_UNIAXIAL/" + rockUniImage2[i];
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
OOFFile file42 = oof.addFile("reb.root", realPath+"web\\service\\ROCK_UNIAXIAL.reb");
|
||||
file42.addConnectionData("*", "oracle1");
|
||||
|
|
@ -2190,12 +2253,14 @@ public class CommonController {
|
|||
if("noImage".equals(rockUniImage1[0]) || "noImage".equals(rockUniImage1[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + rockUniHolecode[i] + "/ROCK_UNIAXIAL/" + rockUniImage1[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + rockUniHolecode[i] + "/ROCK_UNIAXIAL/" + rockUniImage1[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(rockUniImage2[0]) || "noImage".equals(rockUniImage2[i])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = Path + "/files/web/CH/" + projectCode + "/" + rockUniHolecode[i] + "/ROCK_UNIAXIAL/" + rockUniImage2[i];
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/" + rockUniHolecode[i] + "/ROCK_UNIAXIAL/" + rockUniImage2[i];
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
OOFFile file67 = oof.addFile("reb.root", realPath+"web\\service\\ROCK_UNIAXIAL.reb");
|
||||
file67.addConnectionData("*", "oracle1");
|
||||
|
|
@ -2255,7 +2320,8 @@ public class CommonController {
|
|||
if("noImage".equals(repeatTriImage[0]) || "noImage".equals(repeatTriImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + repeatTriHolecode[i] + "/SAND_REPEATED/" + repeatTriImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + repeatTriHolecode[i] + "/SAND_REPEATED/" + repeatTriImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file43 = oof.addFile("reb.root", realPath+"web\\service\\REPEATED.reb");
|
||||
file43.addConnectionData("*", "oracle1");
|
||||
|
|
@ -2329,7 +2395,8 @@ public class CommonController {
|
|||
if("noImage".equals(repeatTriImage[0]) || "noImage".equals(repeatTriImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + repeatTriHolecode[i] + "/SAND_REPEATED/" + repeatTriImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + repeatTriHolecode[i] + "/SAND_REPEATED/" + repeatTriImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file66 = oof.addFile("reb.root", realPath+"web\\service\\REPEATED.reb");
|
||||
file66.addConnectionData("*", "oracle1");
|
||||
|
|
@ -2382,7 +2449,8 @@ public class CommonController {
|
|||
if("noImage".equals(resonantImage[0]) || "noImage".equals(resonantImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + resonantHolecode[i] + "/SAND_RESONANT/" + resonantImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + resonantHolecode[i] + "/SAND_RESONANT/" + resonantImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file44 = oof.addFile("reb.root", realPath+"web\\service\\RESONANT.reb");
|
||||
file44.addConnectionData("*", "oracle1");
|
||||
|
|
@ -2444,7 +2512,8 @@ public class CommonController {
|
|||
if("noImage".equals(resonantImage[0]) || "noImage".equals(resonantImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + resonantHolecode[i] + "/SAND_RESONANT/" + resonantImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + resonantHolecode[i] + "/SAND_RESONANT/" + resonantImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file65 = oof.addFile("reb.root", realPath+"web\\service\\RESONANT.reb");
|
||||
file65.addConnectionData("*", "oracle1");
|
||||
|
|
@ -2453,7 +2522,10 @@ public class CommonController {
|
|||
file65.addField("rc_seq", resonantCode[i]);
|
||||
file65.addField("image1", imagePath1);
|
||||
|
||||
for(int k =0; k <HoleCodeUnit.length; k++ ){
|
||||
for(int k =0; k <HoleCodeUnit.length; k++ ) {
|
||||
if( HoleCodeUnit.length -1 < i ) {
|
||||
break;
|
||||
}
|
||||
if(HoleCodeUnit[k].equals(HoleCodeUnit[i])){
|
||||
if(ItemInfoCode[k].equals("RC_DENSITY_IN_SITU")){
|
||||
|
||||
|
|
@ -2522,12 +2594,14 @@ public class CommonController {
|
|||
if("noImage".equals(triUuImage1[0]) || "noImage".equals(triUuImage1[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triUuImage1[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triUuImage1[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(triUuImage2[0]) || "noImage".equals(triUuImage2[i])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = Path + "/files/web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triUuImage2[i];
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triUuImage2[i];
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
OOFFile file45 = oof.addFile("reb.root", realPath+"web\\service\\SOIL_TRIAXIAL_UU.reb");
|
||||
file45.addConnectionData("*", "oracle1");
|
||||
|
|
@ -2606,12 +2680,14 @@ public class CommonController {
|
|||
if("noImage".equals(triUuImage1[0]) || "noImage".equals(triUuImage1[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triUuImage1[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triUuImage1[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(triUuImage2[0]) || "noImage".equals(triUuImage2[i])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = Path + "/files/web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triUuImage2[i];
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triUuImage2[i];
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
OOFFile file64 = oof.addFile("reb.root", realPath+"web\\service\\SOIL_TRIAXIAL_UU.reb");
|
||||
file64.addConnectionData("*", "oracle1");
|
||||
|
|
@ -2691,12 +2767,14 @@ public class CommonController {
|
|||
if("noImage".equals(triCuImage1[0]) || "noImage".equals(triCuImage1[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triCuImage1[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triCuImage1[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(triCuImage2[0]) || "noImage".equals(triCuImage2[i])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = Path + "/files/web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triCuImage2[i];
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triCuImage2[i];
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
OOFFile file46 = oof.addFile("reb.root", realPath+"web\\service\\SOIL_TRIAXIAL_CU.reb");
|
||||
file46.addConnectionData("*", "oracle1");
|
||||
|
|
@ -2776,12 +2854,14 @@ public class CommonController {
|
|||
if("noImage".equals(triCuImage1[0]) || "noImage".equals(triCuImage1[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triCuImage1[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triCuImage1[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(triCuImage2[0]) || "noImage".equals(triCuImage2[i])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = Path + "/files/web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triCuImage2[i];
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/" + holeCode + "/SAND_TRIAXIAL/" + triCuImage2[i];
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
OOFFile file63 = oof.addFile("reb.root", realPath+"web\\service\\SOIL_TRIAXIAL_CU.reb");
|
||||
file63.addConnectionData("*", "oracle1");
|
||||
|
|
@ -2862,7 +2942,8 @@ public class CommonController {
|
|||
if("noImage".equals(unconfineImage[0]) || "noImage".equals(unconfineImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + unconfineHolecode[i] + "/SAND_UNCONFINED/" + unconfineImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + unconfineHolecode[i] + "/SAND_UNCONFINED/" + unconfineImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
|
||||
OOFFile file47 = oof.addFile("reb.root", realPath+"web\\service\\SOIL_UNCONFINED.reb");
|
||||
|
|
@ -2938,7 +3019,8 @@ public class CommonController {
|
|||
if("noImage".equals(unconfineImage[0]) || "noImage".equals(unconfineImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + unconfineHolecode[i] + "/SAND_UNCONFINED/" + unconfineImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + unconfineHolecode[i] + "/SAND_UNCONFINED/" + unconfineImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
|
||||
OOFFile file62 = oof.addFile("reb.root", realPath+"web\\service\\SOIL_UNCONFINED.reb");
|
||||
|
|
@ -3015,7 +3097,8 @@ public class CommonController {
|
|||
if("noImage".equals(consolidationImage[0]) || "noImage".equals(consolidationImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + consolidationHolecode[i] + "/SAND_CONSOLIDATION/" + consolidationImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + consolidationHolecode[i] + "/SAND_CONSOLIDATION/" + consolidationImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
|
||||
OOFFile file48 = oof.addFile("reb.root", realPath+"web\\service\\SOIL_CONSOLIDATION.reb");
|
||||
|
|
@ -3088,7 +3171,8 @@ public class CommonController {
|
|||
if("noImage".equals(consolidationImage[0]) || "noImage".equals(consolidationImage[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + consolidationHolecode[i] + "/SAND_CONSOLIDATION/" + consolidationImage[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + consolidationHolecode[i] + "/SAND_CONSOLIDATION/" + consolidationImage[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
|
||||
OOFFile file60 = oof.addFile("reb.root", realPath+"web\\service\\SOIL_CONSOLIDATION.reb");
|
||||
|
|
@ -3163,12 +3247,14 @@ public class CommonController {
|
|||
if("noImage".equals(cbrCompacImage1[0]) || "noImage".equals(cbrCompacImage1[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + cbrCompacHolecode[i] + "/SAND_CBR/" + cbrCompacImage1[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + cbrCompacHolecode[i] + "/SAND_CBR/" + cbrCompacImage1[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(cbrCompacImage2[0]) || "noImage".equals(cbrCompacImage2[i])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = Path + "/files/web/CH/" + projectCode + "/" + cbrCompacHolecode[i] + "/SAND_CBR/" + cbrCompacImage2[i];
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/" + cbrCompacHolecode[i] + "/SAND_CBR/" + cbrCompacImage2[i];
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
OOFFile file49 = oof.addFile("reb.root", realPath+"web\\service\\SOIL_CBR.reb");
|
||||
file49.addConnectionData("*", "oracle1");
|
||||
|
|
@ -3233,12 +3319,14 @@ public class CommonController {
|
|||
if("noImage".equals(cbrCompacImage1[0]) || "noImage".equals(cbrCompacImage1[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + cbrCompacHolecode[i] + "/SAND_CBR/" + cbrCompacImage1[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + cbrCompacHolecode[i] + "/SAND_CBR/" + cbrCompacImage1[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(cbrCompacImage2[0]) || "noImage".equals(cbrCompacImage2[i])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = Path + "/files/web/CH/" + projectCode + "/" + cbrCompacHolecode[i] + "/SAND_CBR/" + cbrCompacImage2[i];
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/" + cbrCompacHolecode[i] + "/SAND_CBR/" + cbrCompacImage2[i];
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
OOFFile file61 = oof.addFile("reb.root", realPath+"web\\service\\SOIL_CBR.reb");
|
||||
file61.addConnectionData("*", "oracle1");
|
||||
|
|
@ -3296,7 +3384,8 @@ public class CommonController {
|
|||
if("noImage".equals(classificationImage2[0]) || "noImage".equals(classificationImage2[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + classificationHolecode2[i] + "/SAND_CLASSIFICATION/" + classificationImage2[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + classificationHolecode2[i] + "/SAND_CLASSIFICATION/" + classificationImage2[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file50 = oof.addFile("reb.root", realPath+"web\\service\\SOIL_CLASSIFICATION.reb");
|
||||
file50.addConnectionData("*", "oracle1");
|
||||
|
|
@ -3342,7 +3431,8 @@ public class CommonController {
|
|||
if("noImage".equals(classificationImage2[0]) || "noImage".equals(classificationImage2[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = Path + "/files/web/CH/" + projectCode + "/" + classificationHolecode2[i] + "/SAND_CLASSIFICATION/" + classificationImage2[i];
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/" + classificationHolecode2[i] + "/SAND_CLASSIFICATION/" + classificationImage2[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
OOFFile file59 = oof.addFile("reb.root", realPath+"web\\service\\SOIL_CLASSIFICATION.reb");
|
||||
file59.addConnectionData("*", "oracle1");
|
||||
|
|
@ -3397,7 +3487,8 @@ public class CommonController {
|
|||
if("noImage".equals(coneImage[0]) || "noImage".equals(coneImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + coneHolecode[i] + "/CONE/" + coneImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + coneHolecode[i] + "/CONE/" + coneImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file52 = oof.addFile("reb.root", realPath+"web\\service\\FIELD_CONE_PENETRATION.reb");
|
||||
file52.addConnectionData("*", "oracle1");
|
||||
|
|
@ -3464,7 +3555,8 @@ public class CommonController {
|
|||
if("noImage".equals(coneImage[0]) || "noImage".equals(coneImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + coneHolecode[i] + "/CONE/" + coneImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + coneHolecode[i] + "/CONE/" + coneImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file58 = oof.addFile("reb.root", realPath+"web\\service\\FIELD_CONE_PENETRATION.reb");
|
||||
file58.addConnectionData("*", "oracle1");
|
||||
|
|
@ -3532,7 +3624,8 @@ public class CommonController {
|
|||
if("noImage".equals(permeabilityImage[0]) || "noImage".equals(permeabilityImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + permeabilityHolecode[i] + "/PERMEABILITY/" + permeabilityImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + permeabilityHolecode[i] + "/PERMEABILITY/" + permeabilityImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file53 = oof.addFile("reb.root", realPath+"web\\service\\FIELD_PERMEABILITY.reb");
|
||||
file53.addConnectionData("*", "oracle1");
|
||||
|
|
@ -3583,7 +3676,8 @@ public class CommonController {
|
|||
if("noImage".equals(permeabilityImage[0]) || "noImage".equals(permeabilityImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + permeabilityHolecode[i] + "/PERMEABILITY/" + permeabilityImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + permeabilityHolecode[i] + "/PERMEABILITY/" + permeabilityImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file56 = oof.addFile("reb.root", realPath+"web\\service\\FIELD_PERMEABILITY.reb");
|
||||
file56.addConnectionData("*", "oracle1");
|
||||
|
|
@ -3614,7 +3708,8 @@ public class CommonController {
|
|||
if("noImage".equals(waterpressureImage[0]) || "noImage".equals(waterpressureImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + waterpressureHolecode[i] + "/WATERPRESSURE/" + waterpressureImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + waterpressureHolecode[i] + "/WATERPRESSURE/" + waterpressureImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file54 = oof.addFile("reb.root", realPath+"web\\service\\FIELD_WATERPRESSURE.reb");
|
||||
file54.addConnectionData("*", "oracle1");
|
||||
|
|
@ -3647,7 +3742,8 @@ public class CommonController {
|
|||
if("noImage".equals(waterpressureImage[0]) || "noImage".equals(waterpressureImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = Path + "/files/web/CH/" + projectCode + "/" + waterpressureHolecode[i] + "/WATERPRESSURE/" + waterpressureImage[i];
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + waterpressureHolecode[i] + "/WATERPRESSURE/" + waterpressureImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file57 = oof.addFile("reb.root", realPath+"web\\service\\FIELD_WATERPRESSURE.reb");
|
||||
file57.addConnectionData("*", "oracle1");
|
||||
|
|
@ -3658,6 +3754,135 @@ public class CommonController {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
//검색유통 공내재하시험
|
||||
if(tblTestInfoCode.equals("TBL_FIELD_PRESSUREMETER")) {
|
||||
EgovMap pressuremeter = masterService.getPressuremeter(params);
|
||||
|
||||
String pressuremeter_holecode = (String)pressuremeter.get("holeCode");
|
||||
String pressuremeter_code = (String)pressuremeter.get("fieldprescode");
|
||||
String pressuremeter_image = (String)pressuremeter.get("graphImage");
|
||||
|
||||
String pressuremeterHolecode[] = pressuremeter_holecode.split(",");
|
||||
String pressuremeterCode[] = pressuremeter_code.split(",");
|
||||
String pressuremeterImage[] = pressuremeter_image.split(",");
|
||||
int pressuremeterCnt = pressuremeterHolecode.length;
|
||||
|
||||
for(int i=0; i<pressuremeterCnt; i++){
|
||||
if( !pressuremeterHolecode[i].equals(holeCode.trim()) ) {
|
||||
// 해당 시추공만 처리한다.
|
||||
continue;
|
||||
}
|
||||
|
||||
if("noImage".equals(pressuremeterImage[0]) || "noImage".equals(pressuremeterImage[i])){
|
||||
imagePath = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath = filePath + "web/CH/" + projectCode + "/" + pressuremeterHolecode[i] + "/PRESSUREMETER/" + pressuremeterImage[i];
|
||||
imagePath = getImagePath( Path, imagePath );
|
||||
}
|
||||
OOFFile file9 = oof.addFile("reb.root", realPath+"web\\service\\FIELD_PRESSUREMETER.reb");
|
||||
file9.addConnectionData("*", "oracle1");
|
||||
|
||||
file9.addField("project_code", projectCode);
|
||||
file9.addField("hole_code", pressuremeterHolecode[i]);
|
||||
file9.addField("fieldpres_code", pressuremeterCode[i]);
|
||||
file9.addField("image1", imagePath);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
//검색유통 굴절법 탄성파
|
||||
if(tblTestInfoCode.equals("TBL_REFRACTION_SURVEY")) {
|
||||
|
||||
|
||||
EgovMap refraction = masterService.getRefractionSurvey(params);
|
||||
|
||||
String refraction_line ="";
|
||||
String refraction_image1="";
|
||||
String refraction_image2="";
|
||||
|
||||
refraction_line = String.valueOf(refraction.get("lineNumber"));
|
||||
refraction_image1 =(String)refraction.get("graphImage1");
|
||||
refraction_image2 =(String)refraction.get("graphImage2");
|
||||
|
||||
|
||||
String refractionLine[] = refraction_line.split(",");
|
||||
String refractionImage1[] = refraction_image1.split(",");
|
||||
String refractionImage2[] = refraction_image2.split(",");
|
||||
int refractionCnt = refractionLine.length;
|
||||
int refractionImageCnt1 = refractionImage1.length;
|
||||
int refractionImageCnt2 = refractionImage2.length;
|
||||
|
||||
|
||||
oof = OOFDocument.newOOF();
|
||||
oof.addConnectionData("*", "oracle1");
|
||||
OOFFile file = oof.addFile("reb.root", realPath+"web\\service\\REFRACTION_SURVEY.reb");;
|
||||
|
||||
for(int i=0; i<refractionCnt; i++){
|
||||
if("noImage".equals(refractionImage1[0]) || "noImage".equals(refractionImage1[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/REFRACTION/" + refractionImage1[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(refractionImage2[0]) || "noImage".equals(refractionImage2[i])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/REFRACTION/" + refractionImage2[i];
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
|
||||
file.addField("project_code", projectCode);
|
||||
file.addField("line_number", refractionLine[i]);
|
||||
file.addField("image1", imagePath1);
|
||||
file.addField("image2", imagePath2);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//검색유통 전기비저항탐사정보
|
||||
if(tblTestInfoCode.equals("TBL_RESISTIVITY_SURVEY")) {
|
||||
|
||||
EgovMap resistivity = masterService.getResistivitySurvey(params);
|
||||
|
||||
String resistivity_line = String.valueOf(resistivity.get("lineNumber"));
|
||||
String resistivity_image1 = (String)resistivity.get("graphImage1");
|
||||
String resistivity_image2 = (String)resistivity.get("graphImage2");
|
||||
|
||||
|
||||
String resistivityLine[] = resistivity_line.split(",");
|
||||
String resistivityImage1[] = resistivity_image1.split(",");
|
||||
String resistivityImage2[] = resistivity_image2.split(",");
|
||||
int resistivityCnt = resistivityLine.length;
|
||||
int resistivityImageCnt1 = resistivityImage1.length;
|
||||
int resistivityImageCnt2 = resistivityImage2.length;
|
||||
|
||||
|
||||
oof = OOFDocument.newOOF();
|
||||
oof.addConnectionData("*", "oracle1");
|
||||
OOFFile file = oof.addFile("reb.root", realPath+"web\\service\\RESISTIVITY_SURVEY.reb");;
|
||||
|
||||
for(int i=0; i<resistivityCnt; i++){
|
||||
if("noImage".equals(resistivityImage1[0]) || "noImage".equals(resistivityImage1[i])){
|
||||
imagePath1 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath1 = filePath + "web/CH/" + projectCode + "/RESISTIVITY/" + resistivityImage1[i];
|
||||
imagePath1 = getImagePath( Path, imagePath1 );
|
||||
}
|
||||
if("noImage".equals(resistivityImage2[0]) || "noImage".equals(resistivityImage2[i])){
|
||||
imagePath2 = Path + "/web/images/no_image.png";
|
||||
}else{
|
||||
imagePath2 = filePath + "web/CH/" + projectCode + "/RESISTIVITY/" + resistivityImage2[i];
|
||||
imagePath2 = getImagePath( Path, imagePath2 );
|
||||
}
|
||||
|
||||
file.addField("project_code", projectCode);
|
||||
file.addField("line_number", resistivityLine[i]);
|
||||
file.addField("image1", imagePath1);
|
||||
file.addField("image2", imagePath2);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//검색유통 주상도 표준관입 + TCR/RQD주상도
|
||||
if(tblTestInfoCode.equals("TBL_HOLE")) {
|
||||
|
|
|
|||
|
|
@ -184,9 +184,15 @@
|
|||
FROM VI_DBINFO_DATE
|
||||
WHERE 1=1
|
||||
]]>
|
||||
<if test = "startDate != '0000' and startDate != null">
|
||||
<![CDATA[ AND (SUBSTR(TO_CHAR(START_DATE),0,4) >= #{startDate} AND SUBSTR(TO_CHAR(END_DATE),0,4) <= #{endDate}) ]]>
|
||||
</if>
|
||||
<!-- <if test = "startDate != '0000' and startDate != null"> -->
|
||||
<!-- <![CDATA[ AND (SUBSTR(TO_CHAR(START_DATE),0,4) >= #{startDate} AND SUBSTR(TO_CHAR(END_DATE),0,4) <= #{endDate}) ]]> -->
|
||||
<!-- </if> -->
|
||||
<if test = "startDate != null and startDate != '' and startDate != 'null'">
|
||||
AND (SUBSTR(TO_CHAR(START_DATE),0,4) <![CDATA[>=]]> #{startDate})
|
||||
</if>
|
||||
<if test = "endDate != null and endDate != '' and endDate != 'null'">
|
||||
AND (SUBSTR(TO_CHAR(END_DATE),0,4) <![CDATA[<=]]> #{endDate})
|
||||
</if>
|
||||
<if test = "searchKey != null">
|
||||
<![CDATA[ AND REPLACE(PNAME, ' ', '') LIKE '%' || #{searchKey} || '%' ]]>
|
||||
</if>
|
||||
|
|
|
|||
|
|
@ -802,5 +802,15 @@
|
|||
project_code = #{projectCode}
|
||||
]]>
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<select id="holeNameByUser" parameterType="map" resultType="egovMap">
|
||||
<![CDATA[
|
||||
select th.HOLE_NAME
|
||||
from TBL_HEADER th
|
||||
WHERE th.HOLE_CODE = #{CODE}
|
||||
]]>
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -215,13 +215,13 @@
|
|||
WHERE NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
|
||||
AND NVL(A.USE_YN,' ') <> 'N'
|
||||
]]>
|
||||
|
||||
|
||||
<if test="masterCompanyCode != null and masterCompanyProjectCodes != null and masterCompanyProjectCodes !=''">
|
||||
<![CDATA[
|
||||
AND TRIM(a.PROJECT_CODE) IN( ${masterCompanyProjectCodes} )
|
||||
]]>
|
||||
</if>
|
||||
|
||||
|
||||
<if test="gugun != 'all'">
|
||||
<![CDATA[
|
||||
AND (B.HOLE_LOCATION_TM_X >= C.MINX AND B.HOLE_LOCATION_TM_X <= C.MAXX)
|
||||
|
|
@ -339,6 +339,24 @@
|
|||
]]>
|
||||
</select>
|
||||
|
||||
<select id="selectTempProjectInfo" parameterType="map" resultType="egovMap">
|
||||
<![CDATA[
|
||||
SELECT
|
||||
PROJECT_CODE,
|
||||
PROJECT_NAME,
|
||||
(SELECT CLASS_DETAIL_NAME FROM TBL_CLASS_DETAIL WHERE CLASS_DETAIL_CODE = A.CLASS_CODE) CLASS_NAME,
|
||||
PROJECT_START_DATE,
|
||||
PROJECT_END_DATE,
|
||||
PROJECT_GOAL AS PRO_GOAL,
|
||||
(SELECT MAX(LINE_NUMBER) FROM TBL_REFRACTION_SURVEY_SUB WHERE PROJECT_CODE=#{pcode}) AS REFRACTION_COUNT,
|
||||
(SELECT MAX(LINE_NUMBER) FROM TBL_RESISTIVITY_SURVEY_SUB WHERE PROJECT_CODE=#{pcode}) AS RESISTIVITY_COUNT
|
||||
FROM
|
||||
TEMP_PROJECT_INFO A
|
||||
WHERE
|
||||
NVL(A.USE_YN,' ') <> 'N' AND TRIM(PROJECT_CODE) = #{pcode}
|
||||
]]>
|
||||
</select>
|
||||
|
||||
<select id="selectGetHoleCodeInfo" parameterType="map" resultType="egovMap">
|
||||
<![CDATA[
|
||||
SELECT B.*,
|
||||
|
|
@ -665,7 +683,7 @@
|
|||
</select>
|
||||
|
||||
<select id="selectProjectList" parameterType="map" resultType="egovMap">
|
||||
|
||||
|
||||
SELECT
|
||||
*
|
||||
FROM
|
||||
|
|
@ -677,7 +695,7 @@
|
|||
<foreach collection="projectList" item="project" index="index" open="(" close=")" separator=",">
|
||||
#{project}
|
||||
</foreach>
|
||||
|
||||
|
||||
</select>
|
||||
|
||||
<select id="selectWebDownloadLog" parameterType="map" resultType="egovMap">
|
||||
|
|
@ -739,7 +757,7 @@
|
|||
MAX(HOLE_LOCATION_TM_Y) MAXY
|
||||
FROM TBL_HEADER
|
||||
WHERE
|
||||
NVL(USE_YN,' ') <> 'N' AND
|
||||
NVL(USE_YN,' ') <> 'N' AND
|
||||
]]>
|
||||
<if test="projectCode != null">
|
||||
<![CDATA[
|
||||
|
|
@ -1055,7 +1073,7 @@
|
|||
]]>
|
||||
</select>
|
||||
|
||||
<select id="selectTblProjectInformationYn" parameterType="map" resultType="egovMap">
|
||||
<select id="selectTblProjectInformationYn" parameterType="map" resultType="egovMap">
|
||||
select
|
||||
b.HOLE_CODE,
|
||||
B.HOLE_TOTAL_DEPTH DEPTH,
|
||||
|
|
@ -1433,4 +1451,32 @@
|
|||
</select>
|
||||
|
||||
|
||||
<select id="sPCntTblCsiByKeyword" parameterType="map" resultType="long">
|
||||
SELECT SP_CNT_TBL_CSI_BY_KEYWORD(
|
||||
#{constTag, jdbcType=VARCHAR},
|
||||
#{constName, jdbcType=VARCHAR},
|
||||
#{constStartDate, jdbcType=VARCHAR},
|
||||
#{constEndDate, jdbcType=VARCHAR},
|
||||
#{constStateCode, jdbcType=VARCHAR},
|
||||
#{masterCompanyOCode, jdbcType=VARCHAR},
|
||||
#{masterCompanyTwCode, jdbcType=VARCHAR},
|
||||
#{masterCompanyThCode, jdbcType=VARCHAR},
|
||||
#{masterCompanyName, jdbcType=VARCHAR},
|
||||
#{constCompanyName, jdbcType=VARCHAR},
|
||||
#{constCompanyAdmin, jdbcType=VARCHAR},
|
||||
#{constCompanyTel, jdbcType=VARCHAR},
|
||||
NULL
|
||||
) FROM DUAL
|
||||
</select>
|
||||
|
||||
<select id="spGetTblCsiByKeyword" parameterType="map" resultType="egovMap">
|
||||
SELECT const_name AS project_name,
|
||||
project_code,
|
||||
project_hole_number AS hole_cnt
|
||||
FROM TABLE(SP_GET_TBL_CSI_BY_KEYWORD(
|
||||
#{constTag, jdbcType=VARCHAR},#{constName, jdbcType=VARCHAR},#{constStartDate, jdbcType=VARCHAR},#{constEndDate, jdbcType=VARCHAR},#{constStateCode, jdbcType=VARCHAR},
|
||||
#{masterCompanyOCode, jdbcType=VARCHAR},#{masterCompanyTwCode, jdbcType=VARCHAR},#{masterCompanyThCode, jdbcType=VARCHAR}, #{masterCompanyName, jdbcType=VARCHAR},
|
||||
#{constCompanyName, jdbcType=VARCHAR},#{constCompanyAdmin, jdbcType=VARCHAR},#{constCompanyTel, jdbcType=VARCHAR},NULL,
|
||||
2,2,#{nCount},#{nPage}))
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -13,19 +13,25 @@ $(function(){
|
|||
<%
|
||||
String startDate = request.getParameter("startDate");
|
||||
String endDate = request.getParameter("endDate");
|
||||
|
||||
|
||||
startDate = startDate.replaceAll("<", "&lt;");
|
||||
startDate = startDate.replaceAll(">", "&gt;");
|
||||
startDate = startDate.replaceAll("&", "&amp;");
|
||||
startDate = startDate.replaceAll("\"", "&quot;");
|
||||
|
||||
|
||||
endDate = endDate.replaceAll("<", "&lt;");
|
||||
endDate = endDate.replaceAll(">", "&gt;");
|
||||
endDate = endDate.replaceAll("&", "&amp;");
|
||||
endDate = endDate.replaceAll("\"", "&quot;");
|
||||
%>
|
||||
document.getElementById('startDate').value = <%=("null".equals(startDate))?"2020":startDate%>;
|
||||
document.getElementById('endDate').value = <%=("null".equals(endDate))?"":endDate%>;
|
||||
<%-- document.getElementById('startDate').value = <%=("null".equals(startDate))?"2020":startDate%>; --%>
|
||||
<%-- document.getElementById('endDate').value = <%=("null".equals(endDate))?"":endDate%>; --%>
|
||||
<% if (!"null".equals(startDate)) {%>
|
||||
document.getElementById('startDate').value = "<%=startDate%>";
|
||||
<% }%>
|
||||
<% if (!"null".equals(endDate)) {%>
|
||||
document.getElementById('endDate').value = "<%=endDate%>";
|
||||
<% }%>
|
||||
});
|
||||
function enterkey() {
|
||||
if (window.event.keyCode == 13) {
|
||||
|
|
@ -61,15 +67,27 @@ $(function(){
|
|||
<div class="f-left">
|
||||
기간 :
|
||||
<select id="startDate" name="startDate" style="width: 160px;" validNm="시작연도" onChange="fn_onSelectStartYear()">
|
||||
<c:forEach items="${year}" var="item">
|
||||
<option value="${item.year}" selected>${item.year}</option>
|
||||
<c:forEach items="${year}" var="item" varStatus="status">
|
||||
<c:choose>
|
||||
<c:when test="${status.first}">
|
||||
<%-- <c:if test="${startDate eq 'null'}"> --%>
|
||||
<option value="0000" selected>전체</option>
|
||||
<%-- </c:if> --%>
|
||||
<%-- <c:if test="${startDate ne 'null'}"> --%>
|
||||
<option value="${item.year}">${item.year}</option>
|
||||
<%-- </c:if> --%>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<option value="${item.year}">${item.year}</option>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:forEach>
|
||||
</select>
|
||||
~
|
||||
<select id="endDate" name="endDate" style="width: 160px;" validNm="종료연도" onChange="fn_onSelectEndYear()">
|
||||
<option selected>선택</option>
|
||||
<option value="">전체</option>
|
||||
<c:forEach items="${year}" var="item">
|
||||
<option value="${item.year}" selected>${item.year}</option>
|
||||
<option value="${item.year}">${item.year}</option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -156,8 +156,8 @@ function LoadingShow() {
|
|||
<li><a href="javascript:showJusangdo();"
|
||||
class="map-top-btn map-btn-icon-column">시추<br />주상도
|
||||
</a></li>
|
||||
<li><a href="javascript:showSichuInfoDetail();"
|
||||
class="map-top-btn map-btn-icon-info">정보<br />보기
|
||||
<li><a href="javascript:showSichuInfoDetail(true);"
|
||||
class="map-top-btn map-btn-icon-info">사업정보<br />보기
|
||||
</a></li>
|
||||
<li><a href="javascript:showSichuInfo2();"
|
||||
class="map-top-btn map-btn-icon-info">개별정보<br />보기
|
||||
|
|
@ -442,14 +442,16 @@ function LoadingShow() {
|
|||
<table class="table table-bordered">
|
||||
<colgroup>
|
||||
<col width="auto">
|
||||
<col width="11%">
|
||||
<col width="11%">
|
||||
<col width="11%">
|
||||
<col width="11%">
|
||||
<col width="11%">
|
||||
<col width="11%">
|
||||
<col width="11%">
|
||||
<col width="11%">
|
||||
<col width="10%">
|
||||
<col width="10%">
|
||||
<%-- <col width="10%"> --%>
|
||||
<col width="10%">
|
||||
<col width="10%">
|
||||
<col width="10%">
|
||||
<col width="10%">
|
||||
<col width="10%">
|
||||
<col width="10%">
|
||||
<col width="10%">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -457,11 +459,13 @@ function LoadingShow() {
|
|||
<th scope="col">굴진심도</th>
|
||||
<th scope="col">표고</th>
|
||||
<th scope="col">지하수위</th>
|
||||
<th scope="col">기본<br>현장시험</th>
|
||||
<th scope="col">기본<br>물성시험</th>
|
||||
<th scope="col">토사시험</th>
|
||||
<th scope="col">암석시험</th>
|
||||
<th scope="col">물리검층</th>
|
||||
<!-- <th scope="col">기본<br>현장시험</th> -->
|
||||
<th scope="col">시료 정보</th>
|
||||
<th scope="col">실내<br>토사시험</th>
|
||||
<th scope="col">실내<br>암석시험</th>
|
||||
<th scope="col">현장시험</th>
|
||||
<th scope="col">동적시험</th>
|
||||
<th scope="col">물리탐사</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="sichProjectInfo"> <!-- id="sichProjectInfo" -->
|
||||
|
|
@ -470,6 +474,8 @@ function LoadingShow() {
|
|||
<td class="t-center"></td>
|
||||
<td class="t-center"></td>
|
||||
<td class="t-center"></td>
|
||||
<!-- <td class="t-center"></td> -->
|
||||
<td class="t-center"></td>
|
||||
<td class="t-center"></td>
|
||||
<td class="t-center"></td>
|
||||
<td class="t-center"></td>
|
||||
|
|
@ -490,6 +496,9 @@ function LoadingShow() {
|
|||
<script>
|
||||
var popup1 = $("#popup_type_1");
|
||||
|
||||
const regexDoubleQutor = /"/g;
|
||||
//const regexBraces = /\{/g;
|
||||
|
||||
popup1.kendoWindow({
|
||||
animation: false,
|
||||
width: 900,
|
||||
|
|
@ -502,8 +511,26 @@ function LoadingShow() {
|
|||
pinned: true,
|
||||
title: "사업별 시추공 상세정보"
|
||||
});
|
||||
|
||||
function goOneHoleInfo(element, holeCode, matchingBorehole) {
|
||||
matchingBorehole = matchingBorehole.replace(/\|\^\|/g, "\"");
|
||||
//matchingBorehole = JSON.parse(matchingBorehole);
|
||||
|
||||
var selectSichSize = HOLE_SELECT.features.length;
|
||||
var holeCodeArray = HOLE_SELECT.features;
|
||||
|
||||
for( i=0; i<holeCodeArray.length; i++ ) {
|
||||
if( String(holeCodeArray[i].attributes.CODE) === String(holeCode) ) {
|
||||
selectOneSich(holeCode, matchingBorehole);
|
||||
if( popupData1 ) {
|
||||
popupData1.close();
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function popupDataOpen(projectCode,totalCount){
|
||||
function popupDataOpen(projectCode,totalCount,isShowPopup) {
|
||||
/* var params = "projectCode="+"B7328"+"&pcode="+"B7328"; */
|
||||
openWaitWin();
|
||||
var params = "projectCode="+projectCode+"&pcode="+projectCode;
|
||||
|
|
@ -522,16 +549,16 @@ function LoadingShow() {
|
|||
$("#sichProjectCode3").html(data.project.projectCode);
|
||||
$("#sichMetaData").html('<img src="/body/map/download/image/btns_metadata.gif" width="15" height="15" onClick="javascript:openMetadata(\''+data.project.projectCode+'\')" style="cursor: pointer;">');
|
||||
$("#sichMetaData2").html('<img src="/body/map/download/image/btns_metadata.gif" width="15" height="15" onClick="javascript:openMetadata(\''+data.project.projectCode+'\')" style="cursor: pointer;">');
|
||||
if(data.project.resistivityCount == null || data.project.resistivityCount == ''){
|
||||
$("#resistivityCount").html('0');
|
||||
if(data.project.resistivityCount == null || data.project.resistivityCount == ''){
|
||||
$("#resistivityCount").html('<a href="#" onclick="previewClipReport(\'TBL_RESISTIVITY_SURVEY\',\''+data.project.projectCode+'\',\'\')">' + '0' + '</a>');
|
||||
}else{
|
||||
$("#resistivityCount").html(data.project.resistivityCount);
|
||||
$("#resistivityCount").html('<a href="#" onclick="previewClipReport(\'TBL_RESISTIVITY_SURVEY\',\''+data.project.projectCode+'\',\'\')">' + data.project.resistivityCount + '</a>');
|
||||
}
|
||||
|
||||
if(data.project.refractionCount == null || data.project.refractionCount == ''){
|
||||
$("#refractionCount").html('0');
|
||||
$("#refractionCount").html('<a href="#" onclick="previewClipReport(\'TBL_REFRACTION_SURVEY\',\''+data.project.projectCode+'\',\'\')">' + '0' + '</a>');
|
||||
}else{
|
||||
$("#refractionCount").html(data.project.refractionCount);
|
||||
$("#refractionCount").html('<a href="#" onclick="previewClipReport(\'TBL_REFRACTION_SURVEY\',\''+data.project.projectCode+'\',\'\')">' + data.project.refractionCount + '</a>');
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -743,7 +770,13 @@ function LoadingShow() {
|
|||
|
||||
var text = "";
|
||||
for(var i=0; i<data.projectYn.length; i++){
|
||||
text += '<tr>';
|
||||
|
||||
// <- 여기에 동일한 holeCode값을 찾는 로직을 구현합니다.
|
||||
var matchingBorehole = data.testCountsPerBorehole.find(function(borehole) {
|
||||
return borehole.holeCode === data.projectYn[i].holeCode;
|
||||
});
|
||||
|
||||
text += '<tr onclick="goOneHoleInfo(this, \'' + data.projectYn[i].holeCode + '\', \'' + JSON.stringify(matchingBorehole).replace(regexDoubleQutor, "|^|") + '\')">';
|
||||
text += '<td class="t-center">'+data.projectYn[i].holeName+'</td>';
|
||||
|
||||
text += data.projectYn[i].depth != null ? '<td class="t-center">'+data.projectYn[i].depth+'</td>' : '<td class="t-right"></td>';
|
||||
|
|
@ -757,37 +790,89 @@ function LoadingShow() {
|
|||
if( (data.projectYn[i].spt == 'Y')||(data.projectYn[i].tcrrqd == 'Y') ||(data.projectYn[i].dsf == 'Y') ||(data.projectYn[i].pressuremeter == 'Y')
|
||||
||(data.projectYn[i].slickenside == 'Y') ||(data.projectYn[i].q == 'Y') ||(data.projectYn[i].rmr == 'Y') ||(data.projectYn[i].waterpressure == 'Y')
|
||||
||(data.projectYn[i].permeablity == 'Y')||(data.projectYn[i].conePenetration == 'Y')){
|
||||
text += '<td class="t-center">V</td>'; //기본현장
|
||||
// text += '<td class="t-center">V</td>'; //기본현장
|
||||
}else{
|
||||
text += '<td class="t-center"></td>';
|
||||
// text += '<td class="t-center">V</td>'; //기본현장
|
||||
}
|
||||
|
||||
|
||||
if((data.projectYn[i].sampleInfo == 'Y') ){
|
||||
text += '<td class="t-center">V</td>'; //기본물성
|
||||
}else{
|
||||
text += '<td class="t-center"></td>';
|
||||
}
|
||||
|
||||
if((data.projectYn[i].classification == 'Y') ||(data.projectYn[i].cbrCompac == 'Y') || (data.projectYn[i].consolidation == 'Y') || (data.projectYn[i].unconfinedUsual == 'Y')
|
||||
||(data.projectYn[i].triaxialUsualCu == 'Y')||(data.projectYn[i].triaxialUsualUu == 'Y')||(data.projectYn[i].resonant == 'Y')||(data.projectYn[i].repeated == 'Y')){
|
||||
text += '<td class="t-center">V</td>'; //토사
|
||||
}else{
|
||||
text += '<td class="t-center"></td>';
|
||||
}
|
||||
|
||||
if (matchingBorehole) {
|
||||
// Number(null) is 0.
|
||||
|
||||
if((data.projectYn[i].rockUniaxial == 'Y') ||(data.projectYn[i].rockTriaxial == 'Y') || (data.projectYn[i].rockPointload == 'Y') || (data.projectYn[i].rockJointshear == 'Y')
|
||||
||(data.projectYn[i].rockResonant == 'Y')||(data.projectYn[i].rockRepeated == 'Y')){
|
||||
text += '<td class="t-center">V</td>'; //암석
|
||||
}else{
|
||||
text += '<td class="t-center"></td>';
|
||||
}
|
||||
// 시료정보( 기본물성 )
|
||||
if(0 < matchingBorehole.sampleInfo ){
|
||||
text += '<td class="t-center">V</td>';
|
||||
}else{
|
||||
text += '<td class="t-center"></td>';
|
||||
}
|
||||
|
||||
// 실내 토사시험
|
||||
if(0 < (
|
||||
Number(matchingBorehole.sandClassification)+
|
||||
Number(matchingBorehole.sandCbr)+
|
||||
Number(matchingBorehole.sandConsolidation)+
|
||||
Number(matchingBorehole.sandUnconfinedUsual)+
|
||||
Number(matchingBorehole.sandTriaxialUu)+
|
||||
Number(matchingBorehole.sandTriaxialCu)
|
||||
)){
|
||||
text += '<td class="t-center">V</td>';
|
||||
}else{
|
||||
text += '<td class="t-center"></td>';
|
||||
}
|
||||
|
||||
// 실내 암석시험
|
||||
if(0 < (
|
||||
Number(matchingBorehole.rockUniaxial)+
|
||||
Number(matchingBorehole.rockTriaxial)+
|
||||
Number(matchingBorehole.rockPointload)+
|
||||
Number(matchingBorehole.rockJointshear)
|
||||
)){
|
||||
text += '<td class="t-center">V</td>';
|
||||
}else{
|
||||
text += '<td class="t-center"></td>';
|
||||
}
|
||||
|
||||
if((data.projectYn[i].boreholeWave == 'Y') ||(data.projectYn[i].downhole == 'Y') || (data.projectYn[i].density == 'Y')){
|
||||
text += '<td class="t-center">V</td>'; //물리
|
||||
}else{
|
||||
text += '<td class="t-center"></td>';
|
||||
}
|
||||
// 현장시험
|
||||
if(0 < (
|
||||
Number(matchingBorehole.fieldPressuremeter)+
|
||||
Number(matchingBorehole.fieldPermeablity)+
|
||||
Number(matchingBorehole.fieldWaterpressure)+
|
||||
Number(matchingBorehole.fieldConePenetration)
|
||||
)){
|
||||
text += '<td class="t-center">V</td>';
|
||||
}else{
|
||||
text += '<td class="t-center"></td>';
|
||||
}
|
||||
|
||||
// 동적시험
|
||||
if(0 < (
|
||||
Number(matchingBorehole.sandResonant)+
|
||||
Number(matchingBorehole.rockResonant)+
|
||||
Number(matchingBorehole.sandRepeatedTriaxial)+
|
||||
Number(matchingBorehole.rockRepeatedTriaxial)
|
||||
)){
|
||||
text += '<td class="t-center">V</td>';
|
||||
}else{
|
||||
text += '<td class="t-center"></td>';
|
||||
}
|
||||
|
||||
// 물리탐사
|
||||
if(0 < (
|
||||
Number(matchingBorehole.boreholeWave)+
|
||||
Number(matchingBorehole.downhole)+
|
||||
Number(matchingBorehole.density)
|
||||
)){
|
||||
text += '<td class="t-center">V</td>';
|
||||
}else{
|
||||
text += '<td class="t-center"></td>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
text += '</tr>';
|
||||
}
|
||||
|
|
@ -795,7 +880,24 @@ function LoadingShow() {
|
|||
$("#sichProjectInfo").html(text);//9개
|
||||
|
||||
if(data.bbox != null){
|
||||
moveToExtent(data.bbox.minx, data.bbox.miny, data.bbox.maxx, data.bbox.maxy);
|
||||
var offsetX = (data.bbox.maxx - data.bbox.minx);
|
||||
var offsetY = (data.bbox.maxy - data.bbox.miny);
|
||||
|
||||
|
||||
var offsetRatio = 0.3;
|
||||
if( 10000 < offsetX ) {
|
||||
offsetRatio = 0.25;
|
||||
}
|
||||
|
||||
offsetX = offsetX * offsetRatio;
|
||||
offsetY = offsetY * offsetRatio;
|
||||
|
||||
var minX = data.bbox.minx-offsetX;
|
||||
var minY = data.bbox.miny-offsetY;
|
||||
var maxX = data.bbox.maxx+offsetX;
|
||||
var maxY = data.bbox.maxy+offsetY;
|
||||
|
||||
moveToExtent(minX, minY, maxX, maxY);
|
||||
}
|
||||
addProjectHoles(data.project.projectCode);
|
||||
$("#mask").hide();
|
||||
|
|
@ -809,7 +911,10 @@ function LoadingShow() {
|
|||
/* popupDataOpen2(projectCode,totalCount); */
|
||||
$(".k-edit-form-container").css("width", "100%");
|
||||
$(".contents-row .table-scrollable").css("overflow-x", "hidden");
|
||||
popupData1.open();
|
||||
if( isShowPopup ) {
|
||||
popupData1.open(); // 검색된 사업명 클릭시에는 시추공 선택만.
|
||||
}
|
||||
|
||||
popupData1.center();
|
||||
$("#mask").hide();
|
||||
|
||||
|
|
|
|||
|
|
@ -171,41 +171,43 @@ function downloadNew(mId, fName) {
|
|||
</table></td>
|
||||
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
var openerCalled = false;
|
||||
var checkOpenerInterval; // To store the interval ID
|
||||
|
||||
function tryCallingOpenerFunctions() {
|
||||
if (typeof opener.parent.parent.moveToExtent === "function") {
|
||||
// alert("1111"); // Uncomment for debugging
|
||||
opener.parent.parent.moveToExtent("${bbox.minx}", "${bbox.miny}", "${bbox.maxx}", "${bbox.maxy}");
|
||||
opener.parent.parent.addProjectHoles("${project.projectCode}");
|
||||
openerCalled = true; // Set flag to true
|
||||
} else if (typeof opener.opener.moveToExtent === "function") {
|
||||
// alert("2222"); // Uncomment for debugging
|
||||
opener.opener.moveToExtent("${bbox.minx}", "${bbox.miny}", "${bbox.maxx}", "${bbox.maxy}");
|
||||
opener.opener.addProjectHoles("${project.projectCode}");
|
||||
openerCalled = true; // Set flag to true
|
||||
}
|
||||
|
||||
// If either condition was met, stop the timer
|
||||
if (openerCalled) {
|
||||
clearInterval(checkOpenerInterval); // Stop the interval
|
||||
// console.log("Opener functions called and timer stopped."); // Uncomment for debugging
|
||||
}
|
||||
}
|
||||
|
||||
// Start checking every 100 milliseconds (adjust as needed)
|
||||
checkOpenerInterval = setInterval(tryCallingOpenerFunctions, 100);
|
||||
|
||||
// Optional: Add a timeout to stop checking after a certain period to prevent infinite loops
|
||||
setTimeout(function() {
|
||||
if (!openerCalled) {
|
||||
clearInterval(checkOpenerInterval);
|
||||
// console.warn("Opener functions could not be called within the timeout period."); // Uncomment for debugging
|
||||
}
|
||||
}, 200); // Stop after 5 seconds (5000 milliseconds)
|
||||
});
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
var openerCalled = false;
|
||||
var checkOpenerInterval; // To store the interval ID
|
||||
|
||||
function tryCallingOpenerFunctions() {
|
||||
if (opener.BASE_MAP.getZoom() == 7) { // 전국표시 지도가 떴을때 (확대레벨이 전국표시일 때) zoom 시킨다
|
||||
if (typeof opener.parent.parent.moveToExtent === "function") {
|
||||
// alert("1111"); // Uncomment for debugging
|
||||
opener.parent.parent.moveToExtent("${bbox.minx}", "${bbox.miny}", "${bbox.maxx}", "${bbox.maxy}");
|
||||
opener.parent.parent.addProjectHoles("${project.projectCode}");
|
||||
openerCalled = true; // Set flag to true
|
||||
} else if (typeof opener.opener.moveToExtent === "function") {
|
||||
// alert("2222"); // Uncomment for debugging
|
||||
opener.opener.moveToExtent("${bbox.minx}", "${bbox.miny}", "${bbox.maxx}", "${bbox.maxy}");
|
||||
opener.opener.addProjectHoles("${project.projectCode}");
|
||||
openerCalled = true; // Set flag to true
|
||||
}
|
||||
|
||||
// If either condition was met, stop the timer
|
||||
if (openerCalled) {
|
||||
clearInterval(checkOpenerInterval); // Stop the interval
|
||||
// console.log("Opener functions called and timer stopped."); // Uncomment for debugging
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Start checking every 100 milliseconds (adjust as needed)
|
||||
checkOpenerInterval = setInterval(tryCallingOpenerFunctions, 100);
|
||||
|
||||
// Optional: Add a timeout to stop checking after a certain period to prevent infinite loops
|
||||
setTimeout(function() {
|
||||
if (!openerCalled) {
|
||||
clearInterval(checkOpenerInterval);
|
||||
// console.warn("Opener functions could not be called within the timeout period."); // Uncomment for debugging
|
||||
}
|
||||
}, 200); // Stop after 5 seconds (5000 milliseconds)
|
||||
});
|
||||
</script>
|
||||
</tr>
|
||||
</table> <!--END:내용 -->
|
||||
|
|
|
|||
|
|
@ -343,7 +343,7 @@ function holeCodeSqureCheck(){
|
|||
data : params,
|
||||
success : function(data){
|
||||
AreaHcode = "";
|
||||
if(data.count > 300){
|
||||
if(false && data.count > 300){
|
||||
closeWaitWin();
|
||||
$("#mask").hide()
|
||||
HOLE_SELECT.removeAllFeatures();
|
||||
|
|
@ -356,9 +356,9 @@ function holeCodeSqureCheck(){
|
|||
CTL_MODIFY.deactivate();
|
||||
CTL_MODIFY.activate();
|
||||
CTL_INFO.deactivate();
|
||||
alert("시추공은 300개까지 선택할 수 있습니다.");
|
||||
console.log("시추공은 300개까지 선택할 수 있습니다.3");
|
||||
CTL_AREA.activate();
|
||||
}else if(data.data.length > 300){
|
||||
}else if(false && data.data.length > 300){
|
||||
closeWaitWin();
|
||||
$("#mask").hide()
|
||||
HOLE_SELECT.removeAllFeatures();
|
||||
|
|
@ -371,9 +371,9 @@ function holeCodeSqureCheck(){
|
|||
CTL_MODIFY.deactivate();
|
||||
CTL_MODIFY.activate();
|
||||
CTL_INFO.deactivate();
|
||||
alert("시추공은 300개까지 선택할 수 있습니다.");
|
||||
alert("시추공은 300개까지 선택할 수 있습니다.4");
|
||||
CTL_AREA.activate();
|
||||
}else if(data.data){
|
||||
} else if(data.data) {
|
||||
var format = new OpenLayers.Format.WKT();
|
||||
var features = [];
|
||||
for(var i=0, len=data.data.length; i < len; i++) {
|
||||
|
|
@ -392,6 +392,19 @@ function holeCodeSqureCheck(){
|
|||
if(features.length > 0) {
|
||||
HOLE_SELECT.addFeatures(features);
|
||||
}
|
||||
} else {
|
||||
var currentZoomLevel = BASE_MAP.getZoom();
|
||||
if( currentZoomLevel < 8) {
|
||||
alert("지도 선택 범위가 전국이 보일정도로 너무 넓습니다. 지도를 많이 확대해주세요");
|
||||
} else if( currentZoomLevel < 11) {
|
||||
alert("지도 선택 범위가 넓습니다. 지도를 하나의 읍/면/동이 꽉 찰 때까지 확대해주세요.");
|
||||
} else if( currentZoomLevel < 12) {
|
||||
alert("지도 선택 범위가 넓습니다. 지도를 확대를 더 확대해주세요.");
|
||||
} else if( currentZoomLevel < 13) {
|
||||
alert("지도 선택 범위가 너무 넓습니다.");
|
||||
} else {
|
||||
alert("선택영역 좁혀주세요.");
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
|
|
@ -401,6 +414,23 @@ function holeCodeSqureCheck(){
|
|||
complete: function(){
|
||||
closeWaitWin()
|
||||
$("#mask").hide()
|
||||
clearTextLabels();
|
||||
for (var i=0; i < HOLE_SELECT.features.length; i++){
|
||||
addHoleNames(HOLE_SELECT.features[i]);
|
||||
}
|
||||
|
||||
//선택된 영역을 제거한다.
|
||||
CTL_AREA.deactivate();
|
||||
if (HOLE_AREA.features.length > 0 && HOLE_AREA.features[0]) {
|
||||
HOLE_AREA.features[0].style = null;
|
||||
}
|
||||
var transparentStyle = new OpenLayers.Style({
|
||||
strokeOpacity: 0.0,
|
||||
fillOpacity: 0.0
|
||||
});
|
||||
HOLE_AREA.styleMap = new OpenLayers.StyleMap(transparentStyle);
|
||||
HOLE_AREA.redraw();
|
||||
CTL_AREA.activate();
|
||||
}
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ function showSichuInfo() {
|
|||
|
||||
|
||||
//정보보기 누를 때, 사업별 시추공 상세정보가 나타나도록 한다.
|
||||
function showSichuInfoDetail() {
|
||||
function showSichuInfoDetail(isShowPopup) {
|
||||
var sichuInfo = getSelectAreaInfo2();
|
||||
if (sichuInfo == null || sichuInfo == undefined) {
|
||||
|
||||
|
|
@ -99,7 +99,6 @@ function showSichuInfoDetail() {
|
|||
|
||||
}
|
||||
|
||||
|
||||
const arrSichuInfoComma = String(sichuInfo).split(',');
|
||||
const regex = /([a-zA-Z]+\d+).*/;
|
||||
let foundProjectCode = null;
|
||||
|
|
@ -117,7 +116,7 @@ function showSichuInfoDetail() {
|
|||
if( isMultipleProject ) {
|
||||
alert('가장 마지막에 선택된 하나의 프로젝트만 조회됩니다.');
|
||||
}
|
||||
popupDataOpen(foundProjectCode);
|
||||
popupDataOpen(foundProjectCode, null, isShowPopup);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -186364,6 +186364,128 @@ var 부산광역시 = [
|
|||
[400175.744178534,312101.356864329]
|
||||
];
|
||||
|
||||
//커스텀 DragPopup 컨트롤 정의
|
||||
OpenLayers.Control.DragPopup = OpenLayers.Class(OpenLayers.Control, {
|
||||
popup: null,
|
||||
isDragging: false,
|
||||
startPixel: null,
|
||||
popupStartPos: null,
|
||||
|
||||
// document에 등록/해제할 이벤트 핸들러를 저장하기 위한 속성
|
||||
boundMouseMove: null,
|
||||
boundMouseUp: null,
|
||||
|
||||
initialize: function(popup, options) {
|
||||
OpenLayers.Control.prototype.initialize.apply(this, [options]);
|
||||
this.popup = popup;
|
||||
},
|
||||
|
||||
// 컨트롤을 완전히 제거할 때 호출되어 안전하게 정리합니다.
|
||||
destroy: function() {
|
||||
this.deactivate(); // 이벤트 리스너 등을 먼저 비활성화합니다.
|
||||
OpenLayers.Control.prototype.destroy.apply(this, arguments); // 부모 클래스의 destroy를 호출합니다.
|
||||
this.popup = null; // 팝업 참조를 제거합니다.
|
||||
},
|
||||
|
||||
// 컨트롤이 활성화될 때 팝업 div에 mousedown 이벤트를 연결합니다.
|
||||
activate: function() {
|
||||
if (OpenLayers.Control.prototype.activate.apply(this, arguments) && this.popup && this.popup.div) {
|
||||
this.events = new OpenLayers.Events(this, this.popup.div, null, true);
|
||||
this.events.on({
|
||||
"mousedown": this.onMouseDown,
|
||||
scope: this
|
||||
});
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
|
||||
// 컨트롤이 비활성화될 때 이벤트를 제거합니다.
|
||||
deactivate: function() {
|
||||
if (this.isDragging) {
|
||||
this.onMouseUp(null);
|
||||
}
|
||||
if (this.events) {
|
||||
this.events.destroy();
|
||||
this.events = null;
|
||||
}
|
||||
if( 0 < OpenLayers.Control.prototype.deactivate.length ) {
|
||||
return OpenLayers.Control.prototype.deactivate.apply(this, arguments);
|
||||
}
|
||||
return false;
|
||||
|
||||
},
|
||||
|
||||
onMouseDown: function(evt) {
|
||||
var target = evt.target || evt.srcElement;
|
||||
|
||||
// 닫기 버튼 또는 팝업 내부의 상호작용 가능한 요소(input, button 등)를 클릭한 경우는 드래그를 시작하지 않습니다.
|
||||
if (target.className.indexOf('olPopupCloseBox') > -1 || ['INPUT', 'BUTTON', 'A', 'TEXTAREA', 'SELECT'].indexOf(target.tagName) !== -1) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.isDragging = true;
|
||||
|
||||
// 표준 clientX/Y를 사용하여 시작 좌표를 기록합니다.
|
||||
this.startPixel = { x: evt.clientX, y: evt.clientY };
|
||||
|
||||
this.popupStartPos = {
|
||||
x: parseInt(this.popup.div.style.left) || 0,
|
||||
y: parseInt(this.popup.div.style.top) || 0
|
||||
};
|
||||
|
||||
// document에 이벤트 리스너를 등록합니다.
|
||||
// 변경점: useCapture 인자를 true로 설정하여 '캡처링' 단계에서 이벤트를 감지합니다.
|
||||
// 이렇게 하면 팝업 내부의 다른 요소(예: <a> 태그)가 mouseup 이벤트의 전파를 중단(stopPropagation)시켜도
|
||||
// document 레벨에서 이벤트를 먼저 감지하여 드래그를 정상적으로 종료할 수 있습니다.
|
||||
this.boundMouseMove = this.onMouseMove.bind(this);
|
||||
this.boundMouseUp = this.onMouseUp.bind(this);
|
||||
|
||||
OpenLayers.Event.observe(document, "mousemove", this.boundMouseMove, true);
|
||||
OpenLayers.Event.observe(document, "mouseup", this.boundMouseUp, true);
|
||||
|
||||
this.map.div.style.cursor = "move";
|
||||
OpenLayers.Event.stop(evt); // 이벤트 전파 중단으로 텍스트 선택 등 부수 효과 방지
|
||||
},
|
||||
|
||||
// 마우스를 움직일 때
|
||||
onMouseMove: function(evt) {
|
||||
if (this.isDragging) {
|
||||
|
||||
// 표준 clientX/Y를 사용하여 현재 좌표를 가져옵니다.
|
||||
var currentPixel = { x: evt.clientX, y: evt.clientY };
|
||||
|
||||
var deltaX = currentPixel.x - this.startPixel.x;
|
||||
var deltaY = currentPixel.y - this.startPixel.y;
|
||||
|
||||
this.popup.div.style.left = (this.popupStartPos.x + deltaX) + "px";
|
||||
this.popup.div.style.top = (this.popupStartPos.y + deltaY) + "px";
|
||||
|
||||
OpenLayers.Event.stop(evt);
|
||||
}
|
||||
},
|
||||
|
||||
// 마우스 버튼을 뗐을 때
|
||||
onMouseUp: function(evt) {
|
||||
if (this.isDragging) {
|
||||
this.isDragging = false;
|
||||
|
||||
// 변경점: document에 '캡처링' 단계로 등록했던 이벤트 리스너를 제거합니다.
|
||||
OpenLayers.Event.stopObserving(document, "mousemove", this.boundMouseMove, true);
|
||||
OpenLayers.Event.stopObserving(document, "mouseup", this.boundMouseUp, true);
|
||||
|
||||
this.boundMouseMove = null;
|
||||
this.boundMouseUp = null;
|
||||
|
||||
this.map.div.style.cursor = "";
|
||||
if (evt) {
|
||||
OpenLayers.Event.stop(evt);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
CLASS_NAME: "OpenLayers.Control.DragPopup"
|
||||
});
|
||||
|
||||
//---------여기 시작 코드
|
||||
|
||||
|
|
@ -186569,6 +186691,7 @@ var CTL_INFO;
|
|||
var CTL_TOOLTIP;
|
||||
|
||||
var POPUP_TOOLTIP;
|
||||
var TEXT_LABEL_LAYER;
|
||||
|
||||
var POLYGON_TYPE;
|
||||
|
||||
|
|
@ -186912,6 +187035,29 @@ function initApp(param){
|
|||
}*/
|
||||
|
||||
BASE_MAP.addLayer(HOLE_LAYER);
|
||||
|
||||
var textStyle = new OpenLayers.Style({
|
||||
// feature의 'attributes' 객체에 있는 속성들을 참조하여 스타일을 동적으로 적용합니다.
|
||||
label: "${label}",
|
||||
fontColor: "${fontColor}",
|
||||
fontSize: "${fontSize}",
|
||||
fontWeight: "${fontWeight}",
|
||||
fontFamily: "${fontFamily}",
|
||||
labelAlign: "${labelAlign}",
|
||||
labelYOffset: "${labelYOffset}",
|
||||
labelOutlineColor: "${labelOutlineColor}",
|
||||
labelOutlineWidth: "${labelOutlineWidth}",
|
||||
|
||||
// 점 아이콘은 표시하지 않습니다.
|
||||
pointRadius: 0,
|
||||
fillOpacity: 0
|
||||
});
|
||||
|
||||
TEXT_LABEL_LAYER = new OpenLayers.Layer.Vector("Text Labels", {
|
||||
styleMap: new OpenLayers.StyleMap({'default': textStyle})
|
||||
});
|
||||
BASE_MAP.addLayer(TEXT_LABEL_LAYER);
|
||||
|
||||
// ---------------------
|
||||
// 컨트롤 생성
|
||||
// ---------------------
|
||||
|
|
@ -187297,6 +187443,62 @@ function initApp(param){
|
|||
});
|
||||
BASE_MAP.addControl(CTL_INFO);
|
||||
CTL_INFO.deactivate();
|
||||
|
||||
// 도움말
|
||||
CTL_HELP = new OpenLayers.Control();
|
||||
OpenLayers.Util.extend(CTL_HELP, {
|
||||
|
||||
id : "CTL_HELP",
|
||||
|
||||
infoDiv: null,
|
||||
|
||||
getText: function(){
|
||||
return this.infoDiv.innerHTML;
|
||||
},
|
||||
|
||||
setText: function(txt){
|
||||
this.infoDiv.innerHTML = txt;
|
||||
},
|
||||
|
||||
draw: function () {
|
||||
|
||||
OpenLayers.Control.prototype.draw.apply(this, arguments);
|
||||
|
||||
this.infoDiv = document.createElement('div');
|
||||
this.infoDiv.style.border = 'thin solid #333333';
|
||||
this.infoDiv.style.position = 'absolute';
|
||||
this.infoDiv.style.overflow = 'hidden';
|
||||
this.infoDiv.style.left = 170 + "px";
|
||||
this.infoDiv.style.top = String(10) + "px";
|
||||
this.infoDiv.style.width = 680 + "px";
|
||||
this.infoDiv.style.height = 35*1 + "px";
|
||||
this.infoDiv.style.padding = 5 + "px";
|
||||
|
||||
this.infoDiv.style.backgroundColor = "rgba(0,0,0,0.6)";
|
||||
this.infoDiv.style.fontWeight = "100";
|
||||
this.infoDiv.style.color = "#ffffff";
|
||||
this.infoDiv.style.textAlign = "center";
|
||||
|
||||
this.infoDiv.style.display = "block";
|
||||
this.div.appendChild(this.infoDiv);
|
||||
|
||||
return this.div;
|
||||
},
|
||||
activate : function() {
|
||||
this.infoDiv.style.display = "block";
|
||||
return OpenLayers.Control.prototype.activate.apply(this,arguments);
|
||||
},
|
||||
deactivate: function() {
|
||||
this.infoDiv.style.display = "none";
|
||||
return OpenLayers.Control.prototype.deactivate.apply(this,arguments);
|
||||
}
|
||||
});
|
||||
|
||||
BASE_MAP.addControl(CTL_HELP);
|
||||
CTL_HELP.setText("Shift키를 누른 상태로 영역 드래그 시 확대됨 | 마우스 왼쪽 더블클릭 확대 / 오른쪽 더블클릭 축소");
|
||||
CTL_HELP.activate();
|
||||
$("#CTL_HELP").css("bottom","65px");
|
||||
$("#CTL_HELP").css("left","20px");
|
||||
|
||||
|
||||
// ---------------------
|
||||
|
|
@ -187654,6 +187856,22 @@ function initApp(param){
|
|||
|
||||
|
||||
});
|
||||
|
||||
// 지도의 줌 액션이 끝날 때마다 이 함수가 실행됩니다.
|
||||
BASE_MAP.events.register("zoomend", BASE_MAP, function() {
|
||||
|
||||
// 1. 현재 지도의 줌 레벨을 가져옵니다.
|
||||
var currentZoom = BASE_MAP.getZoom();
|
||||
|
||||
// 2. 줌 레벨이 특정값 이상인지 확인합니다.
|
||||
if (currentZoom >= 14) {
|
||||
// 특정값 이상이면 TEXT_LABEL_LAYER를 보이게 합니다.
|
||||
TEXT_LABEL_LAYER.setVisibility(true);
|
||||
} else {
|
||||
// 특정값 미만이면 TEXT_LABEL_LAYER를 숨깁니다.
|
||||
TEXT_LABEL_LAYER.setVisibility(false);
|
||||
}
|
||||
});
|
||||
|
||||
/*CTL_AREA_CIRCLE2.drawFeature2(evt);*/
|
||||
/*console.log(BASE_MAP.getScale);*/
|
||||
|
|
@ -188680,12 +188898,59 @@ function addTooltip(feature) {
|
|||
}
|
||||
|
||||
function removeTooltip() {
|
||||
if(POPUP_TOOLTIP) {
|
||||
BASE_MAP.removePopup(POPUP_TOOLTIP);
|
||||
|
||||
// 드래그 컨트롤이 존재하면 먼저 destroy 합니다.
|
||||
if (dragControl) {
|
||||
dragControl.destroy();
|
||||
dragControl = null;
|
||||
}
|
||||
// 팝업이 존재하면 destroy 합니다.
|
||||
if(POPUP_TOOLTIP) {
|
||||
POPUP_TOOLTIP.destroy();
|
||||
POPUP_TOOLTIP = null;
|
||||
}
|
||||
}
|
||||
|
||||
// 사용자에 의해 입력된 시추공 명 텍스트 라벨을 모두 지우는 함수 ---
|
||||
function clearTextLabels() {
|
||||
if (TEXT_LABEL_LAYER) {
|
||||
TEXT_LABEL_LAYER.removeAllFeatures();
|
||||
}
|
||||
}
|
||||
|
||||
function addHoleNames(feature) {
|
||||
$.get("/map/hole-name-by-user.do", feature.attributes).done(function(response) {
|
||||
if (response && response.data && response.data.length > 0) {
|
||||
|
||||
var lon = feature.geometry.x;
|
||||
var lat = feature.geometry.y;
|
||||
var point = new OpenLayers.Geometry.Point(lon, lat);
|
||||
|
||||
// 이 속성들은 레이어의 StyleMap에서 참조하여 사용됩니다.
|
||||
var featureAttributes = {
|
||||
label: response.data[0].holeName, // 표시할 텍스트
|
||||
fontColor: "#b1cf42", // 글자색
|
||||
fontSize: "20px", // 글자 크기
|
||||
fontWeight: "bold", // 글자 굵기
|
||||
labelAlign: "cb", // 라벨 정렬 (cm = center-middle)
|
||||
labelOutlineColor: "#52770a", // 테두리 색상
|
||||
labelOutlineWidth: 3, // 테두리 두께
|
||||
labelYOffset: 25, // 포인트로부터 10px 위로 더 밀어냅니다.
|
||||
// pointSymbolizer를 'none'으로 설정하여 점 아이콘은 숨깁니다.
|
||||
pointRadius: 0,
|
||||
fillOpacity: 0
|
||||
};
|
||||
// ----------------------------------------------------------------
|
||||
|
||||
// --- 변경점: 피처 생성 시 geometry와 attributes를 전달합니다. ---
|
||||
var textFeature = new OpenLayers.Feature.Vector(point, featureAttributes);
|
||||
|
||||
// 미리 생성된 단일 텍스트 레이어에 피처를 추가합니다.
|
||||
TEXT_LABEL_LAYER.addFeatures([textFeature]);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//----------------------------
|
||||
//함수 : 영역 선택 기능 관리
|
||||
//----------------------------
|
||||
|
|
@ -188733,6 +188998,7 @@ function getSelectAreaInfo2(){
|
|||
if (HOLE_AREA.features.length == 0 && (CTL_AREA_CIRCLE2.handler.feature == undefined || CTL_AREA_CIRCLE2.handler.feature == null )){
|
||||
return;
|
||||
}
|
||||
|
||||
var bounds = null;
|
||||
if(($('input[name=areaRadio]:checked').val() == '1' && HOLE_AREA.features[0] !=undefined)||$('input[name=areaRadio]:checked').val() == '2' ){
|
||||
CTL_AREA_CIRCLE2.handler.feature = HOLE_AREA.features[0];
|
||||
|
|
@ -188740,6 +189006,9 @@ function getSelectAreaInfo2(){
|
|||
}else if($('input[name=areaRadio]:checked').val() == '1' && HOLE_AREA.features[0] == undefined){
|
||||
bounds = CTL_AREA_CIRCLE2.handler.feature.geometry.getBounds().transform("EPSG:3857", "EPSG:5186");
|
||||
}
|
||||
if( bounds == null ) {
|
||||
initControl();
|
||||
}
|
||||
var strArray = bounds.toString().split( "," );
|
||||
var circleX = (parseFloat(strArray[0],10)+parseFloat(strArray[2],10))/2;
|
||||
var circleY = (parseFloat(strArray[1],10)+parseFloat(strArray[3],10))/2;
|
||||
|
|
@ -188801,6 +189070,7 @@ function onSelectHole(){
|
|||
function offSelectHole(){
|
||||
HOLE_SELECT.removeAllFeatures();
|
||||
HOLE_SELECT2.removeAllFeatures();
|
||||
clearTextLabels();
|
||||
initControl();
|
||||
}
|
||||
|
||||
|
|
@ -188820,7 +189090,6 @@ function getSelectHoleInfo(){
|
|||
|
||||
|
||||
function addHole(evt){
|
||||
|
||||
if (evt.text.length > 50) {
|
||||
|
||||
var values = JSON.parse(evt.text);
|
||||
|
|
@ -188837,6 +189106,8 @@ function addHole(evt){
|
|||
);
|
||||
|
||||
HOLE_SELECT.addFeatures([hole]);
|
||||
hole.attributes.holeCode = hole.attributes.CODE;
|
||||
addHoleNames(hole);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -188905,6 +189176,9 @@ function addProject(evt) {
|
|||
function addProjectHoles(projectCode) {
|
||||
HOLE_SELECT.removeAllFeatures();
|
||||
HOLE_SELECT2.removeAllFeatures();
|
||||
removeTooltip(); // 기존 메인 팝업 제거
|
||||
|
||||
clearTextLabels();
|
||||
console.log("addProjectHoles projectCode ::: " + projectCode);
|
||||
$.get("/map/searchHoleByProjectCode.do", { projectCode : projectCode }).done(function(response) {
|
||||
console.log("get projectCode ::: " + projectCode);
|
||||
|
|
@ -188916,7 +189190,11 @@ function addProjectHoles(projectCode) {
|
|||
var feature = format.read(row.wkt);
|
||||
feature.attributes.CODE = row.code;
|
||||
feature.geometry.transform('EPSG:5186', 'EPSG:3857');
|
||||
features.push(feature);
|
||||
features.push(feature);
|
||||
|
||||
|
||||
feature.attributes.holeCode = feature.attributes.CODE;
|
||||
addHoleNames(feature);
|
||||
}
|
||||
|
||||
if(features.length > 0) {
|
||||
|
|
@ -189783,7 +190061,8 @@ function initControl(){
|
|||
CTL_MODIFY.deactivate();
|
||||
CTL_MODIFY.activate();
|
||||
CTL_INFO.deactivate();
|
||||
|
||||
clearTextLabels();
|
||||
|
||||
for(var i = 0; i < parent.BASE_MAP.layers.length; i ++){
|
||||
if(parent.BASE_MAP.layers[i].name == 'Jihaanjeon'){
|
||||
//parent.BASE_MAP.layers[i].setVisibility(false);
|
||||
|
|
@ -190637,6 +190916,7 @@ function selectHjdCde(feature){
|
|||
}
|
||||
}
|
||||
|
||||
var dragControl; // 드래그 컨트롤을 담을 변수 추가
|
||||
|
||||
function selectOneSich(hcode){
|
||||
//HOLE_SELECT.features
|
||||
|
|
@ -190657,208 +190937,280 @@ function selectOneSich(hcode){
|
|||
var result =data;
|
||||
var tagStr = "";
|
||||
|
||||
tagStr += '<div style="overflow:auto;height:280px;">';
|
||||
tagStr += '<div style="background-color: #004e99;color: white;font-size: 18px;font-weight: bold;margin-bottom: 10px;"> 시추공 정보 </div>'
|
||||
tagStr += '<table class="table table-bordered" width="100%" border="0" cellpadding="4" cellspacing="1">';
|
||||
tagStr += '<colgroup>';
|
||||
tagStr += '<col style="width:100px;">';
|
||||
tagStr += '<col style="width:180px;">';
|
||||
tagStr += '<col style="width:100px;">';
|
||||
tagStr += '<col style="width:180px;">';
|
||||
tagStr += '</colgroup>';
|
||||
tagStr += '<tbody>';
|
||||
|
||||
tagStr += '<tr>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>프로젝트정보</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF" colspan="3">'+data.project.projectName+'</td>';
|
||||
tagStr += '</tr>';
|
||||
|
||||
|
||||
tagStr += '<tr>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>시추공명</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF">'+data.mapHeader.holeName+'</td>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>시추공코드</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF">'+data.mapHeader.holeCode+'</td>';
|
||||
tagStr += '</tr>';
|
||||
|
||||
tagStr += '<div style="overflow:auto;height:280px;">';
|
||||
tagStr += '<div style="background-color: #004e99;color: white;font-size: 18px;font-weight: bold;margin-bottom: 10px;"> 시추공 정보 </div>'
|
||||
tagStr += '<table class="table table-bordered" width="100%" border="0" cellpadding="4" cellspacing="1">';
|
||||
tagStr += '<colgroup>';
|
||||
tagStr += '<col style="width:100px;">';
|
||||
tagStr += '<col style="width:180px;">';
|
||||
tagStr += '<col style="width:100px;">';
|
||||
tagStr += '<col style="width:180px;">';
|
||||
tagStr += '</colgroup>';
|
||||
tagStr += '<tbody>';
|
||||
tagStr += '<tr>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>시추공종류</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF">Boring</td>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>굴진심도</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF">'+data.mapHeader.holeTotalDepth+'</td>';
|
||||
tagStr += '</tr>';
|
||||
|
||||
tagStr += '<tr>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>프로젝트정보</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF" colspan="3">'+data.project.projectName+'</td>';
|
||||
tagStr += '</tr>';
|
||||
tagStr += '<tr>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>표고</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF">'+data.mapHeader.holeEl+'</td>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>지하수위</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF">'+data.mapHeader.holeWl+'</td>';
|
||||
tagStr += '</tr>';
|
||||
|
||||
|
||||
tagStr += '<tr>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>시추공명</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF">'+data.mapHeader.holeName+'</td>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>시추공코드</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF">'+data.mapHeader.holeCode+'</td>';
|
||||
tagStr += '</tr>';
|
||||
|
||||
tagStr += '<tr>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>시추공종류</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF">Boring</td>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>굴진심도</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF">'+data.mapHeader.holeTotalDepth+'</td>';
|
||||
tagStr += '</tr>';
|
||||
|
||||
tagStr += '<tr>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>표고</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF">'+data.mapHeader.holeEl+'</td>';
|
||||
tagStr += '<td bgcolor="F7F7F7"><strong>지하수위</strong></td>';
|
||||
tagStr += '<td bgcolor="#FFFFFF">'+data.mapHeader.holeWl+'</td>';
|
||||
tagStr += '</tr>';
|
||||
|
||||
/* tagStr += '<tr>';
|
||||
tagStr += '<td class="td-head">시추공종류</td>';
|
||||
tagStr += '<td class="t-center">Boring</td>';
|
||||
tagStr += '</tr>';
|
||||
|
||||
tagStr += '<tr>';
|
||||
tagStr += '<td class="td-head">굴진심도</td>';
|
||||
tagStr += '<td class="t-center"> -'+ data.mapHeader.holeEl +'</td>';
|
||||
tagStr += '</tr>';*/
|
||||
|
||||
tagStr += '</tbody>';
|
||||
tagStr += '</table>';
|
||||
tagStr += '<div style="background-color: #004e99;color: white;font-size: 18px;font-weight: bold;margin-top: 10px;margin-bottom: 10px;"> 등록된 시험 정보 </div>'
|
||||
tagStr += '</tbody>';
|
||||
tagStr += '</table>';
|
||||
tagStr += '<div style="background-color: #004e99;color: white;font-size: 18px;font-weight: bold;margin-top: 10px;margin-bottom: 10px;"> 등록된 시험 정보 </div>'
|
||||
tagStr += '<table class="table table-bordered" width="100%" border="0" cellpadding="3" cellspacing="1">';
|
||||
tagStr += '<colgroup>';
|
||||
tagStr += '<col style="width:200px;">';
|
||||
tagStr += '<col style="width:200px;">';
|
||||
tagStr += '<col style="width:160px;">';
|
||||
tagStr += '</colgroup>';
|
||||
tagStr += '<tbody>';
|
||||
tagStr += '<colgroup>';
|
||||
tagStr += '<col style="width:200px;">';
|
||||
tagStr += '<col style="width:200px;">';
|
||||
tagStr += '<col style="width:160px;">';
|
||||
tagStr += '</colgroup>';
|
||||
tagStr += '<tbody>';
|
||||
|
||||
|
||||
//기본
|
||||
var rowspan = 0;
|
||||
rowspan = data.projectYn.waterpressure == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.permeability == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.conePenetration == 'Y' ? rowspan +1 : rowspan;
|
||||
|
||||
var textCount = 0;
|
||||
if( data.projectYn.waterpressure == 'Y'){
|
||||
tagStr += tableRowOneSich("기본현장시험","현장수압시험","TBL_FIELD_WATERPRESSURE2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
|
||||
|
||||
|
||||
// 3. 시료 정보
|
||||
rowspan = 1;
|
||||
textCount = 0;
|
||||
tagStr += tableRowOneSich("시료 정보","시료 정보","TBL_SAMPLE_INFO",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.sampleInfo) ? 'Y' : 'N')
|
||||
textCount ++;
|
||||
|
||||
// 4. 실내토사시험
|
||||
rowspan = 6; //시험이 총 6개
|
||||
textCount = 0;
|
||||
tagStr += tableRowOneSich("실내토사시험","토사 입도분석시험","TBL_CLASSIFICATION2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.sandClassification) ? 'Y' : 'N')
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("실내토사시험","토사 CBR 시험","TBL_CBR2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.sandCbr) ? 'Y' : 'N')
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("실내토사시험","토사 압밀시험 ","TBL_CONSOLIDATION2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.sandConsolidation) ? 'Y' : 'N')
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("실내토사시험","토사 일축압축시험","TBL_UNCONFINED2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.sandUnconfinedUsual) ? 'Y' : 'N')
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("실내토사시험","토사 삼축압축시험 UU","TBL_TRIUU2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.sandTriaxialUu) ? 'Y' : 'N')
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("실내토사시험","토사 삼축압축시험 CU","TBL_TRICU2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.sandTriaxialCu) ? 'Y' : 'N')
|
||||
textCount ++;
|
||||
|
||||
// 5. 실내암석시험
|
||||
rowspan = 4;
|
||||
textCount = 0;
|
||||
tagStr += tableRowOneSich("실내암석시험","암석 일축압축시험","TBL_ROCK_UNIAXIAL2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.rockUniaxial) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("실내암석시험","암석 삼축압축시험 ","TBL_ROCK_TRIAXIAL2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.rockTriaxial) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("실내암석시험","암석 점하중강도시험","TBL_ROCK_POINTLOAD2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.rockPointload) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("실내암석시험","암석 절리면전단시험","TBL_ROCK_JOINTSHEAR2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.rockJointshear) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
|
||||
// 6. 현장시험
|
||||
rowspan = 4;
|
||||
textCount = 0;
|
||||
tagStr += tableRowOneSich("현장시험","공내재하시험","TBL_FIELD_PRESSUREMETER",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.fieldPressuremeter) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("현장시험","현장투수시험","TBL_FIELD_PERMEABILITY2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.fieldPermeablity) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("현장시험","수압시험","TBL_FIELD_WATERPRESSURE2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.fieldWaterpressure) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("현장시험","콘관입시험","TBL_FIELD_CONE_PENETRATION2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.fieldConePenetration) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
|
||||
// 7. 동적시험
|
||||
rowspan = 4;
|
||||
textCount = 0;
|
||||
tagStr += tableRowOneSich("동적시험","토사 공진주시험","TBL_RESONANT2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.sandResonant) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("동적시험","암석 공진주시험","TBL_ROCK_RESONANT_USUAL2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.rockResonant) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("동적시험","토사 반복삼축압축시험","TBL_REPEATED_TRIAXIAL2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.sandRepeatedTriaxial) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("동적시험","암석 반복삼축압축시험","TBL_ROCK_REPEATED_TRIAXIAL_USUAL2",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.rockRepeatedTriaxial) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
|
||||
// 8. 물리탐사
|
||||
rowspan = 3;
|
||||
textCount = 0;
|
||||
tagStr += tableRowOneSich("물리탐사","PS 검층 정보","TBL_BOREHOLE_WAVE",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.boreholeWave) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("물리탐사","하향식 탄성파","TBL_DOWNHOLE",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.downhole) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
tagStr += tableRowOneSich("물리탐사","밀도검층정보","TBL_DENSITY",data.project.projectCode,data.hCode,rowspan,textCount, 0 < Number(data.data.density) ? 'Y' : 'N');
|
||||
textCount ++;
|
||||
|
||||
|
||||
/*
|
||||
//기본
|
||||
rowspan = 0;
|
||||
rowspan = true || data.projectYn.waterpressure == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.permeability == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.pressuremeter == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.conePenetration == 'Y' ? rowspan +1 : rowspan;
|
||||
|
||||
textCount = 0;
|
||||
if( true || data.projectYn.waterpressure == 'Y'){
|
||||
tagStr += tableRowOneSich("기본현장시험","현장수압시험","TBL_FIELD_WATERPRESSURE2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.waterpressure)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.permeability == 'Y'){
|
||||
tagStr += tableRowOneSich("기본현장시험","현장투수시험","TBL_FIELD_PERMEABILITY2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.permeability == 'Y'){
|
||||
tagStr += tableRowOneSich("기본현장시험","현장투수시험","TBL_FIELD_PERMEABILITY2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.permeability)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.conePenetration == 'Y'){
|
||||
tagStr += tableRowOneSich("기본현장시험","콘관입시험","TBL_FIELD_CONE_PENETRATION2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.pressuremeter == 'Y'){
|
||||
tagStr += tableRowOneSich("기본현장시험","공내재하시험","TBL_FIELD_PRESSUREMETER",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.pressuremeter)
|
||||
textCount ++;
|
||||
}
|
||||
if( true || data.projectYn.conePenetration == 'Y'){
|
||||
tagStr += tableRowOneSich("기본현장시험","콘관입시험","TBL_FIELD_CONE_PENETRATION2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.conePenetration)
|
||||
textCount ++;
|
||||
}
|
||||
|
||||
//물성
|
||||
rowspan = 0;
|
||||
textCount = 0;
|
||||
rowspan = data.projectYn.sampleInfo == 'Y' ? rowspan +1 : rowspan;
|
||||
if( data.projectYn.conePenetration == 'Y'){
|
||||
tagStr += tableRowOneSich("기본물성시험","기본물성시험","TBL_SAMPLE_INFO",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
rowspan = true || data.projectYn.sampleInfo == 'Y' ? rowspan +1 : rowspan;
|
||||
if( true || data.projectYn.sampleInfo == 'Y'){
|
||||
tagStr += tableRowOneSich("기본물성시험","기본물성시험","TBL_SAMPLE_INFO",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.sampleInfo)
|
||||
textCount ++;
|
||||
}
|
||||
|
||||
//토사
|
||||
rowspan = 0;
|
||||
textCount = 0;
|
||||
rowspan = data.projectYn.classification == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.cbrCompac == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.consolidation == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.unconfinedUsual == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.triaxialUsualCu == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.triaxialUsualUu == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.rockResonant == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.rockRepeated == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.classification == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.cbrCompac == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.consolidation == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.unconfinedUsual == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.triaxialUsualCu == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.triaxialUsualUu == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.rockResonant == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.rockRepeated == 'Y' ? rowspan +1 : rowspan;
|
||||
|
||||
if( data.projectYn.classification == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","입도분석","TBL_CLASSIFICATION2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.classification == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","입도분석","TBL_CLASSIFICATION2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.classification)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.cbrCompac == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","CBR","TBL_CBR2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.cbrCompac == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","CBR","TBL_CBR2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.cbrCompac)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.consolidation == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","압밀시험","TBL_CONSOLIDATION2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.consolidation == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","압밀시험","TBL_CONSOLIDATION2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.consolidation)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.unconfinedUsual == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","일축압축","TBL_UNCONFINED2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.unconfinedUsual == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","일축압축","TBL_UNCONFINED2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.unconfinedUsual)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.triaxialUsualCu == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","삼축압축_CU","TBL_TRICU2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.triaxialUsualCu == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","삼축압축_CU","TBL_TRICU2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.triaxialUsualCu)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.triaxialUsualUu == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","삼축압축_UU","TBL_TRIUU2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.triaxialUsualUu == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","삼축압축_UU","TBL_TRIUU2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.triaxialUsualUu)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.rockResonant == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","공진주","TBL_RESONANT2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.rockResonant == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","공진주","TBL_RESONANT2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.rockResonant)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.rockRepeated == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","반복삼축","TBL_REPEATED_TRIAXIAL2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.rockRepeated == 'Y'){
|
||||
tagStr += tableRowOneSich("토사시험","반복삼축","TBL_REPEATED_TRIAXIAL2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.rockRepeated)
|
||||
textCount ++;
|
||||
}
|
||||
|
||||
//암석
|
||||
rowspan = 0;
|
||||
textCount = 0;
|
||||
rowspan = data.projectYn.rockUniaxial == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.rockTriaxial == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.rockPointload == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.rockJointshear == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.resonant == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.repeated == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.rockUniaxial == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.rockTriaxial == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.rockPointload == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.rockJointshear == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.resonant == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.repeated == 'Y' ? rowspan +1 : rowspan;
|
||||
|
||||
if( data.projectYn.rockUniaxial == 'Y'){
|
||||
tagStr += tableRowOneSich("암석시험","일축압축","TBL_ROCK_UNIAXIAL2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.rockUniaxial == 'Y'){
|
||||
tagStr += tableRowOneSich("암석시험","일축압축","TBL_ROCK_UNIAXIAL2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.rockUniaxial)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.rockTriaxial == 'Y'){
|
||||
tagStr += tableRowOneSich("암석시험","삼축압축","TBL_ROCK_TRIAXIAL2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.rockTriaxial == 'Y'){
|
||||
tagStr += tableRowOneSich("암석시험","삼축압축","TBL_ROCK_TRIAXIAL2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.rockTriaxial)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.rockPointload == 'Y'){
|
||||
tagStr += tableRowOneSich("암석시험","점하중","TBL_ROCK_POINTLOAD2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.rockPointload == 'Y'){
|
||||
tagStr += tableRowOneSich("암석시험","점하중","TBL_ROCK_POINTLOAD2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.rockPointload)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.rockJointshear == 'Y'){
|
||||
tagStr += tableRowOneSich("암석시험","절리면전단","TBL_ROCK_JOINTSHEAR2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.rockJointshear == 'Y'){
|
||||
tagStr += tableRowOneSich("암석시험","절리면전단","TBL_ROCK_JOINTSHEAR2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.rockJointshear)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.resonant == 'Y'){
|
||||
tagStr += tableRowOneSich("암석시험","공진주","TBL_ROCK_RESONANT_USUAL2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.resonant == 'Y'){
|
||||
tagStr += tableRowOneSich("암석시험","공진주","TBL_ROCK_RESONANT_USUAL2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.resonant)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.repeated == 'Y'){
|
||||
tagStr += tableRowOneSich("암석시험","반복삼축","TBL_ROCK_REPEATED_TRIAXIAL_USUAL2",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.repeated == 'Y'){
|
||||
tagStr += tableRowOneSich("암석시험","반복삼축","TBL_ROCK_REPEATED_TRIAXIAL_USUAL2",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.repeated)
|
||||
textCount ++;
|
||||
}
|
||||
|
||||
//물리
|
||||
rowspan = 0;
|
||||
textCount = 0;
|
||||
rowspan = data.projectYn.boreholeWave == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.downhole == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = data.projectYn.density == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.boreholeWave == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.downhole == 'Y' ? rowspan +1 : rowspan;
|
||||
rowspan = true || data.projectYn.density == 'Y' ? rowspan +1 : rowspan;
|
||||
|
||||
if( data.projectYn.boreholeWave == 'Y'){
|
||||
tagStr += tableRowOneSich("물리검층","PS검층","TBL_BOREHOLE_WAVE",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.boreholeWave == 'Y'){
|
||||
tagStr += tableRowOneSich("물리검층","PS검층","TBL_BOREHOLE_WAVE",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.boreholeWave)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.downhole == 'Y'){
|
||||
tagStr += tableRowOneSich("물리검층","하향식탄성파","TBL_DOWNHOLE",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.downhole == 'Y'){
|
||||
tagStr += tableRowOneSich("물리검층","하향식탄성파","TBL_DOWNHOLE",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.downhole)
|
||||
textCount ++;
|
||||
}
|
||||
if( data.projectYn.density == 'Y'){
|
||||
tagStr += tableRowOneSich("물리검층","밀도검층","TBL_DENSITY",data.project.projectCode,data.hCode,rowspan,textCount)
|
||||
if( true || data.projectYn.density == 'Y'){
|
||||
tagStr += tableRowOneSich("물리검층","밀도검층","TBL_DENSITY",data.project.projectCode,data.hCode,rowspan,textCount, data.projectYn.density)
|
||||
textCount ++;
|
||||
}
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
tagStr += '</tbody>';
|
||||
tagStr += '</table>';
|
||||
tagStr += '</div>';
|
||||
tagStr += '</div>';
|
||||
|
||||
|
||||
POPUP_TOOLTIP = new OpenLayers.Popup.FramedCloud("JibanTooltip", feature.geometry.getBounds().getCenterLonLat(),
|
||||
null, tagStr, null, true, removeTooltip);
|
||||
null, tagStr, null, true, removeTooltip);
|
||||
|
||||
|
||||
// 2. 위에서 정의한 DragPopup 컨트롤을 생성합니다.
|
||||
dragControl = new OpenLayers.Control.DragPopup(POPUP_TOOLTIP);
|
||||
|
||||
BASE_MAP.addControl(dragControl);
|
||||
dragControl.activate();
|
||||
|
||||
BASE_MAP.addPopup(POPUP_TOOLTIP);
|
||||
$("#JibanTooltip_close").css("top",$("#JibanTooltip_FrameDecorationDiv_0").css("top"));
|
||||
$("#JibanTooltip_close").css("right","28px");
|
||||
|
|
@ -190879,13 +191231,16 @@ function selectOneSich(hcode){
|
|||
|
||||
}
|
||||
|
||||
function tableRowOneSich(rowText,tdText,exam,projectCode,hCode,rowspan,textCount){
|
||||
|
||||
function tableRowOneSich(rowText,tdText,exam,projectCode,hCode,rowspan,textCount, projectYn) {
|
||||
|
||||
var text = "";
|
||||
text +='<tr align="center" bgcolor="#FFFFFF">';
|
||||
text += textCount == 0 ? '<td align="center" bgcolor="F7F7F7" rowspan='+rowspan+'><strong>'+rowText+'</strong></td>' : '';
|
||||
text += '<td align="center" bgcolor="F7F7F7">'+tdText+'</td>';
|
||||
text += '<td align="center" bgcolor="#FFFFFF"><a href=# onclick="previewClipReport(\''+exam+'\',\''+projectCode+'\',\''+hCode+'\')">미리보기</a></td>';
|
||||
text += projectYn !== 'Y' ?
|
||||
'<td align="center" bgcolor="#FFFFFF" style="color: #ababab;">없음</td>'
|
||||
:
|
||||
'<td align="center" bgcolor="#FFFFFF"><a href=# onclick="previewClipReport(\''+exam+'\',\''+projectCode+'\',\''+hCode+'\')">보기' + '</a></td>';
|
||||
text +="</tr>";
|
||||
return text;
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
Loading…
Reference in New Issue