From 30c7199cd6a48cb5edfe05f6728b8215bc527964 Mon Sep 17 00:00:00 2001 From: subsub8729 Date: Thu, 15 Sep 2022 10:19:18 +0900 Subject: [PATCH 1/9] =?UTF-8?q?22/09/15=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=B2=B4=ED=97=98=ED=95=98=EA=B8=B0=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/kccadrPb/usr/css/main.css | 78 ++- .../kccadrPb/usr/datepicker/icon_baro06.png | Bin 0 -> 1105 bytes .../usr/datepicker/icon_baro06_hover.png | Bin 0 -> 1136 bytes .../kccadrPb/usr/datepicker/icon_baro07.png | Bin 0 -> 739 bytes .../usr/datepicker/icon_baro07_hover.png | Bin 0 -> 816 bytes .../kccadrPb/usr/datepicker/icon_baro08.png | Bin 0 -> 1218 bytes .../usr/datepicker/icon_baro08_hover.png | Bin 0 -> 1234 bytes .../kccadrPb/usr/datepicker/icon_baro09.png | Bin 0 -> 1780 bytes .../usr/datepicker/icon_baro09_hover.png | Bin 0 -> 1849 bytes .../kccadrPb/usr/datepicker/icon_baro10.png | Bin 0 -> 707 bytes .../usr/datepicker/icon_baro10_hover.png | Bin 0 -> 712 bytes src/main/webapp/kccadrPb/usr/guide.html | 1 + .../kccadrPb/usr/image/main/icon_baro06.png | Bin 0 -> 1105 bytes .../usr/image/main/icon_baro06_hover.png | Bin 0 -> 1136 bytes .../kccadrPb/usr/image/main/icon_baro07.png | Bin 0 -> 739 bytes .../usr/image/main/icon_baro07_hover.png | Bin 0 -> 816 bytes .../kccadrPb/usr/image/main/icon_baro08.png | Bin 0 -> 1218 bytes .../usr/image/main/icon_baro08_hover.png | Bin 0 -> 1234 bytes .../kccadrPb/usr/image/main/icon_baro09.png | Bin 0 -> 1780 bytes .../usr/image/main/icon_baro09_hover.png | Bin 0 -> 1849 bytes .../kccadrPb/usr/image/main/icon_baro10.png | Bin 0 -> 707 bytes .../usr/image/main/icon_baro10_hover.png | Bin 0 -> 712 bytes src/main/webapp/kccadrPb/usr/index2.html | 487 ++++++++++++++++++ src/main/webapp/kccadrPb/usr/script/main.js | 16 + 24 files changed, 564 insertions(+), 18 deletions(-) create mode 100644 src/main/webapp/kccadrPb/usr/datepicker/icon_baro06.png create mode 100644 src/main/webapp/kccadrPb/usr/datepicker/icon_baro06_hover.png create mode 100644 src/main/webapp/kccadrPb/usr/datepicker/icon_baro07.png create mode 100644 src/main/webapp/kccadrPb/usr/datepicker/icon_baro07_hover.png create mode 100644 src/main/webapp/kccadrPb/usr/datepicker/icon_baro08.png create mode 100644 src/main/webapp/kccadrPb/usr/datepicker/icon_baro08_hover.png create mode 100644 src/main/webapp/kccadrPb/usr/datepicker/icon_baro09.png create mode 100644 src/main/webapp/kccadrPb/usr/datepicker/icon_baro09_hover.png create mode 100644 src/main/webapp/kccadrPb/usr/datepicker/icon_baro10.png create mode 100644 src/main/webapp/kccadrPb/usr/datepicker/icon_baro10_hover.png create mode 100644 src/main/webapp/kccadrPb/usr/image/main/icon_baro06.png create mode 100644 src/main/webapp/kccadrPb/usr/image/main/icon_baro06_hover.png create mode 100644 src/main/webapp/kccadrPb/usr/image/main/icon_baro07.png create mode 100644 src/main/webapp/kccadrPb/usr/image/main/icon_baro07_hover.png create mode 100644 src/main/webapp/kccadrPb/usr/image/main/icon_baro08.png create mode 100644 src/main/webapp/kccadrPb/usr/image/main/icon_baro08_hover.png create mode 100644 src/main/webapp/kccadrPb/usr/image/main/icon_baro09.png create mode 100644 src/main/webapp/kccadrPb/usr/image/main/icon_baro09_hover.png create mode 100644 src/main/webapp/kccadrPb/usr/image/main/icon_baro10.png create mode 100644 src/main/webapp/kccadrPb/usr/image/main/icon_baro10_hover.png create mode 100644 src/main/webapp/kccadrPb/usr/index2.html diff --git a/src/main/webapp/kccadrPb/usr/css/main.css b/src/main/webapp/kccadrPb/usr/css/main.css index f7615dcb..57710636 100644 --- a/src/main/webapp/kccadrPb/usr/css/main.css +++ b/src/main/webapp/kccadrPb/usr/css/main.css @@ -25,26 +25,50 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro /* //메인비주얼 */ /* 바로가기 */ -.baro_cont{padding: 0 20px; box-sizing: border-box;} -.baro_cont .inner{max-width: 1200px; width: 100%; height: 180px; position: relative; display: flex; margin: -90px auto 0 auto; background-color: #fff; border-radius: 10px; margin-top: -90px; box-sizing: border-box; box-shadow: 0 0 10px rgba(0,0,0,0.15); z-index: 12;} -.baro_cont a{width: calc(100% / 5); text-align: center; height: 100%; font-size: 21px; font-weight: 500; letter-spacing: -0.8px; position: relative; padding: 20px 0; box-sizing: border-box; transition: color 0.3s ease-in-out;} -.baro_cont a:hover{font-size: 22px; color: #ea5404; transition: color 0.1s linear;} -.baro_cont a::before{position: absolute; content: " "; width: calc(100% + 10px); height: calc(100% + 10px); border: 5px solid #ea5404; border-radius: 10px; left: 50%; top: 50%; transform: translate(-50%,-50%); background-color: #fff; z-index: 1; opacity: 0; transition: border 0.1s linear, opacity 0.1s linear; box-shadow: 0 0 10px rgba(0,0,0,0.5);} -.baro_cont a:hover::before{opacity: 1; transition: border 0.1s linear, opacity 0.1s linear;} +.baro_cont{padding: 0 20px; box-sizing: border-box; z-index: 21; position: relative;} +.baro_cont .inner{max-width: 1200px; width: 100%; height: 180px; position: relative; display: flex; margin: -90px auto 0 auto; background-color: #fff; border-radius: 10px; margin-top: -90px; box-sizing: border-box; box-shadow: 0 0 10px rgba(0,0,0,0.15); z-index: 24;} +.baro_cont a{width: calc(100% / 5); text-align: center; height: 100%; font-size: 21px; font-weight: 500; letter-spacing: -0.8px; position: relative; padding: 20px 0; box-sizing: border-box; transition: color 0.3s ease-in-out; z-index: 0;} +.baro_cont a.on i,.baro_cont a.on p{position: relative; z-index: 29;} +.baro_cont a.on{font-size: 22px; color: #ea5404; transition: color 0.1s linear; z-index: 25;} +.baro_cont a::before{position: absolute; content: " "; width: calc(100% + 10px); height: calc(100% + 10px); border: 5px solid #ea5404; border-radius: 10px; left: 50%; top: 50%; transform: translate(-50%,-50%); background-color: #fff; z-index: 1; opacity: 0; transition: border 0.1s linear, opacity 0.1s linear; box-shadow: 0 0 10px rgba(0,0,0,0.5);z-index: 28;} +.baro_cont a.on::before{opacity: 1; transition: border 0.1s linear, opacity 0.1s linear;} .baro_cont a::after{position: absolute; content: " "; width: 1px; height: calc(100% - 40px); background-color: #dadada; right: 0; top: 50%; transform: translateY(-50%);} .baro_cont a:last-child:after{display: none;} -.baro_cont i{width: 60px; height: 60px; display: block; background-repeat: no-repeat; background-position: center; background-size: contain; margin: 18px auto 20px auto; position: relative; z-index: 1; transition: background-image 0.3s ease-in-out;} -.baro_cont p{position: relative; z-index: 1;} -.baro_cont a:nth-child(1) i{background-image: url(/kccadrPb/usr/image/main/icon_baro01.png);} -.baro_cont a:nth-child(1):hover i{background-image: url(/kccadrPb/usr/image/main/icon_baro01_hover.png);} -.baro_cont a:nth-child(2) i{background-image: url(/kccadrPb/usr/image/main/icon_baro02.png);} -.baro_cont a:nth-child(2):hover i{background-image: url(/kccadrPb/usr/image/main/icon_baro02_hover.png);} -.baro_cont a:nth-child(3) i{background-image: url(/kccadrPb/usr/image/main/icon_baro03.png);} -.baro_cont a:nth-child(3):hover i{background-image: url(/kccadrPb/usr/image/main/icon_baro03_hover.png);} -.baro_cont a:nth-child(4) i{background-image: url(/kccadrPb/usr/image/main/icon_baro04.png);} -.baro_cont a:nth-child(4):hover i{background-image: url(/kccadrPb/usr/image/main/icon_baro04_hover.png);} -.baro_cont a:nth-child(5) i{background-image: url(/kccadrPb/usr/image/main/icon_baro05.png);} -.baro_cont a:nth-child(5):hover i{background-image: url(/kccadrPb/usr/image/main/icon_baro05_hover.png);} + +.baro_cont i{position: relative; width: 60px; height: 60px; display: block; background-repeat: no-repeat; background-position: center; background-size: contain; margin: 18px auto 20px auto; position: relative; transition: background-image 0.3s ease-in-out;} +.baro_cont p{position: relative;} +.baro_cont a:nth-child(2) i{background-image: url(/kccadrPb/usr/image/main/icon_baro01.png);} +.baro_cont a:nth-child(2).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro01_hover.png);} +.baro_cont a:nth-child(3) i{background-image: url(/kccadrPb/usr/image/main/icon_baro02.png);} +.baro_cont a:nth-child(3).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro02_hover.png);} +.baro_cont a:nth-child(4) i{background-image: url(/kccadrPb/usr/image/main/icon_baro03.png);} +.baro_cont a:nth-child(4).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro03_hover.png);} +.baro_cont a:nth-child(5) i{background-image: url(/kccadrPb/usr/image/main/icon_baro04.png);} +.baro_cont a:nth-child(5).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro04_hover.png);} +.baro_cont a:nth-child(6) i{background-image: url(/kccadrPb/usr/image/main/icon_baro05.png);} +.baro_cont a:nth-child(6).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro05_hover.png);} + +.baro_cont.experience_cont a i{width: 48px;} +.baro_cont.experience_cont a:nth-child(2) i{background-image: url(/kccadrPb/usr/image/main/icon_baro06.png);} +.baro_cont.experience_cont a:nth-child(2).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro06_hover.png);} +.baro_cont.experience_cont a:nth-child(3) i{background-image: url(/kccadrPb/usr/image/main/icon_baro07.png);} +.baro_cont.experience_cont a:nth-child(3).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro07_hover.png);} +.baro_cont.experience_cont a:nth-child(4) i{background-image: url(/kccadrPb/usr/image/main/icon_baro08.png);} +.baro_cont.experience_cont a:nth-child(4).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro08_hover.png);} +.baro_cont.experience_cont a:nth-child(5) i{background-image: url(/kccadrPb/usr/image/main/icon_baro09.png);} +.baro_cont.experience_cont a:nth-child(5).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro09_hover.png);} +.baro_cont.experience_cont a:nth-child(6) i{background-image: url(/kccadrPb/usr/image/main/icon_baro10.png);} +.baro_cont.experience_cont a:nth-child(6).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro10_hover.png);} + +.mask{position: fixed; display: none; width: 100%; height: 100%; left: 0; top: 0; background-color: rgba(0,0,0,0.5); z-index: 25;} +.tooltip_type01{position: absolute; display: none; justify-content: space-between; align-items: center; width: 320%; top: -40px; left: calc(100% + 20px); background-color: #fff; padding: 30px 30px 30px 42px; box-sizing: border-box; z-index: 99; border-radius: 5px; line-height: 1.3; box-shadow: 4px 8px 8px rgba(0,0,0,0.2); color: #222; text-align: left;} +.baro_cont a:nth-child(4) .tooltip_type01{top: -140px; left: 0;} +.baro_cont a:nth-child(5) .tooltip_type01{left: calc(-320%);} +.baro_cont a:nth-child(6) .tooltip_type01{left: calc(-320%);} +.tooltip_type01>*{display: inline-block; vertical-align: middle;} +.tooltip_tit01{font-size: 22px;} +.tooltip_tit02{font-size: 16px; margin-top: 10px;} +.tooltip_type01 button{width: 168px; height: 48px; background-color: #ea5404; border-radius: 5px; color: #fff; font-size: 18px; float: right; margin-top: 22px; margin-left: 40px} /* //바로가기 */ .btm_cont{padding: 0 20px; box-sizing: border-box;} @@ -170,6 +194,9 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro .baro_cont a:hover{font-size: 20px;} .baro_cont a::before{width: calc(100% + 10px); height: calc(100% + 10px);} .baro_cont i{width: 45px; height: 45px; margin: 15px auto;} + + .tooltip_type01{position: fixed; max-width: 100%; width: calc(100% - 30px); left: 50% !important; top: 260px;transform: translateX(-50%);} + .baro_cont a:nth-child(4) .tooltip_type01{top: 260px;} /* //바로가기 */ /* 조정신청 안내 */ @@ -229,6 +256,18 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro /* //팝업존 */ } +@media all and (max-width: 840px){ + .tooltip_tit01{font-size: 18px; font-weight: 500;} + .tooltip_tit02{font-size: 14px;} + .tooltip_type01 button{margin-top: 16px; margin-left: 0;} +} + +@media all and (max-width: 700px){ + .tooltip_type01 .text_area{width: 100%; display: block;text-align: center;} + .tooltip_type01 button{float: none; display: block; text-align: center; margin: 20px auto 0;} + .tooltip_type01{top: 200px;} +} + @media all and (max-width: 640px){ .btm_cont{padding-bottom: 40px;} @@ -250,6 +289,9 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro .area_pz .pz_img.img02{background-color: #7c50cc;} .area_pz .pz_img.img03{background-color: #506acc;} */ /* //팝업존 */ + + .mask{background-color: transparent; z-index: -1;} + .tooltip_type01{display: none !important;} } @media all and (max-width: 530px){ diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro06.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro06.png new file mode 100644 index 0000000000000000000000000000000000000000..ce846955f45cc94bbf101acbd0a7a4ccb228e563 GIT binary patch literal 1105 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 V=qQ&$8h`)*002ovPDHLkV1j!UNQwXe literal 0 HcmV?d00001 diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro07_hover.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro07_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..e17b903c43ae7ed60f8de8e2b6196c20eea83b3b GIT binary patch literal 816 zcmV-01JC@4P)k7RA_+)~eZ zkDVjud*gY)=X;(H?|a_&IfqvT96~!~ZUTQ@OB}VVKvIdQc<_ zl9CiKxk+WQShD}S2r*Q%Bc{n;tk>3|*G#qS-n{<+0MP4n*wolSw5U&CzG5+* z1^}2%My%6lN@OhS$PQ96OEgG0z$L^ZtrGBsXG@o=g-#Z8LA-m+IP!pZJ{PLfbr@cEhtRTwt%@-^S@59yJjW}_ zfBI~u2&z(#wIpc7wAwoMIz}fe8o8;|EN%>qvN1_0Kp>dYZbQJ^&Bif0iEwBO4<=R!H{HsVkKp;eI!Hxh}j3de;ya$r9$oHtSP)A3rkuQb3iC! za3@+YwvD7zV-+og>|7Wypb|xb2{LpcT8g?Tit^ctE?nrMkzj4C*2d~01ZfgYV#OB%gexYT}Jd@+ySJ0`7E#+$4QdHM6U(uI{B%FZPlBU zN7ICEG9dp7Y>!}jGcf7PQ^1~j4XOlR0eAcI4qzsN?RUUUP)sx@>9VT_GuskSvr%lL zz|67%bs^#yb9uRGLbqv%CaX88h*{tfU!JeSSSsN;;JQGcu@IZ6q$S{^xb_kHIb9Dw zO%u9JL$qq>n%V0PetwfQQo(+hLJC(2%aR5w*uMzeSZx53j)c{_%+Y5Z+Drmvi2{cx zEGCsO50oVeJdRs>c_gfIBXmoVN~P%U?_bjw78b~4GLbqP7#JwhM@L5^+4uJL(%Ra( zrjLz{vAXJZm~keWOeX2>?q1VpXJ;c54cbF=qFr5Gw70jf=@SzZ&P1Cgbeo2#bLg(D ztS~e*w5Gd;Ob|i)I2aijA(cuMjmZ_xM02?uQ&UsXMplAa?Wd>X-`3QU)UOA84_pQ} zq8$!x!s2*4)z^YtNZnq%i@3;;v^Os&%fvn8Z%H*V)qXPDXTfB|>L#VA#ywbtbyBv_wx&PfY`lVZRS(^W`6brvoIza1?j|=ma(c2O2$e9}dW` zNV?);z6)$fp`Tbl(B;+sR{Q_MnTAne7Jl z2mLfOQAuZkV}YXMW@ceFX0`|T5NPp>K9KZHqlYed-!OCmx8ZG5pPJb*;4R?Wd;(!+ zop?`_2Plxddn!&O>po+XCED z>xg5bEv!<~1v9$`FYoQ8a8yfEe$4Ly&q$if7p#ZS1whg~u;0u^@D>^a?!vp=z5@IJ gd=6wJO_tjK3&6%n;<^%&jQ{`u07*qoM6N<$f`S=6Y5)KL literal 0 HcmV?d00001 diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro08_hover.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro08_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..cf2ff6adbc0c2b8532f20f81dfe35e8cd6b4d463 GIT binary patch literal 1234 zcmV;@1TFiCP)6j4%2g{rYs7e!J2ZABL@bkRt$#@2qs>Y_x=N9&M; zL>KSP%$srM&3$hMoOJTvpf1ix}ffO0JsJts0`W#k&;5dEh=@9xX#Gh44IZd0@;~h)q<|-@vDF?IVnH zq#S;#CUvWZXwlR)vmFk8ev`DlfPD{{60Q)ElC~DGe+js%SOAhb!`fZu=yMKz27tUo zflXuS495mfM2jp3rP>dk zIuqNrl%jq%;74Et+=#X~^a(q#T1xS?U?!w(9o|7)WJp?S=w6TEwL7*{TTL2d%-Q_S&Y`DB$Zgc3fFr;lYZu?PZnAr`0 z0XO+$j{$>#Bn{@XnN%)JI@N&-^kpk`O zeKkw(=z7J;&dd_PHlQ0w6zRSSIBaHb0$q}(Ap+5PiA2_3Fb+zve;e2m(8qy~fUoh+ zdanT5fCtG;qZfchzy_EFtFD=?C!1tHaGj(l@xGy$0M1F;gjcTa3G{v3%(g&<&rvgL z1cH0JcY&uRrOMWWWEQ%Fe*yJ`nf;0PivskR**<5Y7n4cuZr@x|;4$pi1I@mC0(d4s zG7Me79Y8D41awq->fRHOdnGyT_WcE@C-CTAmtXX(L!aM6+J=AyMeN54JP)4deir5+ zP}uC3v=jI|=%*;rQnzlBqTHhAB9*q&lEVI(kST1A`s0q9**IS6HdT7+UiAOgm|3xF zjV$=@-jvOBMX$QRDPXxTuLN?h5c8d0q^7}gGH;b%DxK&NGDJ6$LsU}OhZ|1?*QfGyVJ$U%vJ;KK|d8uRMK%EcyG~fW)@~+W@~^?fExeN0ZHFgdg_Ar4MQ7n zJ>F~T3p3jb>;k?|6%c0Dig!iXL5Acx|5?^4;I!ZHe_+3)7Yj9-Sqtzb9@!w0ctw3P za9K{<5U^I#Nyx5sYk+G@jW{Nn!x|->HnSCYb?*i;TeSxA$NVAitfb-8gV~U}07x1I w+Rbb`-a=!*&3K2~Q@~HaAz+WBfn5840b;#L$_?+=4gdfE07*qoM6N<$g4$eCAOHXW literal 0 HcmV?d00001 diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro09.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro09.png new file mode 100644 index 0000000000000000000000000000000000000000..b63c10f131ab7029b93abde3384f1450b2a2ebac GIT binary patch literal 1780 zcmVtz=yQ&Cc-IS6p(w1OKi&z(P z-+1TcO)@|4&8Qy)=A7Jn?m1`9d-uJ2#zTb=5dpqcV$3iMqY{32DzT`D)B!huZl(Gi zc-}CK2j%v~TkZuFXZR<0)aNsmaHQ-NAR>o>Uw{V7zy1K8GYsQaIsK_b1)OJZ@F?B+ zGW$~A3J{T(f$vTE@ZrM%+`5(Zr4Jj1@k6ypVN$z;+x^nw~&7Rq@E zECNHOaO~KztUrw*HMT62B>^JR0DNl7RaI44-+VHeq^hb)pYo}i<2vQ4fOmkWO<`hU zB6Iyi`d%r$x{UT^Lty^IG2>95PtE;O?BocYgPb3mlS6Az*kCjcwajOE}2c9&Asi`SCIy&;6+|kj&)YO!& zdQ#bR9LEzNBF_SEnsQ4^3o|n_1>2dKnW3enMOVG4Y&(h@74Q|1so&-0W&D2sKEv(t z`~560FYBsmW!q64O@N4u0w+zmx3`z{$=6=CwzgPXTVri)jjgS%T=wYg?bTH$)f$fB zSOP@EhvjWAl}h39*uU7VudlPYxyk0{ChP0#wqraVkKML-L9OKoPFBF{K%Xg$jEvCN z*Oznf-Me>fKU?YR>tkdj>shEzt>p-gBtS%3fsahNwzigdJnn>P0OIjDwY9an>Layg z$v9O3=YVEYh{a;GwY5298rs_0h{a;Ms#&dBG9@QKM8ZJkLTztvXL@?NRI_`So}Q+? zyKCLV)#4Xo^mNh|~gKnzF~^A(>3(-1eLx#~NQMUy7oX3U~_$nL;!grKhK- z1atY()6+vV8r4-HiZW3V7F)>+0%QT3RaBhk{vJTB5G5PFKCFd@7h?E8r6# zU<$Ldvotq17ip?+nwy)Mot@QH0p(M{6r2DNc?pP{axfTVa&oemwM$}ha*|*$sH@`2 zw}L1r0a|w_a~Db^68Lt5j$O%mS~N!oa`)LqkLR40o5Ip&u1W>yeOms-Ud2NVSId?uCA^Ern^H| zR~O^sS{kDT69@!YSXj_ib)NWuaSz9jAGiHnEMsG1 zbarNa>9flBec5-*P#u{cflLGc+_`hsJ8#k4ym=FVBS(%nV(zqA%R#*K53>t>< zSFSk+RlsX#!4D1&Iu<;n19vKTNN>x7gM+&280i>tk~0A!5spa$U3p+j7{bcy=G|^GWZ7%9`u{orDfpm-+GGDETJOTU)v_Se8`r^fl*0Xp= zxqbUKfUCR9ojZ3pefl(y9z8Nu+rTr1Vcdo63iuEeJlHlO948nIy1upAG-_H%#|o$f zh{#dk4O7|L+G=e@{ilh=VzjnqwG!V@F=r}ZPj|=CjQmey)2z*Ol{_MH68KIZeCpIG zR~sCa;PK>IsjC+yIVN$gfKCvlr++aM=HsUN7(g@MonxsQ`ZhAN&nh WNLWIX<;nd30000q$gGRA_V&WU34F&ejK7pJ zo^n*cIg%HT(w!@DETydg5g7n}YsxK;Gy(AW->&Iqdkn+)U8!O!Sp|rQ16bE}tB0ek z9*!oOt}EM;P|Cl+GSF`dp`LDb@7%%eojVBibnABg%C;nwBmp8)4V*V+m&?iVrTO^x z$Cu`Dxh$caS7VA!sVd;dK+qH>!u#X@e~4WRCc^u5`=A2x}IZh0Y5{igC&6pC2^ zE5PHXuqU*Op03Uf2laGyvM01lS3RzL6@{WCKtvt_&YE(C+s*3YT!s-=Ru|`}aJzNY zS>@Aqid6xpfkso98hMJQ#!XodZfe}b)W}o1s!{p09orKiBAviVQ?3s@#KOVRoc$~u z9Hl;B`O!}*-?mbW3U~vkFomOYQ~11*thrK>8GZ(Ff70U|O2#P4!Cx3m); z97t(IH5f=DAv_nwqR!kd>`mCg(nC4=<3*-*7(a?w^M#jq^n~q zPY(21RBA3;uq6Q^(g3WPa;3+^vH58`Tmx`yews>;M^~+>ISag$M(TmJe1HD|#ToB$E&0gjvU!wvP!jt&>W+y!Ar1^fbV znZmL889bhf4CeXa@l60L1sX;h{mcwQVlIU3P41+syFLpsw1g zV#$lV5+EXv056%c&+FyL>|}-!_Htx)5}((rt6owuAVZy2_n^ z-_N1Qn69c-G389o2@sLpz_X?tY-%KOK=PTpAR-5ZU{j;6dRE1j6FDV7>+Zy_LMw|= z+-}=$&9lbscC)f*=_)zMqpOr_1uO#bD^PFucKUmF=IFvc`g?cM+r3>^4HAnnYqCy& zh*SZu#s@l`srq^)XZ3J2@u2lp6>C=HQUNalt)?(8L$oyqGnki#w&oz?GNh|oiN%@~ zStUS3EKX~xt5}*onC%=zXKDH%HPx0M{Y4e?hGbg-KL>oKusl6UZFOP2OP5x*t_;0` zY^bfSW_j9jAL1hx^M-6VvxrzOESrOmGPZvx!-(wo-tOL%pYvsG{}7vlkLs#L6?;Z9 zZW*d0a~X&~;hg>94-&7udGqJbJ_le+Yl|)ZKK#Qcy!@J_8TA3sXBftR(v8`u0*<0B zzJFKJwo?#WT3c*eJg9AXmt|WH5nDrA(k4JeYSCU=a=Tot94h~|w-GCcqPSfyU3E^a zB_)|E;AJ5G7DHq>oOtW`e@U>Zk;rgZS2Yn^OG;8EKtwE$m;rw+i<4uiO!MaE?c2P2 z>3!b4^gcIlr#}_WhsDV;0)ESn{(@Rl66q@74Iq9Ddt^33mCu{TG?X?XcE_J2O`ToDj?a=_ zwn*wKC04*Hu)`Em975VcPgf^<`$BlVUc6o}d;3CJy*!aCDGq6O5L;uM_)jY$b-6 zU{hn!x7HMmntEbu1ylk=WIOP@scfhV5S_5K3td*C6C*U#1$5Q(YR&NqNb2q+G$X&& z#G19KyGjlb83!)u#xtV_irU~P2M-=R;8(x?4gbD>Usq2!MC2-9-xJQai%*=uW95#b nj6CK9&H&$(JCZW+4RGea+5<{EvrU&D00000NkvXXu0mjfM$L9f literal 0 HcmV?d00001 diff --git a/src/main/webapp/kccadrPb/usr/datepicker/icon_baro10.png b/src/main/webapp/kccadrPb/usr/datepicker/icon_baro10.png new file mode 100644 index 0000000000000000000000000000000000000000..7c942e1ce89bb7771fa6176b334e050cfa07eda6 GIT binary patch literal 707 zcmV;!0zCbRP)d3%xqwvW@p}= zcjoyqv$H#}IWybFueN}9z-dWel6E$i+|NW~o&a8&*}7{Pm&xApj56k zKpUb~tBnjX@6B0T3vr=duhVL^`Zg?;N;I3zxEe#ONP6$K^9^t)E;JgAadVe|r@%=! z=z9r$PMCkZGvIp$E&~^VJ;2v7@*YRmuJeOe07>6~wQ=*zEC$%>yqCINXk29gp_KuI zRt6AS89-=d0HKuugjNO+TD}i7lWKo-?K%(41c0RP{qD{D63PHVD+352Gpm?c1!iOy zaupfB6_sZPz|3+$1-R*i3o`)_nO_60IpK%Eb?*RXwg7AZ>yn<2(7vyEN!wl@Vl!I= zUI6ETO*12AIFy z*{ApSfTSOELu{DYB^b{<1bUJ6fS3c;&Fl*Bh!M@li9zH*ym7od0j@gD2AYqPf+>PH z1-$BUd#HIx!MBj4U%(mug}670c}M{ObV1yaba&L;Q~Jm9??P(A}AyX9*z99PZdx^3kwMz zg_T;17f2x0vl1+#g&?MgO$t%aE{BaEeA3h){@D(Oq!&Z_zSWE%4juwZ7}^LAE=%)oEpQ{E0^v<;|5@*jY4 zNtwru0(_LTJBPVgnb~9DL{o7t2p>zRS);&`neEIH>PBt|uS@8EKzP3gxUW` z9s!4=g|3&-=bZ5enhRXdz!_i?7y`bghk0uW_2^G zL!azIQ3b}Y2I>9*FtZ9!2d+elhx-B`Fh2uah!o!gE;$De~`CF3K%!6Y9Nk4%JApCL>LY#`W z>tg;|bDz$i1CoBw3NdG9ry-qr@bn;S15pKL&Fma-pM>VaKrf0wgx{K~z(e4Cq*+(< zVURZk5J!N;Hr27_p#bkfl70cl_!nY2iFqgh0JK0{mo$|$wh#cY1~DP2o+i%KKXaEQ u&G(|?=)2H5U{@~&0XFui-{LHxtoj2@r_Pk;!-y;Z0000
  • XX 목록(완료 8.13)
  • XX 상세(작업중)
    • +
  • 메인 체험하기(9.15)
  • 조정신청 안내(완료)
  • 신청인 정보(완료) (수정 10.7, 이전신청 불러오기 팝업 추가)
  • 피신청인 정보(완료)
    • diff --git a/src/main/webapp/kccadrPb/usr/image/main/icon_baro06.png b/src/main/webapp/kccadrPb/usr/image/main/icon_baro06.png new file mode 100644 index 0000000000000000000000000000000000000000..ce846955f45cc94bbf101acbd0a7a4ccb228e563 GIT binary patch literal 1105 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 V=qQ&$8h`)*002ovPDHLkV1j!UNQwXe literal 0 HcmV?d00001 diff --git a/src/main/webapp/kccadrPb/usr/image/main/icon_baro07_hover.png b/src/main/webapp/kccadrPb/usr/image/main/icon_baro07_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..e17b903c43ae7ed60f8de8e2b6196c20eea83b3b GIT binary patch literal 816 zcmV-01JC@4P)k7RA_+)~eZ zkDVjud*gY)=X;(H?|a_&IfqvT96~!~ZUTQ@OB}VVKvIdQc<_ zl9CiKxk+WQShD}S2r*Q%Bc{n;tk>3|*G#qS-n{<+0MP4n*wolSw5U&CzG5+* z1^}2%My%6lN@OhS$PQ96OEgG0z$L^ZtrGBsXG@o=g-#Z8LA-m+IP!pZJ{PLfbr@cEhtRTwt%@-^S@59yJjW}_ zfBI~u2&z(#wIpc7wAwoMIz}fe8o8;|EN%>qvN1_0Kp>dYZbQJ^&Bif0iEwBO4<=R!H{HsVkKp;eI!Hxh}j3de;ya$r9$oHtSP)A3rkuQb3iC! za3@+YwvD7zV-+og>|7Wypb|xb2{LpcT8g?Tit^ctE?nrMkzj4C*2d~01ZfgYV#OB%gexYT}Jd@+ySJ0`7E#+$4QdHM6U(uI{B%FZPlBU zN7ICEG9dp7Y>!}jGcf7PQ^1~j4XOlR0eAcI4qzsN?RUUUP)sx@>9VT_GuskSvr%lL zz|67%bs^#yb9uRGLbqv%CaX88h*{tfU!JeSSSsN;;JQGcu@IZ6q$S{^xb_kHIb9Dw zO%u9JL$qq>n%V0PetwfQQo(+hLJC(2%aR5w*uMzeSZx53j)c{_%+Y5Z+Drmvi2{cx zEGCsO50oVeJdRs>c_gfIBXmoVN~P%U?_bjw78b~4GLbqP7#JwhM@L5^+4uJL(%Ra( zrjLz{vAXJZm~keWOeX2>?q1VpXJ;c54cbF=qFr5Gw70jf=@SzZ&P1Cgbeo2#bLg(D ztS~e*w5Gd;Ob|i)I2aijA(cuMjmZ_xM02?uQ&UsXMplAa?Wd>X-`3QU)UOA84_pQ} zq8$!x!s2*4)z^YtNZnq%i@3;;v^Os&%fvn8Z%H*V)qXPDXTfB|>L#VA#ywbtbyBv_wx&PfY`lVZRS(^W`6brvoIza1?j|=ma(c2O2$e9}dW` zNV?);z6)$fp`Tbl(B;+sR{Q_MnTAne7Jl z2mLfOQAuZkV}YXMW@ceFX0`|T5NPp>K9KZHqlYed-!OCmx8ZG5pPJb*;4R?Wd;(!+ zop?`_2Plxddn!&O>po+XCED z>xg5bEv!<~1v9$`FYoQ8a8yfEe$4Ly&q$if7p#ZS1whg~u;0u^@D>^a?!vp=z5@IJ gd=6wJO_tjK3&6%n;<^%&jQ{`u07*qoM6N<$f`S=6Y5)KL literal 0 HcmV?d00001 diff --git a/src/main/webapp/kccadrPb/usr/image/main/icon_baro08_hover.png b/src/main/webapp/kccadrPb/usr/image/main/icon_baro08_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..cf2ff6adbc0c2b8532f20f81dfe35e8cd6b4d463 GIT binary patch literal 1234 zcmV;@1TFiCP)6j4%2g{rYs7e!J2ZABL@bkRt$#@2qs>Y_x=N9&M; zL>KSP%$srM&3$hMoOJTvpf1ix}ffO0JsJts0`W#k&;5dEh=@9xX#Gh44IZd0@;~h)q<|-@vDF?IVnH zq#S;#CUvWZXwlR)vmFk8ev`DlfPD{{60Q)ElC~DGe+js%SOAhb!`fZu=yMKz27tUo zflXuS495mfM2jp3rP>dk zIuqNrl%jq%;74Et+=#X~^a(q#T1xS?U?!w(9o|7)WJp?S=w6TEwL7*{TTL2d%-Q_S&Y`DB$Zgc3fFr;lYZu?PZnAr`0 z0XO+$j{$>#Bn{@XnN%)JI@N&-^kpk`O zeKkw(=z7J;&dd_PHlQ0w6zRSSIBaHb0$q}(Ap+5PiA2_3Fb+zve;e2m(8qy~fUoh+ zdanT5fCtG;qZfchzy_EFtFD=?C!1tHaGj(l@xGy$0M1F;gjcTa3G{v3%(g&<&rvgL z1cH0JcY&uRrOMWWWEQ%Fe*yJ`nf;0PivskR**<5Y7n4cuZr@x|;4$pi1I@mC0(d4s zG7Me79Y8D41awq->fRHOdnGyT_WcE@C-CTAmtXX(L!aM6+J=AyMeN54JP)4deir5+ zP}uC3v=jI|=%*;rQnzlBqTHhAB9*q&lEVI(kST1A`s0q9**IS6HdT7+UiAOgm|3xF zjV$=@-jvOBMX$QRDPXxTuLN?h5c8d0q^7}gGH;b%DxK&NGDJ6$LsU}OhZ|1?*QfGyVJ$U%vJ;KK|d8uRMK%EcyG~fW)@~+W@~^?fExeN0ZHFgdg_Ar4MQ7n zJ>F~T3p3jb>;k?|6%c0Dig!iXL5Acx|5?^4;I!ZHe_+3)7Yj9-Sqtzb9@!w0ctw3P za9K{<5U^I#Nyx5sYk+G@jW{Nn!x|->HnSCYb?*i;TeSxA$NVAitfb-8gV~U}07x1I w+Rbb`-a=!*&3K2~Q@~HaAz+WBfn5840b;#L$_?+=4gdfE07*qoM6N<$g4$eCAOHXW literal 0 HcmV?d00001 diff --git a/src/main/webapp/kccadrPb/usr/image/main/icon_baro09.png b/src/main/webapp/kccadrPb/usr/image/main/icon_baro09.png new file mode 100644 index 0000000000000000000000000000000000000000..b63c10f131ab7029b93abde3384f1450b2a2ebac GIT binary patch literal 1780 zcmVtz=yQ&Cc-IS6p(w1OKi&z(P z-+1TcO)@|4&8Qy)=A7Jn?m1`9d-uJ2#zTb=5dpqcV$3iMqY{32DzT`D)B!huZl(Gi zc-}CK2j%v~TkZuFXZR<0)aNsmaHQ-NAR>o>Uw{V7zy1K8GYsQaIsK_b1)OJZ@F?B+ zGW$~A3J{T(f$vTE@ZrM%+`5(Zr4Jj1@k6ypVN$z;+x^nw~&7Rq@E zECNHOaO~KztUrw*HMT62B>^JR0DNl7RaI44-+VHeq^hb)pYo}i<2vQ4fOmkWO<`hU zB6Iyi`d%r$x{UT^Lty^IG2>95PtE;O?BocYgPb3mlS6Az*kCjcwajOE}2c9&Asi`SCIy&;6+|kj&)YO!& zdQ#bR9LEzNBF_SEnsQ4^3o|n_1>2dKnW3enMOVG4Y&(h@74Q|1so&-0W&D2sKEv(t z`~560FYBsmW!q64O@N4u0w+zmx3`z{$=6=CwzgPXTVri)jjgS%T=wYg?bTH$)f$fB zSOP@EhvjWAl}h39*uU7VudlPYxyk0{ChP0#wqraVkKML-L9OKoPFBF{K%Xg$jEvCN z*Oznf-Me>fKU?YR>tkdj>shEzt>p-gBtS%3fsahNwzigdJnn>P0OIjDwY9an>Layg z$v9O3=YVEYh{a;GwY5298rs_0h{a;Ms#&dBG9@QKM8ZJkLTztvXL@?NRI_`So}Q+? zyKCLV)#4Xo^mNh|~gKnzF~^A(>3(-1eLx#~NQMUy7oX3U~_$nL;!grKhK- z1atY()6+vV8r4-HiZW3V7F)>+0%QT3RaBhk{vJTB5G5PFKCFd@7h?E8r6# zU<$Ldvotq17ip?+nwy)Mot@QH0p(M{6r2DNc?pP{axfTVa&oemwM$}ha*|*$sH@`2 zw}L1r0a|w_a~Db^68Lt5j$O%mS~N!oa`)LqkLR40o5Ip&u1W>yeOms-Ud2NVSId?uCA^Ern^H| zR~O^sS{kDT69@!YSXj_ib)NWuaSz9jAGiHnEMsG1 zbarNa>9flBec5-*P#u{cflLGc+_`hsJ8#k4ym=FVBS(%nV(zqA%R#*K53>t>< zSFSk+RlsX#!4D1&Iu<;n19vKTNN>x7gM+&280i>tk~0A!5spa$U3p+j7{bcy=G|^GWZ7%9`u{orDfpm-+GGDETJOTU)v_Se8`r^fl*0Xp= zxqbUKfUCR9ojZ3pefl(y9z8Nu+rTr1Vcdo63iuEeJlHlO948nIy1upAG-_H%#|o$f zh{#dk4O7|L+G=e@{ilh=VzjnqwG!V@F=r}ZPj|=CjQmey)2z*Ol{_MH68KIZeCpIG zR~sCa;PK>IsjC+yIVN$gfKCvlr++aM=HsUN7(g@MonxsQ`ZhAN&nh WNLWIX<;nd30000q$gGRA_V&WU34F&ejK7pJ zo^n*cIg%HT(w!@DETydg5g7n}YsxK;Gy(AW->&Iqdkn+)U8!O!Sp|rQ16bE}tB0ek z9*!oOt}EM;P|Cl+GSF`dp`LDb@7%%eojVBibnABg%C;nwBmp8)4V*V+m&?iVrTO^x z$Cu`Dxh$caS7VA!sVd;dK+qH>!u#X@e~4WRCc^u5`=A2x}IZh0Y5{igC&6pC2^ zE5PHXuqU*Op03Uf2laGyvM01lS3RzL6@{WCKtvt_&YE(C+s*3YT!s-=Ru|`}aJzNY zS>@Aqid6xpfkso98hMJQ#!XodZfe}b)W}o1s!{p09orKiBAviVQ?3s@#KOVRoc$~u z9Hl;B`O!}*-?mbW3U~vkFomOYQ~11*thrK>8GZ(Ff70U|O2#P4!Cx3m); z97t(IH5f=DAv_nwqR!kd>`mCg(nC4=<3*-*7(a?w^M#jq^n~q zPY(21RBA3;uq6Q^(g3WPa;3+^vH58`Tmx`yews>;M^~+>ISag$M(TmJe1HD|#ToB$E&0gjvU!wvP!jt&>W+y!Ar1^fbV znZmL889bhf4CeXa@l60L1sX;h{mcwQVlIU3P41+syFLpsw1g zV#$lV5+EXv056%c&+FyL>|}-!_Htx)5}((rt6owuAVZy2_n^ z-_N1Qn69c-G389o2@sLpz_X?tY-%KOK=PTpAR-5ZU{j;6dRE1j6FDV7>+Zy_LMw|= z+-}=$&9lbscC)f*=_)zMqpOr_1uO#bD^PFucKUmF=IFvc`g?cM+r3>^4HAnnYqCy& zh*SZu#s@l`srq^)XZ3J2@u2lp6>C=HQUNalt)?(8L$oyqGnki#w&oz?GNh|oiN%@~ zStUS3EKX~xt5}*onC%=zXKDH%HPx0M{Y4e?hGbg-KL>oKusl6UZFOP2OP5x*t_;0` zY^bfSW_j9jAL1hx^M-6VvxrzOESrOmGPZvx!-(wo-tOL%pYvsG{}7vlkLs#L6?;Z9 zZW*d0a~X&~;hg>94-&7udGqJbJ_le+Yl|)ZKK#Qcy!@J_8TA3sXBftR(v8`u0*<0B zzJFKJwo?#WT3c*eJg9AXmt|WH5nDrA(k4JeYSCU=a=Tot94h~|w-GCcqPSfyU3E^a zB_)|E;AJ5G7DHq>oOtW`e@U>Zk;rgZS2Yn^OG;8EKtwE$m;rw+i<4uiO!MaE?c2P2 z>3!b4^gcIlr#}_WhsDV;0)ESn{(@Rl66q@74Iq9Ddt^33mCu{TG?X?XcE_J2O`ToDj?a=_ zwn*wKC04*Hu)`Em975VcPgf^<`$BlVUc6o}d;3CJy*!aCDGq6O5L;uM_)jY$b-6 zU{hn!x7HMmntEbu1ylk=WIOP@scfhV5S_5K3td*C6C*U#1$5Q(YR&NqNb2q+G$X&& z#G19KyGjlb83!)u#xtV_irU~P2M-=R;8(x?4gbD>Usq2!MC2-9-xJQai%*=uW95#b nj6CK9&H&$(JCZW+4RGea+5<{EvrU&D00000NkvXXu0mjfM$L9f literal 0 HcmV?d00001 diff --git a/src/main/webapp/kccadrPb/usr/image/main/icon_baro10.png b/src/main/webapp/kccadrPb/usr/image/main/icon_baro10.png new file mode 100644 index 0000000000000000000000000000000000000000..7c942e1ce89bb7771fa6176b334e050cfa07eda6 GIT binary patch literal 707 zcmV;!0zCbRP)d3%xqwvW@p}= zcjoyqv$H#}IWybFueN}9z-dWel6E$i+|NW~o&a8&*}7{Pm&xApj56k zKpUb~tBnjX@6B0T3vr=duhVL^`Zg?;N;I3zxEe#ONP6$K^9^t)E;JgAadVe|r@%=! z=z9r$PMCkZGvIp$E&~^VJ;2v7@*YRmuJeOe07>6~wQ=*zEC$%>yqCINXk29gp_KuI zRt6AS89-=d0HKuugjNO+TD}i7lWKo-?K%(41c0RP{qD{D63PHVD+352Gpm?c1!iOy zaupfB6_sZPz|3+$1-R*i3o`)_nO_60IpK%Eb?*RXwg7AZ>yn<2(7vyEN!wl@Vl!I= zUI6ETO*12AIFy z*{ApSfTSOELu{DYB^b{<1bUJ6fS3c;&Fl*Bh!M@li9zH*ym7od0j@gD2AYqPf+>PH z1-$BUd#HIx!MBj4U%(mug}670c}M{ObV1yaba&L;Q~Jm9??P(A}AyX9*z99PZdx^3kwMz zg_T;17f2x0vl1+#g&?MgO$t%aE{BaEeA3h){@D(Oq!&Z_zSWE%4juwZ7}^LAE=%)oEpQ{E0^v<;|5@*jY4 zNtwru0(_LTJBPVgnb~9DL{o7t2p>zRS);&`neEIH>PBt|uS@8EKzP3gxUW` z9s!4=g|3&-=bZ5enhRXdz!_i?7y`bghk0uW_2^G zL!azIQ3b}Y2I>9*FtZ9!2d+elhx-B`Fh2uah!o!gE;$De~`CF3K%!6Y9Nk4%JApCL>LY#`W z>tg;|bDz$i1CoBw3NdG9ry-qr@bn;S15pKL&Fma-pM>VaKrf0wgx{K~z(e4Cq*+(< zVURZk5J!N;Hr27_p#bkfl70cl_!nY2iFqgh0JK0{mo$|$wh#cY1~DP2o+i%KKXaEQ u&G(|?=)2H5U{@~&0XFui-{LHxtoj2@r_Pk;!-y;Z0000 + + + + + + + 저작권 전자조정시스템 - 메인 + + + + + + + + + + + + + + + + + + + + + + + +
    + 본문 바로가기 +
    + +
    +
    +
    +
    + 한국저작권위원회 + 바로가기 +
    +
    + + 로그아웃 + 회원정보 수정 +
    + + +
    +
    +
    +
    +
    +
    +

    저작권 전자조정시스템 Copyright Electronic Coordination System

    +
    + +
    +
    + + + + + + +
    +
    +
    +
    + + + +
    +
    +

    저작권 전자조정시스템 Copyright Electronic Coordination System

    + + +
    +
    + + + + + + + +
    + +
    +
    +
      +
    • +
    • +
    • +
    + +
    + + +
    +
    +
    +
    +

    분쟁을 신속하고 공정하게 해결해주는

    + 저작권 전자조정시스템 +
    + +
    +
    + + + + +
    +
    +
    + +

    접수

    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    + +
    +     + + +

    기일지정

    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    + +
    +     + + +

    기일개최

    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    + +
    +     + + +

    조정중

    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    + +
    +     + + +

    종료

    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    + +
    +     + +
    +
    + +
    +
    + +
    +
    +

    조정신청 안내

    +
    +
    +
    + + + 전자조정 신청 +

    온라인상으로 구비서류 제출 및 수수료 결제

    +     + + + 오프라인 신청 +

    한국저작권위원회로 우편 송달 또는 방문

    +     +
    +
    +
    + +

    상담전화

    +
    +

    + 02-2669-0044 + 월~금(평일) 09:00~18:00 +

    +
    +
    +
    + + + +
    +
    +

    조정사례

    +
    + +
    +
    +
    + +
    +
    + + + + +
    +
    +

    팝업존

    +
    + + + +
    +
    +
    +
    +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    +
    +
    +
    + +
    +
    +
    + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/kccadrPb/usr/script/main.js b/src/main/webapp/kccadrPb/usr/script/main.js index 2076c1c2..e061256b 100644 --- a/src/main/webapp/kccadrPb/usr/script/main.js +++ b/src/main/webapp/kccadrPb/usr/script/main.js @@ -21,6 +21,22 @@ $(document).ready(function () { $(".sch.swiper-slide.swiper-slide-active a").attr("tabIndex", "0"); }); /* //조정일정 스케줄 웹접근성 */ + + $(".baro_cont a").mouseover(function(){ + if($(this).siblings().is("on") == false){ + $(this).addClass("on"); + $(".mask").show(); + $(this).children(".tooltip_type01").show(); + $(this).siblings().removeClass("on"); + $(this).next().siblings(".tooltip_type01").hide() + }else{} + }); + + $(".tooltip_type01").mouseleave(function(){ + $(".tooltip_type01").hide(); + $(".mask").hide(); + $(".baro_cont a").removeClass("on"); + }); }); function main_visual() { From ae7341a86ef8e3fec0d8d254a0ac8b623819c4e6 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 15 Sep 2022 14:03:07 +0900 Subject: [PATCH 2/9] =?UTF-8?q?feat:=EC=98=88=EB=AC=B8=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=20=EA=B8=B0=EB=8A=A5=20=EC=99=84=EB=A3=8C=20[?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=EC=98=A4=ED=94=84=EB=9D=BC?= =?UTF-8?q?=EC=9D=B8=EB=93=B1=EB=A1=9D,=20=EC=82=AC=EC=9A=A9=EC=9E=90:?= =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=8B=A0=EC=B2=ADSTEP3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/apm/web/ApmController.java | 12 +- .../kccadr/adjst/service/AdjstReqService.java | 2 +- .../kcc/kccadr/adjst/service/AdjstReqVO.java | 16 +- .../adjst/service/impl/AdjstReqDAO.java | 6 +- .../service/impl/AdjstReqServiceImpl.java | 6 +- .../adjst/web/AdjstReqWebController.java | 27 ++- .../java/kcc/kccadr/cmm/RestResponse.java | 6 +- .../kccadr/adjst/AdjstReq_SQL_Mysql.xml | 7 +- .../apm/popup/adjstReqOpenExamplePop.jsp | 106 ++++++--- .../adjReqMgrOff/adjReqMgrOffRegist.jsp | 8 +- .../adjst/popup/adjstReqOpenExamplePop.jsp | 202 +++++++++++------- .../kccadr/kccadrCom/kccadrConstantsJsp.jsp | 4 +- 12 files changed, 256 insertions(+), 146 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index f2bd4736..40f3b3d7 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -609,13 +609,11 @@ public class ApmController { */ @RequestMapping(value = "popup/adjstReqOpenExamplePop.do") public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - - AdjstReqVO expm = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); - -// apmVO.setSrchRpplTy(apmVO.getRpplTy()); -// model.addAttribute("rppList", apmService.selectAdrRpplList(apmVO)); - - model.addAttribute("expm", expm); + + model.addAttribute("ccTy", adjstReqVO.getCcTy()); + model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); + System.out.println("adjstReqVO.getExmpCd() : "+ adjstReqVO.getExmpCd()); + return "/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop"; } diff --git a/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java index 4f9b4974..72b0b48b 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqService.java @@ -51,7 +51,7 @@ public interface AdjstReqService { // 조정사건 정보 불러오기 public AdjstReqVO selectAdjsMgrMaster(AdjstReqVO adjstReqVO) throws Exception; - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception; + public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception; // 조정사건 대리인/신청인/피신청인 정보 불러오기 public List selectAdjsReqUserListByadjSeq(AdjstReqVO adjstReqVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java index 1df4c032..93afadfe 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java @@ -826,35 +826,35 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable { this.edtStatus = edtStatus; } - public String getExpmCd() { + public String getExmpCd() { return exmpCd; } - public void setExpmCd(String exmpCd) { + public void setExmpCd(String exmpCd) { this.exmpCd = exmpCd; } - public String getExpmCn() { + public String getExmpCn() { return exmpCn; } - public void setExpmCn(String exmpCn) { + public void setExmpCn(String exmpCn) { this.exmpCn = exmpCn; } - public String getExpmTit() { + public String getExmpTit() { return exmpTit; } - public void setExpmTit(String exmpTit) { + public void setExmpTit(String exmpTit) { this.exmpTit = exmpTit; } - public String getExpmCcTy() { + public String getExmpCcTy() { return exmpCcTy; } - public void setExpmCcTy(String exmpCcTy) { + public void setExmpCcTy(String exmpCcTy) { this.exmpCcTy = exmpCcTy; } diff --git a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java index fd25c459..9750fb91 100644 --- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java +++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqDAO.java @@ -166,9 +166,9 @@ public class AdjstReqDAO extends EgovAbstractDAO { public int updateAdrMgrEditInfo(AdjstReqVO adjstReqVO) throws Exception { return (Integer) update("AdjstReqDAO.updateAdrMgrEditInfo", adjstReqVO); } - - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { - return (AdjstReqVO) select("AdjstReqDAO.selectAdjstReqOpenExamplePop",adjstReqVO); + + public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception { + return (AdjstReqVO) select("AdjstReqDAO.selectAdjstReqOpenExamplePopCn",adjstReqVO); } diff --git a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java index 524a6cf3..82253d16 100644 --- a/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjst/service/impl/AdjstReqServiceImpl.java @@ -877,10 +877,10 @@ public class AdjstReqServiceImpl extends EgovAbstractServiceImpl implements Adj } return result; } - + @Override - public AdjstReqVO selectAdjstReqOpenExamplePop(AdjstReqVO adjstReqVO) throws Exception { - return adjstReqDAO.selectAdjstReqOpenExamplePop(adjstReqVO); + public AdjstReqVO selectAdjstReqOpenExamplePopCn(AdjstReqVO adjstReqVO) throws Exception { + return adjstReqDAO.selectAdjstReqOpenExamplePopCn(adjstReqVO); } /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 6e7f1d7a..d2b9cadf 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -1,6 +1,7 @@ package kcc.kccadr.adjst.web; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -18,6 +19,7 @@ import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.env.SystemEnvironmentPropertySource; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -201,17 +203,26 @@ public class AdjstReqWebController { */ @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do") public String adjstReqOpenExamplePop(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, ModelMap model) throws Exception { - AdjstReqVO expm = adjstReqService.selectAdjstReqOpenExamplePop(adjstReqVO); - if (expm != null && StringUtils.isNotBlank(expm.getAtchFileId())) { - FileVO fileVO = new FileVO(); - fileVO.setAtchFileId(expm.getAtchFileId()); - List fileList = fileService.selectFileInfs(fileVO); - model.addAttribute("fileList", fileList); - } - model.addAttribute("expm", expm); + model.addAttribute("ccTy", adjstReqVO.getCcTy()); + model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); return "/web/kccadr/adjst/popup/adjstReqOpenExamplePop"; } + @RequestMapping("/web/kccadr/adjst/popup/adjstReqOpenExamplePopCn.do") + public ResponseEntity adjstReqOpenExamplePopCn(@RequestBody AdjstReqVO adjstReqVO) throws Exception { + System.out.println("adjstReqVO.getExmpCd() :: "+ adjstReqVO.getExmpCd()); + System.out.println("adjstReqVO.getExmpCcTy() :: "+ adjstReqVO.getExmpCcTy()); + AdjstReqVO expm = adjstReqService.selectAdjstReqOpenExamplePopCn(adjstReqVO); + +// if (expm != null && StringUtils.isNotBlank(expm.getAtchFileId())) { +// FileVO fileVO = new FileVO(); +// fileVO.setAtchFileId(expm.getAtchFileId()); +// List fileList = fileService.selectFileInfs(fileVO); +// model.addAttribute("fileList", fileList); +// } + return ResponseEntity.ok().body(new RestResponse(HttpStatus.OK, expm.getExmpCn(), LocalDateTime.now())); + } + /** * 조정신청 구분선택 - 안내화면 */ diff --git a/src/main/java/kcc/kccadr/cmm/RestResponse.java b/src/main/java/kcc/kccadr/cmm/RestResponse.java index f84945bc..1a1055af 100644 --- a/src/main/java/kcc/kccadr/cmm/RestResponse.java +++ b/src/main/java/kcc/kccadr/cmm/RestResponse.java @@ -66,12 +66,12 @@ public class RestResponse { this.status = status; } - public String getMessage() { + public String getData() { return data; } - public void setMessage(String message) { - this.data = message; + public void setData(String data) { + this.data = data; } public LocalDateTime getTimestamp() { diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml index 3ca076bf..ce0f0b4d 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjst/AdjstReq_SQL_Mysql.xml @@ -859,7 +859,8 @@ AND EDT_SN = #edtSn# AND EDT_TY = #edtTy# - SELECT T1.EXMP_TIT AS exmpTit ,T1.ATCH_FILE_ID AS atchFileId @@ -871,8 +872,8 @@ INNER JOIN ADR_EXMP_DTL T2 ON T1.EXMP_CC_TY = T2.EXMP_CC_TY WHERE 1=1 - AND T1.EXMP_CC_TY = #ccTy# - AND T2.EXMP_CD = #exmpCd# + AND T1.EXMP_CC_TY = #exmpCcTy# + AND T2.EXMP_CD = #exmpCd# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp index 76a4f5f3..8a2653c6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp @@ -34,45 +34,93 @@ //$('#oldDe').text(moment('').format('YYYY-MM-DD')); //$('#newDe').text(moment('').add(1, 'months').format('YYYY-MM-DD')); + function fncClose() { + window.close(); + } + + /* + * 저작물 변경 event + */ + $('#exmpCcTy').on('change', function(){ + fn_selectCn(); + }); + + /* + * 등록버튼 click event + */ + $('#redBtn').on('click', function(){ + var exmpCd = $("#exmpCd").val(); + console.log(exmpCd.replace(/(^0+)/, "")); + var perId = '#reqCn'+exmpCd.replace(/(^0+)/, ""); + $(opener.document).find(perId).text($('#exmpCn').text()); + window.close(); + + }); + + /* + * 상세내용 select + */ + function fn_selectCn(){ + + $.ajax({ + type: "POST", + url: "/web/kccadr/adjst/popup/adjstReqOpenExamplePopCn.do", + data: JSON.stringify({exmpCd : $("#exmpCd").val() + ,exmpCcTy : $("#exmpCcTy").val() }), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (data) { + if(data.status == "OK"){ + console.log('data : ', data); + $('#exmpCn').text(data.data); + }else{ + return false; + } + }, + error: function (e) { alert("조회에 실패하였습니다."); console.log("ERROR : ", e); } + }); + } + + fn_selectCn(); }); - - function fncClose() { - window.close(); - } - +
    -

    - - - - - - - - - - -
    -

    - - - - - - 등록된 내용이 없습니다. - - -

    -
    +

    + + + + + + + + + + + + + + + +
    + + + +
    + 내용 + +
    - +
    diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp index 7a20dfef..4d9bb2c6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp @@ -38,13 +38,13 @@ - - - -
    -
    -

    조정신청 예문

    -
    -
    - -
    - * -
    -     - - - - - - - - - - -
    - - - - - - 등록된 내용이 없습니다. - - -
    -
    - -
    -
    -
    - - +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%pageContext.setAttribute("crlf", "\r\n"); %> + + + +조정신청 예문보기 + + + + + +
    + +
    +

    조정신청 예문

    +
    +
    + +
    + * +
    +     + + + + + + + + + + + + + + + +
    + + + +
    + 내용 + +
    +
    + + +
    +
    +
    + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 47d228f2..720a838d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -1059,12 +1059,12 @@ var AdjstReq = { , "adjstHostoryPop" ); }, - openExamplePop : function(expmCd){ + openExamplePop : function(exmpCd){ commonPopLayeropen( "/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do" , 1100 , 600 - , {ccTy : $("#ccTy").val(), expmCd : expmCd} + , {ccTy : $("#ccTy").val(), exmpCd : exmpCd} , "N" , "openExamplePop" ); From 5b21ac99dccb59b6cc73792eb78e374c83345ea7 Mon Sep 17 00:00:00 2001 From: subsub8729 Date: Thu, 15 Sep 2022 14:47:54 +0900 Subject: [PATCH 3/9] =?UTF-8?q?22/09/15=20=EC=8B=A0=EC=B2=AD=EC=B7=A8?= =?UTF-8?q?=EC=A7=80/=EC=9B=90=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=ED=95=98=EB=8B=A8=20=EB=AC=B8=EA=B5=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/kccadrPb/usr/css/content.css | 2 ++ src/main/webapp/kccadrPb/usr/guide.html | 2 +- src/main/webapp/kccadrPb/usr/sub02_1_04.html | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/kccadrPb/usr/css/content.css b/src/main/webapp/kccadrPb/usr/css/content.css index 2a3c180c..3ea15ed2 100644 --- a/src/main/webapp/kccadrPb/usr/css/content.css +++ b/src/main/webapp/kccadrPb/usr/css/content.css @@ -54,6 +54,8 @@ .c_ea5404{color: #ea5404;} .read-only,.disabled{background-color: #eee !important; color: #aaa !important; font-size: 16px;} + +.cf_text02{font-size: 16px; font-weight: 300; color: #e40000; text-align: right; margin: 10px 0 0 0;} /* //서브 공통 */ /* 로그인 */ diff --git a/src/main/webapp/kccadrPb/usr/guide.html b/src/main/webapp/kccadrPb/usr/guide.html index 63a32504..f5964101 100644 --- a/src/main/webapp/kccadrPb/usr/guide.html +++ b/src/main/webapp/kccadrPb/usr/guide.html @@ -44,10 +44,10 @@
  • XX 목록(완료 8.13)
  • XX 상세(작업중)
  • 메인 체험하기(9.15)
    • +
  • 신청취지/원인 (수정 9.15)
  • 조정신청 안내(완료)
  • 신청인 정보(완료) (수정 10.7, 이전신청 불러오기 팝업 추가)
  • 피신청인 정보(완료)
    • -
  • 신청취지/원인(완료)
  • 조정신청상세(완료 8.19, 수정요청 팝업 포함)
  • 나의 사건 관리 > 조정일정현황(완료 8.19)
  • 조정진행상세(완료 8.19)
    • diff --git a/src/main/webapp/kccadrPb/usr/sub02_1_04.html b/src/main/webapp/kccadrPb/usr/sub02_1_04.html index d844c39e..d76b7c8e 100644 --- a/src/main/webapp/kccadrPb/usr/sub02_1_04.html +++ b/src/main/webapp/kccadrPb/usr/sub02_1_04.html @@ -399,6 +399,7 @@ +

    제출하신 신청서는 조정조사관이 서류미비시 도움을 드리겠습니다.

    From acb2c16773d11be439ad38d0c1a292842cd96e43 Mon Sep 17 00:00:00 2001 From: LJH Date: Thu, 15 Sep 2022 15:23:48 +0900 Subject: [PATCH 4/9] =?UTF-8?q?rebel.xml=20=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/rebel.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml index 20c9d7e6..0e85c739 100644 --- a/src/main/resources/rebel.xml +++ b/src/main/resources/rebel.xml @@ -7,7 +7,7 @@ - + From 6d7e24db3a7afdfd597561151ceb0097e87dd29d Mon Sep 17 00:00:00 2001 From: subsub8729 Date: Thu, 15 Sep 2022 16:28:39 +0900 Subject: [PATCH 5/9] =?UTF-8?q?2022/09/15=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=B2=B4=ED=97=98=ED=95=98=EA=B8=B0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/kccadrPb/usr/css/main.css | 37 ++++----- src/main/webapp/kccadrPb/usr/guide2022.html | 82 +++++++++++++++++++ src/main/webapp/kccadrPb/usr/index2.html | 90 ++++++++++++--------- src/main/webapp/kccadrPb/usr/script/main.js | 10 +-- 4 files changed, 156 insertions(+), 63 deletions(-) create mode 100644 src/main/webapp/kccadrPb/usr/guide2022.html diff --git a/src/main/webapp/kccadrPb/usr/css/main.css b/src/main/webapp/kccadrPb/usr/css/main.css index 57710636..a6c7ed8e 100644 --- a/src/main/webapp/kccadrPb/usr/css/main.css +++ b/src/main/webapp/kccadrPb/usr/css/main.css @@ -37,16 +37,16 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro .baro_cont i{position: relative; width: 60px; height: 60px; display: block; background-repeat: no-repeat; background-position: center; background-size: contain; margin: 18px auto 20px auto; position: relative; transition: background-image 0.3s ease-in-out;} .baro_cont p{position: relative;} -.baro_cont a:nth-child(2) i{background-image: url(/kccadrPb/usr/image/main/icon_baro01.png);} -.baro_cont a:nth-child(2).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro01_hover.png);} -.baro_cont a:nth-child(3) i{background-image: url(/kccadrPb/usr/image/main/icon_baro02.png);} -.baro_cont a:nth-child(3).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro02_hover.png);} -.baro_cont a:nth-child(4) i{background-image: url(/kccadrPb/usr/image/main/icon_baro03.png);} -.baro_cont a:nth-child(4).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro03_hover.png);} -.baro_cont a:nth-child(5) i{background-image: url(/kccadrPb/usr/image/main/icon_baro04.png);} -.baro_cont a:nth-child(5).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro04_hover.png);} -.baro_cont a:nth-child(6) i{background-image: url(/kccadrPb/usr/image/main/icon_baro05.png);} -.baro_cont a:nth-child(6).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro05_hover.png);} +.baro_cont a:nth-child(1) i{background-image: url(/kccadrPb/usr/image/main/icon_baro01.png);} +.baro_cont a:nth-child(1).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro01_hover.png);} +.baro_cont a:nth-child(2) i{background-image: url(/kccadrPb/usr/image/main/icon_baro02.png);} +.baro_cont a:nth-child(2).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro02_hover.png);} +.baro_cont a:nth-child(3) i{background-image: url(/kccadrPb/usr/image/main/icon_baro03.png);} +.baro_cont a:nth-child(3).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro03_hover.png);} +.baro_cont a:nth-child(4) i{background-image: url(/kccadrPb/usr/image/main/icon_baro04.png);} +.baro_cont a:nth-child(4).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro04_hover.png);} +.baro_cont a:nth-child(5) i{background-image: url(/kccadrPb/usr/image/main/icon_baro05.png);} +.baro_cont a:nth-child(5).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro05_hover.png);} .baro_cont.experience_cont a i{width: 48px;} .baro_cont.experience_cont a:nth-child(2) i{background-image: url(/kccadrPb/usr/image/main/icon_baro06.png);} @@ -61,10 +61,11 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro .baro_cont.experience_cont a:nth-child(6).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro10_hover.png);} .mask{position: fixed; display: none; width: 100%; height: 100%; left: 0; top: 0; background-color: rgba(0,0,0,0.5); z-index: 25;} -.tooltip_type01{position: absolute; display: none; justify-content: space-between; align-items: center; width: 320%; top: -40px; left: calc(100% + 20px); background-color: #fff; padding: 30px 30px 30px 42px; box-sizing: border-box; z-index: 99; border-radius: 5px; line-height: 1.3; box-shadow: 4px 8px 8px rgba(0,0,0,0.2); color: #222; text-align: left;} -.baro_cont a:nth-child(4) .tooltip_type01{top: -140px; left: 0;} -.baro_cont a:nth-child(5) .tooltip_type01{left: calc(-320%);} -.baro_cont a:nth-child(6) .tooltip_type01{left: calc(-320%);} +.tooltip_box{position: absolute; display: none; background-color: transparent; top: -100px; left: -10px; width: 500%; height: calc(100% - 30px); z-index: 30;} +.tooltip_type01{display: inline-flex; justify-content: space-between; align-items: center; background-color: #fff; padding: 30px 30px 30px 42px; box-sizing: border-box; z-index: 99; border-radius: 5px; line-height: 1.3; box-shadow: 4px 8px 8px rgba(0,0,0,0.2); color: #222; text-align: left; margin-left: 60px;} +.baro_cont a:nth-child(4) .tooltip_box{left: -10px; width: 400%;} +.baro_cont a:nth-child(5) .tooltip_box{left: auto; right: -10px;} +.baro_cont a:nth-child(6) .tooltip_box{left: auto; right: -10px;} .tooltip_type01>*{display: inline-block; vertical-align: middle;} .tooltip_tit01{font-size: 22px;} .tooltip_tit02{font-size: 16px; margin-top: 10px;} @@ -195,7 +196,7 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro .baro_cont a::before{width: calc(100% + 10px); height: calc(100% + 10px);} .baro_cont i{width: 45px; height: 45px; margin: 15px auto;} - .tooltip_type01{position: fixed; max-width: 100%; width: calc(100% - 30px); left: 50% !important; top: 260px;transform: translateX(-50%);} + .tooltip_box{position: fixed; max-width: 100%; width: calc(100% - 30px); height: 326px; left: 50% !important; top: 260px;transform: translateX(-50%);} .baro_cont a:nth-child(4) .tooltip_type01{top: 260px;} /* //바로가기 */ @@ -259,13 +260,13 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro @media all and (max-width: 840px){ .tooltip_tit01{font-size: 18px; font-weight: 500;} .tooltip_tit02{font-size: 14px;} - .tooltip_type01 button{margin-top: 16px; margin-left: 0;} + .tooltip_box button{margin-top: 16px; margin-left: 0;} } @media all and (max-width: 700px){ .tooltip_type01 .text_area{width: 100%; display: block;text-align: center;} .tooltip_type01 button{float: none; display: block; text-align: center; margin: 20px auto 0;} - .tooltip_type01{top: 200px;} + .tooltip_box{top: 200px;} } @media all and (max-width: 640px){ @@ -291,7 +292,7 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro /* //팝업존 */ .mask{background-color: transparent; z-index: -1;} - .tooltip_type01{display: none !important;} + .tooltip_box{display: none !important;} } @media all and (max-width: 530px){ diff --git a/src/main/webapp/kccadrPb/usr/guide2022.html b/src/main/webapp/kccadrPb/usr/guide2022.html new file mode 100644 index 00000000..dd27c772 --- /dev/null +++ b/src/main/webapp/kccadrPb/usr/guide2022.html @@ -0,0 +1,82 @@ + + + + + + + + 가이드 + + + + + + +
    +
    + +

    메인

    +     +
    + +

    남은내역

    +
    +
      + +
    +
    +
    +
    +
    +
    * 완료시 요청자가 내용 삭제 +
    개발자 요청사항 +
      +
    • +

      + xx 요청드려요~(요청 8.13 여현준) +

      +
      • +
    +
    +
    퍼블리셔 요청사항 +
      +
    • +

      + xx 확인 및 XX 부탁드려요~(요청 8.13 정수빈) +

      +
      • +
    +
    +
    +
    + + + diff --git a/src/main/webapp/kccadrPb/usr/index2.html b/src/main/webapp/kccadrPb/usr/index2.html index f422f377..a8290196 100644 --- a/src/main/webapp/kccadrPb/usr/index2.html +++ b/src/main/webapp/kccadrPb/usr/index2.html @@ -260,71 +260,81 @@

    접수

    -
    -
    -

    - 조정사건을 신청하는 기능
    - 사건 유형별, 사건정보를 등록하여 조정신청을 진행 -

    -

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    -

    기일지정

    -
    -
    -

    - 조정사건을 신청하는 기능
    - 사건 유형별, 사건정보를 등록하여 조정신청을 진행 -

    -

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    -

    기일개최

    -
    -
    -

    - 조정사건을 신청하는 기능
    - 사건 유형별, 사건정보를 등록하여 조정신청을 진행 -

    -

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    -

    조정중

    -
    -
    -

    - 조정사건을 신청하는 기능
    - 사건 유형별, 사건정보를 등록하여 조정신청을 진행 -

    -

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    -

    종료

    -
    -
    -

    - 조정사건을 신청하는 기능
    - 사건 유형별, 사건정보를 등록하여 조정신청을 진행 -

    -

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    -
    diff --git a/src/main/webapp/kccadrPb/usr/script/main.js b/src/main/webapp/kccadrPb/usr/script/main.js index e061256b..f1c4a695 100644 --- a/src/main/webapp/kccadrPb/usr/script/main.js +++ b/src/main/webapp/kccadrPb/usr/script/main.js @@ -26,17 +26,17 @@ $(document).ready(function () { if($(this).siblings().is("on") == false){ $(this).addClass("on"); $(".mask").show(); - $(this).children(".tooltip_type01").show(); + $(this).children(".tooltip_box").show(); $(this).siblings().removeClass("on"); - $(this).next().siblings(".tooltip_type01").hide() + $(this).next().siblings(".tooltip_box").hide() }else{} }); - $(".tooltip_type01").mouseleave(function(){ - $(".tooltip_type01").hide(); + $(".tooltip_box, .baro_cont a").mouseleave(function(){ + $(".tooltip_box").hide(); $(".mask").hide(); $(".baro_cont a").removeClass("on"); - }); + }) }); function main_visual() { From f0c4533ced20424955eb7fbc2c9714bd4d40b0b3 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 16 Sep 2022 09:20:56 +0900 Subject: [PATCH 6/9] =?UTF-8?q?refactor:=EA=B3=BC=EA=B1=B0=EC=9D=B4?= =?UTF-8?q?=EB=A0=A5=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AdjReqMgrPastServiceImpl.java | 6 +- .../web/AdjReqMgrPastController.java | 41 +++++ .../java/kcc/kccadr/cmm/RestResponse.java | 22 ++- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 2 +- .../adjReqMgrPastBasicRegist.jsp | 10 +- .../adjReqMgrPast/adjReqMgrPastProgRegist.jsp | 166 ++++++++++++++++++ .../webapp/js/kccadr/adjReqMgrPast/value.js | 3 +- 7 files changed, 240 insertions(+), 10 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index f722a137..665639c5 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -206,11 +206,11 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjReqMgrPastVO.setStatCd(KccadrConstants.ADR_NOSUCC); - //신규 조정사건 생성해 주기 int adrCnt = 0 ; adrCnt = adjReqMgrPastDAO.insertAdrMgrMaster(adjReqMgrPastVO); - + + if(adrCnt == 0) { //조정사건 생성이 실패했다면 return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "저장에 실패하였습니다.", LocalDateTime.now())); @@ -401,7 +401,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements - return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "조정신청 정보 저장이 완료되었습니다.", LocalDateTime.now())); + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "조정신청 정보 저장이 완료되었습니다.", adrSeq, LocalDateTime.now())); } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 65fe69ff..dd8aef06 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -127,6 +127,47 @@ public class AdjReqMgrPastController { return "kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist"; } + + /** + * @methodName : adjReqMgrPastProgRegist + * @author : 이호영 + * @date : 2022.09.15 + * @description : 사건진행정보 목록 + * @param adjReqMgrPastVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastProgRegist.do") + public String adjReqMgrPastProgRegist(@ModelAttribute("searchVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { + + //로그인 권한정보 불러오기 +// LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; +// model.addAttribute("user", user); +// +// // 공통코드 조회 +// List codeResult = cmmUseService.selectCmmCodeDetail("CC001"); +// model.addAttribute("CC001", codeResult); +// +// int reqPerTotCnt = 0; +// +// if(StringUtils.isNotBlank(adjReqMgrPastVO.getAdrSeq())) { +// +// //오프라인 조정 신청 정보 불러오기. +// AdjReqMgrPastVO resultAdjReqMgrOffLine = adjReqMgrPastService.selectAdjReqMgrOffLineInfo(adjReqMgrPastVO); +// model.addAttribute("adrVO", resultAdjReqMgrOffLine); +// }else { +// //기본 값 셋팅 - 대리인 여부, 신청자 분류 +// adjReqMgrPastVO.setRpplTy("10"); +// adjReqMgrPastVO.setReqTy("01"); +// model.addAttribute("adrVO", adjReqMgrPastVO); +// } +// +// +// model.addAttribute("reqPerTotCnt", reqPerTotCnt); + + return "kccadr/adjReqMgrPast/adjReqMgrPastProgRegist"; + } /** * @methodName : insertAdjReqMgrOffAjax diff --git a/src/main/java/kcc/kccadr/cmm/RestResponse.java b/src/main/java/kcc/kccadr/cmm/RestResponse.java index 1a1055af..67535342 100644 --- a/src/main/java/kcc/kccadr/cmm/RestResponse.java +++ b/src/main/java/kcc/kccadr/cmm/RestResponse.java @@ -37,9 +37,11 @@ import org.springframework.http.HttpStatus; public class RestResponse { - private HttpStatus status; + private HttpStatus status; - private String data; + private String data; + + private String dataSub; private LocalDateTime timestamp; @@ -51,6 +53,13 @@ public class RestResponse { this.timestamp = timestamp; } + public RestResponse(HttpStatus status, String data, String dataSub, LocalDateTime timestamp) { + this.status = status; + this.data = data; + this.dataSub = dataSub; + this.timestamp = timestamp; + } + public RestResponse(HttpStatus status, List dataList, String data, LocalDateTime timestamp) { this.status = status; this.dataList = dataList; @@ -89,6 +98,15 @@ public class RestResponse { public void setDataList(List dataList) { this.dataList = dataList; } + + public String getDataSub() { + return dataSub; + } + + public void setDataSub(String dataSub) { + this.dataSub = dataSub; + } + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index fe3839da..36ba07cb 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -123,7 +123,7 @@ ,LAST_UPDUSR_ID ) VALUES ( #adrSeq# - ,"400000" + ,'400000' ,#adrNo# ,#reqOlCd# ,#reqCn1# diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp index 446365a0..c391b3ad 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -40,9 +40,9 @@ -
    - -
    +<%--
    --%> + +<%--
    --%>
    @@ -1392,6 +1392,10 @@
    + + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp new file mode 100644 index 00000000..27c9a5f0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp @@ -0,0 +1,166 @@ + +<%@ 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="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt_rt" %> +<% + /** + * @Class Name : AdjustDeptManagerList.jsp + * @Description : 조정부관리 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 김봉호 + * @since 2021.08.21 + * @version 1.0 + * @see + * + */ +%> + + + + +사건진행정보 + + + +<%-- --%> +<%-- " /> --%> +<%-- " /> --%> +<%-- " /> --%> + + + +
    +
    + + +
    +

    사건진행정보

    +
      +
      • +
    • +

      오프라인 조정관리

      +
      • +
    • +

      과거사건등록

      +
      • +
    • 사건진행정보
      • +
    +
    + + +
    + +
    +

    총 진행 회차 : ??건

    +
    + +
    +
    + + +
    + + + + + + + + + + + + + + + + + + + + +
    회차결과등록/삭제
    + 1 + + 1 + + +
    +
    + + +
    + +
    + + + +<%-- --%> + + +
    +
    +
    + + + +     + + + diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js index 0573fd24..7fc08f52 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js @@ -1080,7 +1080,8 @@ success: function (data) { console.log('data : ', data); if(data.status == 'OK'){ - alert(data.message); + alert(data.data); + dataSub } else if(data.status == 'Unauthorized') { From c088cac176ca90e155b276bba019d7d899daab93 Mon Sep 17 00:00:00 2001 From: subsub8729 Date: Thu, 15 Sep 2022 14:47:54 +0900 Subject: [PATCH 7/9] =?UTF-8?q?22/09/15=20=EC=8B=A0=EC=B2=AD=EC=B7=A8?= =?UTF-8?q?=EC=A7=80/=EC=9B=90=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=ED=95=98=EB=8B=A8=20=EB=AC=B8=EA=B5=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/kccadrPb/usr/css/content.css | 2 ++ src/main/webapp/kccadrPb/usr/guide.html | 2 +- src/main/webapp/kccadrPb/usr/sub02_1_04.html | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/kccadrPb/usr/css/content.css b/src/main/webapp/kccadrPb/usr/css/content.css index 2a3c180c..3ea15ed2 100644 --- a/src/main/webapp/kccadrPb/usr/css/content.css +++ b/src/main/webapp/kccadrPb/usr/css/content.css @@ -54,6 +54,8 @@ .c_ea5404{color: #ea5404;} .read-only,.disabled{background-color: #eee !important; color: #aaa !important; font-size: 16px;} + +.cf_text02{font-size: 16px; font-weight: 300; color: #e40000; text-align: right; margin: 10px 0 0 0;} /* //서브 공통 */ /* 로그인 */ diff --git a/src/main/webapp/kccadrPb/usr/guide.html b/src/main/webapp/kccadrPb/usr/guide.html index 63a32504..f5964101 100644 --- a/src/main/webapp/kccadrPb/usr/guide.html +++ b/src/main/webapp/kccadrPb/usr/guide.html @@ -44,10 +44,10 @@
  • XX 목록(완료 8.13)
  • XX 상세(작업중)
  • 메인 체험하기(9.15)
    • +
  • 신청취지/원인 (수정 9.15)
  • 조정신청 안내(완료)
  • 신청인 정보(완료) (수정 10.7, 이전신청 불러오기 팝업 추가)
  • 피신청인 정보(완료)
    • -
  • 신청취지/원인(완료)
  • 조정신청상세(완료 8.19, 수정요청 팝업 포함)
  • 나의 사건 관리 > 조정일정현황(완료 8.19)
  • 조정진행상세(완료 8.19)
    • diff --git a/src/main/webapp/kccadrPb/usr/sub02_1_04.html b/src/main/webapp/kccadrPb/usr/sub02_1_04.html index d844c39e..d76b7c8e 100644 --- a/src/main/webapp/kccadrPb/usr/sub02_1_04.html +++ b/src/main/webapp/kccadrPb/usr/sub02_1_04.html @@ -399,6 +399,7 @@ +

    제출하신 신청서는 조정조사관이 서류미비시 도움을 드리겠습니다.

    From 0a757541b3abf8dfe322842c25b421045823de84 Mon Sep 17 00:00:00 2001 From: LJH Date: Thu, 15 Sep 2022 15:23:48 +0900 Subject: [PATCH 8/9] =?UTF-8?q?rebel.xml=20=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/rebel.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml index 20c9d7e6..0e85c739 100644 --- a/src/main/resources/rebel.xml +++ b/src/main/resources/rebel.xml @@ -7,7 +7,7 @@ - + From e08f4f3fcfb0b3108b92b4a1f5f905e2b3fa3b62 Mon Sep 17 00:00:00 2001 From: subsub8729 Date: Thu, 15 Sep 2022 16:28:39 +0900 Subject: [PATCH 9/9] =?UTF-8?q?2022/09/15=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=B2=B4=ED=97=98=ED=95=98=EA=B8=B0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/kccadrPb/usr/css/main.css | 37 ++++----- src/main/webapp/kccadrPb/usr/guide2022.html | 82 +++++++++++++++++++ src/main/webapp/kccadrPb/usr/index2.html | 90 ++++++++++++--------- src/main/webapp/kccadrPb/usr/script/main.js | 10 +-- 4 files changed, 156 insertions(+), 63 deletions(-) create mode 100644 src/main/webapp/kccadrPb/usr/guide2022.html diff --git a/src/main/webapp/kccadrPb/usr/css/main.css b/src/main/webapp/kccadrPb/usr/css/main.css index 57710636..a6c7ed8e 100644 --- a/src/main/webapp/kccadrPb/usr/css/main.css +++ b/src/main/webapp/kccadrPb/usr/css/main.css @@ -37,16 +37,16 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro .baro_cont i{position: relative; width: 60px; height: 60px; display: block; background-repeat: no-repeat; background-position: center; background-size: contain; margin: 18px auto 20px auto; position: relative; transition: background-image 0.3s ease-in-out;} .baro_cont p{position: relative;} -.baro_cont a:nth-child(2) i{background-image: url(/kccadrPb/usr/image/main/icon_baro01.png);} -.baro_cont a:nth-child(2).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro01_hover.png);} -.baro_cont a:nth-child(3) i{background-image: url(/kccadrPb/usr/image/main/icon_baro02.png);} -.baro_cont a:nth-child(3).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro02_hover.png);} -.baro_cont a:nth-child(4) i{background-image: url(/kccadrPb/usr/image/main/icon_baro03.png);} -.baro_cont a:nth-child(4).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro03_hover.png);} -.baro_cont a:nth-child(5) i{background-image: url(/kccadrPb/usr/image/main/icon_baro04.png);} -.baro_cont a:nth-child(5).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro04_hover.png);} -.baro_cont a:nth-child(6) i{background-image: url(/kccadrPb/usr/image/main/icon_baro05.png);} -.baro_cont a:nth-child(6).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro05_hover.png);} +.baro_cont a:nth-child(1) i{background-image: url(/kccadrPb/usr/image/main/icon_baro01.png);} +.baro_cont a:nth-child(1).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro01_hover.png);} +.baro_cont a:nth-child(2) i{background-image: url(/kccadrPb/usr/image/main/icon_baro02.png);} +.baro_cont a:nth-child(2).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro02_hover.png);} +.baro_cont a:nth-child(3) i{background-image: url(/kccadrPb/usr/image/main/icon_baro03.png);} +.baro_cont a:nth-child(3).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro03_hover.png);} +.baro_cont a:nth-child(4) i{background-image: url(/kccadrPb/usr/image/main/icon_baro04.png);} +.baro_cont a:nth-child(4).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro04_hover.png);} +.baro_cont a:nth-child(5) i{background-image: url(/kccadrPb/usr/image/main/icon_baro05.png);} +.baro_cont a:nth-child(5).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro05_hover.png);} .baro_cont.experience_cont a i{width: 48px;} .baro_cont.experience_cont a:nth-child(2) i{background-image: url(/kccadrPb/usr/image/main/icon_baro06.png);} @@ -61,10 +61,11 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro .baro_cont.experience_cont a:nth-child(6).on i{background-image: url(/kccadrPb/usr/image/main/icon_baro10_hover.png);} .mask{position: fixed; display: none; width: 100%; height: 100%; left: 0; top: 0; background-color: rgba(0,0,0,0.5); z-index: 25;} -.tooltip_type01{position: absolute; display: none; justify-content: space-between; align-items: center; width: 320%; top: -40px; left: calc(100% + 20px); background-color: #fff; padding: 30px 30px 30px 42px; box-sizing: border-box; z-index: 99; border-radius: 5px; line-height: 1.3; box-shadow: 4px 8px 8px rgba(0,0,0,0.2); color: #222; text-align: left;} -.baro_cont a:nth-child(4) .tooltip_type01{top: -140px; left: 0;} -.baro_cont a:nth-child(5) .tooltip_type01{left: calc(-320%);} -.baro_cont a:nth-child(6) .tooltip_type01{left: calc(-320%);} +.tooltip_box{position: absolute; display: none; background-color: transparent; top: -100px; left: -10px; width: 500%; height: calc(100% - 30px); z-index: 30;} +.tooltip_type01{display: inline-flex; justify-content: space-between; align-items: center; background-color: #fff; padding: 30px 30px 30px 42px; box-sizing: border-box; z-index: 99; border-radius: 5px; line-height: 1.3; box-shadow: 4px 8px 8px rgba(0,0,0,0.2); color: #222; text-align: left; margin-left: 60px;} +.baro_cont a:nth-child(4) .tooltip_box{left: -10px; width: 400%;} +.baro_cont a:nth-child(5) .tooltip_box{left: auto; right: -10px;} +.baro_cont a:nth-child(6) .tooltip_box{left: auto; right: -10px;} .tooltip_type01>*{display: inline-block; vertical-align: middle;} .tooltip_tit01{font-size: 22px;} .tooltip_tit02{font-size: 16px; margin-top: 10px;} @@ -195,7 +196,7 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro .baro_cont a::before{width: calc(100% + 10px); height: calc(100% + 10px);} .baro_cont i{width: 45px; height: 45px; margin: 15px auto;} - .tooltip_type01{position: fixed; max-width: 100%; width: calc(100% - 30px); left: 50% !important; top: 260px;transform: translateX(-50%);} + .tooltip_box{position: fixed; max-width: 100%; width: calc(100% - 30px); height: 326px; left: 50% !important; top: 260px;transform: translateX(-50%);} .baro_cont a:nth-child(4) .tooltip_type01{top: 260px;} /* //바로가기 */ @@ -259,13 +260,13 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro @media all and (max-width: 840px){ .tooltip_tit01{font-size: 18px; font-weight: 500;} .tooltip_tit02{font-size: 14px;} - .tooltip_type01 button{margin-top: 16px; margin-left: 0;} + .tooltip_box button{margin-top: 16px; margin-left: 0;} } @media all and (max-width: 700px){ .tooltip_type01 .text_area{width: 100%; display: block;text-align: center;} .tooltip_type01 button{float: none; display: block; text-align: center; margin: 20px auto 0;} - .tooltip_type01{top: 200px;} + .tooltip_box{top: 200px;} } @media all and (max-width: 640px){ @@ -291,7 +292,7 @@ main{width: 100%; height: 100%; margin-top: 135px; padding-bottom: 90px; backgro /* //팝업존 */ .mask{background-color: transparent; z-index: -1;} - .tooltip_type01{display: none !important;} + .tooltip_box{display: none !important;} } @media all and (max-width: 530px){ diff --git a/src/main/webapp/kccadrPb/usr/guide2022.html b/src/main/webapp/kccadrPb/usr/guide2022.html new file mode 100644 index 00000000..dd27c772 --- /dev/null +++ b/src/main/webapp/kccadrPb/usr/guide2022.html @@ -0,0 +1,82 @@ + + + + + + + + 가이드 + + + + + + +
    +
    + +

    메인

    +     +
    + +

    남은내역

    +
    +
      + +
    +
    +
    +
    +
    +
    * 완료시 요청자가 내용 삭제 +
    개발자 요청사항 +
      +
    • +

      + xx 요청드려요~(요청 8.13 여현준) +

      +
      • +
    +
    +
    퍼블리셔 요청사항 +
      +
    • +

      + xx 확인 및 XX 부탁드려요~(요청 8.13 정수빈) +

      +
      • +
    +
    +
    +
    + + + diff --git a/src/main/webapp/kccadrPb/usr/index2.html b/src/main/webapp/kccadrPb/usr/index2.html index f422f377..a8290196 100644 --- a/src/main/webapp/kccadrPb/usr/index2.html +++ b/src/main/webapp/kccadrPb/usr/index2.html @@ -260,71 +260,81 @@

    접수

    -
    -
    -

    - 조정사건을 신청하는 기능
    - 사건 유형별, 사건정보를 등록하여 조정신청을 진행 -

    -

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    -

    기일지정

    -
    -
    -

    - 조정사건을 신청하는 기능
    - 사건 유형별, 사건정보를 등록하여 조정신청을 진행 -

    -

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    -

    기일개최

    -
    -
    -

    - 조정사건을 신청하는 기능
    - 사건 유형별, 사건정보를 등록하여 조정신청을 진행 -

    -

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    -

    조정중

    -
    -
    -

    - 조정사건을 신청하는 기능
    - 사건 유형별, 사건정보를 등록하여 조정신청을 진행 -

    -

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    -

    종료

    -
    -
    -

    - 조정사건을 신청하는 기능
    - 사건 유형별, 사건정보를 등록하여 조정신청을 진행 -

    -

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    +
    +

    + 조정사건을 신청하는 기능
    + 사건 유형별, 사건정보를 등록하여 조정신청을 진행 +

    +

    정보등록, 불러오기, 제출하기 기능 제공

    +
    +
    -
    diff --git a/src/main/webapp/kccadrPb/usr/script/main.js b/src/main/webapp/kccadrPb/usr/script/main.js index e061256b..f1c4a695 100644 --- a/src/main/webapp/kccadrPb/usr/script/main.js +++ b/src/main/webapp/kccadrPb/usr/script/main.js @@ -26,17 +26,17 @@ $(document).ready(function () { if($(this).siblings().is("on") == false){ $(this).addClass("on"); $(".mask").show(); - $(this).children(".tooltip_type01").show(); + $(this).children(".tooltip_box").show(); $(this).siblings().removeClass("on"); - $(this).next().siblings(".tooltip_type01").hide() + $(this).next().siblings(".tooltip_box").hide() }else{} }); - $(".tooltip_type01").mouseleave(function(){ - $(".tooltip_type01").hide(); + $(".tooltip_box, .baro_cont a").mouseleave(function(){ + $(".tooltip_box").hide(); $(".mask").hide(); $(".baro_cont a").removeClass("on"); - }); + }) }); function main_visual() {