From e63242f0cf2c64e6f127861aa9a1e44fc3c5f85b Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Fri, 19 Jan 2024 16:48:40 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=B2=AD=EC=86=8C=EB=85=84=20=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20=EC=B0=A8=ED=8A=B8=20=EC=88=98=EC=A0=95(=EB=A7=89?=
 =?UTF-8?q?=EB=8C=80+=EC=84=A0=20=EA=B7=B8=EB=9E=98=ED=94=84),=20=EC=9A=B4?=
 =?UTF-8?q?=EC=98=81=EC=84=9C=EB=B2=84=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?=
 =?UTF-8?q?=ED=97=A4=EB=8D=94=EC=97=90=20=EB=B0=B0=EC=9B=80=ED=84=B0=20?=
 =?UTF-8?q?=EB=A7=81=ED=81=AC=EB=93=A4=20=EC=A3=BC=EC=84=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp | 143 ++++++++++--------
 .../WEB-INF/jsp/web/com/webCommonHeader.jsp   |  30 ++--
 2 files changed, 91 insertions(+), 82 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp
index 27b2262a..af0d7a47 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp
@@ -344,79 +344,90 @@
 							</script>
 						</c:if>
 					</c:forEach>
-					<!-- 횟수 차트 -->
 					<div id="chartContainer" style="display:flex; width:100%;">
-						<div id="chartNumOfTime" style="float:left; width: 50%; height:600px;">
+						<div id="chartAll" style="float:left; width: 100%; height:600px;">
 						</div>
-						
 						<script type="text/javascript">
-							<!-- 차트 선언 -->
-							var chartNOT = echarts.init(document.getElementById('chartNumOfTime'));
+							var chartAll = echarts.init(document.getElementById('chartAll'));
 							var month = ['1월', '2월', '3월', '4월', '5월','6월','7월','8월', '9월','10월','11월', '12월'];
