tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git

Browse Source
This commit is contained in:
myname 2022-11-21 10:25:21 +09:00
commit 8f31ee24ac
3 changed files with 93 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java
View File

@ -19,6 +19,7 @@ import org.json.simple.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.SystemEnvironmentPropertySource;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
@ -659,6 +660,7 @@ public class ApmController {
// List<FileVO> fileList = fileService.selectFileInfs(fileVO); // List<FileVO> fileList = fileService.selectFileInfs(fileVO);
// model.addAttribute("fileList", fileList); // model.addAttribute("fileList", fileList);
// } // }
model.addAttribute("exmpList", exmp); model.addAttribute("exmpList", exmp);
model.addAttribute("ccTy", adjstReqVO.getCcTy()); model.addAttribute("ccTy", adjstReqVO.getCcTy());
model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); model.addAttribute("exmpCd", adjstReqVO.getExmpCd());

75
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp
View File

@ -30,7 +30,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script type="text/javascript" src="<c:url value='/js/antdatepicker/moment.min.js'/>"></script> <script type="text/javascript" src="<c:url value='/js/antdatepicker/moment.min.js'/>"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
//$('#oldDe').text(moment('<c:out value="${info.adrEndDeDay}" />').format('YYYY-MM-DD')); //$('#oldDe').text(moment('<c:out value="${info.adrEndDeDay}" />').format('YYYY-MM-DD'));
//$('#newDe').text(moment('<c:out value="${info.adrEndDeDay}" />').add(1, 'months').format('YYYY-MM-DD')); //$('#newDe').text(moment('<c:out value="${info.adrEndDeDay}" />').add(1, 'months').format('YYYY-MM-DD'));
@ -85,49 +85,48 @@
}); });
} */ } */
fn_selectCn(); //fn_selectCn();
}); });
function workView(obj){
if($(obj).closest(".work_flow_wrap").hasClass("off")){
$(obj).closest(".work_flow_wrap").removeClass("off");
$(obj).addClass("btn_close").removeClass("btn_open");
}else{
$(obj).closest(".work_flow_wrap").addClass("off");
$(obj).removeClass("btn_close").addClass("btn_open");
}
}
</script> </script>
<style>
.popup_cont {border-bottom:0 none;}
.work_flow_wrap {min-width:auto;padding:0 10px;margin:0 0 15px;}
.work_flow_wrap .work_tit {padding:10px 0 10px 5px;font-size:16px;}
.work_flow_wrap .work_cont {width:100%;height:auto;padding:10px 15px;transition:none;}
.work_flow_wrap .work_cont dl dt {margin:10px 0 0;line-height:30px;}
.work_flow_wrap .work_cont dl dd {margin:5px 0 0;padding:10px;line-height:24px;background:#f1f2f4;border-radius:5px;}
.work_flow_wrap .work_cont dl dd span {color:#d43403;}
.work_flow_wrap .work_cont dl:first-child dt {margin:0;}
.work_flow_wrap .work_cont .text {line-height:24px;}
.work_flow_wrap .work_cont .text span {color:#d43403;}
.work_flow_wrap.off .work_cont {height:0;padding:0 15px;transition:none;}
</style>
</head> </head>
<body> <body>
<div class="popup_cont" style="max-height: none;">
<div class="area_popup case_change" style="width: 550px;"> <c:forEach items="${exmpList }" var="exmp">
<div class="cont_popup"> <div class="work_flow_wrap off">
<p class="tb_tit"><kc:code codeId="CC040" code="${exmpCd}"/></p> <div class="work_tit">
<table class="popup_tbType01 t_center"> <p><c:out value="${exmp.exmpTit }" /></p>
<colgroup> <button type="button" title="열림" class="btn_open" onclick="workView(this);"><i></i></button>
<col style="width: 20%;"> </div>
<col style="width: 80%;"> <div class="work_cont">
</colgroup> <div class="text">
<tbody> <a href="javascript:;" onclick="addText(this, '01'); return false;"><c:out value="${exmp.exmpCn }" /></a>
<tr>
<td style="line-height: 30px; text-align: left;">
<kc:code codeId="CC040" code="${exmpCd}"/>
</td>
<td style="line-height: 30px; text-align: left;">
<%-- <kc:select codeId="CC002" name="exmpCcTy" id="exmpCcTy" selectedValue="${ccTy}"/> --%>
<select style="width: 135px;">
<option value="">사건 유형 1</option>
<option value="">사건 유형 2</option>
<option value="">사건 유형 3</option>
</select>
</td>
</tr>
<tr>
<td style="line-height: 30px; text-align: left;">
내용
</td>
<td id="exmpCn" style="line-height: 30px; text-align: left;" >
1)피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(W3,000,000)을 지급한다. 2)피신청인이 제작, 보유하고 있는 본 건 침해물 <월간 스키라이브>를 조정성립일로부터 14일 이내에 폐기처분한다. 라는 조정을 구합니다
</td>
</tr>
</tbody>
</table>
<div class="btn_wrap btn_layout04">
<button class="btnType01 tooltip-close" id="redBtn">등록</button>
</div> </div>
</div> </div>
</div> </div>
</c:forEach>
</div>
</body> </body>
</html> </html>

16
src/main/webapp/kccadrPb/adm/css/content.css
View File

@ -488,19 +488,3 @@ table select+button{vertical-align: middle;}
.tbType01 tbody td .innorix_basic {margin:15px 0;} .tbType01 tbody td .innorix_basic {margin:15px 0;}