기업사용자 입력시스템: 시추공정보 > 시추방향의 각도에 '-'입력 지원(웹, 엑셀업로드)
parent
1b8de5cd9b
commit
7b963c5f6d
|
|
@ -639,7 +639,11 @@ public class HeaderController {
|
||||||
String oHOLE_BORING_METHOD = sUtil.checkNull(String.valueOf(params.get("HOLE_BORING_METHOD"))); //시추방법
|
String oHOLE_BORING_METHOD = sUtil.checkNull(String.valueOf(params.get("HOLE_BORING_METHOD"))); //시추방법
|
||||||
String oHOLE_BORING_MACHINE = sUtil.checkNull(String.valueOf(request.getParameter("HOLE_BORING_MACHINE"))); //시추장비
|
String oHOLE_BORING_MACHINE = sUtil.checkNull(String.valueOf(request.getParameter("HOLE_BORING_MACHINE"))); //시추장비
|
||||||
String oHOLE_LAYER_NUM = sUtil.checkNull(String.valueOf(params.get("HOLE_LAYER_NUM"))); //지층수
|
String oHOLE_LAYER_NUM = sUtil.checkNull(String.valueOf(params.get("HOLE_LAYER_NUM"))); //지층수
|
||||||
String oBORING_DIRECTION = sUtil.checkNull(String.valueOf(params.get("BORING_DIRECTION_SEL")))+"|"+sUtil.checkNull(String.valueOf(request.getParameter("BORING_DIRECTION_INPUT"))); //시추방향
|
String BORING_DIRECTIOIN_DEGREE = sUtil.checkNull(String.valueOf(request.getParameter("BORING_DIRECTION_INPUT"))); // 시추방향 각도(oBORING_DIRECTION 에 사용한다.)
|
||||||
|
if ("-".equals(BORING_DIRECTIOIN_DEGREE)) {
|
||||||
|
BORING_DIRECTIOIN_DEGREE = "-999";
|
||||||
|
}
|
||||||
|
String oBORING_DIRECTION = sUtil.checkNull(String.valueOf(params.get("BORING_DIRECTION_SEL")))+"|"+BORING_DIRECTIOIN_DEGREE; //시추방향
|
||||||
String oHOLE_TYPE = "Boring"; //Boring
|
String oHOLE_TYPE = "Boring"; //Boring
|
||||||
String oHOLE_DB_INPUTCOMP = sUtil.checkNull(String.valueOf(params.get("HOLE_DB_INPUTCOMP"))); //입력기업
|
String oHOLE_DB_INPUTCOMP = sUtil.checkNull(String.valueOf(params.get("HOLE_DB_INPUTCOMP"))); //입력기업
|
||||||
String oHOLE_DESC = sUtil.checkNull(String.valueOf(request.getParameter("HOLE_DESC"))); //기타
|
String oHOLE_DESC = sUtil.checkNull(String.valueOf(request.getParameter("HOLE_DESC"))); //기타
|
||||||
|
|
|
||||||
|
|
@ -6880,7 +6880,11 @@ public class ManageExcelUploadProc03Controller {
|
||||||
|
|
||||||
String _holeBoringMachine = excel1Wp.get("col2",17).trim(); //시추장비
|
String _holeBoringMachine = excel1Wp.get("col2",17).trim(); //시추장비
|
||||||
String _holeLayerNum = excel1Wp.get("col2",15).trim(); //지층수
|
String _holeLayerNum = excel1Wp.get("col2",15).trim(); //지층수
|
||||||
String _boringDirection = excel1Wp.get("col2",19).trim()+"|"+excel1Wp.get("col7",19).trim(); //시추방향
|
String boringDirectionDegree = excel1Wp.get("col7",19).trim(); //시추방향 각도(_boringDirection 에 사용한다.)
|
||||||
|
if ("-".equals(boringDirectionDegree)) {
|
||||||
|
boringDirectionDegree = "-999";
|
||||||
|
}
|
||||||
|
String _boringDirection = excel1Wp.get("col2",19).trim()+"|"+boringDirectionDegree; //시추방향
|
||||||
System.out.println("시추방향 : " + excel1Wp.get("col2",19).trim());
|
System.out.println("시추방향 : " + excel1Wp.get("col2",19).trim());
|
||||||
String _holeType = "Boring"; //Boring
|
String _holeType = "Boring"; //Boring
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -623,12 +623,12 @@ window.onload = function() {
|
||||||
//시추방향
|
//시추방향
|
||||||
if('${mapHeader.boringDirection}' != null && '${mapHeader.boringDirection}' != ''){
|
if('${mapHeader.boringDirection}' != null && '${mapHeader.boringDirection}' != ''){
|
||||||
var boring = "${mapHeader.boringDirection}".split("|");
|
var boring = "${mapHeader.boringDirection}".split("|");
|
||||||
|
var boringDegree = boring[1] === '-999' ? '-' : boring[1];
|
||||||
var consFrmSel = document.getElementById("BORING_DIRECTION_SEL");
|
var consFrmSel = document.getElementById("BORING_DIRECTION_SEL");
|
||||||
var consFrmInput = document.getElementById("BORING_DIRECTION_INPUT");
|
var consFrmInput = document.getElementById("BORING_DIRECTION_INPUT");
|
||||||
|
|
||||||
fn_SelectedData(consFrmSel,boring[0]);
|
fn_SelectedData(consFrmSel,boring[0]);
|
||||||
consFrmInput.value = boring[1];
|
consFrmInput.value = boringDegree;
|
||||||
|
|
||||||
if (boring[0] === "-") {
|
if (boring[0] === "-") {
|
||||||
consFrmInput.disabled = true;
|
consFrmInput.disabled = true;
|
||||||
|
|
@ -637,7 +637,39 @@ window.onload = function() {
|
||||||
consFrmInput.disabled = false;
|
consFrmInput.disabled = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var input = document.getElementById('BORING_DIRECTION_INPUT');
|
||||||
|
|
||||||
|
// 1. 입력 제한
|
||||||
|
input.addEventListener("input", function () {
|
||||||
|
let val = this.value;
|
||||||
|
|
||||||
|
if (!/^[-]?\d*\.?\d*$/.test(val)) {
|
||||||
|
this.value = val.slice(0, -1);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 2. ↑ ↓ 키
|
||||||
|
input.addEventListener("keydown", function (e) {
|
||||||
|
if (e.key === "ArrowUp" || e.key === "ArrowDown") {
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
let val = this.value.trim();
|
||||||
|
|
||||||
|
if (val === "-" || val === "") {
|
||||||
|
val = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
let num = parseFloat(val);
|
||||||
|
if (isNaN(num)) num = 0;
|
||||||
|
|
||||||
|
if (e.key === "ArrowUp") num += 1;
|
||||||
|
else num -= 1;
|
||||||
|
|
||||||
|
this.value = num;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
consFrmSel.addEventListener("change", function() {
|
consFrmSel.addEventListener("change", function() {
|
||||||
if (this.value === "-") {
|
if (this.value === "-") {
|
||||||
consFrmInput.disabled = true;
|
consFrmInput.disabled = true;
|
||||||
|
|
@ -1758,7 +1790,7 @@ function fn_HoleLoad(){
|
||||||
<select name="BORING_DIRECTION_SEL" id="BORING_DIRECTION_SEL" style="width:160px;" class="selectbox">
|
<select name="BORING_DIRECTION_SEL" id="BORING_DIRECTION_SEL" style="width:160px;" class="selectbox">
|
||||||
${map.CM010}
|
${map.CM010}
|
||||||
</select>
|
</select>
|
||||||
<input name="BORING_DIRECTION_INPUT" id="BORING_DIRECTION_INPUT" type="number" style="width:160px;" maxlength="40" value="${mapHeader.boringDirectionInput}"/> ˚
|
<input name="BORING_DIRECTION_INPUT" id="BORING_DIRECTION_INPUT" type="text" style="width:160px;" maxlength="40" value="${mapHeader.boringDirectionInput}"/> ˚
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue