

231113김하영
@3982334d185b09b1688fad161e03bc325d6d9a50
--- client/resources/css/Main.css
+++ client/resources/css/Main.css
... | ... | @@ -517,14 +517,6 @@ |
517 | 517 |
font-family: "Pretendard-Regular"; |
518 | 518 |
} |
519 | 519 |
|
520 |
-.matchingbox img { |
|
521 |
- /* padding: 2rem; */ |
|
522 |
- height: 119px; |
|
523 |
- width: 80%; |
|
524 |
- margin: 0 auto; |
|
525 |
- object-fit: contain; |
|
526 |
-} |
|
527 |
- |
|
528 | 520 |
.matchingbox p:nth-child(3) { |
529 | 521 |
text-align: left; |
530 | 522 |
color: #333; |
... | ... | @@ -546,6 +538,18 @@ |
546 | 538 |
box-shadow: 2px 2px 2px #33333332; |
547 | 539 |
position: relative; |
548 | 540 |
} |
541 |
+.matchingbox-img { |
|
542 |
+ box-shadow: 2px 2px 2px rgba(51, 51, 51, 0) !important; |
|
543 |
+ /* border: 1px solid red; */ |
|
544 |
+ margin: 0 auto; |
|
545 |
+ padding: 0 !important; |
|
546 |
+} |
|
547 |
+.matchingbox-img img { |
|
548 |
+ width: 100% !important; |
|
549 |
+ height: 100%; |
|
550 |
+ width: 80%; |
|
551 |
+ margin: 0 auto; |
|
552 |
+} |
|
549 | 553 |
|
550 | 554 |
/* .matchingbox div:nth-child(1):before { |
551 | 555 |
position: absolute; |
--- client/resources/css/admin.css
+++ client/resources/css/admin.css
... | ... | @@ -19,32 +19,6 @@ |
19 | 19 |
font-family: "Pretendard-Regular"; |
20 | 20 |
} |
21 | 21 |
|
22 |
-/* datalnsert */ |
|
23 |
- |
|
24 |
-.insert-table { |
|
25 |
- border-top: 3px solid #ddd; |
|
26 |
- border-bottom: 3px solid #ddd; |
|
27 |
-} |
|
28 |
- |
|
29 |
-textarea { |
|
30 |
- width: 100%; |
|
31 |
- height: 450px; |
|
32 |
-} |
|
33 |
- |
|
34 |
-label { |
|
35 |
- border: 1px solid #535353; |
|
36 |
- color: #535353; |
|
37 |
- background-color: #fff; |
|
38 |
- padding: 10px; |
|
39 |
- border-radius: 3px; |
|
40 |
- margin-right: 10px; |
|
41 |
-} |
|
42 |
- |
|
43 |
-input:checked + label { |
|
44 |
- background: #535353; |
|
45 |
- color: #fff; |
|
46 |
-} |
|
47 |
- |
|
48 | 22 |
/* dataselectone */ |
49 | 23 |
.insert-table { |
50 | 24 |
border-top: 2px solid #007aff; |
... | ... | @@ -61,20 +35,23 @@ |
61 | 35 |
margin-right: 5px; |
62 | 36 |
} |
63 | 37 |
/* dataUpdate */ |
64 |
-.insert-table { |
|
38 |
+.dataUpdate .insert-table, |
|
39 |
+.dataInsert .insert-table { |
|
65 | 40 |
border-top: 3px solid #ddd; |
66 | 41 |
border-bottom: 3px solid #ddd; |
67 | 42 |
} |
68 | 43 |
|
69 |
-textarea { |
|
44 |
+.dataUpdate textarea, |
|
45 |
+.dataInsert textarea { |
|
70 | 46 |
width: 100%; |
71 | 47 |
height: 450px; |
72 | 48 |
} |
73 |
-.file-list { |
|
49 |
+.dataUpdate .file-list { |
|
74 | 50 |
padding: 5px 0; |
75 | 51 |
} |
76 | 52 |
|
77 |
-label { |
|
53 |
+.dataUpdate label, |
|
54 |
+.dataInsert label { |
|
78 | 55 |
border: 1px solid #535353; |
79 | 56 |
color: #535353; |
80 | 57 |
background-color: #fff; |
... | ... | @@ -83,7 +60,8 @@ |
83 | 60 |
margin-right: 10px; |
84 | 61 |
} |
85 | 62 |
|
86 |
-input:checked + label { |
|
63 |
+.dataUpdate input:checked + label, |
|
64 |
+.dataInsert input:checked + label { |
|
87 | 65 |
background: #535353; |
88 | 66 |
color: #fff; |
89 | 67 |
} |
... | ... | @@ -96,18 +74,18 @@ |
96 | 74 |
border-radius: 30px; |
97 | 75 |
} |
98 | 76 |
|
99 |
-.logo { |
|
77 |
+.login-box .logo { |
|
100 | 78 |
text-align: center; |
101 | 79 |
margin-bottom: 50px; |
102 | 80 |
} |
103 | 81 |
|
104 |
-.logo h1 { |
|
82 |
+.login-box .logo h1 { |
|
105 | 83 |
font-family: "Pretendard-Regular"; |
106 | 84 |
font-weight: bold; |
107 | 85 |
font-size: 3rem; |
108 | 86 |
} |
109 | 87 |
|
110 |
-.logo p { |
|
88 |
+.login-box .logo p { |
|
111 | 89 |
font-size: 2rem; |
112 | 90 |
} |
113 | 91 |
|
--- client/views/pages/admin/databook/DataInsert.vue
+++ client/views/pages/admin/databook/DataInsert.vue
... | ... | @@ -7,7 +7,7 @@ |
7 | 7 |
<h2 class="main-title">자료집</h2> |
8 | 8 |
</div> |
9 | 9 |
</div> |
10 |
- <div class="content-wrap"> |
|
10 |
+ <div class="content-wrap dataInsert"> |
|
11 | 11 |
<table class="insert-table"> |
12 | 12 |
<tbody> |
13 | 13 |
<tr> |
--- client/views/pages/admin/databook/DataUpdate.vue
+++ client/views/pages/admin/databook/DataUpdate.vue
... | ... | @@ -7,7 +7,7 @@ |
7 | 7 |
<h2 class="main-title">자료집</h2> |
8 | 8 |
</div> |
9 | 9 |
</div> |
10 |
- <div class="content-wrap"> |
|
10 |
+ <div class="content-wrap dataUpdate"> |
|
11 | 11 |
<table class="insert-table"> |
12 | 12 |
<tbody> |
13 | 13 |
<tr> |
--- client/views/pages/user/networking/Matching.vue
+++ client/views/pages/user/networking/Matching.vue
... | ... | @@ -34,14 +34,22 @@ |
34 | 34 |
<!-- best 기업 --> |
35 | 35 |
<h3>BEST 기업</h3> |
36 | 36 |
<div class="matching-box-bos"> |
37 |
- <div v-for="(item, idx) in companyTop6List" :key="idx" class="matching-box matchingbox" @click="companySelectOnePage(item)"> |
|
37 |
+ <div v-for="(item, idx) in companyTop6List" :key="idx" class="matching-box matchingbox" |
|
38 |
+ @click="companySelectOnePage(item)"> |
|
38 | 39 |
<div> |
39 | 40 |
<h3>{{ item.company_nm }}</h3> |
40 |
- <img :src="'http://localhost:8080'+item.file_path +'\\' + item.file_nm + '.' + item.file_extn_nm" width="20px" alt=""> |
|
41 |
+ <div style="width: 260px ; height: 120px; text-align: center;" class="matchingbox-img"> |
|
42 |
+ |
|
43 |
+ <img :src="'http://localhost:8080' + item.file_path + '\\' + item.file_nm + '.' + item.file_extn_nm" |
|
44 |
+ width="100%" alt=""> |
|
45 |
+ </div> |
|
41 | 46 |
<p>{{ company_info }}</p> |
42 | 47 |
<div class="matchingbox-1"> |
43 |
- <p v-if="!item.pick_yn" @click.stop="pickModal(item)"><i class="fa-regular fa-heart fa-lg" style="color: #3f87f7;"></i> {{ item.company_pick_cnt }} </p> |
|
44 |
- <p v-else @click.stop="pickCancelModal(item)"><i class="fa fa-heart fa-lg" style="color: #d41515;"></i> {{ item.company_pick_cnt }} </p> |
|
48 |
+ <p v-if="!item.pick_yn" @click.stop="pickModal(item)"><i |
|
49 |
+ class="fa-regular fa-heart fa-lg" style="color: #3f87f7;"></i> {{ |
|
50 |
+ item.company_pick_cnt }} </p> |
|
51 |
+ <p v-else @click.stop="pickCancelModal(item)"><i class="fa fa-heart fa-lg" |
|
52 |
+ style="color: #d41515;"></i> {{ item.company_pick_cnt }} </p> |
|
45 | 53 |
<p class="matchingbox-text">조회수 <span>{{ item.view_cnt }}</span></p> |
46 | 54 |
</div> |
47 | 55 |
<div class="matching-span"> |
... | ... | @@ -60,15 +68,19 @@ |
60 | 68 |
<div class="matching-box-main-two"> |
61 | 69 |
<div class="w1400"> |
62 | 70 |
<div class="matching-box-grid-two"> |
63 |
- <div class="matching-box-2" v-for="(item, idx) in companyList" :key="idx" @click="companySelectOnePage(item)"> |
|
71 |
+ <div class="matching-box-2" v-for="(item, idx) in companyList" :key="idx" |
|
72 |
+ @click="companySelectOnePage(item)"> |
|
64 | 73 |
<div> |
65 | 74 |
<h5>{{ item.company_nm }}</h5> |
66 | 75 |
<div class="matching-span"> |
67 |
- <span v-for="(item, idx1) in keywordList[idx]" :key="idx1"> #{{ item }}</span> |
|
76 |
+ <span v-for="(item, idx1) in keywordList[idx]" :key="idx1"> #{{ item }}</span> |
|
68 | 77 |
</div> |
69 | 78 |
<div class="matchingbox-2"> |
70 |
- <p v-if="!item.pick_yn" @click.stop="pickModal(item)"><i class="fa-regular fa-heart fa-lg" style="color: #3f87f7;"></i> {{ item.company_pick_cnt }} </p> |
|
71 |
- <p v-else @click.stop="pickCancelModal(item)"><i class="fa fa-heart fa-lg" style="color: #d41515;"></i> {{ item.company_pick_cnt }} </p> |
|
79 |
+ <p v-if="!item.pick_yn" @click.stop="pickModal(item)"><i |
|
80 |
+ class="fa-regular fa-heart fa-lg" style="color: #3f87f7;"></i> {{ |
|
81 |
+ item.company_pick_cnt }} </p> |
|
82 |
+ <p v-else @click.stop="pickCancelModal(item)"><i class="fa fa-heart fa-lg" |
|
83 |
+ style="color: #d41515;"></i> {{ item.company_pick_cnt }} </p> |
|
72 | 84 |
<p>조회수 <span>{{ item.view_cnt }}</span> </p> |
73 | 85 |
</div> |
74 | 86 |
|
... | ... | @@ -95,11 +107,11 @@ |
95 | 107 |
searchText: null, |
96 | 108 |
}, |
97 | 109 |
userCompanyId: null, |
98 |
- bestList:[], |
|
99 |
- companyList:[], |
|
100 |
- keyword:[], |
|
101 |
- keywordList:[], |
|
102 |
- companyTop6List:[], |
|
110 |
+ bestList: [], |
|
111 |
+ companyList: [], |
|
112 |
+ keyword: [], |
|
113 |
+ keywordList: [], |
|
114 |
+ companyTop6List: [], |
|
103 | 115 |
companyListCount: 0, |
104 | 116 |
companyIdx: 0, |
105 | 117 |
|
... | ... | @@ -107,9 +119,9 @@ |
107 | 119 |
} |
108 | 120 |
}, |
109 | 121 |
methods: { |
110 |
- companySelectList: function() { |
|
122 |
+ companySelectList: function () { |
|
111 | 123 |
const vm = this; |
112 |
- |
|
124 |
+ |
|
113 | 125 |
axios({ |
114 | 126 |
url: '/matching/companySelectList.json', |
115 | 127 |
method: 'post', |
... | ... | @@ -117,47 +129,47 @@ |
117 | 129 |
'Content-Type': "application/json; charset=UTF-8", |
118 | 130 |
}, |
119 | 131 |
data: vm.companyListSearch |
120 |
- }).then(function(response) { |
|
132 |
+ }).then(function (response) { |
|
121 | 133 |
vm.companyList = response.data.companySelectList; |
122 | 134 |
vm.companyListCount = response.data.companySelectListCount; |
123 | 135 |
vm.companyIdx = vm.companyListCount - (vm.companyListSearch.currentPage - 1) * vm.companyListSearch.perPage; |
124 | 136 |
vm.companyTop6List = response.data.companyTop6; |
125 | 137 |
vm.userCompanyId = response.data.userCompanyId; |
126 | 138 |
|
127 |
- for( let i = 0; i < vm.companyList.length; i++) { |
|
128 |
- vm.keyword = vm.companyList[i].keyword.split('#',4); |
|
139 |
+ for (let i = 0; i < vm.companyList.length; i++) { |
|
140 |
+ vm.keyword = vm.companyList[i].keyword.split('#', 4); |
|
129 | 141 |
vm.keyword.splice(0, 1) |
130 | 142 |
vm.keywordList[i] = vm.keyword |
131 | 143 |
console.log("keyword", vm.keywordList); |
132 | 144 |
} |
133 |
- |
|
134 |
- }).catch(function(error) { |
|
145 |
+ |
|
146 |
+ }).catch(function (error) { |
|
135 | 147 |
console.log('error - ', error) |
136 | 148 |
alert('기업 목록 조회 오류, 관리자에게 문의하세요.'); |
137 | 149 |
}) |
138 | 150 |
}, |
139 | 151 |
|
140 |
- pickModal: function(item) { |
|
141 |
- |
|
142 |
- if(this.userCompanyId != item.company_id) { |
|
143 |
- if(confirm(item.company_nm + "에게 PICK 신청을 하시겠습니까?")) { |
|
144 |
- this.pick(item) |
|
152 |
+ pickModal: function (item) { |
|
153 |
+ |
|
154 |
+ if (this.userCompanyId != item.company_id) { |
|
155 |
+ if (confirm(item.company_nm + "에게 PICK 신청을 하시겠습니까?")) { |
|
156 |
+ this.pick(item) |
|
145 | 157 |
} |
146 | 158 |
} else { |
147 | 159 |
alert("자신의 기업에는 PICK을 할 수 없습니다.") |
148 | 160 |
} |
149 |
- |
|
161 |
+ |
|
150 | 162 |
}, |
151 | 163 |
|
152 |
- pickCancelModal: function(item) { |
|
153 |
- if(confirm(item.company_nm + "에게 신청한 PICK을 취소 하시겠습니까?")) { |
|
164 |
+ pickCancelModal: function (item) { |
|
165 |
+ if (confirm(item.company_nm + "에게 신청한 PICK을 취소 하시겠습니까?")) { |
|
154 | 166 |
this.pickCancel(item) |
155 | 167 |
} |
156 | 168 |
}, |
157 | 169 |
|
158 |
- pick: function(item) { |
|
170 |
+ pick: function (item) { |
|
159 | 171 |
const vm = this; |
160 |
- |
|
172 |
+ |
|
161 | 173 |
axios({ |
162 | 174 |
url: '/matching/pick.json', |
163 | 175 |
method: 'post', |
... | ... | @@ -165,16 +177,16 @@ |
165 | 177 |
'Content-Type': "application/json; charset=UTF-8", |
166 | 178 |
}, |
167 | 179 |
data: item |
168 |
- }).then(function(response) { |
|
180 |
+ }).then(function (response) { |
|
169 | 181 |
alert(response.data); |
170 | 182 |
vm.companySelectList(); |
171 |
- }).catch(function(error) { |
|
183 |
+ }).catch(function (error) { |
|
172 | 184 |
console.log('error - ', error) |
173 | 185 |
alert(' PICK 오류, 관리자에게 문의하세요.'); |
174 | 186 |
}) |
175 | 187 |
}, |
176 | 188 |
|
177 |
- pickCancel: function(item) { |
|
189 |
+ pickCancel: function (item) { |
|
178 | 190 |
const vm = this; |
179 | 191 |
|
180 | 192 |
axios({ |
... | ... | @@ -184,18 +196,18 @@ |
184 | 196 |
'Content-Type': "application/json; charset=UTF-8", |
185 | 197 |
}, |
186 | 198 |
data: item |
187 |
- }).then(function(response) { |
|
188 |
- alert(response.data); |
|
189 |
- vm.companySelectList(); |
|
190 |
- }).catch(function(error) { |
|
199 |
+ }).then(function (response) { |
|
200 |
+ alert(response.data); |
|
201 |
+ vm.companySelectList(); |
|
202 |
+ }).catch(function (error) { |
|
191 | 203 |
console.log('error - ', error) |
192 | 204 |
alert('PICK 취소 오류, 관리자에게 문의하세요.'); |
193 | 205 |
}) |
194 | 206 |
}, |
195 | 207 |
|
196 |
- companySelectOnePage: function(item) { |
|
208 |
+ companySelectOnePage: function (item) { |
|
197 | 209 |
const vm = this; |
198 |
- |
|
210 |
+ |
|
199 | 211 |
axios({ |
200 | 212 |
url: '/matching/companyViewCountAdd.json', |
201 | 213 |
method: 'post', |
... | ... | @@ -204,7 +216,7 @@ |
204 | 216 |
}, |
205 | 217 |
data: { 'company_id': item.company_id } |
206 | 218 |
}).then(function (response) { |
207 |
- vm.$router.push({ path: '/MatchingOne.page', query: {'company_id': item.company_id}}); |
|
219 |
+ vm.$router.push({ path: '/MatchingOne.page', query: { 'company_id': item.company_id } }); |
|
208 | 220 |
}).catch(function (error) { |
209 | 221 |
console.log("기업 상세조회 오류, 관리자에게 문의하세요."); |
210 | 222 |
}) |
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?