
Merge branch 'master' of http://210.180.118.83/jhpark/cms_frontend
@939db6f7989e84581fd63d175e6c7d4551bf34db
--- client/resources/scss/admin/content.scss
+++ client/resources/scss/admin/content.scss
... | ... | @@ -5,7 +5,9 @@ |
5 | 5 |
|
6 | 6 |
>.content-zone { |
7 | 7 |
height: calc(100% - 140px); |
8 |
- background-color: transparent; |
|
8 |
+ // background-color: #ffffff; |
|
9 |
+ // padding: 3rem; |
|
10 |
+ // @include radius(20); |
|
9 | 11 |
// box-shadow: 0 0 1rem rgba(0, 0, 0, 0.02); |
10 | 12 |
|
11 | 13 |
>.content { |
... | ... | @@ -62,7 +64,20 @@ |
62 | 64 |
padding: 3rem 0; |
63 | 65 |
|
64 | 66 |
button { |
65 |
- margin-left: 1rem |
|
67 |
+ margin-left: 1rem; |
|
68 |
+ &.main{ |
|
69 |
+ background-color: var(--tk-main-50); |
|
70 |
+ border: 1px solid var(--tk-main-50); |
|
71 |
+ &:hover{ |
|
72 |
+ background-color: var(--tk-main-70); |
|
73 |
+ border: 1px solid var(--tk-main-70); |
|
74 |
+ } |
|
75 |
+ &[disabled] { |
|
76 |
+ background-color: var(--#{$prefix}gray-30); |
|
77 |
+ border-color: var(--#{$prefix}gray-30); |
|
78 |
+ color: var(--#{$prefix}gray-60); |
|
79 |
+ } |
|
80 |
+ } |
|
66 | 81 |
} |
67 | 82 |
|
68 | 83 |
&.list { |
... | ... | @@ -179,12 +194,12 @@ |
179 | 194 |
|
180 | 195 |
.form-box { |
181 | 196 |
border: 1px solid var(--tk-gray-10); |
182 |
- @include radius(30); |
|
197 |
+ @include radius(20); |
|
183 | 198 |
box-shadow: 0 0 1rem rgba(0, 0, 0, 0.02); |
184 | 199 |
|
185 | 200 |
.form-box-title { |
186 | 201 |
padding: 1rem 3rem; |
187 |
- background-color: #fbfbfb; |
|
202 |
+ background-color: #c8d0d8; |
|
188 | 203 |
@include flex-layout(flex, center, start); |
189 | 204 |
font-size: var(--tk-fz-title-sm); |
190 | 205 |
border-radius: 2rem 2rem 0 0; |
... | ... | @@ -225,8 +240,8 @@ |
225 | 240 |
.node-zone { |
226 | 241 |
width: 325px; |
227 | 242 |
height: 100%; |
228 |
- margin-right: 5rem; |
|
229 |
- background-color: #fbfbfb; |
|
243 |
+ margin-right: 3rem; |
|
244 |
+ background-color: #ffffff; |
|
230 | 245 |
border-radius: var(--tk-rd-12); |
231 | 246 |
box-shadow: 0 0 1rem rgba(0, 0, 0, 0.02); |
232 | 247 |
|
... | ... | @@ -241,7 +256,7 @@ |
241 | 256 |
} |
242 | 257 |
|
243 | 258 |
.setting-zone { |
244 |
- width: calc(100% - 325px - 5rem); |
|
259 |
+ width: calc(100% - 325px - 3rem); |
|
245 | 260 |
height: 100%; |
246 | 261 |
|
247 | 262 |
.btn-wrap { |
... | ... | @@ -326,12 +341,24 @@ |
326 | 341 |
|
327 | 342 |
.tbl-wrap{ |
328 | 343 |
// height: 100%; |
329 |
- box-shadow: 0 0 1rem rgba(0, 0, 0, 0.02); |
|
344 |
+ // box-shadow: 0 0 1rem rgba(0, 0, 0, 0.02); |
|
330 | 345 |
|
331 | 346 |
&.overflow-y{ |
332 | 347 |
overflow-y: auto; |
333 | 348 |
} |
334 | 349 |
|
350 |
+ .tbl.data thead{ |
|
351 |
+ th{ |
|
352 |
+ background-color: #c8d0d8; |
|
353 |
+ &:first-child{ |
|
354 |
+ border-radius: 1rem 0 0 0; |
|
355 |
+ } |
|
356 |
+ &:last-child{ |
|
357 |
+ border-radius: 0 1rem 0 0; |
|
358 |
+ } |
|
359 |
+ } |
|
360 |
+ } |
|
361 |
+ |
|
335 | 362 |
|
336 | 363 |
} |
337 | 364 |
.mixing thead th{ |
--- client/resources/scss/admin/layout.scss
+++ client/resources/scss/admin/layout.scss
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 |
background-color: #eaeff4; |
3 | 3 |
display: grid; |
4 | 4 |
grid-template-columns: clamp(240px, 10vw, 450px) minmax(1020px, 1fr); |
5 |
- grid-template-rows: auto minmax(851px, 1226px); |
|
5 |
+ grid-template-rows: 60px minmax(851px, 1226px); |
|
6 | 6 |
grid-template-areas: |
7 | 7 |
"sidebar header " |
8 | 8 |
"sidebar main "; |
... | ... | @@ -45,89 +45,95 @@ |
45 | 45 |
} |
46 | 46 |
|
47 | 47 |
.side-bar{ |
48 |
- // .sub-menu { |
|
49 | 48 |
grid-area: sidebar; |
50 | 49 |
height: 100%; |
51 | 50 |
background-color: #f7f9fb; |
52 | 51 |
border-right: 1px solid var(--tk-gray-30); |
53 |
- overflow-y: auto; |
|
54 | 52 |
|
55 | 53 |
.logo{ |
56 |
- padding: 1rem; |
|
54 |
+ padding: 1.35rem 1rem; |
|
57 | 55 |
font-size: var(--tk-fz-title-lg); |
58 | 56 |
font-weight: 700; |
59 | 57 |
text-align: center; |
58 |
+ border-bottom: 1px solid var(--tk-gray-30); |
|
60 | 59 |
} |
61 | 60 |
|
62 |
- |
|
63 |
- /* 메뉴 스타일 */ |
|
64 |
- .main-menu { |
|
65 |
- .menu-item { |
|
66 |
- position: relative; |
|
67 |
- cursor: pointer; |
|
68 |
- padding: 0 1rem; |
|
69 |
- |
|
70 |
- span{ |
|
71 |
- display: block; |
|
72 |
- padding: 1rem 0; |
|
73 |
- |
|
74 |
- &.main-active{ |
|
75 |
- color: #008943; |
|
76 |
- font-weight: 700; |
|
77 |
- } |
|
78 |
- } |
|
79 |
- |
|
80 |
- /* 서브메뉴 스타일 */ |
|
81 |
- .sub-menu { |
|
82 |
- padding: 1rem; |
|
83 |
- background: var(--tk-white); |
|
84 |
- border: 1px solid #ccc; |
|
85 |
- @include radius(10); |
|
86 |
- display: block; |
|
87 |
- width: 100%; |
|
88 |
- |
|
89 |
- >li{ |
|
90 |
- padding: 0 1rem; |
|
91 |
- cursor: pointer; |
|
92 |
- |
|
93 |
- |
|
94 |
- &.only-second-depth{ |
|
95 |
- &.sub-active{ |
|
96 |
- background-color: #008943; |
|
97 |
- color: var(--tk-white); |
|
98 |
- font-weight: 700; |
|
99 |
- @include radius(10); |
|
100 |
- } |
|
61 |
+ nav{ |
|
62 |
+ height: calc(100% - 60px); |
|
63 |
+ /* 메뉴 스타일 */ |
|
64 |
+ .main-menu { |
|
65 |
+ padding: 2rem 0; |
|
66 |
+ height: 100%; |
|
67 |
+ overflow-y: auto; |
|
68 |
+ .menu-item { |
|
69 |
+ position: relative; |
|
70 |
+ cursor: pointer; |
|
71 |
+ padding: 0 2rem; |
|
72 |
+ |
|
73 |
+ span{ |
|
74 |
+ display: block; |
|
75 |
+ padding: 1rem; |
|
76 |
+ |
|
77 |
+ &.main-active{ |
|
78 |
+ color: var(--tk-main-50); |
|
79 |
+ font-weight: 700; |
|
101 | 80 |
} |
102 |
- |
|
103 |
- &.has-third-depth{ |
|
81 |
+ } |
|
82 |
+ |
|
83 |
+ /* 서브메뉴 스타일 */ |
|
84 |
+ .sub-menu { |
|
85 |
+ padding: 1rem; |
|
86 |
+ background: var(--tk-white); |
|
87 |
+ border: 1px solid #ccc; |
|
88 |
+ @include radius(10); |
|
89 |
+ display: block; |
|
90 |
+ width: 100%; |
|
91 |
+ |
|
92 |
+ >li{ |
|
93 |
+ |
|
94 |
+ cursor: pointer; |
|
95 |
+ |
|
104 | 96 |
&.sub-active{ |
105 | 97 |
>span{ |
98 |
+ background-color: var(--tk-main-50); |
|
99 |
+ color: var(--tk-white); |
|
106 | 100 |
font-weight: 700; |
101 |
+ @include radius(10); |
|
107 | 102 |
} |
108 | 103 |
} |
109 |
- |
|
110 |
- .ss-active{ |
|
111 |
- background-color: #008943; |
|
112 |
- color: var(--tk-white); |
|
113 |
- font-weight: 700; |
|
114 |
- @include radius(10); |
|
104 |
+ |
|
105 |
+ |
|
106 |
+ &.has-third-depth{ |
|
107 |
+ &.sub-active { |
|
108 |
+ >span{ |
|
109 |
+ background-color: var(--tk-main-50); |
|
110 |
+ color: var(--tk-white); |
|
111 |
+ font-weight: 700; |
|
112 |
+ @include radius(10); |
|
113 |
+ // border-radius: 1rem 1rem 0 0; |
|
114 |
+ } |
|
115 |
+ } |
|
116 |
+ |
|
115 | 117 |
} |
116 |
- } |
|
117 |
- |
|
118 |
- .ssub-menu{ |
|
119 |
- padding: 1rem; |
|
120 |
- background-color: var(--tk-gray-10); |
|
121 |
- @include radius(10); |
|
122 |
- li{ |
|
123 |
- span{ |
|
124 |
- padding: 1rem; |
|
118 |
+ |
|
119 |
+ .ssub-menu{ |
|
120 |
+ padding: 1rem; |
|
121 |
+ background-color: var(--tk-gray-10); |
|
122 |
+ @include radius(10); |
|
123 |
+ li{ |
|
124 |
+ span{ |
|
125 |
+ padding: 1rem; |
|
126 |
+ } |
|
127 |
+ &.ss-active{ |
|
128 |
+ color: var(--tk-main-50); |
|
129 |
+ font-weight: 700; |
|
130 |
+ } |
|
125 | 131 |
} |
126 | 132 |
} |
127 | 133 |
} |
128 | 134 |
} |
135 |
+ |
|
129 | 136 |
} |
130 |
- |
|
131 | 137 |
} |
132 | 138 |
} |
133 | 139 |
} |
--- client/resources/scss/common/base/_colors.scss
+++ client/resources/scss/common/base/_colors.scss
... | ... | @@ -38,4 +38,13 @@ |
38 | 38 |
.bg-gray-#{$color} { |
39 | 39 |
background-color: $value; |
40 | 40 |
} |
41 |
+} |
|
42 |
+ |
|
43 |
+@each $color, $value in $main-colors { |
|
44 |
+ .text-gray-#{$color} { |
|
45 |
+ color: $value; |
|
46 |
+ } |
|
47 |
+ .bg-gray-#{$color} { |
|
48 |
+ background-color: $value; |
|
49 |
+ } |
|
41 | 50 |
}(파일 끝에 줄바꿈 문자 없음) |
--- client/resources/scss/common/base/_root.scss
+++ client/resources/scss/common/base/_root.scss
... | ... | @@ -17,6 +17,9 @@ |
17 | 17 |
@each $num, $value in $gray-colors { |
18 | 18 |
--#{$prefix}gray-#{$num}: #{$value}; |
19 | 19 |
} |
20 |
+ @each $num, $value in $main-colors { |
|
21 |
+ --#{$prefix}main-#{$num}: #{$value}; |
|
22 |
+ } |
|
20 | 23 |
|
21 | 24 |
|
22 | 25 |
//fonts |
--- client/resources/scss/common/base/_variables.scss
+++ client/resources/scss/common/base/_variables.scss
... | ... | @@ -115,6 +115,31 @@ |
115 | 115 |
"90": $gray-90, |
116 | 116 |
) !default; |
117 | 117 |
|
118 |
+//main colors |
|
119 |
+$main-5: #EAF6EC !default; |
|
120 |
+$main-10: #D8EEDD !default; |
|
121 |
+$main-20: #A9DAB4 !default; |
|
122 |
+$main-30: #7EC88E !default; |
|
123 |
+$main-40: #3FA654 !default; |
|
124 |
+$main-50: #228738 !default; |
|
125 |
+$main-60: #1E5C2C !default; |
|
126 |
+$main-70: #204A29 !default; |
|
127 |
+$main-80: #1F4727 !default; |
|
128 |
+$main-90: #122B18 !default; |
|
129 |
+ |
|
130 |
+$main-colors: ( |
|
131 |
+ "5": $main-5, |
|
132 |
+ "10": $main-10, |
|
133 |
+ "20": $main-20, |
|
134 |
+ "30": $main-30, |
|
135 |
+ "40": $main-40, |
|
136 |
+ "50": $main-50, |
|
137 |
+ "60": $main-60, |
|
138 |
+ "70": $main-70, |
|
139 |
+ "80": $main-80, |
|
140 |
+ "90": $main-90, |
|
141 |
+) !default; |
|
142 |
+ |
|
118 | 143 |
|
119 | 144 |
//prefix |
120 | 145 |
$prefix: tk- !default; |
--- client/views/component/Breadcrumb/Breadcrumb.vue
+++ client/views/component/Breadcrumb/Breadcrumb.vue
... | ... | @@ -1,6 +1,7 @@ |
1 | 1 |
<template> |
2 | 2 |
<div v-if="breadcrumbList.length > 0"> |
3 |
- <span v-for="(crumb, index) in breadcrumbList" :key="index"> |
|
3 |
+ <span><router-link :to="{path : '/adm/main.page'}">홈</router-link> > </span> |
|
4 |
+ <span v-for="(crumb, index) in breadcrumbList" :key="index"> |
|
4 | 5 |
{{ crumb.menuNm }} |
5 | 6 |
<span v-if="index < breadcrumbList.length - 1"> > </span> |
6 | 7 |
</span> |
--- client/views/component/userInfo/UserInfoInsert.vue
+++ client/views/component/userInfo/UserInfoInsert.vue
... | ... | @@ -281,7 +281,7 @@ |
281 | 281 |
<div class="btn-wrap"> |
282 | 282 |
<button |
283 | 283 |
:class="{ |
284 |
- 'btn sm primary': true, |
|
284 |
+ 'btn sm main': true, |
|
285 | 285 |
// 'blue-btn': pageRole == 'adm', |
286 | 286 |
// 'green-btn': pageRole == 'portal', |
287 | 287 |
}" |
--- client/views/component/userInfo/UserInfoView.vue
+++ client/views/component/userInfo/UserInfoView.vue
... | ... | @@ -236,7 +236,7 @@ |
236 | 236 |
<button |
237 | 237 |
v-if="pageAuth.mdfcnAuthrt == 'Y'" |
238 | 238 |
:class="{ |
239 |
- 'btn sm primary': true, |
|
239 |
+ 'btn sm main': true, |
|
240 | 240 |
}" |
241 | 241 |
@click="fnUpdate" |
242 | 242 |
> |
--- client/views/pages/adm/boardManagement/boardManagement/BoardManagementInsert.vue
+++ client/views/pages/adm/boardManagement/boardManagement/BoardManagementInsert.vue
... | ... | @@ -168,7 +168,7 @@ |
168 | 168 |
</div> |
169 | 169 |
</div> |
170 | 170 |
<div class="btn-wrap"> |
171 |
- <button class="btn sm primary" @click="fnInsert"> |
|
171 |
+ <button class="btn sm main" @click="fnInsert"> |
|
172 | 172 |
{{ bbsMng.bbsMngId == null ? "등록" : "수정" }} |
173 | 173 |
</button> |
174 | 174 |
<button class="btn sm tertiary" @click="fnCancel">취소</button> |
--- client/views/pages/adm/boardManagement/boardManagement/BoardManagementSelectList.vue
+++ client/views/pages/adm/boardManagement/boardManagement/BoardManagementSelectList.vue
... | ... | @@ -4,7 +4,7 @@ |
4 | 4 |
<option value="">전체</option> |
5 | 5 |
<option v-for="(item, idx) in codeList" :key="idx" :value="item.cd">{{ item.cdNm }}</option> |
6 | 6 |
</select> |
7 |
- <input type="text" class="form-control sm" v-model="search.searchText" @keyup.enter="findAll"> |
|
7 |
+ <input type="text" class="form-control sm" v-model="search.searchText" placeholder="검색어를 입력하세요" @keyup.enter="findAll"> |
|
8 | 8 |
|
9 | 9 |
<button class="btn sm ico-before ico-sch" @click="findAll">검색</button> |
10 | 10 |
</div> |
... | ... | @@ -53,7 +53,7 @@ |
53 | 53 |
:click="findAll" |
54 | 54 |
/> |
55 | 55 |
|
56 |
- <button class="btn sm primary" @click="fnAdd">등록</button> |
|
56 |
+ <button class="btn sm" @click="fnAdd">등록</button> |
|
57 | 57 |
|
58 | 58 |
</div> |
59 | 59 |
</template> |
--- client/views/pages/adm/boardManagement/boardManagement/BoardManagementSelectListOne.vue
+++ client/views/pages/adm/boardManagement/boardManagement/BoardManagementSelectListOne.vue
... | ... | @@ -276,7 +276,7 @@ |
276 | 276 |
</div> |
277 | 277 |
<div class="btn-wrap"> |
278 | 278 |
<button class="btn sm tertiary" @click="fnList">목록</button> |
279 |
- <button class="btn sm primary" @click="fnUpdate"> |
|
279 |
+ <button class="btn sm main" @click="fnUpdate"> |
|
280 | 280 |
수정 |
281 | 281 |
</button> |
282 | 282 |
<button class="btn sm red" @click="fnDelete">삭제</button> |
--- client/views/pages/adm/boardManagement/template/commonTemplate/CommonInsert.vue
+++ client/views/pages/adm/boardManagement/template/commonTemplate/CommonInsert.vue
... | ... | @@ -205,7 +205,7 @@ |
205 | 205 |
</div> |
206 | 206 |
</div> |
207 | 207 |
<div class="btn-wrap"> |
208 |
- <button class="btn sm primary" @click="fnInsert">{{ bbsCn.bbsId == null ? "등록" : "수정" }}</button> |
|
208 |
+ <button class="btn sm main" @click="fnInsert">{{ bbsCn.bbsId == null ? "등록" : "수정" }}</button> |
|
209 | 209 |
<button class="btn sm tertiary" @click="fnCancel">취소</button> |
210 | 210 |
</div> |
211 | 211 |
</template> |
--- client/views/pages/adm/boardManagement/template/commonTemplate/CommonSelectList.vue
+++ client/views/pages/adm/boardManagement/template/commonTemplate/CommonSelectList.vue
... | ... | @@ -91,7 +91,7 @@ |
91 | 91 |
<button class="btn sm ico-before ico-sch" @click="findAll"> |
92 | 92 |
검색 |
93 | 93 |
</button> |
94 |
- <button class="btn-ico md ico-refresh" @click="fnSearchReset"></button> |
|
94 |
+ <!-- <button class="btn-ico md ico-refresh" @click="fnSearchReset"></button> --> |
|
95 | 95 |
</div> |
96 | 96 |
<div class="content-zone"> |
97 | 97 |
<div class="content"> |
... | ... | @@ -119,7 +119,7 @@ |
119 | 119 |
:click="findAll" |
120 | 120 |
/> |
121 | 121 |
<template v-if="pageAuth.regAuthrt == 'Y'"> |
122 |
- <button class="btn sm primary" @click="fnAdd"> |
|
122 |
+ <button class="btn sm main" @click="fnAdd"> |
|
123 | 123 |
등록 |
124 | 124 |
</button> |
125 | 125 |
</template> |
--- client/views/pages/adm/boardManagement/template/commonTemplate/CommonSelectListOne.vue
+++ client/views/pages/adm/boardManagement/template/commonTemplate/CommonSelectListOne.vue
... | ... | @@ -272,7 +272,7 @@ |
272 | 272 |
목록 |
273 | 273 |
</button> |
274 | 274 |
<template v-if="pageAuth.mdfcnAuthrt == 'Y' || mbrId == bbsCn.rgtr"> |
275 |
- <button class="btn sm primary" @click="fnUpdate">수정</button> |
|
275 |
+ <button class="btn sm main" @click="fnUpdate">수정</button> |
|
276 | 276 |
</template> |
277 | 277 |
<template v-if="pageAuth.delAuthrt == 'Y' || mbrId == bbsCn.rgtr"> |
278 | 278 |
<button class="btn sm red" @click="fnDelete">삭제</button> |
--- client/views/pages/adm/boardManagement/template/galleryTemplate/GallerySelectList.vue
+++ client/views/pages/adm/boardManagement/template/galleryTemplate/GallerySelectList.vue
... | ... | @@ -106,7 +106,7 @@ |
106 | 106 |
<PaginationButton :className="'pagination'" v-model:currentPage="search.currentPage" |
107 | 107 |
:pagination='search' :click="findAll" /> |
108 | 108 |
<template v-if="pageAuth.regAuthrt == 'Y'" > |
109 |
- <button class="btn sm primary" @click="fnAdd">등록</button> |
|
109 |
+ <button class="btn sm main" @click="fnAdd">등록</button> |
|
110 | 110 |
</template> |
111 | 111 |
</div> |
112 | 112 |
</template> |
--- client/views/pages/adm/boardManagement/wordsManagement/WordsManagementSelectList.vue
+++ client/views/pages/adm/boardManagement/wordsManagement/WordsManagementSelectList.vue
... | ... | @@ -4,7 +4,7 @@ |
4 | 4 |
<option value="">전체</option> |
5 | 5 |
<option v-for="(item, idx) in codeList" :key="idx" :value="item.cd">{{ item.cdNm }}</option> |
6 | 6 |
</select> |
7 |
- <input type="text" class="form-control sm" placeholder="검색명을 입력하세요" |
|
7 |
+ <input type="text" class="form-control sm" placeholder="검색어를 입력하세요." |
|
8 | 8 |
v-model="search.searchText" @keyup.enter="fnFindAllWord" /> |
9 | 9 |
<button class="btn sm ico-before ico-sch" @click="fnFindAllWord">검색</button> |
10 | 10 |
</div> |
... | ... | @@ -29,7 +29,7 @@ |
29 | 29 |
<PaginationButton :className="'admin-pagination'" v-model:currentPage="search.currentPage" |
30 | 30 |
:pagination='search' :click="fnFindAllWord" /> |
31 | 31 |
<div> |
32 |
- <button class="btn sm primary" @click="fnAdd">추가</button> |
|
32 |
+ <button class="btn sm main" @click="fnAdd">추가</button> |
|
33 | 33 |
<button class="btn sm red" @click="fnDelete">선택삭제</button> |
34 | 34 |
</div> |
35 | 35 |
</div> |
... | ... | @@ -53,7 +53,7 @@ |
53 | 53 |
</ul> |
54 | 54 |
<template v-slot:footer> |
55 | 55 |
<button class="btn sm tertiary" @click="modalClose">취소</button> |
56 |
- <button class="btn sm primary" @click="fnSave">등록</button> |
|
56 |
+ <button class="btn sm main" @click="fnSave">등록</button> |
|
57 | 57 |
</template> |
58 | 58 |
</Modal> |
59 | 59 |
</template> |
--- client/views/pages/adm/departmentManagement/DepartmentManagement.vue
+++ client/views/pages/adm/departmentManagement/DepartmentManagement.vue
... | ... | @@ -34,7 +34,7 @@ |
34 | 34 |
</div> |
35 | 35 |
</div> |
36 | 36 |
<div class="setting-zone"> |
37 |
- <div> |
|
37 |
+ <div ref="topBox" class="mb30"> |
|
38 | 38 |
<div class="form-box"> |
39 | 39 |
<div class="form-box-title"> |
40 | 40 |
<p>부서 정보</p> |
... | ... | @@ -88,7 +88,7 @@ |
88 | 88 |
</div> |
89 | 89 |
<div class="btn-wrap"> |
90 | 90 |
<button |
91 |
- class="btn sm primary" |
|
91 |
+ class="btn sm main" |
|
92 | 92 |
:disabled="isFormDisabled" |
93 | 93 |
@click="fnSave" |
94 | 94 |
> |
... | ... | @@ -107,12 +107,12 @@ |
107 | 107 |
</div> |
108 | 108 |
</div> |
109 | 109 |
|
110 |
- <div> |
|
111 |
- <div class="form-box"> |
|
110 |
+ <div ref="bottomBox" :style="{ height: bottomBoxHeight }"> |
|
111 |
+ <div class="form-box" style="height: calc(100% - 60px);"> |
|
112 | 112 |
<div class="form-box-title"> |
113 | 113 |
<p>부서 사용자</p> |
114 | 114 |
</div> |
115 |
- <div class="form-content"> |
|
115 |
+ <div class="form-content" style="display: block;overflow-y: auto;"> |
|
116 | 116 |
<div class="tbl-wrap"> |
117 | 117 |
<ListTable |
118 | 118 |
:className="'data'" |
... | ... | @@ -139,7 +139,7 @@ |
139 | 139 |
</div> |
140 | 140 |
<div class="btn-wrap"> |
141 | 141 |
<button |
142 |
- class="btn sm primary" |
|
142 |
+ class="btn sm main" |
|
143 | 143 |
:disabled="isFormDisabled" |
144 | 144 |
@click="modalOpen" |
145 | 145 |
v-if="pageAuth.regAuthrt == 'Y'" |
... | ... | @@ -231,6 +231,7 @@ |
231 | 231 |
searchText: "", // 사용자 정보 검색 |
232 | 232 |
|
233 | 233 |
submitStts: true, |
234 |
+ topBoxHeight: 0, |
|
234 | 235 |
}; |
235 | 236 |
}, |
236 | 237 |
created() { |
... | ... | @@ -486,15 +487,33 @@ |
486 | 487 |
alert(error.res.data.message); |
487 | 488 |
} |
488 | 489 |
}, |
490 |
+ updateHeight() { |
|
491 |
+ if (this.$refs.topBox) { |
|
492 |
+ this.topBoxHeight = this.$refs.topBox.offsetHeight; |
|
493 |
+ } |
|
494 |
+ }, |
|
489 | 495 |
}, |
490 |
- watch: {}, |
|
496 |
+ watch: { |
|
497 |
+ topBoxHeight() { |
|
498 |
+ this.updateHeight(); // 높이 변경될 때 업데이트 |
|
499 |
+ }, |
|
500 |
+ }, |
|
491 | 501 |
computed: { |
492 | 502 |
isFormDisabled() { |
493 | 503 |
if (!this.viewDept) return true; |
494 | 504 |
return Object.keys(this.viewDept).length === 0; |
495 | 505 |
}, |
506 |
+ bottomBoxHeight() { |
|
507 |
+ return `calc(100% - ${this.topBoxHeight}px - 30px)`; |
|
508 |
+ }, |
|
496 | 509 |
}, |
497 |
- mounted() {}, |
|
510 |
+ mounted() { |
|
511 |
+ this.updateHeight(); |
|
512 |
+ window.addEventListener("resize", this.updateHeight); |
|
513 |
+ }, |
|
514 |
+ beforeUnmount() { |
|
515 |
+ window.removeEventListener("resize", this.updateHeight); |
|
516 |
+ }, |
|
498 | 517 |
}; |
499 | 518 |
</script> |
500 | 519 |
|
--- client/views/pages/adm/log/AdminLog.vue
+++ client/views/pages/adm/log/AdminLog.vue
... | ... | @@ -13,7 +13,7 @@ |
13 | 13 |
<select name="selectType" id="selectType" class="border-none gd-2" > |
14 | 14 |
<option value="">전체</option> |
15 | 15 |
</select> |
16 |
- <input type="text" class="full-input border-none gd-10 condition-input" > |
|
16 |
+ <input type="text" class="full-input border-none gd-10 condition-input" placeholder="검색어를 입력하세요." > |
|
17 | 17 |
</div> |
18 | 18 |
</div> |
19 | 19 |
<div class="gd-1"> |
--- client/views/pages/adm/log/LoginLog.vue
+++ client/views/pages/adm/log/LoginLog.vue
... | ... | @@ -41,7 +41,7 @@ |
41 | 41 |
class="form-control sm" |
42 | 42 |
v-model="search['searchText']" |
43 | 43 |
v-on:keyup.enter="fnViewList" |
44 |
- placeholder="검색명을 입력하세요" |
|
44 |
+ placeholder="검색어를 입력하세요." |
|
45 | 45 |
/> |
46 | 46 |
<button class="btn sm ico-before ico-sch" @click="fnViewList"> |
47 | 47 |
검색 |
--- client/views/pages/adm/log/PersonalDataLog.vue
+++ client/views/pages/adm/log/PersonalDataLog.vue
... | ... | @@ -41,7 +41,7 @@ |
41 | 41 |
class="form-control sm" |
42 | 42 |
v-model="search['searchText']" |
43 | 43 |
v-on:keyup.enter="fnViewList" |
44 |
- placeholder="검색명을 입력하세요" |
|
44 |
+ placeholder="검색어를 입력하세요." |
|
45 | 45 |
/> |
46 | 46 |
<button class="btn sm ico-before ico-sch" @click="fnViewList"> |
47 | 47 |
검색 |
--- client/views/pages/adm/member/adminManagement/AdminManagementSelectList.vue
+++ client/views/pages/adm/member/adminManagement/AdminManagementSelectList.vue
... | ... | @@ -10,6 +10,7 @@ |
10 | 10 |
class="form-control sm" |
11 | 11 |
v-model="search['searchText']" |
12 | 12 |
v-on:keyup.enter="fnViewList" |
13 |
+ placeholder="검색어를 입력하세요." |
|
13 | 14 |
/> |
14 | 15 |
|
15 | 16 |
<button class="btn sm ico-before ico-sch" @click="fnViewList"> |
... | ... | @@ -51,7 +52,7 @@ |
51 | 52 |
:click="fnViewList" |
52 | 53 |
/> |
53 | 54 |
<button |
54 |
- class="btn sm primary" |
|
55 |
+ class="btn sm main" |
|
55 | 56 |
@click="fnInsert" |
56 | 57 |
v-if="pageAuth.regAuthrt == 'Y'" |
57 | 58 |
> |
--- client/views/pages/adm/member/userManagement/UserManagementSelectList.vue
+++ client/views/pages/adm/member/userManagement/UserManagementSelectList.vue
... | ... | @@ -10,6 +10,7 @@ |
10 | 10 |
class="form-control sm" |
11 | 11 |
v-model="search['searchText']" |
12 | 12 |
v-on:keyup.enter="fnViewList" |
13 |
+ placeholder="검색어를 입력하세요." |
|
13 | 14 |
/> |
14 | 15 |
<button class="btn sm ico-before ico-sch" @click="fnViewList">검색</button> |
15 | 16 |
</div> |
... | ... | @@ -48,7 +49,7 @@ |
48 | 49 |
/> |
49 | 50 |
|
50 | 51 |
<button |
51 |
- class="btn sm primary" |
|
52 |
+ class="btn sm main" |
|
52 | 53 |
@click="fnInsert" |
53 | 54 |
v-if="pageAuth.regAuthrt == 'Y'" |
54 | 55 |
> |
... | ... | @@ -72,7 +73,7 @@ |
72 | 73 |
></textarea> |
73 | 74 |
</div> |
74 | 75 |
<template v-slot:footer> |
75 |
- <button class="btn sm primary" @click="fnModalInsert"> |
|
76 |
+ <button class="btn sm main" @click="fnModalInsert"> |
|
76 | 77 |
등록 |
77 | 78 |
</button> |
78 | 79 |
<button class="btn sm tertiary" @click="fnModalClose"> |
--- client/views/pages/adm/popup/PopupManagementInsert.vue
+++ client/views/pages/adm/popup/PopupManagementInsert.vue
... | ... | @@ -211,7 +211,7 @@ |
211 | 211 |
</div> |
212 | 212 |
</div> |
213 | 213 |
<div class="btn-wrap"> |
214 |
- <button class="btn sm primary" @click="fnUpsert"> |
|
214 |
+ <button class="btn sm main" @click="fnUpsert"> |
|
215 | 215 |
<span v-if="this.$route.query.pageId == null">저장</span> |
216 | 216 |
<span v-else>수정</span> |
217 | 217 |
</button> |
--- client/views/pages/adm/popup/PopupManagementSelectList.vue
+++ client/views/pages/adm/popup/PopupManagementSelectList.vue
... | ... | @@ -10,7 +10,7 @@ |
10 | 10 |
class="form-control sm" |
11 | 11 |
v-model="search['searchText']" |
12 | 12 |
v-on:keyup.enter="fnViewList" |
13 |
- placeholder="검색명을 입력하세요" |
|
13 |
+ placeholder="검색어를 입력하세요." |
|
14 | 14 |
/> |
15 | 15 |
<button class="btn sm ico-before ico-sch" @click="fnViewList"> |
16 | 16 |
검색 |
... | ... | @@ -40,7 +40,7 @@ |
40 | 40 |
:click="fnViewList" |
41 | 41 |
/> |
42 | 42 |
<button |
43 |
- class="btn sm primary" |
|
43 |
+ class="btn sm main" |
|
44 | 44 |
@click="fnInsert" |
45 | 45 |
v-if="pageAuth.regAuthrt == 'Y'" |
46 | 46 |
> |
--- client/views/pages/adm/popup/PopupManagementSelectListOne.vue
+++ client/views/pages/adm/popup/PopupManagementSelectListOne.vue
... | ... | @@ -236,7 +236,7 @@ |
236 | 236 |
<div class="btn-wrap"> |
237 | 237 |
<button class="btn sm tertiary" @click="fnList">목록</button> |
238 | 238 |
<button |
239 |
- class="btn sm primary" |
|
239 |
+ class="btn sm main" |
|
240 | 240 |
@click="fnUpdate" |
241 | 241 |
v-if="pageAuth.mdfcnAuthrt == 'Y'" |
242 | 242 |
> |
--- client/views/pages/adm/preferences/commonCodeManagement/CommonCodeManagement.vue
+++ client/views/pages/adm/preferences/commonCodeManagement/CommonCodeManagement.vue
... | ... | @@ -1,7 +1,7 @@ |
1 | 1 |
<template> |
2 | 2 |
<div class="content-zone sch-full"> |
3 | 3 |
<div class="content"> |
4 |
- <div class="setting-box"> |
|
4 |
+ <div class="setting-box h_100"> |
|
5 | 5 |
<div class="node-zone"> |
6 | 6 |
<div class="tree"> |
7 | 7 |
<draggable tag="ul" class="tree-node" :list="codeList" :group="{ name: 'menu' }" item-key="id" |
... | ... | @@ -79,7 +79,7 @@ |
79 | 79 |
</div> |
80 | 80 |
</div> |
81 | 81 |
<div class="btn-wrap"> |
82 |
- <button class="btn sm primary" :disabled="isFormDisabled" @click="fnSave" |
|
82 |
+ <button class="btn sm main" :disabled="isFormDisabled" @click="fnSave" |
|
83 | 83 |
v-if="pageAuth.regAuthrt == 'Y'"> |
84 | 84 |
<span v-if="submitStts">등록</span> |
85 | 85 |
<span v-else>수정</span> |
--- client/views/pages/adm/preferences/contentTypeManagement/ContentTypeManagementInsert.vue
+++ client/views/pages/adm/preferences/contentTypeManagement/ContentTypeManagementInsert.vue
... | ... | @@ -95,7 +95,7 @@ |
95 | 95 |
</div> |
96 | 96 |
</div> |
97 | 97 |
<div class="btn-wrap"> |
98 |
- <button class="btn sm primary" @click="fnUpsert"> |
|
98 |
+ <button class="btn sm main" @click="fnUpsert"> |
|
99 | 99 |
{{ pageId == null ? "등록" : "수정" }} |
100 | 100 |
</button> |
101 | 101 |
<button class="btn sm tertiary" @click="fnList">취소</button> |
--- client/views/pages/adm/preferences/contentTypeManagement/ContentTypeManagementSelectList.vue
+++ client/views/pages/adm/preferences/contentTypeManagement/ContentTypeManagementSelectList.vue
... | ... | @@ -35,7 +35,7 @@ |
35 | 35 |
:click="fnViewList" |
36 | 36 |
/> |
37 | 37 |
<button |
38 |
- class="btn primary sm" |
|
38 |
+ class="btn main sm" |
|
39 | 39 |
@click="fnInsert" |
40 | 40 |
v-if="pageAuth.regAuthrt == 'Y'" |
41 | 41 |
> |
--- client/views/pages/adm/preferences/contentTypeManagement/ContentTypeManagementSelectListOne.vue
+++ client/views/pages/adm/preferences/contentTypeManagement/ContentTypeManagementSelectListOne.vue
... | ... | @@ -93,7 +93,7 @@ |
93 | 93 |
<div class="btn-wrap"> |
94 | 94 |
<button class="btn sm tertiary" @click="fnList">목록</button> |
95 | 95 |
<button |
96 |
- class="btn sm primary" |
|
96 |
+ class="btn sm main" |
|
97 | 97 |
@click="fnUpdate" |
98 | 98 |
v-if="pageAuth.mdfcnAuthrt == 'Y'" |
99 | 99 |
> |
--- client/views/pages/adm/statistics/BbsStatistics.vue
+++ client/views/pages/adm/statistics/BbsStatistics.vue
... | ... | @@ -35,7 +35,7 @@ |
35 | 35 |
v-model="searchDate.endDt" |
36 | 36 |
@change="validateDate($event, 'endDt')" |
37 | 37 |
/> --> |
38 |
- <button class="btn sm primary" @click="axiosSelectList"> |
|
38 |
+ <button class="btn sm main" @click="axiosSelectList"> |
|
39 | 39 |
조회 |
40 | 40 |
</button> |
41 | 41 |
<button |
--- client/views/pages/adm/statistics/MenuStatistics.vue
+++ client/views/pages/adm/statistics/MenuStatistics.vue
... | ... | @@ -35,7 +35,7 @@ |
35 | 35 |
v-model="searchDate.endDt" |
36 | 36 |
@change="validateDate($event, 'endDt')" |
37 | 37 |
/> --> |
38 |
- <button class="btn sm primary" @click="axiosSelectList"> |
|
38 |
+ <button class="btn sm main" @click="axiosSelectList"> |
|
39 | 39 |
조회 |
40 | 40 |
</button> |
41 | 41 |
<button |
--- client/views/pages/adm/statistics/UserStatistics.vue
+++ client/views/pages/adm/statistics/UserStatistics.vue
... | ... | @@ -37,7 +37,7 @@ |
37 | 37 |
/> --> |
38 | 38 |
|
39 | 39 |
|
40 |
- <button class="btn sm primary" @click="axiosSelectList"> |
|
40 |
+ <button class="btn sm main" @click="axiosSelectList"> |
|
41 | 41 |
조회 |
42 | 42 |
</button> |
43 | 43 |
|
--- client/views/pages/adm/system/LoginPolicy/LoginPolicy.vue
+++ client/views/pages/adm/system/LoginPolicy/LoginPolicy.vue
... | ... | @@ -41,9 +41,9 @@ |
41 | 41 |
<label for="loginModeS">SESSION 방식</label> |
42 | 42 |
</div> |
43 | 43 |
</div> |
44 |
- <span class="ml10 gray"> |
|
44 |
+ <!-- <span class="ml10 gray"> |
|
45 | 45 |
현재 로그인 방식은 <strong>{{ loginModeLabel }}</strong> 입니다. |
46 |
- </span> |
|
46 |
+ </span> --> |
|
47 | 47 |
</div> |
48 | 48 |
</div> |
49 | 49 |
<div> |
... | ... | @@ -53,7 +53,7 @@ |
53 | 53 |
<div class="form-check"> |
54 | 54 |
<input type="text" id="cntxtPth" class="form-control sm" v-model="cntxtPth" ref="cntxtPth" /> |
55 | 55 |
</div> |
56 |
- <button class="btn sm primary" @click="fnSave">저장</button> |
|
56 |
+ <button class="btn sm main" @click="fnSave">저장</button> |
|
57 | 57 |
</div> |
58 | 58 |
<span class="ml10 gray"> |
59 | 59 |
<strong>/경로</strong> 형식으로 입력해주세요. |
... | ... | @@ -68,7 +68,7 @@ |
68 | 68 |
</template> |
69 | 69 |
|
70 | 70 |
<script> |
71 |
-import { findAllByLoginPolicy, saveByLoginPolicy, findAllByLoginMode, saveByLoginMode } from '../../../../../resources/api/loginPolicy'; |
|
71 |
+import { findAllByLoginPolicy, saveByLoginPolicy, findAllByLoginMode, saveByLoginMode } from '../../../../../resources/api/loginPolicy.js'; |
|
72 | 72 |
import { getCntxtPth, saveCntxtPth } from '../../../../../resources/api/cntxtPth'; |
73 | 73 |
import { cacheReSet } from "../../../../../resources/api/cacheReSet"; |
74 | 74 |
import store from "../../../../../views/pages/AppStore"; |
... | ... | @@ -91,9 +91,9 @@ |
91 | 91 |
mounted() { |
92 | 92 |
}, |
93 | 93 |
computed: { |
94 |
- loginModeLabel() { |
|
95 |
- return this.lgnMode === 'J' ? 'JWT' : 'SESSION'; |
|
96 |
- } |
|
94 |
+ // loginModeLabel() { |
|
95 |
+ // return this.lgnMode === 'J' ? 'JWT' : 'SESSION'; |
|
96 |
+ // } |
|
97 | 97 |
}, |
98 | 98 |
methods: { |
99 | 99 |
async findAll() { |
--- client/views/pages/adm/system/contextPath/ContextPathSelectList.vue
+++ client/views/pages/adm/system/contextPath/ContextPathSelectList.vue
... | ... | @@ -44,7 +44,7 @@ |
44 | 44 |
:click="findAll" |
45 | 45 |
/> |
46 | 46 |
<button |
47 |
- class="btn sm primary" |
|
47 |
+ class="btn sm main" |
|
48 | 48 |
@click="fnAdd" |
49 | 49 |
v-if="pageAuth.regAuthrt == 'Y'" |
50 | 50 |
> |
--- client/views/pages/adm/system/networkAccessControl/NetworkAccessControlInsert.vue
+++ client/views/pages/adm/system/networkAccessControl/NetworkAccessControlInsert.vue
... | ... | @@ -34,7 +34,7 @@ |
34 | 34 |
</div> |
35 | 35 |
</div> |
36 | 36 |
<div class="btn-wrap"> |
37 |
- <button class="btn sm primary" @click="fnInsert">{{ accesCtrl.acsCntrlId == 0 ? '등록' : |
|
37 |
+ <button class="btn sm main" @click="fnInsert">{{ accesCtrl.acsCntrlId == 0 ? '등록' : |
|
38 | 38 |
'수정'}}</button> |
39 | 39 |
<button class="btn sm tertiary" @click="fnCancel">취소</button> |
40 | 40 |
</div> |
--- client/views/pages/adm/system/networkAccessControl/NetworkAccessControlSelectList.vue
+++ client/views/pages/adm/system/networkAccessControl/NetworkAccessControlSelectList.vue
... | ... | @@ -50,7 +50,7 @@ |
50 | 50 |
:click="findAll" |
51 | 51 |
/> |
52 | 52 |
<button |
53 |
- class="btn sm primary" |
|
53 |
+ class="btn sm main" |
|
54 | 54 |
@click="fnAdd" |
55 | 55 |
v-if="pageAuth.regAuthrt == 'Y'" |
56 | 56 |
> |
--- client/views/pages/adm/system/networkAccessControl/NetworkAccessControlSelectListOne.vue
+++ client/views/pages/adm/system/networkAccessControl/NetworkAccessControlSelectListOne.vue
... | ... | @@ -28,7 +28,7 @@ |
28 | 28 |
<div class="btn-wrap"> |
29 | 29 |
<button class="btn tertiary sm" @click="fnList">목록</button> |
30 | 30 |
<button |
31 |
- class="btn primary sm" |
|
31 |
+ class="btn main sm" |
|
32 | 32 |
@click="fnUpdate" |
33 | 33 |
v-if="pageAuth.mdfcnAuthrt == 'Y'" |
34 | 34 |
> |
--- client/views/pages/login/Login.vue
+++ client/views/pages/login/Login.vue
... | ... | @@ -41,7 +41,7 @@ |
41 | 41 |
/> |
42 | 42 |
</div> |
43 | 43 |
<button |
44 |
- class="btn md primary user-btn" |
|
44 |
+ class="btn md main user-btn" |
|
45 | 45 |
v-if="!isAdminPage" |
46 | 46 |
@click="fnLogin" |
47 | 47 |
@keydown.enter="fnLogin" |
... | ... | @@ -49,7 +49,7 @@ |
49 | 49 |
로그인 |
50 | 50 |
</button> |
51 | 51 |
<button |
52 |
- class="btn md primary" |
|
52 |
+ class="btn md main" |
|
53 | 53 |
v-else |
54 | 54 |
@click="fnLogin" |
55 | 55 |
@keydown.enter="fnLogin" |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?