From a52cd3dc295ea0935175bb269ec036c706359e83 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 27 Sep 2023 10:15:56 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=ED=8C=8C=EC=9D=BC=EB=93=B1?=
 =?UTF-8?q?=EB=A1=9D=20=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/fims/crdn/crdn05020-info.jsp  | 102 +++++++++---------
 1 file changed, 49 insertions(+), 53 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp
index 9c3adaaf..de674881 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp
@@ -3,7 +3,7 @@
 <c:set var="pageKorName" scope="request">단속 파일 등록</c:set>
 <div class="d-flex" style="flex-flow:column">
 	<div class="d-flex flex-row justify-content-evenly">
-		<div class="card" style="width:1400px;height:100px;">
+		<div class="card" style="min-width:1400px;width:1400px;height:100px;">
 			<form id="frmFirst--${pageName}">
 				<div class="row g-1">
 					<div class="col-md-4">
@@ -22,44 +22,47 @@
 						class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">장비업체</label>
 						<select id="entType--${pageName}" name="entType" class="form-select">
 							<option value="">선택하세요</option>
-							<option value="KNL">KNL</option>
-							<option value="INO">이노</option>
-							<option value="GASAN">가산정보통신</option>
-							<option value="ELISOFT">엘리소프트</option>
-							<option value="HITECOM">하이테콤</option>
-							<option value="XIT">XIT권장포맷</option>
-							<option value="MOBILE">모바일(스마트폰)</option>
+							<c:if test="${taskSeCd == 'DPV' or taskSeCd == 'ECA'}">
+								<option value="KNL">KNL</option>
+								<option value="INO">이노</option>
+							</c:if>
+							<c:if test="${taskSeCd == 'PVS' or taskSeCd == 'BPV'}">
+								<option value="GASAN">가산정보통신</option>
+								<option value="ELISOFT">엘리소프트</option>
+								<option value="XIT">XIT권장포맷</option>
+							</c:if>
+							<c:if test="${taskSeCd == 'BPV'}">
+								<option value="HITECOM">하이테콤</option>
+							</c:if>
+							<c:if test="${taskSeCd == '미세먼지'}">
+								<option value="unknown">unknown</option>
+							</c:if>
 						</select>
 					</div>
-					<c:if test="${taskSeCd == 'PVS' or taskSeCd == 'BPV'}">
-						<div class="col-md-4">
+					<div class="col-md-4 d-flex align-items-center flex-nowrap">
+						<c:if test="${taskSeCd == 'PVS' or taskSeCd == 'BPV'}">
 							<label for="cctvType--${pageName}" 
-							class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">cctv 구분</label>
+							class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">장비 구분</label>
 							<select id="cctvType--${pageName}" name="cctvType" class="form-select">
 								<option value="">선택</option>
 								<option value="고정형">고정형</option>
 								<option value="주행형">주행형</option>
 								<option value="버스장착형">버스장착형</option>
+								<option value="MOBILE">모바일(스마트폰)</option>
 							</select>
-						</div>
-					</c:if>
-					
-					<div class="col-md-12">
-						<c:if test="${taskSeCd == 'PVS' or taskSeCd == 'BPV' or taskSeCd == '미세먼지'}">
-							<label for="localFile--${pageName}" 
-							class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">파일</label>
-							<input type="file" id="localFile--${pageName}" name="localFile" />
-						</c:if>	
-						<span class="justify-content-end float-end me-4">
-							
+						</c:if>
+						<span class="d-flex justify-content-end float-end ms-auto me-4">
 							<button type="button" id="btnSearch--${pageName}" class="btn btn-primary">조회</button>
-							
-							<c:if test="${taskSeCd == 'PVS' or taskSeCd == 'BPV' or taskSeCd == '미세먼지'}">
-								<button type="button" id="btnFileUpload--${pageName}" class="btn btn-primary">등록</button>
-							</c:if>
 						</span>
 					</div>
-					
+					<div class="col-md-12 d-flex align-items-center flex-nowrap">
+						<label for="localFile--${pageName}" 
+						class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">파일</label>
+						<input type="file" id="localFile--${pageName}" name="localFile" multiple="multiple" />
+						<span class="d-flex justify-content-end float-end  ms-auto me-4">
+							<button type="button" id="btnFileUpload--${pageName}" class="btn btn-primary">업로드</button>
+						</span>
+					</div>
 				</div>
 			</form>
 		</div>
@@ -195,7 +198,7 @@
 			    </div>
 			</form>
 		</div>
-		<div id="imageArea--${pageName}" class="card my-4 px-4 justify-content-center" style="width:600px;height:600px;">
+		<div id="imageArea--${pageName}" class="card my-4 px-4 justify-content-center" style="min-width:600px;width:600px;height:600px;">
 		</div>
 		
 		<div class="card my-4 px-2" style="width:120px;height:600px;min-width:120px;">
@@ -283,21 +286,28 @@ $(document).ready(function(){
 	/**************************************************************************
 	 * pageObject.function
 	 **************************************************************************/
-	
-	//ftp체크
-	$P.checkFTP() = () => {
+	$P.validate = () => {
 		if($("#entType--${pageName}").val() == ""){
 			dialog.alert("장비업체를 선택하세요.");
-			return;
+			return false;
 		}
 		
-		if($("#entType--${pageName}").val() != "KNL" && $("#entType--${pageName}").val() != "INO"){
-			dialog.alert("해당 과태료 업무와 관련된 장비업체가 아닙니다.");
-			return;
+		if($("#entType--${pageName}").val() == "unkown" 
+				|| $("#entType--${pageName}").val() == "KNL"
+				|| $("#entType--${pageName}").val() == "GASAN" 
+				|| $("#entType--${pageName}").val() == "ELISOFT"
+				|| $("#entType--${pageName}").val() == "XIT"
+			){
+			dialog.alert("해당 업체 연계는 현재 준비중입니다.");
+			return false;
 		}
 		
-		if($("#entType--${pageName}").val() == "KNL"){
-			dialog.alert("KNL 파일 등록 기능은 서비스 준비 중입니다.");
+		return true;
+	}
+	
+	//ftp체크
+	$P.checkFTP = () => {
+		if(!$P.validate()){
 			return;
 		}
 		
@@ -315,17 +325,7 @@ $(document).ready(function(){
 	
 	 //로컬파일업로드
 	 $P.uploadLocalFile = () => {
-		 if($("#entType--${pageName}").val() == ""){
-			dialog.alert("장비업체를 선택하세요.");
-			return;
-		}
-
-		if($("#entType--${pageName}").val() != "GASAN" 
-				&& $("#entType--${pageName}").val() != "ELISOFT"
-				&& $("#entType--${pageName}").val() != "HITECOM"
-				&& $("#entType--${pageName}").val() != "XIT"
-				){
-			dialog.alert("해당 과태료 업무와 관련된 장비업체가 아닙니다.");
+		if(!$P.validate()){
 			return;
 		}
 		
@@ -334,9 +334,6 @@ $(document).ready(function(){
 			return;
 		}
 		
-		dialog.alert("주정차,전용차로,미세먼지 과태료 파일 등록 기능은 서비스 준비 중입니다.");
-		return;
-		
 		ajax.post({
 			url : wctx.url("/${taskSeCd}/crdn/crdn05/020/importFileFromClient.do"),
 			data : { entType : $("#entType--${pageName}").val() }, 
@@ -346,8 +343,7 @@ $(document).ready(function(){
 				}
 			}
 		});
-		
-		
+
 	 }
 	 
 	//서버에 등록된 파일 조회