

Merge branches 'front-end' and 'front-end' of http://210.180.118.83/yjryu/KERIS into front-end
@efa7a6e2d4e98d707c6f0a9b3b0fff42ffc51534
--- client/views/pages/user/Data/Data.vue
+++ client/views/pages/user/Data/Data.vue
... | ... | @@ -98,6 +98,7 @@ |
98 | 98 |
import axios from 'axios'; |
99 | 99 |
import COMMON_UTIL from '../../../../resources/js/commonUtil.js'; |
100 | 100 |
import PaginationButton from '../../../component/pagination/PaginationButton.vue'; |
101 |
+import { useRoute } from 'vue-router'; |
|
101 | 102 |
|
102 | 103 |
export default { |
103 | 104 |
data() { |
... | ... | @@ -115,7 +116,7 @@ |
115 | 116 |
postListCount: 0, |
116 | 117 |
postIdx: 0, |
117 | 118 |
categoryName: '전체', |
118 |
- |
|
119 |
+ route: useRoute(), |
|
119 | 120 |
|
120 | 121 |
// 자료실 버튼 |
121 | 122 |
buttons: Array(3).fill(), |
... | ... | @@ -224,6 +225,13 @@ |
224 | 225 |
components: { |
225 | 226 |
PaginationButton: PaginationButton, |
226 | 227 |
}, |
228 |
+ created() { |
|
229 |
+ if(this.route.query.type != undefined) { |
|
230 |
+ this.buttons[2].clicked = true; |
|
231 |
+ this.categoryName = '가이드라인' |
|
232 |
+ this.postListSearch.ctgry_nm = 'guide' |
|
233 |
+ } |
|
234 |
+ }, |
|
227 | 235 |
mounted() { |
228 | 236 |
console.log('Data mounted'); |
229 | 237 |
this.postSelectList(); |
--- client/views/pages/user/Data/Technology.vue
+++ client/views/pages/user/Data/Technology.vue
... | ... | @@ -49,11 +49,11 @@ |
49 | 49 |
<p class="date"> </p> |
50 | 50 |
</div> |
51 | 51 |
<div> |
52 |
- <button class="blue-btn">바로가기</button> |
|
52 |
+ <button class="blue-btn" @click="showAlert">바로가기</button> |
|
53 | 53 |
<!-- <button class="blue-btn" @click="goToPage3">바로가기</button> --> |
54 | 54 |
</div> |
55 | 55 |
</div> |
56 |
- <div class="overlay-text">준비 중 입니다.</div> |
|
56 |
+ <!-- <div class="overlay-text">준비 중 입니다.</div> --> |
|
57 | 57 |
</li> |
58 | 58 |
<li class="tech-box-sec "> |
59 | 59 |
<div class="tech-box-fillter"> |
... | ... | @@ -73,11 +73,11 @@ |
73 | 73 |
<p class="date"> </p> |
74 | 74 |
</div> |
75 | 75 |
<div> |
76 |
- <button class="blue-btn">바로가기</button> |
|
76 |
+ <button class="blue-btn" @click="showAlert">바로가기</button> |
|
77 | 77 |
<!-- <button class="blue-btn" @click="goToPage3">바로가기</button> --> |
78 | 78 |
</div> |
79 | 79 |
</div> |
80 |
- <div class="overlay-text">준비 중 입니다.</div> |
|
80 |
+ <!-- <div class="overlay-text">준비 중 입니다.</div> --> |
|
81 | 81 |
</li> |
82 | 82 |
<li class="tech-box-sec "> |
83 | 83 |
<div class="tech-box-fillter"> |
... | ... | @@ -97,11 +97,11 @@ |
97 | 97 |
<p class="date"> </p> |
98 | 98 |
</div> |
99 | 99 |
<div> |
100 |
- <button class="blue-btn">바로가기</button> |
|
100 |
+ <button class="blue-btn" @click="showAlert">바로가기</button> |
|
101 | 101 |
<!-- <button class="blue-btn" @click="goToPage3">바로가기</button> --> |
102 | 102 |
</div> |
103 | 103 |
</div> |
104 |
- <div class="overlay-text">준비 중 입니다.</div> |
|
104 |
+ <!-- <div class="overlay-text">준비 중 입니다.</div> --> |
|
105 | 105 |
</li> |
106 | 106 |
<li class="tech-box-sec "> |
107 | 107 |
<div class="tech-box-fillter"> |
... | ... | @@ -121,11 +121,11 @@ |
121 | 121 |
<p class="date"> </p> |
122 | 122 |
</div> |
123 | 123 |
<div> |
124 |
- <button class="blue-btn">바로가기</button> |
|
124 |
+ <button class="blue-btn" @click="showAlert">바로가기</button> |
|
125 | 125 |
<!-- <button class="blue-btn" @click="goToPage3">바로가기</button> --> |
126 | 126 |
</div> |
127 | 127 |
</div> |
128 |
- <div class="overlay-text">준비 중 입니다.</div> |
|
128 |
+ <!-- <div class="overlay-text">준비 중 입니다.</div> --> |
|
129 | 129 |
</li> |
130 | 130 |
<li class="tech-box-sec "> |
131 | 131 |
<div class="tech-box-fillter"> |
... | ... | @@ -145,11 +145,11 @@ |
145 | 145 |
<p class="date"> </p> |
146 | 146 |
</div> |
147 | 147 |
<div> |
148 |
- <button class="blue-btn">바로가기</button> |
|
148 |
+ <button class="blue-btn" @click="showAlert">바로가기</button> |
|
149 | 149 |
<!-- <button class="blue-btn" @click="goToPage3">바로가기</button> --> |
150 | 150 |
</div> |
151 | 151 |
</div> |
152 |
- <div class="overlay-text">준비 중입니다.</div> |
|
152 |
+ <!-- <div class="overlay-text">준비 중입니다.</div> --> |
|
153 | 153 |
</li> |
154 | 154 |
<li class="tech-box-sec "> |
155 | 155 |
<div class="tech-box-fillter"> |
... | ... | @@ -169,11 +169,11 @@ |
169 | 169 |
<p class="date"> </p> |
170 | 170 |
</div> |
171 | 171 |
<div> |
172 |
- <button class="blue-btn">바로가기</button> |
|
172 |
+ <button class="blue-btn" @click="showAlert">바로가기</button> |
|
173 | 173 |
<!-- <button class="blue-btn" @click="goToPage3">바로가기</button> --> |
174 | 174 |
</div> |
175 | 175 |
</div> |
176 |
- <div class="overlay-text">준비 중입니다.</div> |
|
176 |
+ <!-- <div class="overlay-text">준비 중입니다.</div> --> |
|
177 | 177 |
</li> |
178 | 178 |
<li class="tech-box-sec "> |
179 | 179 |
<div class="tech-box-fillter"> |
... | ... | @@ -193,11 +193,11 @@ |
193 | 193 |
<p class="date"> </p> |
194 | 194 |
</div> |
195 | 195 |
<div> |
196 |
- <button class="blue-btn">바로가기</button> |
|
196 |
+ <button class="blue-btn" @click="showAlert">바로가기</button> |
|
197 | 197 |
<!-- <button class="blue-btn" @click="goToPage3">바로가기</button> --> |
198 | 198 |
</div> |
199 | 199 |
</div> |
200 |
- <div class="overlay-text">준비 중 입니다.</div> |
|
200 |
+ <!-- <div class="overlay-text">준비 중 입니다.</div> --> |
|
201 | 201 |
</li> |
202 | 202 |
<li class="tech-box-sec "> |
203 | 203 |
<div class="tech-box-fillter"> |
... | ... | @@ -217,11 +217,11 @@ |
217 | 217 |
<p class="date"> </p> |
218 | 218 |
</div> |
219 | 219 |
<div> |
220 |
- <button class="blue-btn">바로가기</button> |
|
220 |
+ <button class="blue-btn" @click="showAlert">바로가기</button> |
|
221 | 221 |
<!-- <button class="blue-btn" @click="goToPage3">바로가기</button> --> |
222 | 222 |
</div> |
223 | 223 |
</div> |
224 |
- <div class="overlay-text">준비 중입니다.</div> |
|
224 |
+ <!-- <div class="overlay-text">준비 중입니다.</div> --> |
|
225 | 225 |
</li> |
226 | 226 |
</ul> |
227 | 227 |
<div class="bottom-wrap"> |
... | ... | @@ -301,6 +301,9 @@ |
301 | 301 |
return COMMON_UTIL.yyyymmdd(date); |
302 | 302 |
}, |
303 | 303 |
|
304 |
+ showAlert: function() { |
|
305 |
+ alert('준비중입니다.') |
|
306 |
+ }, |
|
304 | 307 |
}, |
305 | 308 |
watch: { |
306 | 309 |
|
--- client/views/pages/user/main/Main.vue
+++ client/views/pages/user/main/Main.vue
... | ... | @@ -88,33 +88,36 @@ |
88 | 88 |
<div class="main-wrap-grid-3 "> |
89 | 89 |
<div class="main-position"> |
90 | 90 |
<a href="/Guide.page"> |
91 |
- <img src="../../../../resources/jpg/main-box.png" alt=""> |
|
92 |
- <button class="main-grid-box">가이드라인</button> |
|
93 |
- </a> |
|
94 |
- </div> |
|
95 |
- </div> |
|
96 |
- <div class="main-wrap-grid-4 "> |
|
97 |
- <div class="main-position"> |
|
98 |
- <a href="/Data.page"> |
|
99 |
- <img src="../../../../resources/jpg/main-pu4.png" alt=""> |
|
100 |
- <button class="main-grid-box">자료집</button> |
|
101 |
- </a> |
|
102 |
- </div> |
|
103 |
- </div> |
|
104 |
- <div class="main-wrap-grid-5 "> |
|
105 |
- <div class="main-position"> |
|
106 |
- <a href="/Technology.page"> |
|
107 |
- <img src="../../../../resources/jpg/main-pu3.png" alt=""> |
|
108 |
- <button class="main-grid-box">기술문서</button> |
|
109 |
- </a> |
|
91 |
+ <div class="main-wrap-grid-3"> |
|
92 |
+ <div> |
|
93 |
+ <a href="/Data.page?type=main"> |
|
94 |
+ <img src="../../../../resources/jpg/main-box.png" alt=""> |
|
95 |
+ <button class="main-grid-box">가이드라인</button> |
|
96 |
+ </a> |
|
97 |
+ </div> |
|
98 |
+ </div> |
|
99 |
+ <div class="main-wrap-grid-4 "> |
|
100 |
+ <div class="main-position"> |
|
101 |
+ <a href="/Data.page"> |
|
102 |
+ <img src="../../../../resources/jpg/main-pu4.png" alt=""> |
|
103 |
+ <button class="main-grid-box">자료집</button> |
|
104 |
+ </a> |
|
105 |
+ </div> |
|
106 |
+ </div> |
|
107 |
+ <div class="main-wrap-grid-5 "> |
|
108 |
+ <div class="main-position"> |
|
109 |
+ <a href="/Technology.page"> |
|
110 |
+ <img src="../../../../resources/jpg/main-pu3.png" alt=""> |
|
111 |
+ <button class="main-grid-box">기술문서</button> |
|
112 |
+ </a> |
|
113 |
+ </div> |
|
114 |
+ </div> |
|
110 | 115 |
</div> |
111 | 116 |
</div> |
112 | 117 |
</div> |
118 |
+ |
|
113 | 119 |
</div> |
114 | 120 |
</div> |
115 |
- |
|
116 |
- </div> |
|
117 |
- </div> |
|
118 | 121 |
</section> |
119 | 122 |
<section class="main-sec sec1"> |
120 | 123 |
|
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?