
--- client/resources/scss/admin/content.scss
+++ client/resources/scss/admin/content.scss
... | ... | @@ -5,8 +5,8 @@ |
5 | 5 |
|
6 | 6 |
>.content-zone { |
7 | 7 |
height: calc(100% - 140px); |
8 |
- background-color: var(--tk-white); |
|
9 |
- box-shadow: 0 0 1rem rgba(0, 0, 0, 0.02); |
|
8 |
+ background-color: transparent; |
|
9 |
+ // box-shadow: 0 0 1rem rgba(0, 0, 0, 0.02); |
|
10 | 10 |
|
11 | 11 |
>.content { |
12 | 12 |
height: 100%; |
... | ... | @@ -76,6 +76,9 @@ |
76 | 76 |
padding: 2rem; |
77 | 77 |
display: grid; |
78 | 78 |
grid-template-columns: 1fr 1fr; |
79 |
+ background-color: var(--tk-white); |
|
80 |
+ border-radius: 0 0 2rem 2rem; |
|
81 |
+ height: calc(100% - 45px); |
|
79 | 82 |
// grid-template-rows: 1fr 1fr; |
80 | 83 |
|
81 | 84 |
>div { |
... | ... | @@ -177,13 +180,14 @@ |
177 | 180 |
.form-box { |
178 | 181 |
border: 1px solid var(--tk-gray-10); |
179 | 182 |
@include radius(30); |
183 |
+ box-shadow: 0 0 1rem rgba(0, 0, 0, 0.02); |
|
180 | 184 |
|
181 | 185 |
.form-box-title { |
182 | 186 |
padding: 1rem 3rem; |
183 | 187 |
background-color: #fbfbfb; |
184 | 188 |
@include flex-layout(flex, center, start); |
185 | 189 |
font-size: var(--tk-fz-title-sm); |
186 |
- border-radius: 3rem 3rem 0 0; |
|
190 |
+ border-radius: 2rem 2rem 0 0; |
|
187 | 191 |
|
188 | 192 |
>p { |
189 | 193 |
margin-right: 1rem; |
... | ... | @@ -216,7 +220,7 @@ |
216 | 220 |
.setting-box { |
217 | 221 |
@include flex-layout(flex, start, start); |
218 | 222 |
width: 100%; |
219 |
- height: calc(100% - 77.5px); |
|
223 |
+ // height: calc(100% - 77.5px); |
|
220 | 224 |
|
221 | 225 |
.node-zone { |
222 | 226 |
width: 325px; |
... | ... | @@ -224,6 +228,7 @@ |
224 | 228 |
margin-right: 5rem; |
225 | 229 |
background-color: #fbfbfb; |
226 | 230 |
border-radius: var(--tk-rd-12); |
231 |
+ box-shadow: 0 0 1rem rgba(0, 0, 0, 0.02); |
|
227 | 232 |
|
228 | 233 |
.tree { |
229 | 234 |
padding: 3rem; |
... | ... | @@ -239,14 +244,6 @@ |
239 | 244 |
width: calc(100% - 325px - 5rem); |
240 | 245 |
height: 100%; |
241 | 246 |
|
242 |
- // .form-content { |
|
243 |
- // // padding: 0; |
|
244 |
- |
|
245 |
- // >div { |
|
246 |
- // padding: 1rem; |
|
247 |
- // |
|
248 |
- // } |
|
249 |
- // } |
|
250 | 247 |
.btn-wrap { |
251 | 248 |
// justify-content: flex-end; |
252 | 249 |
padding: 1rem 0; |
... | ... | @@ -327,6 +324,7 @@ |
327 | 324 |
|
328 | 325 |
.tbl-wrap{ |
329 | 326 |
// height: 100%; |
327 |
+ box-shadow: 0 0 1rem rgba(0, 0, 0, 0.02); |
|
330 | 328 |
|
331 | 329 |
&.overflow-y{ |
332 | 330 |
overflow-y: auto; |
... | ... | @@ -378,4 +376,9 @@ |
378 | 376 |
.check-area { |
379 | 377 |
@include flex-layout(flex, center); |
380 | 378 |
gap: 3rem; |
381 |
-}(파일 끝에 줄바꿈 문자 없음) |
|
379 |
+} |
|
380 |
+ |
|
381 |
+.h_100{ |
|
382 |
+ height: 100%; |
|
383 |
+} |
|
384 |
+ |
--- client/resources/scss/common/component/_tables.scss
+++ client/resources/scss/common/component/_tables.scss
... | ... | @@ -31,6 +31,10 @@ |
31 | 31 |
color: var(--#{$prefix}gray-90); |
32 | 32 |
font-weight: map-get($fws, normal); |
33 | 33 |
text-align: left; |
34 |
+ |
|
35 |
+ & .data-none{ |
|
36 |
+ text-align: center; |
|
37 |
+ } |
|
34 | 38 |
} |
35 | 39 |
} |
36 | 40 |
&.cursor{ |
--- client/views/layout/AdminHeader.vue
+++ client/views/layout/AdminHeader.vue
... | ... | @@ -34,7 +34,7 @@ |
34 | 34 |
data() { |
35 | 35 |
return { |
36 | 36 |
mbrNm: store.state.mbrNm, |
37 |
- pgNm: store.state.menu.menuNm ? store.state.menu.menuNm : "홈", |
|
37 |
+ pgNm: store.state.menu && store.state.menu.menuNm ? store.state.menu.menuNm : "홈", |
|
38 | 38 |
} |
39 | 39 |
}, |
40 | 40 |
created() { |
... | ... | @@ -63,6 +63,9 @@ |
63 | 63 |
|
64 | 64 |
}, |
65 | 65 |
watch: { |
66 |
+ 'pgNm'(newValue,oldValue){ |
|
67 |
+ console.log(oldValue) |
|
68 |
+ }, |
|
66 | 69 |
'$store.state.menu'(newValue) { |
67 | 70 |
this.pgNm = newValue.menuNm |
68 | 71 |
}, |
... | ... | @@ -70,6 +73,10 @@ |
70 | 73 |
}, |
71 | 74 |
computed: { |
72 | 75 |
|
76 |
+ pgNm() { |
|
77 |
+ return store.state.menu && store.state.menu.menuNm ? store.state.menu.menuNm : "홈"; |
|
78 |
+ } |
|
79 |
+ |
|
73 | 80 |
}, |
74 | 81 |
mounted() { |
75 | 82 |
|
--- client/views/pages/adm/boardManagement/boardManagement/BoardManagementInsert.vue
+++ client/views/pages/adm/boardManagement/boardManagement/BoardManagementInsert.vue
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 |
<div class="content-zone sch-full"> |
3 | 3 |
<div class="content"> |
4 | 4 |
<div class="scroll"> |
5 |
- <div class="form-box"> |
|
5 |
+ <div class="form-box mb30"> |
|
6 | 6 |
<div class="form-box-title"> |
7 | 7 |
<p>기본 설정</p> |
8 | 8 |
</div> |
... | ... | @@ -49,7 +49,7 @@ |
49 | 49 |
</div> |
50 | 50 |
</div> |
51 | 51 |
</div> |
52 |
- <div class="form-box mb30"> |
|
52 |
+ <div class="form-box"> |
|
53 | 53 |
<div class="form-box-title"> |
54 | 54 |
<p>세부설정</p> |
55 | 55 |
</div> |
--- client/views/pages/adm/boardManagement/template/commonTemplate/CommonInsert.vue
+++ client/views/pages/adm/boardManagement/template/commonTemplate/CommonInsert.vue
... | ... | @@ -122,7 +122,7 @@ |
122 | 122 |
<tr v-if="bbsCn.ntcPstYn === 'Y'" class="border-top"> |
123 | 123 |
<th>공지글 게시기간</th> |
124 | 124 |
<td> |
125 |
- <div class="input-form"> |
|
125 |
+ <div class="input-group"> |
|
126 | 126 |
<div class="form-control sm cal"> |
127 | 127 |
<VueDatePicker |
128 | 128 |
InlineOptions |
... | ... | @@ -611,6 +611,13 @@ |
611 | 611 |
// return new UploadAdapter(loader); |
612 | 612 |
// } |
613 | 613 |
// } |
614 |
+ // 날짜포맷 |
|
615 |
+ formatDate(date) { |
|
616 |
+ const year = date.getFullYear(); |
|
617 |
+ const month = ('00' + (date.getMonth() + 1)).slice(-2); |
|
618 |
+ const day = ('00' + date.getDate()).slice(-2); |
|
619 |
+ return `${year}-${month}-${day}`; |
|
620 |
+ } |
|
614 | 621 |
}, |
615 | 622 |
watch: { |
616 | 623 |
"bbsCn.ntcPstYn": function (val) { |
--- client/views/pages/adm/departmentManagement/DepartmentManagement.vue
+++ client/views/pages/adm/departmentManagement/DepartmentManagement.vue
... | ... | @@ -1,7 +1,7 @@ |
1 | 1 |
<template> |
2 | 2 |
<div class="content-zone full-page"> |
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 |
<div> |
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?