-
-  
+ |
+
+
+
+  
  |
diff --git a/src/main/webapp/WEB-INF/views/web/include/includeTopInput.jsp b/src/main/webapp/WEB-INF/views/web/include/includeTopInput.jsp
index dc691335..5cc6bd03 100644
--- a/src/main/webapp/WEB-INF/views/web/include/includeTopInput.jsp
+++ b/src/main/webapp/WEB-INF/views/web/include/includeTopInput.jsp
@@ -93,17 +93,22 @@
검수등록완료 목록
-
+
입력중인프로젝트 현황
-
+
좌표수정
-
+
+
+ 프로젝트명 수정
+
+
+
검수자 관리
diff --git a/src/main/webapp/WEB-INF/views/web/input/basic/labInfoFieldPermeability.jsp b/src/main/webapp/WEB-INF/views/web/input/basic/labInfoFieldPermeability.jsp
index ff5224c8..dd2a54ec 100644
--- a/src/main/webapp/WEB-INF/views/web/input/basic/labInfoFieldPermeability.jsp
+++ b/src/main/webapp/WEB-INF/views/web/input/basic/labInfoFieldPermeability.jsp
@@ -232,6 +232,9 @@ function fn_isNumeric(fieldData, fieldName, msgTest) {
function fn_validateLength(fieldData, fieldName, msgTest, intLength, decimalLength) {
for (let i = 0; i < fieldData.length; i++) {
let value = fieldData[i][fieldName];
+ if( value === -999 ) {
+ continue;
+ }
let parts = value.toString().split(".");
if (parts[0].length > intLength || (parts[1] && parts[1].length > decimalLength)) {
alert(msgTest + "의 값은 정수 : " + intLength + "자리, 소수점 이하 : " + decimalLength + "자리까지 입력할 수 있습니다.");
@@ -241,14 +244,43 @@ function fn_validateLength(fieldData, fieldName, msgTest, intLength, decimalLeng
return true;
}
+function changeHyphenToMinus999Main(data) {
+ for( idx in data ) {
+ // -(hyphen) 허용한 것을 -999로 변환한다.
+ var targetItemKey = 'fieldperAvgPermeability';
+ data[idx][targetItemKey] = changeHyphenToMinus999(data[idx][targetItemKey]);
+ }
+
+ return data;
+}
+
+function changeHyphenToMinus999Sub(data) {
+ for( idx in data ) {
+ // -(hyphen) 허용한 것을 -999로 변환한다.
+ var targetItemKey = 'fieldperSubTotalHead';
+ data[idx][targetItemKey] = changeHyphenToMinus999(data[idx][targetItemKey]);
+
+ targetItemKey = 'fieldperSubPermeability';
+ data[idx][targetItemKey] = changeHyphenToMinus999(data[idx][targetItemKey]);
+ }
+
+ return data;
+}
+
+function changeHyphenToMinus999(data) {
+ if( data === '-' ) {
+ data = -999;
+ }
+ return data;
+}
+
//Data 저장.
function fn_save(rUrl) {
-
//240103 임효주 - 현장투수시험 (평균)투수계수의 type 에러 예방. 해당 값이 숫자 또는 공백인지 확인
let fieldData1 = kendoJQuery("#kictGrid1").data("kendoGrid")._data;
let fieldName1 = "fieldperAvgPermeability"; // 수정됨
let msgTest1 = "평균투수계수";
-
+ fieldData1 = changeHyphenToMinus999Main(fieldData1);
if (!fn_isNumeric(fieldData1, fieldName1, msgTest1)) {
return false;
}
@@ -256,7 +288,7 @@ function fn_save(rUrl) {
let fieldData2 = kendoJQuery("#kictGrid2").data("kendoGrid")._data;
let fieldName2 = "fieldperSubPermeability"; // 수정됨
let msgTest2 = "투수계수";
-
+ fieldData2 = changeHyphenToMinus999Sub(fieldData2);
if (!fn_isNumeric(fieldData2, fieldName2, msgTest2)) {
return false;
}
@@ -339,9 +371,11 @@ function fn_save(rUrl) {
if(fn_saveNumberCheckKendo("ROW", dataSource2, grid2, "gridCheck2", 0, rowInfo2, rowInfoItem2) == false)return false;
//data1
+ data1 = changeHyphenToMinus999Main(data1);
var kendoData1 = fn_kendoAllDataXml02(grid1, kendoColCount1, kendoRowCount1, 0, data1);
//data2
+ data2 = changeHyphenToMinus999Sub(data2);
var kendoData2 = fn_kendoAllDataXml02(grid2, kendoColCount2, kendoRowCount2, 0, data2);
// ----------------------- kendoGrid XML 구조저장 끝 -----------------------
@@ -887,7 +921,20 @@ function fn_grid_refresh(){
},
{ field: "fieldperCasingDia", title: "케이싱지름(cm)", editor: chooseEditor, width:120, attributes: { style:"text-align: right" }, template: "#= (fieldperCasingDia == null) ? '0' : fieldperCasingDia # " },
{ field: "fieldperCasingHeight", title: "케이싱길이(m)", editor: chooseEditor, width:120, attributes: { style:"text-align: right" }, template: "#= (fieldperCasingHeight == null) ? '0' : fieldperCasingHeight # " },
- { field: "fieldperAvgPermeability", title: "평균투수계수 (cm/sec)", editor: chooseTest, width:120, attributes: { style:"text-align: right" }, template: "#= (fieldperAvgPermeability == null) ? '0' : fieldperAvgPermeability # " },
+ { field: "fieldperAvgPermeability", title: "평균투수계수 (cm/sec)", editor: chooseTest, width:120, attributes: { style:"text-align: right" },
+ template: function(data) {
+ //"#= (fieldperAvgPermeability == null) ? '0' : fieldperAvgPermeability # "
+ if( data.fieldperAvgPermeability === "") {
+ data.fieldperAvgPermeability = "0";
+ } else if( data.fieldperAvgPermeability === null) {
+ data.fieldperAvgPermeability = "0";
+ } else if( data.fieldperAvgPermeability === "-999") {
+ data.fieldperAvgPermeability = "-";
+ }
+ var url = "" + data.fieldperAvgPermeability + " ";
+ return url;
+ }
+ },
{ field: "fieldperInspectedBy", title: "조사자", width:150, attributes: { style:"text-align: left" }, template: "#= (fieldperInspectedBy == null) ? '-' : fieldperInspectedBy # " },
{ field: "fieldperCheckedBy", title: "검수자", width:150, attributes: { style:"text-align: left" }, template: "#= (fieldperCheckedBy == null) ? '-' : fieldperCheckedBy # " },
{ field: "fieldperRemark", title: "비고", width:120, attributes: { style:"text-align: left" }, template: "#= (fieldperRemark == null) ? '-' : fieldperRemark # " },
@@ -962,7 +1009,7 @@ function fn_grid_refresh(){
oldFieldperCode: { type: "string" },
fieldperOrder: { type: "number", editable: false },
fieldperSubTime: { type: "number" },
- fieldperSubTotalHead: { type: "number" },
+ fieldperSubTotalHead: { type: "string" },
fieldperSubFallingHead: { type: "number" },
fieldperSubWaterLoose: { type: "number" },
fieldperSubQuantity: { type: "number" },
@@ -977,11 +1024,37 @@ function fn_grid_refresh(){
columns: [
{ field: "fieldperOrder", title: "시험 순서", width:60, attributes: { style:"text-align: center" } },
{ field: "fieldperSubTime", title: "시간(sec) (값 중복 허용 안 함)", editor: chooseEditor, attributes: { style:"text-align: right" }, template: "#= (fieldperSubTime == null) ? '0' : fieldperSubTime # " },
- { field: "fieldperSubTotalHead", title: "총수두(cm)", editor: chooseEditor, attributes: { style:"text-align: right" }, template: "#= (fieldperSubTotalHead == null) ? '0' : fieldperSubTotalHead # " },
+ { field: "fieldperSubTotalHead", title: "총수두(cm)", editor: chooseEditorAllowHyphen, attributes: { style:"text-align: right" },
+ template: function(data) {
+ //"#= (fieldperSubTotalHead == null) ? '0' : fieldperSubTotalHead # "
+ if( data.fieldperSubTotalHead === "") {
+ data.fieldperSubTotalHead = "0";
+ } else if( data.fieldperSubTotalHead === null) {
+ data.fieldperSubTotalHead = "0";
+ } else if( data.fieldperSubTotalHead === "-999") {
+ data.fieldperSubTotalHead = "-";
+ }
+ var url = "" + data.fieldperSubTotalHead + " ";
+ return url;
+ }
+ },
{ field: "fieldperSubFallingHead", title: "수두차(cm)", editor: chooseEditor, attributes: { style:"text-align: right" }, template: "#= (fieldperSubFallingHead == null) ? '0' : fieldperSubFallingHead # " },
{ field: "fieldperSubWaterLoose", title: "유출수량(㎤)", editor: chooseEditor, attributes: { style:"text-align: right" }, template: "#= (fieldperSubWaterLoose == null) ? '0' : fieldperSubWaterLoose # " },
{ field: "fieldperSubQuantity", title: "수량(㎤)", editor: chooseEditor, attributes: { style:"text-align: right" }, template: "#= (fieldperSubQuantity == null) ? '0' : fieldperSubQuantity # " },
- { field: "fieldperSubPermeability", title: "투수계수(K,cm/sec)", editor: chooseTest, attributes: { style:"text-align: right" }, template: "#= (fieldperSubPermeability == null) ? '0' : fieldperSubPermeability # " },
+ { field: "fieldperSubPermeability", title: "투수계수(K,cm/sec)", editor: chooseTest, attributes: { style:"text-align: right" },
+ template: function(data) {
+ //"#= (fieldperSubPermeability == null) ? '0' : fieldperSubPermeability # "
+ if( data.fieldperSubPermeability === "") {
+ data.fieldperSubPermeability = "0";
+ } else if( data.fieldperSubPermeability === null) {
+ data.fieldperSubPermeability = "0";
+ } else if( data.fieldperSubPermeability === "-999") {
+ data.fieldperSubPermeability = "-";
+ }
+ var url = "" + data.fieldperSubPermeability + " ";
+ return url;
+ }
+ },
{ field: "seq", hidden: true },
{ field: "newFieldperCode", hidden: true },
{ field: "oldFieldperCode", hidden: true },
@@ -1040,6 +1113,14 @@ function fn_grid_refresh(){
break;
}
}
+
+ function chooseEditorAllowHyphen(container, options) {
+ switch (options.model.COLUMN) {
+ default:
+ numericEditorAllowHyphen(container, options);
+ break;
+ }
+ }
function chooseTest(container, options) {
diff --git a/src/main/webapp/WEB-INF/views/web/manage/hole_coord_modify.jsp b/src/main/webapp/WEB-INF/views/web/manage/hole_coord_modify.jsp
index 69327a43..46daf7ac 100644
--- a/src/main/webapp/WEB-INF/views/web/manage/hole_coord_modify.jsp
+++ b/src/main/webapp/WEB-INF/views/web/manage/hole_coord_modify.jsp
@@ -125,10 +125,10 @@ function fn_help_tour(){
| 시추공 고유번호 |
시추공명 |
- 원좌표_X |
- 원좌표_Y |
- 경도 |
- 위도 |
+ 좌표계번호 |
+ 원좌표_X(E) |
+ 원좌표_Y(N) |
+ 지도 |
@@ -141,17 +141,39 @@ function fn_help_tour(){
${result.holeName}
|
+
+
+ |
|
|
-
-
- |
-
-
+ |
+
|
diff --git a/src/main/webapp/WEB-INF/views/web/manage/list_reg.jsp b/src/main/webapp/WEB-INF/views/web/manage/list_reg.jsp
index df6579f2..54b028a9 100644
--- a/src/main/webapp/WEB-INF/views/web/manage/list_reg.jsp
+++ b/src/main/webapp/WEB-INF/views/web/manage/list_reg.jsp
@@ -8,13 +8,6 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 프로젝트명 수정 목록
+
+
+
+
+
+
+
+
+
+
+
+
+ <%@ include file="/include/inc_kendoUI_2019.jsp" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%@ include file="/include/inc_footer_2021_new.jsp" %>
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/web/manage/re_name_modify.jsp b/src/main/webapp/WEB-INF/views/web/manage/re_name_modify.jsp
new file mode 100644
index 00000000..2e6075d3
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/web/manage/re_name_modify.jsp
@@ -0,0 +1,150 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+
+<%@ include file="/include/inc_head_2021_new.jsp" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 프로젝트명 수정
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 프로젝트 명 |
+ ${pName} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%@ include file="/include/inc_footer_2021_new.jsp" %>
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/web/map/mapTop.jsp b/src/main/webapp/WEB-INF/views/web/map/mapTop.jsp
index bd6cbfe1..59379f4f 100644
--- a/src/main/webapp/WEB-INF/views/web/map/mapTop.jsp
+++ b/src/main/webapp/WEB-INF/views/web/map/mapTop.jsp
@@ -8,6 +8,8 @@
+
+
지도
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 47836ef5..c818bcdf 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -16,6 +16,7 @@
encodingFilter
*.do
*.json
+ /video/stream/*
@@ -72,8 +73,12 @@
action
- *.json
+ *.json
+
+ action
+ /video/stream/*
+
ImageServlet
net.sf.jasperreports.j2ee.servlets.ImageServlet
diff --git a/src/main/webapp/body/map/download/image/btn_delete_all.gif b/src/main/webapp/body/map/download/image/btn_delete_all.gif
new file mode 100644
index 00000000..e0e24458
Binary files /dev/null and b/src/main/webapp/body/map/download/image/btn_delete_all.gif differ
diff --git a/src/main/webapp/com/css/map-service.css b/src/main/webapp/com/css/map-service.css
index ecfdf199..73a36035 100644
--- a/src/main/webapp/com/css/map-service.css
+++ b/src/main/webapp/com/css/map-service.css
@@ -863,6 +863,13 @@ header .global-link-wrapper {
background: url(../img/map-service/icon/ico_map_right_control_19.png) no-repeat 50% 50%;
}
+.map-right-btn-group > li .map-right-btn.map-btn-icon-geology::before {
+ background: url(../img/map-service/icon/ico_map_right_control_geology.png) no-repeat 50% 50%;
+}
+.map-right-btn-group > li .map-right-btn.map-btn-icon-mine::before {
+ background: url(../img/map-service/icon/ico_map_right_control_mine.png) no-repeat 50% 50%;
+}
+
/* 지도구분 탭 시작 */
diff --git a/src/main/webapp/com/img/map-service/icon/ico_map_right_control_geology.png b/src/main/webapp/com/img/map-service/icon/ico_map_right_control_geology.png
new file mode 100644
index 00000000..b4099984
Binary files /dev/null and b/src/main/webapp/com/img/map-service/icon/ico_map_right_control_geology.png differ
diff --git a/src/main/webapp/com/img/map-service/icon/ico_map_right_control_mine.png b/src/main/webapp/com/img/map-service/icon/ico_map_right_control_mine.png
new file mode 100644
index 00000000..03c50791
Binary files /dev/null and b/src/main/webapp/com/img/map-service/icon/ico_map_right_control_mine.png differ
diff --git a/src/main/webapp/com/js/drilling/drilling-common.js b/src/main/webapp/com/js/drilling/drilling-common.js
index 25cea9b4..6cf236e7 100644
--- a/src/main/webapp/com/js/drilling/drilling-common.js
+++ b/src/main/webapp/com/js/drilling/drilling-common.js
@@ -1,11 +1,3 @@
-let xhr;
-if(window.XMLHttpRequest) {
- xhr = new XMLHttpRequest();
-} else {
- // IE5, IE6 일때
- xhr = new ActiveXObject("Microsoft.XMLHTTP");
-}
-
function onClickBtnViewOnMap() {
const projectMasterCompanyName = '${mbr.projectMasterCompanyName}';
let projectCode = '${mbr.ProjectCode}';
diff --git a/src/main/webapp/include/inc_head_2021_new.jsp b/src/main/webapp/include/inc_head_2021_new.jsp
index e8c27ceb..7dfbebbe 100644
--- a/src/main/webapp/include/inc_head_2021_new.jsp
+++ b/src/main/webapp/include/inc_head_2021_new.jsp
@@ -43,6 +43,7 @@
============================================================== -->
+
|