이준호 전자조정시스템 커밋

- 관리자 대시보드 변경

src/main/java/kcc/let/main/web/EgovMainController.java

@@ -213,158 +213,6 @@ public class EgovMainController {
 				return "forward:/uat/uia/actionMain.do";
 			}
 		}
-		
-//		PaginationInfo paginationInfo = new PaginationInfo();
-//		{//일일관리자 접속 리스트
-//			LoginLog loginLog = new LoginLog();
-//			paginationInfo.setCurrentPageNo(loginLog.getPageIndex());
-//			paginationInfo.setRecordCountPerPage(loginLog.getPageUnit());
-//			paginationInfo.setPageSize(loginLog.getPageSize());
-//	
-//			loginLog.setFirstIndex(paginationInfo.getFirstRecordIndex());
-//			loginLog.setLastIndex(paginationInfo.getLastRecordIndex());
-//			loginLog.setRecordCountPerPage(10); //50개까지 보여주기
-//			//if(null != loginVO){ loginLog.setSiteId(loginVO.getSiteId()); }
-//			List<LoginLog> adminLogList  = loginLogService.selectMainAmdinLog(loginLog);
-//			int adminLogListCnt = loginLogService.selectMainAmdinLogTotCnt(loginLog);
-//			paginationInfo.setTotalRecordCount(adminLogListCnt);
-//			model.addAttribute("paginationInfo", paginationInfo);
-//			model.addAttribute("adminLogList", adminLogList);
-//		}
-//		{// 최근 게시물 / 새개시물 카운트
-//			//0번째 부터 6개의 항목만 조회
-//			boardVO.setFirstIndex(0);
-//			boardVO.setRecordCountPerPage(5);
-//			// 최신날짜 우선순위 조회
-//			boardVO.setSearchSortCnd("frstRegisterPnttm");
-//			boardVO.setSearchSortOrd("desc");
-//			List<BoardVO> adminBoardList = bbsMngService.selectAdminMainBoard(boardVO);
-//			model.addAttribute("adminBoardList", adminBoardList);
-//			
-//			int adminMainNewBoardCnt = bbsMngService.selectAdminMainNewBoardCnt(boardVO);
-//			model.addAttribute("adminMainNewBoardCnt", adminMainNewBoardCnt);
-//			
-//		}
-//		{// 관리자 로그관리 리스트 
-//			LoginLog loginLog = new LoginLog();
-//			//0번째 부터 6개의 항목만 조회
-//			loginLog.setFirstIndex(0);
-//			loginLog.setRecordCountPerPage(6);
-//			// 최신날짜 우선순위 조회
-//			loginLog.setSearchSortCnd("creatDt");
-//			loginLog.setSearchSortOrd("desc");
-//			List<LoginLog> adminLogList  = loginLogService.selectAmdinLog(loginLog);
-//			model.addAttribute("adminLogList", adminLogList);
-//			
-//		}
-//		{//신규가입회원 목록
-//			UserDefaultVO userSearchVO = new UserDefaultVO();
-//			
-//			//0번째 부터 4개의 항목만 조회
-//			userSearchVO.setFirstIndex(0);
-//			userSearchVO.setRecordCountPerPage(4);  
-//			
-//			// 가입일시 우선순위 조회
-//			userSearchVO.setSearchSortCnd("sbscrbDe");
-//			userSearchVO.setSearchSortOrd("desc");
-//			
-//			userSearchVO.setAdminYn("N");
-//			List<?> userList = userManageService.selectUserList(userSearchVO);
-//			model.addAttribute("userList", userList);
-//			
-//			UserDefaultVO userCount = userManageService.selectUserCount();
-//			model.addAttribute("userCount", userCount);
-//		}
-//
-//		{//접속통계 사용자만
-//			StatsVO statsVO = new StatsVO();
-//			statsVO.setRecordCountPerPage(20);  //일카운터(20개)
-//			statsVO.setFirstIndex(0);
-//			List<StatsVO> statsDayList = conectStatsService.selectMainStatsDay(statsVO); //일일접속카운터(관리자)
-//			List<StatsVO> statsMonthList = conectStatsService.selectMainStatsMonth(statsVO); //월별접속카운터(관리자)
-//			List<StatsVO> statsYearList = conectStatsService.selectMainStatsYear(statsVO); //연도변접속카운터(관리자)
-// 			{//일일통계  /* 연도없애기 */
-//				JSONObject statsObject = new JSONObject();
-//				JSONArray cntArray = new JSONArray();
-//				JSONArray dateArray = new JSONArray();
-//				for(StatsVO tempStatsVO : statsDayList){
-//					cntArray.add(tempStatsVO.getCnt());
-//					dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()));
-//				}
-//				statsObject.put("cnt" , cntArray);
-//				statsObject.put("date" , dateArray);
-//				model.addAttribute("statsDayList", statsObject);
-//			}
-//			{//월통계
-//				JSONObject statsObject = new JSONObject();
-//				JSONArray cntArray = new JSONArray();
-//				JSONArray dateArray = new JSONArray();
-//				for(StatsVO tempStatsVO : statsMonthList){
-//					cntArray.add(tempStatsVO.getCnt());
-//					dateArray.add(tempStatsVO.getStatsDate());
-//				}
-//				statsObject.put("cnt" , cntArray);
-//				statsObject.put("date" , dateArray);
-//				model.addAttribute("statsMonthList", statsObject);
-//			}
-//			{//년통계
-//				JSONObject statsObject = new JSONObject();
-//				JSONArray cntArray = new JSONArray();
-//				JSONArray dateArray = new JSONArray();
-//				cntArray.add(0); //데이터가 2018 한건만 조회 되어서 2017년도 0 넣어줌
-//				dateArray.add("2017");
-//				for(StatsVO tempStatsVO : statsYearList){
-//					cntArray.add(tempStatsVO.getCnt());
-//					dateArray.add(tempStatsVO.getStatsDate());
-//				}
-//				statsObject.put("cnt" , cntArray);
-//				statsObject.put("date" , dateArray);
-//				model.addAttribute("statsYearList", statsObject);
-//			}
-//			
-//			//PC, 모바일 접속통계(주간)
-//			statsVO.setRecordCountPerPage(7);  //일카운터(7일 : 일주일)
-//			statsVO.setFirstIndex(0);
-//			List<StatsVO> statsPcDayList = conectStatsService.selectPcMainStatsDay(statsVO); //일일접속카운터(사용자)
-//			List<StatsVO> statsMobileDayList = conectStatsService.selectMobileMainStatsDay(statsVO); //일일접속카운터(사용자)
-//			List<StatsVO> statsAllDayList = conectStatsService.selectPcMobileMainStatsDay(statsVO); //모바일+PC(사용자)
-//			{//PC
-//				JSONObject statsObject = new JSONObject();
-//				JSONArray cntArray = new JSONArray();
-//				JSONArray dateArray = new JSONArray();
-//				for(StatsVO tempStatsVO : statsPcDayList){
-//					cntArray.add(tempStatsVO.getCnt());
-//					dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) );
-//				}
-//				statsObject.put("cnt" , cntArray);
-//				statsObject.put("date" , dateArray);
-//				model.addAttribute("statsPcDayList", statsObject);
-//			}
-//			{//모바일
-//				JSONObject statsObject = new JSONObject();
-//				JSONArray cntArray = new JSONArray();
-//				JSONArray dateArray = new JSONArray();
-//				for(StatsVO tempStatsVO : statsMobileDayList){
-//					cntArray.add(tempStatsVO.getCnt());
-//					dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) );
-//				}
-//				statsObject.put("cnt" , cntArray);
-//				statsObject.put("date" , dateArray);
-//				model.addAttribute("statsMobileDayList", statsObject);
-//			}
-//			{//전체
-//				JSONObject statsObject = new JSONObject();
-//				JSONArray cntArray = new JSONArray();
-//				JSONArray dateArray = new JSONArray();
-//				for(StatsVO tempStatsVO : statsAllDayList){
-//					cntArray.add(tempStatsVO.getCnt());
-//					dateArray.add(tempStatsVO.getStatsDate().substring(5,tempStatsVO.getStatsDate().length()) );
-//				}
-//				statsObject.put("cnt" , cntArray);
-//				statsObject.put("date" , dateArray);
-//				model.addAttribute("statsPcMobileDayList", statsObject);
-//			}
-//		}
 
 		//조정 목록, 이번달 현황 조회(최근 접수, 진행 사건, 처리현황)
 		PgrCmmVO cmmVO = new PgrCmmVO();
@@ -403,18 +251,10 @@ public class EgovMainController {
 		model.addAttribute("progressCnt", cmmService.selectPgrCmmListMainCnt(cmmVO));
 		
 		//처리현황(종결) - status : C
-		cmmVO.setSearchStatus("C");
+//		cmmVO.setSearchStatus("C");
-		model.addAttribute("closeList", cmmService.selectPgrCmmListMain(cmmVO));
+//		model.addAttribute("closeList", cmmService.selectPgrCmmListMain(cmmVO));
-		model.addAttribute("closeCnt", cmmService.selectPgrCmmListMainCnt(cmmVO));
+//		model.addAttribute("closeCnt", cmmService.selectPgrCmmListMainCnt(cmmVO));
 		
-		
-		//CPU정보등 조회
-		/*showOSBean();
-		showThreadBean();
-	    showClassLoading();
-	    showMemory();
-	    showDisk();
-	    showCPU();*/
 		return "main/EgovMainView";
 	}
 

src/main/webapp/WEB-INF/jsp/kccadr/textSense/pop/EgovTextSenseDetailPop.jsp

@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<%@ 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="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%>
+<html lang="ko">
+<head>
+<title>OCR 편집</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<script type="text/javascript">
+
+	function fnReset(){
+		alert('초기화 된 내용으로 변경하려면 저장버튼을 눌러주세요.');
+		
+		document.pop.refresh.value = "Y";
+		document.pop.action = "/kccadr/textsence/popup/modifyTextSenseResultPop.do";
+		document.pop.submit();
+	}
+	
+	function fnSave(){
+		var data = new FormData(document.pop);
+		
+		$.ajax({
+		    type: "POST",
+		    url: "/kccadr/textsence/textSenseModifyAjax.do",
+		    data: data,
+		    dataType:'json',
+		    async: false,
+		    processData: false,
+		    contentType: false,
+		    cache: false,
+		    success: function (returnData, status) {
+			console.log(returnData.result);
+			if(returnData.result ==  'SUCCESS'){
+				alert("저장되었습니다.");
+			}else{
+			    alert(returnData.message);                                        
+			}
+		    },
+		    error: function (e) { alert("요청에 실패하였습니다."); console.log("ERROR : ", e); }
+		});
+	}
+</script>
+</head>
+<body>
+	<form id="pop" name="pop" onsubmit="return false;" method="post">
+		<input type="hidden" id="refresh" name="refresh" value=""/>
+		<input type="hidden" id="id" name="id" value="<c:out value='${textSenseVO.id}'/>"/>
+		<input type="hidden" id="fileName" name="fileName" value="<c:out value='${textSenseVO.fileName}'/>"/>
+		
+	
+		<div class="area_popup supm_popup" style="width: 800px;">
+			<div class="cont_popup">
+				<p class="tb_tit">OCR 처리 결과 편집</p>
+				<table class="pop_tbType01">
+					<colgroup>
+						<col style="width: 20%;">
+						<col style="width: auto;">
+					</colgroup>
+					<tbody>
+						<tr>
+							<td>
+								<p><pre><textarea rows="80" cols="30" name="fileContentsModify" id="fileContentsModify" style="height: 320px;">${textSenseVO.fileContentsModify}</textarea></pre></p>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				<div class="btn_wrap btn_layout04">
+					<button type="button" class="btnType06" onclick="fnReset(); return false;">초기화</button>
+					<button type="button" class="btnType06" onclick="fnSave();">저장</button>
+					<button type="button" class="btnType03" onclick="window.close()">닫기</button>
+				</div>
+			</div>
+		</div>
+	</form>
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp

@@ -28,18 +28,13 @@
 		<title>관리자 대시보드</title>
 		
 		<script src="<c:url value='/js/jquery.js' />"></script>
-		<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.js"></script> -->
-<%-- 		<script src="<c:url value='/js/new_main.js' />"></script> --%>
 		<link rel="stylesheet" href="/kccadrPb/adm/css/dashboard.css">
 		<script type="text/javaScript" language="javascript">
 
 		$(document).ready(function(){
 			
 			fncAvoideReg();
-						
 		});
-		
-		
 			//상세화면 - 조정진행관리, 조정종결관리 구분
 			function fncGoDetail(adrSeq, adrSn, type) {
 				if(type == 'C'){ //조정 처리 현황
@@ -87,15 +82,6 @@
 		</script>
 </head>
 <body>
-	<!-- <noscript>자바스크립트를 지원하지 않는 브라우저에서는 일부 기능을 사용하실 수 없습니다.</noscript>
-	<div class="area_right">
-	<div class="cont_wrap">
-	<div class="box">
-		<h2 class="titType2 fwExtBold">DASHBOARD</h2>
-	</div>
-	</div>
-	</div> -->
-
 			<!-- cont -->
 			<div class="cont_wrap dashboard">
 				<div class="box_wrap">
@@ -128,71 +114,22 @@
 							<p>시스템관리</p>
 						</div>
 						<div class="box_cont system_box">
-							<a href="javascript:goMenuPage('9995100', '/kccadr/sch/SchduleManagerStatus.do')" class="btn_system system01">
-								<p>조정 일정 현황</p>
-								<span>바로가기 ></span>
-							</a>
 							<a href="javascript:goMenuPage('9993400', '/kccadr/adjPgrMgr/apm/apmList.do')" class="btn_system system02">
 								<p>조정 진행 관리</p>
 								<span>바로가기 ></span>
 							</a>
-							<a href="javascript:goMenuPage('99919100', '/kccadr/adjclsmgr/adjCloseMangeList.do')" class="btn_system system03">
-								<p>조정 종결 관리</p>
-								<span>바로가기 ></span>
-							</a>
 							<a href="javascript:goMenuPage('9993700', '/kccadr/adjPgrMgr/iam/internalApprovManageList.do')" class="btn_system system04">
 								<p>결재 관리</p>
 								<span>바로가기 ></span>
 							</a>
-						</div>
+							<a href="javascript:goMenuPage('9995100', '/kccadr/sch/SchduleManagerStatus.do')" class="btn_system system01">
-					</div>
+								<p>조정 일정 현황</p>
-					<div class="box">
+								<span>바로가기 ></span>
-						<div class="box_tit">
+							</a>
-							<p>2021 분쟁조정 처리현황</p>
+							<a href="javascript:goMenuPage('99919100', '/kccadr/adjclsmgr/adjCloseMangeList.do')" class="btn_system system03">
-							<button type="button" class="btn_plus">더보기 +</button>
+								<p>조정 종결 관리</p>
-						</div>
+								<span>바로가기 ></span>
-						<div class="box_cont ds_box">
+							</a>
-							<ul class="chartType01">
-								<li>
-									<p>성립</p>
-									<div class="chart_wrap">
-										<div></div>
-									</div>
-								</li>
-								<li>
-									<p>불성립</p>
-									<div class="chart_wrap">
-										<div></div>
-									</div>
-								</li>
-								<li>
-									<p>취하</p>
-									<div class="chart_wrap">
-										<div></div>
-									</div>
-								</li>
-								<li>
-									<p>기타</p>
-									<div class="chart_wrap">
-										<div></div>
-									</div>
-								</li>
-								<li>
-									<p>진행</p>
-									<div class="chart_wrap">
-										<div></div>
-									</div>
-								</li>
-							</ul>
-
-							<ul class="chart_num">
-								<li>0</li>
-								<li>10</li>
-								<li>20</li>
-								<li>30</li>
-								<li>40</li>
-							</ul>
-
 						</div>
 					</div>
 					<c:set var="today" value="<%=new Date()%>"/>
@@ -252,7 +189,7 @@
 							</div>
 						</div>
 					</form:form>
-					<form:form id="closeListListForm" name="closeListListForm" commandName="cmmVO" onsubmit="return false;" method="post">
+					<%-- <form:form id="closeListListForm" name="closeListListForm" commandName="cmmVO" onsubmit="return false;" method="post">
 						<input type="hidden" name="adrSeq" />
 						<input type="hidden" name="adrSn" />					
 						<div class="box">
@@ -274,34 +211,7 @@
 								</ul>
 							</div>
 						</div>
-					</form:form>
+					</form:form> --%>
-						<div class="box">
-							<div class="box_tit">
-								<p>2021 연도별 조정 처리 현황</p>
-								<button type="button" class="btn_plus">더보기 +</button>
-							</div>
-							<div class="box_cont chart_box">
-								<img src="/kccadrPb/adm/image/dashboard/chart01.jpg" alt="">
-							</div>
-						</div>
-					<div class="box">
-						<div class="box_tit">
-							<p>2021 분야별 조정 분포</p>
-							<button type="button" class="btn_plus">더보기 +</button>
-						</div>
-						<div class="box_cont chart_box">
-							<img src="/kccadrPb/adm/image/dashboard/chart02.jpg" alt="">
-						</div>
-					</div>
-					<div class="box">
-						<div class="box_tit">
-							<p>조정처리 성립률</p>
-							<button type="button" class="btn_plus">더보기 +</button>
-						</div>
-						<div class="box_cont chart_box">
-							<img src="/kccadrPb/adm/image/dashboard/chart03.jpg" alt="">
-						</div>
-					</div>
 				</div>
 			</div>
 			<!-- //cont -->