somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

충돌 처리

Browse Source
This commit is contained in:
com02 2021-11-19 14:43:58 +09:00
parent 4fa9982dff
commit b45c13d331
5 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/egovframework/egovProps/globals.properties
View File

@ -30,7 +30,7 @@ Globals.DbType = maria
# > grant all privileges on uac_cltr_db.* to 'uac_cltr';
# > flush privileges;
Globals.maria.DriverClassName=org.mariadb.jdbc.Driver
Globals.maria.Url=jdbc:mariadb://nlib-db.nculture.org:3306/uac_cltr_db
Globals.maria.Url=jdbc:mariadb://210.181.197.70:3306/uac_cltr_db
Globals.maria.UserName = uac_cltr
Globals.maria.Password = uac_cltr

3
src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp
View File

@ -36,7 +36,7 @@
<script>
$( document ).ready(function() {
// 메시지 표출
if(!fn_isEmpty('${message}')) {
alert("${message}");
@ -155,6 +155,7 @@
}
</script>
<!-- 공지사항 섹션 -->
<div class="location noti-data">

12
src/main/webapp/css/default.css
View File

@ -850,7 +850,7 @@ transform: rotate(45deg);}
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input {height:36px;line-height: 36px;border:1px solid #ddd;color:#666;padding:0px 40px 0px 10px;vertical-align: top;border-radius: 3px;position: relative;}
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input input::placeholder {font-size:12px;color:#999;font-weight: 500;}
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button {background: url(/images/icon/icon-data-search.png) no-repeat center;text-indent: -9999999px;width:36px;height:36px;vertical-align: top;position: absolute;top:0px;right:0px;}
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button.filter-btn {display:none;}
/********** 소장자료 상세페이지 **********/
.data.detail {width:100%;}
@ -868,14 +868,13 @@ transform: rotate(45deg);}
.data.detail .inner .row-top .center .left .cla .con-2 {display: inline-block;padding:0px 0px 0px 10px;}
.data.detail .inner .row-top .center .left .cla .con-2 .code {font-size:16px;color:#fff;line-height: 26px;}
.data.detail .inner .row-top .center .left .tit {font-size:30px;color:#fff;font-weight: 500;margin-bottom:20px;}
.data.detail .inner .row-top .center .left .img {background:#fff;display: inline-block;width:100%;height:445px;display: flex;align-items: center;justify-content: center;}
.data.detail .inner .row-top .center .left .img {background:#fff;display: inline-block;}
.data.detail .inner .row-top .center .right .con-1 {display: inline-block;width:100%;height:100px;border-bottom:1px solid #ddd;text-align: right;margin-bottom: 30px;}
.data.detail .inner .row-top .center .right .con-1 button {background:#f5f5f5;width:auto;height:30px;line-height:28px;width:30px;border-radius: 3px;font-size:14px;color:#222;font-weight: 600;text-align: center;border:1px solid #ddd;margin-top:55px;}
.data.detail .inner .row-top .center .right .con-1 button.view {width:auto;padding:0px 26px;}
.data.detail .inner .row-top .center .right .con-1 button.ris {}
.data.detail .inner .row-top .center .right .con-1 button.favorit {text-indent: -99999px;background:url(/images/icon/icon-data-star.png) no-repeat center #f5f5f5;}
.data.detail .inner .row-top .center .right .con-1 button.share {text-indent: -99999px;background:url(/images/icon/icon-data-share.png) no-repeat center #f5f5f5;}
.data.detail .inner .row-top .center .right .con-1 button.original {width:200px;display:none;}
.data.detail .inner .row-top .center .right .con-2 {}
.data.detail .inner .row-top .center .right .con-2 .de-data {display: flex;}
.data.detail .inner .row-top .center .right .con-2 .de-data ul {width: 50%;display: flex;flex-direction: column;}
@ -900,8 +899,7 @@ transform: rotate(45deg);}
.data.detail .inner .row-bottom .con-1 .text-box {display:inline-block;width:96%;padding:10px 2%;background:#f4f4f4;text-align: left;}
.data.detail .inner .row-bottom .con-1 .text-box p {font-size:12px;}
.data.detail .inner .row-bottom .con-2 {display:inline-block;width:100%;border-top:1px solid #333;border-bottom:1px solid #ddd;margin:0px 0px 100px;}
.data.detail .inner .row-bottom .con-2 .top {position:relative;}
.data.detail .inner .row-bottom .con-2 .top h3 {font-size:24px;text-align: center;height:60px;line-height:60px;}
.data.detail .inner .row-bottom .con-2 .top h3 {font-size:24px;text-align: center;}
.data.detail .inner .row-bottom .con-2 .top h3 span {color: #376795;}
.data.detail .inner .row-bottom .con-2 .top .down-btn {position: absolute;top:0px;right:0px;text-indent: -999999px;background:url(/images/icon/icon-data-downarr2.png) no-repeat center;width:60px;height:60px;}
.data.detail .inner .row-bottom .con-2 .top .down-btn.on {background:url(/images/icon/icon-data-downarr2-on.png) no-repeat center;}
@ -1316,7 +1314,7 @@ transform: rotate(45deg);}
.list-table-wrap li .t-status {width: 10%;}
.list-table-wrap li .t-file {width:auto;}
.list-table-wrap li .t-answer {width:auto;}
.list-table-wrap .t-tit-line {width: 100%;border-top: 2px solid #000;border-bottom: 1px solid #000;color: #fff;font-size:14px;font-weight:400;background: #556676;}
.list-table-wrap .t-tit-line {width: 100%;border-top: 2px solid #000;border-bottom: 1px solid #000;color: #fff;font-size:12px;font-weight:400;background: #556676;}
.list-table-wrap .t-tit-line span {text-align: center;}
.list-table-wrap li .message {width: 100%;text-align: center;}
.list-table-wrap .t-status em {text-align: center;font-size: 14px;width: 82px;height: 30px;line-height: 30px;display: block;margin: 0 auto;border-radius: 15px;border: 1px solid #ddd;}
@ -1994,7 +1992,7 @@ animation: animate-bg2 2.0s 1.9s ease-in infinite;
.paging .btn-next {text-indent: 0px;width:70px;text-align:left;}
.paging .btn a {font-size:12px;font-weight: 300;}
.article-side .filter-wrap .Title {display:none;}

28
src/main/webapp/css/media.css
View File

@ -405,6 +405,13 @@ a.pop-logo img { margin-right: 10px; }
.article-side .Title.mo-ver h3 { font-weight: 500; font-size: 22px; line-height: 33px; color: #ffffff; }
.article-side .Title.mo-ver .filter-close { position: absolute; right: 20px; top: 20px; width: 26px; height: 26px; text-indent: 9999px; font-size: 0; overflow: hidden; background: url("/images/btn/btn_close_size_27x26_c9c9c7.png") no-repeat; background-size: 100%; }
.article-side .filter-wrap { height: calc(100% - 125px); overflow: scroll; border: none; }
.article-side .filter-wrap {display:inline-block;padding-top:100px;}
.article-side .filter-wrap .Title {display:inline-block;background: #3670a3;width: 96%;padding: 0px 2%;height: 80px;line-height: 80px;padding: 0 16px;box-sizing: border-box;width: 100%;position:absolute;top:0px;left:0px;z-index:999;}
.article-side .filter-wrap .Title span:nth-of-type(1) {font-size: 24px;font-weight: 500;margin-right: 10px;font-size: 22px;line-height: 33px;color:#fff;}
.article-side .filter-wrap .Title span:nth-of-type(2) {position: absolute;right: 16px;top: 30px;}
.article-side .filter-wrap .Title span:nth-of-type(2) .filter-close {display:inline-block;width:22px;height:22px;}
.culture-box { width: 100%; }
.data .mo_tabs_wrap { height: 50px; }
.data .inner .tabs { /*width: max-content;*/ display: flex;white-space:nowrap;overflow-y:hidden;overflow-x:auto;text-align:center;height:50px; }
@ -420,6 +427,8 @@ a.pop-logo img { margin-right: 10px; }
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input { margin-left: 0; width: 100%; box-sizing: border-box; margin: 10px 0 26px; display: flex; padding: 0 0 0 36px; }
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input input { width: 100%; height: 100%; }
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button[type="submit"] { background: url("/images/icon/icon-search-mo.png") no-repeat center; right: auto; left: 0; }
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button.filter-btn {display:inline-block;position: absolute;left: auto;right: 10px;top: 4px;width: 43px;height: 26px;background:#e6e7e9;color:#666;border-radius:50px;text-indent:0;}
.data .inner .tab_content { padding-right: 16px; box-sizing: border-box; }
.data .inner .tabs_item { border-top: 1px solid #222222; padding: 0; }
.data .inner .tabs_item .list-cart-wrap .list-data .list.t-tit-line { display: none; }
@ -462,6 +471,7 @@ a.pop-logo img { margin-right: 10px; }
.data.detail .inner .row-bottom .con-4 .top h3,
.data.detail .inner .row-bottom .con-4 .top h3::before,
.data.detail .inner .row-top .center .left .img img { width: 100%; }
.data.detail .inner .row-top .center .left .img {background:#fff;text-align:center;width:40%;padding:5% 30%;}
.data.detail .inner .row-bottom { padding: 0; }
.data.detail .inner .row-top .center .left .cla { position: relative; }
.data.detail .inner .row-top .center .left .cla .con-1 { width: 100%; display: block; }
@ -472,6 +482,7 @@ a.pop-logo img { margin-right: 10px; }
.data.detail .inner .row-top .center .right .con-1 button.view { flex: 1; }
.data.detail .inner .row-top .center .right .con-1 button.ris { display: none; }
.data.detail .inner .row-top .center .right .con-1 button.favorit { margin: 14px 10px 0; }
.data.detail .inner .row-top .center .right .con-1 button.original {width:200px;display:inline-block;}
.data.detail .inner .row-top .center .right .con-2 .de-data { flex-direction: column; }
.data.detail .inner .row-top .center .right .con-2 .de-data ul { width: 100%; display: flex; flex-direction: column; }
.data.detail .inner .row-top .center .right .con-2 .de-data ul li { width: 100%; }
@ -525,7 +536,7 @@ a.pop-logo img { margin-right: 10px; }
.list-select select { min-width: auto; width: 100%; }
.list-table-wrap { border-top: 1px solid; }
.list-table-wrap .t-tit-line { display: none; }
.list-table-wrap li { display: flex; align-items: center; padding: 10px; }
.list-table-wrap li { display: flex; align-items: center; padding: 10px;flex-wrap:wrap;font-size:14px; }
.list-table-wrap li.no-result { justify-content: center; }
.list-table-wrap li span { height: auto; }
.list-table-wrap li .t-num { font-size: 12px; }
@ -535,6 +546,17 @@ a.pop-logo img { margin-right: 10px; }
.list-table-wrap li .t-tit { width: 100%; margin-bottom: 6px; }
.list-table-wrap li span.t-info > span { width: auto; padding-right: 10px; margin-right: 10px; border-right: 1px solid #ccc; line-height: 1; }
.list-table-wrap li span.t-info > span:last-child { padding: 0; margin: 0; border: none; }
.list-table-wrap li .t-num { position: absolute; }
.list-table-wrap li .t-type { position: absolute;left:40px; }
.list-table-wrap li .t-tit { width: 100%; padding-left: 40px; box-sizing: border-box; }
.list-table-wrap li .t-writer { padding-left: 40px; }
.list-table-wrap li .t-file {height:18px;line-height:18px;}
.list-table-wrap li .t-writer,
.list-table-wrap li .t-date,
.list-table-wrap li .t-file,
.list-table-wrap li .t-answer { width: auto; }
.list-table-wrap li .t-writer { margin-right: 10px; padding-right: 10px; border-right: 1px solid #ccc; line-height: 1; }
/* 공지사항 상세 */
.view-tit { position: relative; padding-left: 60px; box-sizing: border-box; width: 100%; }
@ -824,9 +846,9 @@ a.pop-logo img { margin-right: 10px; }
/* 로그인 팝업 */
.pop-login { top: 0; left: 0; width: 100vw; height: 100vh; border-radius: 0; display: flex; flex-direction: column; }
.pop-login .Title { padding: 12px 16px; text-align: left; }
.pop-login .Title { padding: 25px 16px; text-align: left; }
.pop-login .Title p,
.pop-login .Title h3 { display: none; }
.pop-login .Title h3 { }
.pop-login .inner { display: flex; flex-direction: column; align-items: center; justify-content: center; flex: 1; padding: 60px 16px; box-sizing: border-box; }
.pop-login .inner .First { padding: 0; width: 100%; }
.pop-login .inner .First .Btn button { font-weight: normal; font-size: 15px; }

11
src/main/webapp/js/default.js
View File

@ -185,12 +185,21 @@ $(document).ready(function(){
$('.pop-change').fadeOut();
});
// 필터 팝업
$('.filter-btn').click(function(){
$('.article-side').fadeIn();
});
// 닫기
$('.filter-close').on('click', function () {
$('.article-side').fadeOut();
});
// 검색 닫기
$('.search-close').on('click', function () {
$('.search-wrap').hide();
$('.nav-wrap').show();
});
/* 메인 메뉴 반응형 */
jQuery(function ($) {
$.fn.responsivenav = function (args) {