diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java index 33aa3c3e..37d4c8f6 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java @@ -1156,7 +1156,7 @@ public class CrownixAjaxController { } - p_modelAndView.addObject("page_1_28", "총 "+vEInstrDetailVOList.size()+"회, "+i_sumChasi+"차시 [세부내용 별지 참조]"); + p_modelAndView.addObject("page_1_28", "총 "+vEInstrDetailVOList.size()+"회, "+i_sumChasi+"차시 [세부내용 별지 참조1]"); if (vEInstrDetailVOList.size()==0) { JSONObject jsDrtInfo = new JSONObject(); //전체 정보 diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp index 604a1b0e..3092ecd5 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrActvtHstryMngDetail.jsp @@ -85,6 +85,12 @@ function fn_egov_downFile(atchFileId, fileSn){//atchFileId -> 파일 Id, fileSn -> 파일 순번 window.open(""); } + + function fncGoScholExcel(){ + var detailForm = document.detailForm ; + detailForm.action = ""; + detailForm.submit(); + } @@ -101,6 +107,7 @@ +
@@ -220,6 +227,7 @@
+
@@ -273,7 +281,8 @@ var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service'); viewer.hideToolbarItem(["save"]); viewer.showToolbarItem(["print_pdf"]); - viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+'&p_instrDetailActvtHstryOrd='+p_instrDetailActvtHstryOrd+']'); + //viewer.openFile('instr_activity_20231108.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+'&p_instrDetailActvtHstryOrd='+p_instrDetailActvtHstryOrd+']'); + viewer.openFile('instr_activity_20231108.mrd', '/rf [http://192.168.0.32:3080/offedu/ve/aplct/adultVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+'&p_instrDetailActvtHstryOrd='+p_instrDetailActvtHstryOrd+']'); } } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp index c8604238..27aaf42a 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrActvtHstryMngDetail.jsp @@ -107,6 +107,7 @@ +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctActvtExcel.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctActvtExcel.jsp index 7681bee3..ecf40039 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctActvtExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctActvtExcel.jsp @@ -135,10 +135,18 @@ $( document ).ready(function(){ } - function fncGoList(){ + function fncGoList(){ + var createForm = document.createForm; createForm.action = ""; + + if ($("#siteNm").val()=="adult"){ + createForm.action = ""; + } + + createForm.submit(); + } @@ -311,6 +319,7 @@ $( document ).ready(function(){ +
@@ -372,7 +381,7 @@ $( document ).ready(function(){
- +