
--- client/resources/css/Main.css
+++ client/resources/css/Main.css
... | ... | @@ -676,7 +676,7 @@ |
676 | 676 |
font-weight: 700; |
677 | 677 |
color: rgb(6, 6, 6); |
678 | 678 |
} |
679 |
- |
|
679 |
+eObjectURL |
|
680 | 680 |
.matchingbox-text span { |
681 | 681 |
font-weight: 400; |
682 | 682 |
} |
... | ... | @@ -793,9 +793,9 @@ |
793 | 793 |
border-bottom: 1px solid rgb(199, 199, 199); |
794 | 794 |
} |
795 | 795 |
|
796 |
-.mat-sec2 div { |
|
796 |
+/* .mat-sec2 div { |
|
797 | 797 |
padding: 2rem 0; |
798 |
-} |
|
798 |
+} */ |
|
799 | 799 |
|
800 | 800 |
.mat-sec2-end { |
801 | 801 |
display: grid; |
... | ... | @@ -2349,9 +2349,9 @@ |
2349 | 2349 |
grid-template-columns: 1fr !important; |
2350 | 2350 |
} |
2351 | 2351 |
|
2352 |
-.info-sec-summary div { |
|
2352 |
+/* .info-sec-summary div { |
|
2353 | 2353 |
grid-template-columns: 1fr; |
2354 |
-} |
|
2354 |
+} */ |
|
2355 | 2355 |
|
2356 | 2356 |
.info-sec-summary textarea { |
2357 | 2357 |
height: 200px; |
--- client/resources/css/common.css
+++ client/resources/css/common.css
... | ... | @@ -151,10 +151,6 @@ |
151 | 151 |
/* padding: 10px; */ |
152 | 152 |
} |
153 | 153 |
|
154 |
-.viewer { |
|
155 |
- min-height: 388px; |
|
156 |
-} |
|
157 |
- |
|
158 | 154 |
.article-list { |
159 | 155 |
padding: 30px 0; |
160 | 156 |
} |
... | ... | @@ -417,6 +413,7 @@ |
417 | 413 |
width: 100%; |
418 | 414 |
} |
419 | 415 |
.viewer{ |
416 |
+ padding: 1.5rem 0; |
|
420 | 417 |
text-align: left; |
421 | 418 |
} |
422 | 419 |
.viewer iframe { |
--- client/resources/css/reset.css
+++ client/resources/css/reset.css
... | ... | @@ -54,6 +54,7 @@ |
54 | 54 |
a { |
55 | 55 |
color: #333; |
56 | 56 |
text-decoration: none; |
57 |
+ cursor: pointer; |
|
57 | 58 |
} |
58 | 59 |
|
59 | 60 |
button { |
--- client/views/pages/App.vue
+++ client/views/pages/App.vue
... | ... | @@ -242,7 +242,7 @@ |
242 | 242 |
this.isModalOpen = true; |
243 | 243 |
next(false); |
244 | 244 |
} |
245 |
- next(); |
|
245 |
+ next('/'); |
|
246 | 246 |
} |
247 | 247 |
}); |
248 | 248 |
} |
--- client/views/pages/admin/networking/NetworkingSelectOne.vue
+++ client/views/pages/admin/networking/NetworkingSelectOne.vue
... | ... | @@ -16,17 +16,17 @@ |
16 | 16 |
<tbody> |
17 | 17 |
<tr> |
18 | 18 |
<td class="title-zone" colspan="2"> |
19 |
- <p class="post-title">타이틀 <span v-if="best === 'best'">(BEST 기업)</span></p> |
|
19 |
+ <p class="post-title">{{ company.company_nm }}</p> |
|
20 | 20 |
<div class="flex"> |
21 | 21 |
<p class="write-info"> |
22 | 22 |
<span><i class="fa fa-heart fa-lg" style="color: #d41515;"></i></span> |
23 |
- <span>100</span> |
|
23 |
+ <span>{{ company.company_pick_cnt }}</span> |
|
24 | 24 |
</p> |
25 | 25 |
<p class="flex-end write-info"> |
26 |
- <span class="writer">작성자</span> |
|
27 |
- <span>ㅏ아아아앙</span> |
|
26 |
+ <!-- <span class="writer">{{ company }}</span> |
|
27 |
+ <span>ㅏ아아아앙</span> --> |
|
28 | 28 |
<span class="view">조회수</span> |
29 |
- <span>후후후후후</span> |
|
29 |
+ <span>{{ company.view_cnt }}</span> |
|
30 | 30 |
</p> |
31 | 31 |
</div> |
32 | 32 |
|
... | ... | @@ -34,32 +34,28 @@ |
34 | 34 |
</tr> |
35 | 35 |
<tr> |
36 | 36 |
<td colspan="2"> |
37 |
- <div id="viewer" ref="viewer" class="viewer"></div> |
|
37 |
+ <div id="viewer1" ref="viewer1" class="viewer"></div> |
|
38 |
+ <div id="viewer2" ref="viewer2" class="viewer"></div> |
|
39 |
+ <div id="viewer3" ref="viewer3" class="viewer"></div> |
|
38 | 40 |
</td> |
39 | 41 |
</tr> |
40 | 42 |
<tr> |
41 | 43 |
<th style="width: 10%;">회사소개서</th> |
42 | 44 |
<td> |
43 |
- <!-- <div v-if="fileList.length == 0"> |
|
44 |
- <label>첨부된 파일이 없습니다.</label> |
|
45 |
- </div> --> |
|
46 |
- <!-- <ul v-else v-for="(item, idx) in fileList" :key="idx"> |
|
47 |
- <li @click="downloadFile(item)">{{ item.real_file_nm |
|
48 |
- }}</li> |
|
49 |
- </ul> --> |
|
45 |
+ <p @click="downloadFile(company)">{{ company.real_file_nm }}</p> |
|
50 | 46 |
</td> |
51 | 47 |
</tr> |
52 | 48 |
</tbody> |
53 | 49 |
</table> |
54 |
- <div class="article-list"> |
|
50 |
+ <!-- <div class="article-list"> |
|
55 | 51 |
<ul> |
56 | 52 |
<li><span class="next">다음글</span><span></span></li> |
57 | 53 |
<li><span class="prev">이전글</span><span></span></li> |
58 | 54 |
</ul> |
59 |
- </div> |
|
55 |
+ </div> --> |
|
60 | 56 |
<div class="btn-wrap"> |
57 |
+ <button class="dark-gray-btn" @click="postSelectListPage">목록</button> |
|
61 | 58 |
<!-- <button class="red-btn" @click="postDelete()">삭제</button> |
62 |
- <button class="dark-gray-btn" @click="postSelectListPage()">목록</button> |
|
63 | 59 |
<button class="blue-btn" @click="postUpdatePage()">수정</button> --> |
64 | 60 |
</div> |
65 | 61 |
</div> |
... | ... | @@ -67,22 +63,135 @@ |
67 | 63 |
</div> |
68 | 64 |
</template> |
69 | 65 |
<script> |
66 |
+import { useRoute } from 'vue-router'; |
|
67 |
+import axios from 'axios'; |
|
68 |
+import Viewer from '@toast-ui/editor/dist/toastui-editor-viewer'; |
|
69 |
+import '@toast-ui/editor/dist/toastui-editor.css'; |
|
70 |
+import '@toast-ui/editor/dist/i18n/ko-kr'; |
|
71 |
+import * as FileSaver from 'file-saver'; |
|
70 | 72 |
|
71 | 73 |
|
72 | 74 |
export default { |
73 | 75 |
|
74 | 76 |
data() { |
75 |
- return {}; |
|
77 |
+ return { |
|
78 |
+ company: { |
|
79 |
+ company_id: null, |
|
80 |
+ company_nm: null, |
|
81 |
+ company_info: null, |
|
82 |
+ company_point: null, |
|
83 |
+ file_id: null, |
|
84 |
+ user_id: null, |
|
85 |
+ keyword: null, |
|
86 |
+ company_pick_cnt: null, |
|
87 |
+ company_technology: null, |
|
88 |
+ company_service: null, |
|
89 |
+ view_cnt: null, |
|
90 |
+ file_path: null, |
|
91 |
+ file_nm: null, |
|
92 |
+ file_extn_nm: null, |
|
93 |
+ real_file_nm: null, |
|
94 |
+ pick_yn: null, |
|
95 |
+ }, |
|
96 |
+ best: null, |
|
97 |
+ userCompanyId: null, |
|
98 |
+ route: useRoute(), |
|
99 |
+ }; |
|
76 | 100 |
}, |
77 | 101 |
methods: { |
78 |
- selectList: function () { |
|
79 |
- this.$router.push({ path: '/adm/newsSelectList.page' }); |
|
102 |
+ companySelectOne: function () { |
|
103 |
+ const vm = this; |
|
104 |
+ |
|
105 |
+ vm.best = vm.route.query.best; |
|
106 |
+ |
|
107 |
+ axios({ |
|
108 |
+ url: '/matching/companySelectOne.json', |
|
109 |
+ method: 'post', |
|
110 |
+ hearder: { |
|
111 |
+ 'Content-Type': "application/json; charset=UTF-8", |
|
112 |
+ }, |
|
113 |
+ data: { 'company_id': vm.route.query.company_id } |
|
114 |
+ }).then(function (response) { |
|
115 |
+ vm.company = response.data; |
|
116 |
+ vm.userCompanyId = response.data.userCompanyId; |
|
117 |
+ }).catch(function (error) { |
|
118 |
+ console.log("error - ", error) |
|
119 |
+ alert("기업 상세보기 조회 오류, 관리자에게 문의하세요."); |
|
120 |
+ }) |
|
121 |
+ }, |
|
122 |
+ |
|
123 |
+ getViewer(data, viewerId) { |
|
124 |
+ this.viewer = new Viewer({ |
|
125 |
+ el: this.$refs[viewerId], |
|
126 |
+ initialEditType: 'wysiwyg', |
|
127 |
+ previewStyle: 'vertical', |
|
128 |
+ initialValue: data, |
|
129 |
+ customHTMLRenderer: { |
|
130 |
+ htmlBlock: { |
|
131 |
+ iframe(node) { |
|
132 |
+ return [ |
|
133 |
+ { type: 'openTag', tagName: 'iframe', outerNewLine: true, attributes: node.attrs }, |
|
134 |
+ { type: 'html', content: node.childrenHTML }, |
|
135 |
+ { type: 'closeTag', tagName: 'iframe', outerNewLine: true }, |
|
136 |
+ ]; |
|
137 |
+ }, |
|
138 |
+ } |
|
139 |
+ }, |
|
140 |
+ }); |
|
141 |
+ }, |
|
142 |
+ downloadFile: function (item) { |
|
143 |
+ const vm = this; |
|
144 |
+ let path = item.file_path + '/' + item.file_nm + '.' + item.file_extn_nm; |
|
145 |
+ console.log(path); |
|
146 |
+ axios({ |
|
147 |
+ url: '/file/downloadFile.json', |
|
148 |
+ method: 'post', |
|
149 |
+ headers: { |
|
150 |
+ "Content-Type": "application/x-www-form-urlencoded", |
|
151 |
+ }, |
|
152 |
+ responseType: 'blob', |
|
153 |
+ data: `file_path=${encodeURIComponent(path)}` |
|
154 |
+ }).then((response) => { |
|
155 |
+ const blob = new Blob([response.data]); |
|
156 |
+ |
|
157 |
+ const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent); |
|
158 |
+ |
|
159 |
+ if (isSafari) { |
|
160 |
+ FileSaver.saveAs(blob, item.real_file_nm); |
|
161 |
+ } else { |
|
162 |
+ const url = window.URL.createObjectURL(blob); |
|
163 |
+ const a = document.createElement('a'); |
|
164 |
+ a.style.display = 'none'; |
|
165 |
+ a.href = url; |
|
166 |
+ a.download = item.real_file_nm; |
|
167 |
+ document.body.appendChild(a); |
|
168 |
+ a.click(); |
|
169 |
+ window.URL.revokeObjectURL(url); |
|
170 |
+ } |
|
171 |
+ |
|
172 |
+ this.$router.go(0); |
|
173 |
+ |
|
174 |
+ }).catch(function (error) { |
|
175 |
+ console.log('error - ', error) |
|
176 |
+ alert('에러발생'); |
|
177 |
+ }); |
|
178 |
+ }, |
|
179 |
+ postSelectListPage: function () { |
|
180 |
+ this.$router.push({ path: '/adm/networkingSelectList.page' }); |
|
181 |
+ }, |
|
182 |
+ }, |
|
183 |
+ watch: { |
|
184 |
+ 'company': function (nuwValue) { |
|
185 |
+ console.log(nuwValue); |
|
186 |
+ this.getViewer(nuwValue.company_info, 'viewer1'); |
|
187 |
+ this.getViewer(nuwValue.company_service, 'viewer2'); |
|
188 |
+ this.getViewer(nuwValue.company_technology, 'viewer3'); |
|
80 | 189 |
} |
81 | 190 |
}, |
82 |
- watch: {}, |
|
83 | 191 |
computed: {}, |
84 | 192 |
components: {}, |
85 | 193 |
mounted() { |
194 |
+ this.companySelectOne(); |
|
86 | 195 |
} |
87 | 196 |
}; |
88 | 197 |
</script> |
--- client/views/pages/user/mypage/Info.vue
+++ client/views/pages/user/mypage/Info.vue
... | ... | @@ -111,10 +111,11 @@ |
111 | 111 |
</div> |
112 | 112 |
<div> |
113 | 113 |
<p class="info-th">첨부파일</p> |
114 |
- <a style="font-size: 15px;" class="down-btn-1" |
|
114 |
+ <a @click="downloadFile(proFile)">{{ proFile.real_file_nm }}</a> |
|
115 |
+ <!-- <a style="font-size: 15px;" class="down-btn-1" |
|
115 | 116 |
:href="'http://localhost:8080' + proFile.file_path + '/' + proFile.file_nm + '.' + proFile.file_extn_nm" target='_blank' download> |
116 | 117 |
{{ proFile.real_file_nm }} |
117 |
- </a> |
|
118 |
+ </a> --> |
|
118 | 119 |
</div> |
119 | 120 |
<div class=""> |
120 | 121 |
<p class="info-th info-keword-far">명함</p> |
--- client/views/pages/user/networking/MatchingOne.vue
+++ client/views/pages/user/networking/MatchingOne.vue
... | ... | @@ -43,24 +43,9 @@ |
43 | 43 |
<section class="mat-sec2"> |
44 | 44 |
<div class="info-sec-summary"> |
45 | 45 |
<sapn class="info-th"></sapn> |
46 |
- <details> |
|
47 |
- <summary @click="getViewer(0)">기업소개</summary> |
|
48 |
- <div> |
|
49 |
- <span id="viewer1" ref="viewer1" class="viewer"></span> |
|
50 |
- </div> |
|
51 |
- </details> |
|
52 |
- <details> |
|
53 |
- <summary @click="getViewer(1)">대표 기술 소개</summary> |
|
54 |
- <div> |
|
55 |
- <span id="viewer2" ref="viewer2" class="viewer"></span> |
|
56 |
- </div> |
|
57 |
- </details> |
|
58 |
- <details> |
|
59 |
- <summary @click="getViewer(2)">서비스 소개</summary> |
|
60 |
- <div> |
|
61 |
- <span id="viewer3" ref="viewer3" class="viewer"></span> |
|
62 |
- </div> |
|
63 |
- </details> |
|
46 |
+ <div id="viewer1" ref="viewer1" class="viewer"></div> |
|
47 |
+ <div id="viewer2" ref="viewer2" class="viewer"></div> |
|
48 |
+ <div id="viewer3" ref="viewer3" class="viewer"></div> |
|
64 | 49 |
</div> |
65 | 50 |
<div class="mat-sec2-end"> |
66 | 51 |
<p> |
... | ... | @@ -173,11 +158,9 @@ |
173 | 158 |
}) |
174 | 159 |
}, |
175 | 160 |
|
176 |
- getViewer(idx) { |
|
177 |
- const vm = this; |
|
178 |
- let data = [vm.company.company_info, vm.company.company_technology, vm.company.company_service][idx]; |
|
161 |
+ getViewer(data, viewerId) { |
|
179 | 162 |
this.viewer = new Viewer({ |
180 |
- el: this.$refs[`viewer${idx + 1}`], |
|
163 |
+ el: this.$refs[viewerId], |
|
181 | 164 |
initialEditType: 'wysiwyg', |
182 | 165 |
previewStyle: 'vertical', |
183 | 166 |
initialValue: data, |
... | ... | @@ -366,7 +349,12 @@ |
366 | 349 |
}, |
367 | 350 |
}, |
368 | 351 |
watch: { |
369 |
- |
|
352 |
+ 'company': function (nuwValue) { |
|
353 |
+ console.log(nuwValue); |
|
354 |
+ this.getViewer(nuwValue.company_info, 'viewer1'); |
|
355 |
+ this.getViewer(nuwValue.company_service, 'viewer2'); |
|
356 |
+ this.getViewer(nuwValue.company_technology, 'viewer3'); |
|
357 |
+ } |
|
370 | 358 |
}, |
371 | 359 |
computed: { |
372 | 360 |
|
... | ... | @@ -374,9 +362,6 @@ |
374 | 362 |
mounted() { |
375 | 363 |
console.log('Matching mounted'); |
376 | 364 |
this.companySelectOne(); |
377 |
- this.getViewer(0); |
|
378 |
- this.getViewer(1); |
|
379 |
- this.getViewer(2); |
|
380 | 365 |
} |
381 | 366 |
} |
382 | 367 |
</script> |
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?