From 4520f140c11a351016aa4c223142851d4a94aff3 Mon Sep 17 00:00:00 2001 From: thkim Date: Wed, 25 Mar 2026 16:30:33 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=95=94=EC=84=9D=EC=8B=9C=ED=97=98?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20>=20=EC=9D=BC=EC=B6=95=EC=95=95=EC=B6=95?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=8B=9C=ED=97=98=ED=9A=9F=EC=88=98=20?= =?UTF-8?q?=EC=88=AB=EC=9E=90=20=EC=9E=85=EB=A0=A5=20=EC=8B=9C,=20?= =?UTF-8?q?=EB=B0=94=EB=A1=9C=20=EC=A0=81=EC=9A=A9=EB=90=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp | 10 +++++++--- src/main/webapp/web/js/common.js | 3 +-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp b/src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp index 3942b58d..d4565abe 100644 --- a/src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp +++ b/src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp @@ -327,7 +327,7 @@ function fn_setFile(arrayRock){ for(var i =0; i < arrayRock.length; i++){ - file += '
일축압축시험결과 그래프를 입력하세요. (최대크기: 500KB)
'; + file += '
일축압축시험결과 그래프를 입력하세요. (최대크기: 500KB) 파일은 JPEG 또는 PNG 형태로 올려주셔야 합니다.
'; file += ' '; file += ' '; file += ' '; @@ -882,7 +882,11 @@ function fn_openClipReport2(table,project,hole,sample,etc1,etc2,gbn){
- +
@@ -1219,7 +1223,7 @@ function fn_openClipReport2(table,project,hole,sample,etc1,etc2,gbn){
-
일축압축시험결과 그래프를 입력하세요. (최대크기: 500KB)
+
일축압축시험결과 그래프를 입력하세요. (최대크기: 500KB) 파일은 JPEG 또는 PNG 형태로 올려주셔야 합니다.
diff --git a/src/main/webapp/web/js/common.js b/src/main/webapp/web/js/common.js index 8d959f49..b083e879 100644 --- a/src/main/webapp/web/js/common.js +++ b/src/main/webapp/web/js/common.js @@ -834,11 +834,10 @@ function fn_FileAddRow(tableId, file_key, file_id, tr_id, desc){ //첨부파일 row 동적삭제 function fn_FileRemoveRow(tableId, rowIndex, num){ - debugger; var objTable = document.getElementById(tableId); //현재 로우가 있을경우만 삭제 가능 - if(objTable.rows.length > 0){ + if(objTable && objTable.rows && objTable.rows.length > 0){ for(var i=1; i<=num; i++){ objTable.deleteRow(rowIndex-i); }