-							//차트 옵션 지정하기
-							var optionNOT = {
-								// 차트 제목
-								title: {
-									text: '월별 횟수 차트 (총합 :' + dataNOTSum +')',
-								},
-								// x축 라벨
-								xAxis: {
-									data: month,
-								},
-								yAxis: {},
-								series: [
-									{
-										name: '개수',
-										type: 'bar', // 막대 그래프
-										data: dataNOT,
-										label: {
-											show: true,
-											position: 'top'
+							
+							var optionAll = {
+									toolbox: {
+												feature: {
+													//dataView: { show: true, readOnly: false },
+													magicType: { show: true, type: ['line', 'bar'] },
+													restore: { show: true },
+													saveAsImage: { show: true }
+												}
+											},
+									legend: {
+												data: ['횟수', '인원']
+											},
+									xAxis: [
+												{
+													type: 'category',
+													data: month,
+													axisPointer: {
+														type: 'shadow'
+													}
+												}
+										  ],
+									yAxis: [
+												{
+													type: 'value',
+													name: '횟수',
+													interval: 50,
+													max : dataNOTSum,
+													axisLabel: {
+														formatter: '{value}회'
+													}
+												},
+												{
+													type: 'value',
+													name: '인원',
+													interval: 50,
+													mas : dataNOTSum,
+													axisLabel: {
+													  formatter: '{value}명'
+													}
+												}
+											],
+									series: [
+												{
+													name: '횟수',
+													type: 'bar',
+													tooltip: {
+														valueFormatter: function (value) {
+															return value + '회';
+														}
+													},
+													label: {
+														show: true,
+														position: 'top'
+													},
+													data: dataNOT
+												},
+												{
+													name: '인원',
+													type: 'line',
+													yAxisIndex: 1,
+													tooltip: {
+														valueFormatter: function (value) {
+															return value + '명';
+														}
+													},
+													label: {
+														show: true,
+														position: 'top'
+													},
+													data: dataNOP
+												}
+											]
 										}
-									},
-								],
-							}
-	
-							//차트 옵션 적용
-							chartNOT.setOption(optionNOT);
-						</script>
-						<!-- /횟수 차트 -->
-	
-						<!-- 인원 차트 -->
-						<div id="chartNumOfPeople" style="float:right; width: 50%; height:600px;">
-						</div>
-						<script type="text/javascript">
-							<!-- 차트 선언 -->
-							var chartNOP = echarts.init(document.getElementById('chartNumOfPeople'));
-							<!-- 차트 옵션 지정하기 -->
-							var optionNOP = {
-								// 차트 제목
-								title: {
-									text: '월별 인원 차트(총합 :' + dataNOPSum +')',
-								},
-								// x축 라벨
-								xAxis: {
-									data: month,
-								},
-								yAxis: {},
-								series: [
-									{
-										name: '개수',
-										type: 'bar', // 막대 그래프
-										data: dataNOP,
-										label: {
-											show: true,
-											position: 'top'
-										}
-									},
-								],
-							}
-	
-							<!--  차트 옵션 적용 -->
-							chartNOP.setOption(optionNOP);
+								//차트 옵션 적용
+								chartAll.setOption(optionAll);
 						</script>
 					</div>
-					<!-- /인원 차트 -->
 					<!-- /월별 횟수/교육인원 차트 -->
 
 
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
index b784c6db..a5267ac0 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
@@ -240,14 +240,13 @@ function usrJoin(){
 				<div class="inner">
 					<div class="top_link">
 						<ul>
-							<!-- <li><a href="https://edu-copyright.or.kr/portal/main.do">포털사이트</a></li>
-							<li><a href="https://edu-copyright.or.kr/user/main/main.do">저작권e배움터</a></li>
-							<li><a href="https://edu-copyright.or.kr/dsprUser/main/main.do">장애인e배움터</a></li>
-							<li class="on"><a href="https://www.edu-copyright.or.kr/offedu/web/main/mainPage.do">저작권배움터</a></li> -->
-							<li><a href="#goLink" onclick="goLink('portal');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">포털사이트</a></li>
-							<li><a href="#goLink" onclick="goLink('user');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">저작권e배움터</a></li>
-							<li><a href="#goLink" onclick="goLink('dsprUser');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">장애인e배움터</a></li>
-							<li class="on"><a href="#goLink" onclick="goLink('offedu');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">저작권배움터</a></li>
+							<!-- 240119 요청으로 인하여 운영서버는 링크 제외 -->
+							<c:if test="${environment ne 'real' }">
+								<li><a href="#goLink" onclick="goLink('portal');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">포털사이트</a></li>
+								<li><a href="#goLink" onclick="goLink('user');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">저작권e배움터</a></li>
+								<li><a href="#goLink" onclick="goLink('dsprUser');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">장애인e배움터</a></li>
+								<li class="on"><a href="#goLink" onclick="goLink('offedu');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">저작권배움터</a></li>
+							</c:if>
 						</ul>
 					</div>
 					<!-- <div class="area_left">
@@ -311,14 +310,13 @@ function usrJoin(){
 				<div class="inner">
 					<div class="top_link">
 						<ul>
-							<!-- <li><a href="https://edu-copyright.or.kr/portal/main.do">포털사이트</a></li>
-							<li><a href="https://edu-copyright.or.kr/user/main/main.do">저작권e배움터</a></li>
-							<li><a href="https://edu-copyright.or.kr/dsprUser/main/main.do">장애인e배움터</a></li>
-							<li class="on"><a href="https://edu-copyright.or.kr/offedu/web/main/mainPage.do">저작권배움터</a></li> -->
-							<li><a href="#goLink" onclick="goLink('portal');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">포털사이트</a></li>
-							<li><a href="#goLink" onclick="goLink('user');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">저작권e배움터</a></li>
-							<li><a href="#goLink" onclick="goLink('dsprUser');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">장애인e배움터</a></li>
-							<li class="on"><a href="#goLink" onclick="goLink('offedu');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">저작권배움터</a></li>
+							<!-- 240119 요청으로 인하여 운영서버는 링크 제외 -->
+							<c:if test="${environment ne 'real' }">
+								<li><a href="#goLink" onclick="goLink('portal');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">포털사이트</a></li>
+								<li><a href="#goLink" onclick="goLink('user');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">저작권e배움터</a></li>
+								<li><a href="#goLink" onclick="goLink('dsprUser');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">장애인e배움터</a></li>
+								<li class="on"><a href="#goLink" onclick="goLink('offedu');return false;" onkeypress="this.onclick;" title="새창열림" target="_blank">저작권배움터</a></li>
+							</c:if>
 						</ul>
 					</div>
 					<!--<div class="area_left">