

231201 김성훈 통계 검색날짜 수정
@6c6aca99d31c3ce4e2b74b6623e38260e7a79143
--- client/views/pages/admin/statistics/CorporatePRCenter.vue
+++ client/views/pages/admin/statistics/CorporatePRCenter.vue
... | ... | @@ -3,19 +3,20 @@ |
3 | 3 |
<div class="chart-top"> |
4 | 4 |
<div class="flex"> |
5 | 5 |
<div class="date-zone flex-start"> |
6 |
- <input type="date" name="" id="" min="2023-11-24" :max="companyListSearch.endDate" v-model="companyListSearch.startDate"> |
|
6 |
+ <!-- <input type="date" name="" id="" min="2023-11-24" :max="companyListSearch.endDate" v-model="companyListSearch.startDate"> --> |
|
7 |
+ <input type="date" name="" id="" v-model="companyListSearch.startDate"> |
|
7 | 8 |
<span>~</span> |
8 |
- <input type="date" name="" id="" :min="companyListSearch.startDate" :max="oneMonthLater" |
|
9 |
- v-model="companyListSearch.endDate"> |
|
10 |
- <button class="blue-btn" @click="dateCheck()">조회</button> |
|
9 |
+ <!-- <input type="date" name="" id="" :min="companyListSearch.startDate" :max="oneMonthLater" v-model="companyListSearch.endDate"> --> |
|
10 |
+ <input type="date" name="" id="" v-model="companyListSearch.endDate"> |
|
11 |
+ <button class="blue-btn" @click="typeCheck()">조회</button> |
|
11 | 12 |
</div> |
12 | 13 |
<div class="date-check flex-end"> |
13 | 14 |
<div> |
14 |
- <input type="radio" name="dayCategory" value="view" id="check" style="display:none" @change="dateCheck()" v-model="selectType"> |
|
15 |
+ <input type="radio" name="dayCategory" value="view" id="check" style="display:none" @change="typeCheck()" v-model="selectType"> |
|
15 | 16 |
<label for="check">조회수</label> |
16 | 17 |
</div> |
17 | 18 |
<div> |
18 |
- <input type="radio" name="dayCategory" value="dwld" id="download" style="display:none" @change="dateCheck()" v-model="selectType"> |
|
19 |
+ <input type="radio" name="dayCategory" value="dwld" id="download" style="display:none" @change="typeCheck()" v-model="selectType"> |
|
19 | 20 |
<label for="download">다운로드수</label> |
20 | 21 |
</div> |
21 | 22 |
</div> |
... | ... | @@ -67,9 +68,9 @@ |
67 | 68 |
<tbody> |
68 | 69 |
<tr> |
69 | 70 |
<th>합계</th> |
70 |
- <td>전체합계</td> |
|
71 |
- <td>기업회원합계</td> |
|
72 |
- <td>일반회원합계</td> |
|
71 |
+ <td>{{ companyViewTotal.total }}</td> |
|
72 |
+ <td>{{ companyViewTotal.company }}</td> |
|
73 |
+ <td>{{ companyViewTotal.common }}</td> |
|
73 | 74 |
</tr> |
74 | 75 |
</tbody> |
75 | 76 |
</table> |
... | ... | @@ -83,16 +84,16 @@ |
83 | 84 |
<tbody> |
84 | 85 |
<tr> |
85 | 86 |
<th>합계</th> |
86 |
- <td>전체합계</td> |
|
87 |
- <td>기업회원합계</td> |
|
88 |
- <td>일반회원합계</td> |
|
87 |
+ <td>{{ companyViewTotal.total }}</td> |
|
88 |
+ <td>{{ companyViewTotal.company }}</td> |
|
89 |
+ <td>{{ companyViewTotal.common }}</td> |
|
89 | 90 |
</tr> |
90 | 91 |
</tbody> |
91 | 92 |
</table> |
92 | 93 |
</div> |
93 | 94 |
<div class="bottom-wrap"> |
94 | 95 |
<PaginationButton v-model:currentPage="companyListSearch.currentPage" :perPage="companyListSearch.perPage" |
95 |
- :totalCount="companyListByDateCount" :maxRange="5" :click="dateCheck" /> |
|
96 |
+ :totalCount="companyListByDateCount" :maxRange="5" :click="typeCheck" /> |
|
96 | 97 |
</div> |
97 | 98 |
</div> |
98 | 99 |
</template> |
... | ... | @@ -118,8 +119,8 @@ |
118 | 119 |
companyListSearch: { |
119 | 120 |
currentPage: 1, |
120 | 121 |
perPage: 7, |
121 |
- startDate: '2023-11-24', |
|
122 |
- endDate: COMMON_UTIL.yesterday(), |
|
122 |
+ startDate: null, |
|
123 |
+ endDate: null, |
|
123 | 124 |
}, |
124 | 125 |
|
125 | 126 |
oneMonthLater: COMMON_UTIL.yesterday(), |
... | ... | @@ -229,31 +230,38 @@ |
229 | 230 |
}); |
230 | 231 |
} |
231 | 232 |
}, |
233 |
+ |
|
234 |
+ typeCheck: function() { |
|
235 |
+ if(this.selectType == 'view') { |
|
236 |
+ this.postLogList(); |
|
237 |
+ } else { |
|
238 |
+ this.dwldLogList(); |
|
239 |
+ } |
|
240 |
+ }, |
|
232 | 241 |
|
233 |
- /**날짜선택 유효성 검사 */ |
|
234 | 242 |
dateCheck: function() { |
235 |
- if(COMMON_UTIL.isEmpty(this.companyListSearch.endDate) === false) { |
|
243 |
+ if(COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) { |
|
236 | 244 |
alert("날짜를 선택해주세요."); |
237 | 245 |
} else { |
246 |
+ |
|
238 | 247 |
if(this.selectType == 'view') { |
239 |
- this.companyLogList(); |
|
248 |
+ this.postLogList(); |
|
240 | 249 |
} else { |
241 |
- this.profileLogList(); |
|
250 |
+ this.dwldLogList(); |
|
242 | 251 |
} |
243 |
- |
|
244 | 252 |
} |
245 | 253 |
}, |
246 | 254 |
}, |
247 | 255 |
watch: { |
248 |
- 'companyListSearch.startDate': function(newValue) { |
|
249 |
- let date = COMMON_UTIL.oneMonthLater(newValue); |
|
250 |
- this.companyListSearch.endDate = null; |
|
251 |
- if(date > COMMON_UTIL.today()) { |
|
252 |
- this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
253 |
- } else { |
|
254 |
- this.oneMonthLater = date; |
|
255 |
- } |
|
256 |
- }, |
|
256 |
+ // 'companyListSearch.startDate': function(newValue) { |
|
257 |
+ // let date = COMMON_UTIL.oneMonthLater(newValue); |
|
258 |
+ // this.companyListSearch.endDate = null; |
|
259 |
+ // if(date > COMMON_UTIL.today()) { |
|
260 |
+ // this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
261 |
+ // } else { |
|
262 |
+ // this.oneMonthLater = date; |
|
263 |
+ // } |
|
264 |
+ // }, |
|
257 | 265 |
}, |
258 | 266 |
computed: { |
259 | 267 |
|
--- client/views/pages/admin/statistics/Data.vue
+++ client/views/pages/admin/statistics/Data.vue
... | ... | @@ -4,22 +4,22 @@ |
4 | 4 |
<div class="chart-top"> |
5 | 5 |
<div class="flex"> |
6 | 6 |
<div class="date-zone flex-start"> |
7 |
- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" |
|
8 |
- v-model="postListSearch.startDate"> |
|
7 |
+ <!-- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> --> |
|
8 |
+ <input type="date" name="" id="" v-model="postListSearch.startDate"> |
|
9 | 9 |
<span>~</span> |
10 |
- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" |
|
11 |
- v-model="postListSearch.endDate"> |
|
12 |
- <button class="blue-btn" @click="dateCheck()">조회</button> |
|
10 |
+ <!-- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" v-model="postListSearch.endDate"> --> |
|
11 |
+ <input type="date" name="" id="" v-model="postListSearch.endDate"> |
|
12 |
+ <button class="blue-btn" @click="typeCheck()">조회</button> |
|
13 | 13 |
</div> |
14 | 14 |
<div class="date-check flex-end"> |
15 | 15 |
<div> |
16 | 16 |
<input type="radio" name="dayCategory" value="view" id="check" style="display:none" |
17 |
- @change="dateCheck()" v-model="selectType"> |
|
17 |
+ @change="typeCheck()" v-model="selectType"> |
|
18 | 18 |
<label for="check">조회수</label> |
19 | 19 |
</div> |
20 | 20 |
<div> |
21 | 21 |
<input type="radio" name="dayCategory" value="dwld" id="download" style="display:none" |
22 |
- @change="dateCheck()" v-model="selectType"> |
|
22 |
+ @change="typeCheck()" v-model="selectType"> |
|
23 | 23 |
<label for="download">다운로드수</label> |
24 | 24 |
</div> |
25 | 25 |
</div> |
... | ... | @@ -104,9 +104,9 @@ |
104 | 104 |
<tbody> |
105 | 105 |
<tr> |
106 | 106 |
<th>합계</th> |
107 |
- <td>전체합계</td> |
|
108 |
- <td>기업회원합계</td> |
|
109 |
- <td>일반회원합계</td> |
|
107 |
+ <td>{{ logTotalCount.total }}</td> |
|
108 |
+ <td>{{ logTotalCount.company }}</td> |
|
109 |
+ <td>{{ logTotalCount.common }}</td> |
|
110 | 110 |
</tr> |
111 | 111 |
</tbody> |
112 | 112 |
</table> |
... | ... | @@ -120,16 +120,16 @@ |
120 | 120 |
<tbody> |
121 | 121 |
<tr> |
122 | 122 |
<th>합계</th> |
123 |
- <td>전체합계</td> |
|
124 |
- <td>기업회원합계</td> |
|
125 |
- <td>일반회원합계</td> |
|
123 |
+ <td>{{ logTotalCount.total }}</td> |
|
124 |
+ <td>{{ logTotalCount.company }}</td> |
|
125 |
+ <td>{{ logTotalCount.common }}</td> |
|
126 | 126 |
</tr> |
127 | 127 |
</tbody> |
128 | 128 |
</table> |
129 | 129 |
</div> |
130 | 130 |
<div class="bottom-wrap"> |
131 | 131 |
<PaginationButton v-model:currentPage="postListSearch.currentPage" :perPage="postListSearch.perPage" |
132 |
- :totalCount="logListByDateCount" :maxRange="5" :click="dateCheck" /> |
|
132 |
+ :totalCount="logListByDateCount" :maxRange="5" :click="typeCheck" /> |
|
133 | 133 |
</div> |
134 | 134 |
</div> |
135 | 135 |
</template> |
... | ... | @@ -154,12 +154,11 @@ |
154 | 154 |
postListSearch: { |
155 | 155 |
currentPage: 1, |
156 | 156 |
perPage: 7, |
157 |
- startDate: '2023-11-24', |
|
158 |
- endDate: COMMON_UTIL.yesterday(), |
|
157 |
+ startDate: null, |
|
158 |
+ endDate: null, |
|
159 | 159 |
bbs_id: '0' |
160 | 160 |
}, |
161 | 161 |
|
162 |
- oneMonthLater: COMMON_UTIL.yesterday(), |
|
163 | 162 |
logListByDate: [], |
164 | 163 |
logListByDateCount: 0, |
165 | 164 |
logTotalCount: {}, |
... | ... | @@ -268,13 +267,20 @@ |
268 | 267 |
} |
269 | 268 |
}, |
270 | 269 |
|
271 |
- /**날짜선택 유효성 검사 */ |
|
272 |
- dateCheck: function () { |
|
273 |
- if (COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) { |
|
270 |
+ typeCheck: function() { |
|
271 |
+ if(this.selectType == 'view') { |
|
272 |
+ this.postLogList(); |
|
273 |
+ } else { |
|
274 |
+ this.dwldLogList(); |
|
275 |
+ } |
|
276 |
+ }, |
|
277 |
+ |
|
278 |
+ dateCheck: function() { |
|
279 |
+ if(COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) { |
|
274 | 280 |
alert("날짜를 선택해주세요."); |
275 | 281 |
} else { |
276 | 282 |
|
277 |
- if (this.selectType == 'view') { |
|
283 |
+ if(this.selectType == 'view') { |
|
278 | 284 |
this.postLogList(); |
279 | 285 |
} else { |
280 | 286 |
this.dwldLogList(); |
... | ... | @@ -283,15 +289,15 @@ |
283 | 289 |
}, |
284 | 290 |
}, |
285 | 291 |
watch: { |
286 |
- 'postListSearch.startDate': function (newValue) { |
|
287 |
- let date = COMMON_UTIL.oneMonthLater(newValue); |
|
288 |
- this.postListSearch.endDate = null; |
|
289 |
- if (date > COMMON_UTIL.today()) { |
|
290 |
- this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
291 |
- } else { |
|
292 |
- this.oneMonthLater = date; |
|
293 |
- } |
|
294 |
- }, |
|
292 |
+ // 'postListSearch.startDate': function (newValue) { |
|
293 |
+ // let date = COMMON_UTIL.oneMonthLater(newValue); |
|
294 |
+ // this.postListSearch.endDate = null; |
|
295 |
+ // if (date > COMMON_UTIL.today()) { |
|
296 |
+ // this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
297 |
+ // } else { |
|
298 |
+ // this.oneMonthLater = date; |
|
299 |
+ // } |
|
300 |
+ // }, |
|
295 | 301 |
}, |
296 | 302 |
computed: { |
297 | 303 |
|
--- client/views/pages/admin/statistics/Member.vue
+++ client/views/pages/admin/statistics/Member.vue
... | ... | @@ -4,11 +4,12 @@ |
4 | 4 |
<div class="chart-top"> |
5 | 5 |
<div class="flex"> |
6 | 6 |
<div class="date-zone flex-start"> |
7 |
- <input type="date" name="" id="" min="2023-11-24" :max="loginListSearch.endDate" v-model="loginListSearch.startDate"> |
|
7 |
+ <!-- <input type="date" name="" id="" min="2023-11-24" :max="loginListSearch.endDate" v-model="loginListSearch.startDate"> --> |
|
8 |
+ <input type="date" name="" id="" v-model="loginListSearch.startDate"> |
|
8 | 9 |
<span>~</span> |
9 |
- <input type="date" name="" id="" :min="loginListSearch.startDate" :max="oneMonthLater" |
|
10 |
- v-model="loginListSearch.endDate"> |
|
11 |
- <button class="blue-btn" @click="loginLogListCheck()">조회</button> |
|
10 |
+ <!-- <input type="date" name="" id="" :min="loginListSearch.startDate" :max="oneMonthLater" v-model="loginListSearch.endDate"> --> |
|
11 |
+ <input type="date" name="" id="" v-model="loginListSearch.endDate"> |
|
12 |
+ <button class="blue-btn" @click="loginLogList()">조회</button> |
|
12 | 13 |
</div> |
13 | 14 |
<div class="date-check flex-end"> |
14 | 15 |
<div> |
... | ... | @@ -82,7 +83,7 @@ |
82 | 83 |
</div> |
83 | 84 |
<div class="bottom-wrap"> |
84 | 85 |
<PaginationButton v-model:currentPage="loginListSearch.currentPage" :perPage="loginListSearch.perPage" |
85 |
- :totalCount="loginLogListByDateCount" :maxRange="5" :click="loginLogListCheck" /> |
|
86 |
+ :totalCount="loginLogListByDateCount" :maxRange="5" :click="loginLogList" /> |
|
86 | 87 |
</div> |
87 | 88 |
</div> |
88 | 89 |
</template> |
... | ... | @@ -100,11 +101,11 @@ |
100 | 101 |
loginListSearch: { |
101 | 102 |
currentPage: 1, |
102 | 103 |
perPage: 7, |
103 |
- startDate: '2023-11-24', |
|
104 |
- endDate: COMMON_UTIL.yesterday(), |
|
104 |
+ startDate: null, |
|
105 |
+ endDate: null, |
|
105 | 106 |
type: 'day' |
106 | 107 |
}, |
107 |
- oneMonthLater: COMMON_UTIL.yesterday(), |
|
108 |
+ // oneMonthLater: COMMON_UTIL.yesterday(), |
|
108 | 109 |
loginLogListByDate: [], |
109 | 110 |
loginLogListByDateCount: 0, |
110 | 111 |
loginSelectTotal:{}, |
... | ... | @@ -171,25 +172,25 @@ |
171 | 172 |
}); |
172 | 173 |
}, |
173 | 174 |
|
174 |
- /**날짜선택 유효성 검사 */ |
|
175 |
- loginLogListCheck: function() { |
|
176 |
- if(COMMON_UTIL.isEmpty(this.loginListSearch.endDate) === false) { |
|
177 |
- alert("날짜를 선택해주세요."); |
|
178 |
- } else { |
|
179 |
- this.loginLogList(); |
|
180 |
- } |
|
181 |
- }, |
|
175 |
+ // /**날짜선택 유효성 검사 */ |
|
176 |
+ // loginLogListCheck: function() { |
|
177 |
+ // if(COMMON_UTIL.isEmpty(this.loginListSearch.endDate) === false) { |
|
178 |
+ // alert("날짜를 선택해주세요."); |
|
179 |
+ // } else { |
|
180 |
+ // this.loginLogList(); |
|
181 |
+ // } |
|
182 |
+ // }, |
|
182 | 183 |
}, |
183 | 184 |
watch: { |
184 |
- 'loginListSearch.startDate': function(newValue) { |
|
185 |
- let date = COMMON_UTIL.oneMonthLater(newValue); |
|
186 |
- this.loginListSearch.endDate = null; |
|
187 |
- if(date > COMMON_UTIL.today()) { |
|
188 |
- this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
189 |
- } else { |
|
190 |
- this.oneMonthLater = date; |
|
191 |
- } |
|
192 |
- }, |
|
185 |
+ // 'loginListSearch.startDate': function(newValue) { |
|
186 |
+ // let date = COMMON_UTIL.oneMonthLater(newValue); |
|
187 |
+ // this.loginListSearch.endDate = null; |
|
188 |
+ // if(date > COMMON_UTIL.today()) { |
|
189 |
+ // this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
190 |
+ // } else { |
|
191 |
+ // this.oneMonthLater = date; |
|
192 |
+ // } |
|
193 |
+ // }, |
|
193 | 194 |
}, |
194 | 195 |
computed: { |
195 | 196 |
|
--- client/views/pages/admin/statistics/MenuStatistics.vue
+++ client/views/pages/admin/statistics/MenuStatistics.vue
... | ... | @@ -4,22 +4,22 @@ |
4 | 4 |
<div class="chart-top"> |
5 | 5 |
<div class="flex"> |
6 | 6 |
<div class="date-zone flex-start"> |
7 |
- <input type="date" name="" id="" min="2023-11-24" :max="logListSearch.endDate" |
|
8 |
- v-model="logListSearch.startDate"> |
|
7 |
+ <!-- <input type="date" name="" id="" min="2023-11-24" :max="logListSearch.endDate" v-model="logListSearch.startDate"> --> |
|
8 |
+ <input type="date" name="" id="" v-model="logListSearch.startDate"> |
|
9 | 9 |
<span>~</span> |
10 |
- <input type="date" name="" id="" :min="logListSearch.startDate" :max="oneMonthLater" |
|
11 |
- v-model="logListSearch.endDate"> |
|
12 |
- <button class="blue-btn" @click="dateCheck()">조회</button> |
|
10 |
+ <!-- <input type="date" name="" id="" :min="logListSearch.startDate" :max="oneMonthLater" v-model="logListSearch.endDate"> --> |
|
11 |
+ <input type="date" name="" id="" v-model="logListSearch.endDate"> |
|
12 |
+ <button class="blue-btn" @click="typeCheck()">조회</button> |
|
13 | 13 |
</div> |
14 | 14 |
<div class="date-check flex-end"> |
15 | 15 |
<div> |
16 | 16 |
<input type="radio" name="dayCategory" id="check" value="view" style="display:none" |
17 |
- @change="dateCheck()" v-model="selectType"> |
|
17 |
+ @change="typeCheck()" v-model="selectType"> |
|
18 | 18 |
<label for="check">조회수</label> |
19 | 19 |
</div> |
20 | 20 |
<div> |
21 | 21 |
<input type="radio" name="dayCategory" id="download" value="dwld" style="display:none" |
22 |
- @change="dateCheck()" v-model="selectType"> |
|
22 |
+ @change="typeCheck()" v-model="selectType"> |
|
23 | 23 |
<label for="download">다운로드수</label> |
24 | 24 |
</div> |
25 | 25 |
</div> |
... | ... | @@ -171,7 +171,7 @@ |
171 | 171 |
</div> |
172 | 172 |
<div class="bottom-wrap"> |
173 | 173 |
<PaginationButton v-model:currentPage="logListSearch.currentPage" :perPage="logListSearch.perPage" |
174 |
- :totalCount="logListByDateCount" :maxRange="5" :click="dateCheck" /> |
|
174 |
+ :totalCount="logListByDateCount" :maxRange="5" :click="typeCheck" /> |
|
175 | 175 |
</div> |
176 | 176 |
</div> |
177 | 177 |
</template> |
... | ... | @@ -191,12 +191,12 @@ |
191 | 191 |
logListSearch: { |
192 | 192 |
currentPage: 1, |
193 | 193 |
perPage: 7, |
194 |
- startDate: '2023-11-24', |
|
195 |
- endDate: COMMON_UTIL.yesterday(), |
|
194 |
+ startDate: null, |
|
195 |
+ endDate: null, |
|
196 | 196 |
type: 'day' |
197 | 197 |
}, |
198 | 198 |
|
199 |
- oneMonthLater: COMMON_UTIL.yesterday(), |
|
199 |
+ // oneMonthLater: COMMON_UTIL.yesterday(), |
|
200 | 200 |
logListByDate: [], |
201 | 201 |
logListByDateCount: 0, |
202 | 202 |
logTotal: {}, |
... | ... | @@ -307,31 +307,39 @@ |
307 | 307 |
} |
308 | 308 |
}, |
309 | 309 |
|
310 |
- /**날짜선택 유효성 검사 */ |
|
311 |
- dateCheck: function () { |
|
312 |
- if (COMMON_UTIL.isEmpty(this.logListSearch.endDate) === false) { |
|
313 |
- alert("날짜를 선택해주세요."); |
|
314 |
- } else { |
|
315 |
- |
|
316 |
- if (this.selectType == 'view') { |
|
310 |
+ typeCheck: function() { |
|
311 |
+ if(this.selectType == 'view') { |
|
317 | 312 |
this.pageLogList(); |
318 |
- } else { |
|
319 |
- this.dwldLogList(); |
|
320 |
- } |
|
321 |
- |
|
313 |
+ } else { |
|
314 |
+ this.dwldLogList(); |
|
322 | 315 |
} |
323 | 316 |
}, |
317 |
+ |
|
318 |
+ // /**날짜선택 유효성 검사 */ |
|
319 |
+ // dateCheck: function () { |
|
320 |
+ // if (COMMON_UTIL.isEmpty(this.logListSearch.endDate) === false) { |
|
321 |
+ // alert("날짜를 선택해주세요."); |
|
322 |
+ // } else { |
|
323 |
+ |
|
324 |
+ // if (this.selectType == 'view') { |
|
325 |
+ // this.pageLogList(); |
|
326 |
+ // } else { |
|
327 |
+ // this.dwldLogList(); |
|
328 |
+ // } |
|
329 |
+ |
|
330 |
+ // } |
|
331 |
+ // }, |
|
324 | 332 |
}, |
325 | 333 |
watch: { |
326 |
- 'logListSearch.startDate': function (newValue) { |
|
327 |
- let date = COMMON_UTIL.oneMonthLater(newValue); |
|
328 |
- this.logListSearch.endDate = null; |
|
329 |
- if (date > COMMON_UTIL.today()) { |
|
330 |
- this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
331 |
- } else { |
|
332 |
- this.oneMonthLater = date; |
|
333 |
- } |
|
334 |
- }, |
|
334 |
+ // 'logListSearch.startDate': function (newValue) { |
|
335 |
+ // let date = COMMON_UTIL.oneMonthLater(newValue); |
|
336 |
+ // this.logListSearch.endDate = null; |
|
337 |
+ // if (date > COMMON_UTIL.today()) { |
|
338 |
+ // this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
339 |
+ // } else { |
|
340 |
+ // this.oneMonthLater = date; |
|
341 |
+ // } |
|
342 |
+ // }, |
|
335 | 343 |
}, |
336 | 344 |
computed: { |
337 | 345 |
|
--- client/views/pages/admin/statistics/NewsAndPr.vue
+++ client/views/pages/admin/statistics/NewsAndPr.vue
... | ... | @@ -4,19 +4,20 @@ |
4 | 4 |
<div class="chart-top"> |
5 | 5 |
<div class="flex"> |
6 | 6 |
<div class="date-zone flex-start"> |
7 |
- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> |
|
8 |
- <span>~</span> |
|
9 |
- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" |
|
10 |
- v-model="postListSearch.endDate"> |
|
11 |
- <button class="blue-btn" @click="dateCheck()">조회</button> |
|
7 |
+ <!-- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> --> |
|
8 |
+ <input type="date" name="" id="" v-model="postListSearch.startDate"> |
|
9 |
+ <span>~</span> |
|
10 |
+ <!-- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" v-model="postListSearch.endDate"> --> |
|
11 |
+ <input type="date" name="" id="" v-model="postListSearch.endDate"> |
|
12 |
+ <button class="blue-btn" @click="typeCheck()">조회</button> |
|
12 | 13 |
</div> |
13 | 14 |
<div class="date-check flex-end"> |
14 | 15 |
<div> |
15 |
- <input type="radio" name="dayCategory" value="view" id="check" style="display:none" @change="dateCheck()" v-model="selectType"> |
|
16 |
+ <input type="radio" name="dayCategory" value="view" id="check" style="display:none" @change="typeCheck()" v-model="selectType"> |
|
16 | 17 |
<label for="check">조회수</label> |
17 | 18 |
</div> |
18 | 19 |
<div> |
19 |
- <input type="radio" name="dayCategory" value="dwld" id="download" style="display:none" @change="dateCheck()" v-model="selectType"> |
|
20 |
+ <input type="radio" name="dayCategory" value="dwld" id="download" style="display:none" @change="typeCheck()" v-model="selectType"> |
|
20 | 21 |
<label for="download">다운로드수</label> |
21 | 22 |
</div> |
22 | 23 |
</div> |
... | ... | @@ -138,7 +139,7 @@ |
138 | 139 |
</div> |
139 | 140 |
<div class="bottom-wrap"> |
140 | 141 |
<PaginationButton v-model:currentPage="postListSearch.currentPage" :perPage="postListSearch.perPage" |
141 |
- :totalCount="logListByDateCount" :maxRange="5" :click="dateCheck" /> |
|
142 |
+ :totalCount="logListByDateCount" :maxRange="5" :click="typeCheck" /> |
|
142 | 143 |
</div> |
143 | 144 |
</div> |
144 | 145 |
</template> |
... | ... | @@ -163,11 +164,10 @@ |
163 | 164 |
postListSearch: { |
164 | 165 |
currentPage: 1, |
165 | 166 |
perPage: 7, |
166 |
- startDate: '2023-11-24', |
|
167 |
- endDate: COMMON_UTIL.yesterday(), |
|
167 |
+ startDate: null, |
|
168 |
+ endDate: null, |
|
168 | 169 |
bbs_id: '1' |
169 | 170 |
}, |
170 |
- oneMonthLater: COMMON_UTIL.yesterday(), |
|
171 | 171 |
logListByDate: [], |
172 | 172 |
logListByDateCount: 0, |
173 | 173 |
logTotalCount: {}, |
... | ... | @@ -275,6 +275,14 @@ |
275 | 275 |
} |
276 | 276 |
}, |
277 | 277 |
|
278 |
+ typeCheck: function() { |
|
279 |
+ if(this.selectType == 'view') { |
|
280 |
+ this.postLogList(); |
|
281 |
+ } else { |
|
282 |
+ this.dwldLogList(); |
|
283 |
+ } |
|
284 |
+ }, |
|
285 |
+ |
|
278 | 286 |
/**날짜선택 유효성 검사 */ |
279 | 287 |
dateCheck: function() { |
280 | 288 |
if(COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) { |
... | ... | @@ -290,15 +298,15 @@ |
290 | 298 |
}, |
291 | 299 |
}, |
292 | 300 |
watch: { |
293 |
- 'postListSearch.startDate': function(newValue) { |
|
294 |
- let date = COMMON_UTIL.oneMonthLater(newValue); |
|
295 |
- this.postListSearch.endDate = null; |
|
296 |
- if(date > COMMON_UTIL.today()) { |
|
297 |
- this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
298 |
- } else { |
|
299 |
- this.oneMonthLater = date; |
|
300 |
- } |
|
301 |
- }, |
|
301 |
+ // 'postListSearch.startDate': function(newValue) { |
|
302 |
+ // let date = COMMON_UTIL.oneMonthLater(newValue); |
|
303 |
+ // this.postListSearch.endDate = null; |
|
304 |
+ // if(date > COMMON_UTIL.today()) { |
|
305 |
+ // this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
306 |
+ // } else { |
|
307 |
+ // this.oneMonthLater = date; |
|
308 |
+ // } |
|
309 |
+ // }, |
|
302 | 310 |
}, |
303 | 311 |
computed: { |
304 | 312 |
|
--- client/views/pages/admin/statistics/Notice.vue
+++ client/views/pages/admin/statistics/Notice.vue
... | ... | @@ -4,19 +4,20 @@ |
4 | 4 |
<div class="chart-top"> |
5 | 5 |
<div class="flex"> |
6 | 6 |
<div class="date-zone flex-start"> |
7 |
- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> |
|
7 |
+ <!-- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> --> |
|
8 |
+ <input type="date" name="" id="" v-model="postListSearch.startDate"> |
|
8 | 9 |
<span>~</span> |
9 |
- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" |
|
10 |
- v-model="postListSearch.endDate"> |
|
11 |
- <button class="blue-btn" @click="dateCheck()">조회</button> |
|
10 |
+ <!-- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" v-model="postListSearch.endDate"> --> |
|
11 |
+ <input type="date" name="" id="" v-model="postListSearch.endDate"> |
|
12 |
+ <button class="blue-btn" @click="typeCheck()">조회</button> |
|
12 | 13 |
</div> |
13 | 14 |
<div class="date-check flex-end"> |
14 | 15 |
<div> |
15 |
- <input type="radio" name="dayCategory" value="view" id="check" style="display:none" @change="dateCheck()" v-model="selectType"> |
|
16 |
+ <input type="radio" name="dayCategory" value="view" id="check" style="display:none" @change="typeCheck()" v-model="selectType"> |
|
16 | 17 |
<label for="check">조회수</label> |
17 | 18 |
</div> |
18 | 19 |
<div> |
19 |
- <input type="radio" name="dayCategory" value="dwld" id="download" style="display:none" @change="dateCheck()" v-model="selectType"> |
|
20 |
+ <input type="radio" name="dayCategory" value="dwld" id="download" style="display:none" @change="typeCheck()" v-model="selectType"> |
|
20 | 21 |
<label for="download">다운로드수</label> |
21 | 22 |
</div> |
22 | 23 |
</div> |
... | ... | @@ -110,10 +111,10 @@ |
110 | 111 |
<tbody> |
111 | 112 |
<tr> |
112 | 113 |
<th>합계</th> |
113 |
- <td>전체합계</td> |
|
114 |
- <td>기업회원합계</td> |
|
115 |
- <td>일반회원합계</td> |
|
116 |
- <td>비회원합계</td> |
|
114 |
+ <td>{{ logTotalCount.total }}</td> |
|
115 |
+ <td>{{ logTotalCount.company }}</td> |
|
116 |
+ <td>{{ logTotalCount.common }}</td> |
|
117 |
+ <td>{{ logTotalCount.non }}</td> |
|
117 | 118 |
</tr> |
118 | 119 |
</tbody> |
119 | 120 |
</table> |
... | ... | @@ -128,17 +129,17 @@ |
128 | 129 |
<tbody> |
129 | 130 |
<tr> |
130 | 131 |
<th>합계</th> |
131 |
- <td>전체합계</td> |
|
132 |
- <td>기업회원합계</td> |
|
133 |
- <td>일반회원합계</td> |
|
134 |
- <td>비회원합계</td> |
|
132 |
+ <td>{{ logTotalCount.total }}</td> |
|
133 |
+ <td>{{ logTotalCount.company }}</td> |
|
134 |
+ <td>{{ logTotalCount.common }}</td> |
|
135 |
+ <td>{{ logTotalCount.non }}</td> |
|
135 | 136 |
</tr> |
136 | 137 |
</tbody> |
137 | 138 |
</table> |
138 | 139 |
</div> |
139 | 140 |
<div class="bottom-wrap"> |
140 | 141 |
<PaginationButton v-model:currentPage="postListSearch.currentPage" :perPage="postListSearch.perPage" |
141 |
- :totalCount="logListByDateCount" :maxRange="5" :click="dateCheck" /> |
|
142 |
+ :totalCount="logListByDateCount" :maxRange="5" :click="typeCheck" /> |
|
142 | 143 |
</div> |
143 | 144 |
</div> |
144 | 145 |
</template> |
... | ... | @@ -163,11 +164,10 @@ |
163 | 164 |
postListSearch: { |
164 | 165 |
currentPage: 1, |
165 | 166 |
perPage: 7, |
166 |
- startDate: '2023-11-24', |
|
167 |
- endDate: COMMON_UTIL.yesterday(), |
|
167 |
+ startDate: null, |
|
168 |
+ endDate: null, |
|
168 | 169 |
bbs_id: '2' |
169 | 170 |
}, |
170 |
- oneMonthLater: COMMON_UTIL.yesterday(), |
|
171 | 171 |
logListByDate: [], |
172 | 172 |
logListByDateCount: 0, |
173 | 173 |
logTotalCount: {}, |
... | ... | @@ -275,7 +275,14 @@ |
275 | 275 |
} |
276 | 276 |
}, |
277 | 277 |
|
278 |
- /**날짜선택 유효성 검사 */ |
|
278 |
+ typeCheck: function() { |
|
279 |
+ if(this.selectType == 'view') { |
|
280 |
+ this.postLogList(); |
|
281 |
+ } else { |
|
282 |
+ this.dwldLogList(); |
|
283 |
+ } |
|
284 |
+ }, |
|
285 |
+ |
|
279 | 286 |
dateCheck: function() { |
280 | 287 |
if(COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) { |
281 | 288 |
alert("날짜를 선택해주세요."); |
... | ... | @@ -290,15 +297,15 @@ |
290 | 297 |
}, |
291 | 298 |
}, |
292 | 299 |
watch: { |
293 |
- 'postListSearch.startDate': function(newValue) { |
|
294 |
- let date = COMMON_UTIL.oneMonthLater(newValue); |
|
295 |
- this.postListSearch.endDate = null; |
|
296 |
- if(date > COMMON_UTIL.today()) { |
|
297 |
- this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
298 |
- } else { |
|
299 |
- this.oneMonthLater = date; |
|
300 |
- } |
|
301 |
- }, |
|
300 |
+ // 'postListSearch.startDate': function(newValue) { |
|
301 |
+ // let date = COMMON_UTIL.oneMonthLater(newValue); |
|
302 |
+ // this.postListSearch.endDate = null; |
|
303 |
+ // if(date > COMMON_UTIL.today()) { |
|
304 |
+ // this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
305 |
+ // } else { |
|
306 |
+ // this.oneMonthLater = date; |
|
307 |
+ // } |
|
308 |
+ // }, |
|
302 | 309 |
}, |
303 | 310 |
computed: { |
304 | 311 |
|
--- client/views/pages/admin/statistics/Tech.vue
+++ client/views/pages/admin/statistics/Tech.vue
... | ... | @@ -4,19 +4,20 @@ |
4 | 4 |
<div class="chart-top"> |
5 | 5 |
<div class="flex"> |
6 | 6 |
<div class="date-zone flex-start"> |
7 |
- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> |
|
7 |
+ <!-- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> --> |
|
8 |
+ <input type="date" name="" id="" v-model="postListSearch.startDate"> |
|
8 | 9 |
<span>~</span> |
9 |
- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" |
|
10 |
- v-model="postListSearch.endDate"> |
|
11 |
- <button class="blue-btn" @click="dateCheck()">조회</button> |
|
10 |
+ <!-- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" v-model="postListSearch.endDate"> --> |
|
11 |
+ <input type="date" name="" id="" v-model="postListSearch.endDate"> |
|
12 |
+ <button class="blue-btn" @click="typeCheck()">조회</button> |
|
12 | 13 |
</div> |
13 | 14 |
<div class="date-check flex-end"> |
14 | 15 |
<div> |
15 |
- <input type="radio" name="dayCategory" value="view" id="check" style="display:none" @change="dateCheck()" v-model="selectType"> |
|
16 |
+ <input type="radio" name="dayCategory" value="view" id="check" style="display:none" @change="typeCheck()" v-model="selectType"> |
|
16 | 17 |
<label for="check">조회수</label> |
17 | 18 |
</div> |
18 | 19 |
<div> |
19 |
- <input type="radio" name="dayCategory" value="dwld" id="download" style="display:none" @change="dateCheck()" v-model="selectType"> |
|
20 |
+ <input type="radio" name="dayCategory" value="dwld" id="download" style="display:none" @change="typeCheck()" v-model="selectType"> |
|
20 | 21 |
<label for="download">다운로드수</label> |
21 | 22 |
</div> |
22 | 23 |
</div> |
... | ... | @@ -101,9 +102,9 @@ |
101 | 102 |
<tbody> |
102 | 103 |
<tr> |
103 | 104 |
<th>합계</th> |
104 |
- <td>전체합계</td> |
|
105 |
- <td>기업회원합계</td> |
|
106 |
- <td>일반회원합계</td> |
|
105 |
+ <td>{{ logTotalCount.total }}</td> |
|
106 |
+ <td>{{ logTotalCount.company }}</td> |
|
107 |
+ <td>{{ logTotalCount.common }}</td> |
|
107 | 108 |
</tr> |
108 | 109 |
</tbody> |
109 | 110 |
</table> |
... | ... | @@ -117,16 +118,16 @@ |
117 | 118 |
<tbody> |
118 | 119 |
<tr> |
119 | 120 |
<th>합계</th> |
120 |
- <td>전체합계</td> |
|
121 |
- <td>기업회원합계</td> |
|
122 |
- <td>일반회원합계</td> |
|
121 |
+ <td>{{ logTotalCount.total }}</td> |
|
122 |
+ <td>{{ logTotalCount.company }}</td> |
|
123 |
+ <td>{{ logTotalCount.common }}</td> |
|
123 | 124 |
</tr> |
124 | 125 |
</tbody> |
125 | 126 |
</table> |
126 | 127 |
</div> |
127 | 128 |
<div class="bottom-wrap"> |
128 | 129 |
<PaginationButton v-model:currentPage="postListSearch.currentPage" :perPage="postListSearch.perPage" |
129 |
- :totalCount="logListByDateCount" :maxRange="5" :click="dateCheck" /> |
|
130 |
+ :totalCount="logListByDateCount" :maxRange="5" :click="typeCheck" /> |
|
130 | 131 |
</div> |
131 | 132 |
</div> |
132 | 133 |
</template> |
... | ... | @@ -151,11 +152,10 @@ |
151 | 152 |
postListSearch: { |
152 | 153 |
currentPage: 1, |
153 | 154 |
perPage: 7, |
154 |
- startDate: '2023-11-24', |
|
155 |
- endDate: COMMON_UTIL.yesterday(), |
|
155 |
+ startDate: null, |
|
156 |
+ endDate: null, |
|
156 | 157 |
bbs_id: '3' |
157 | 158 |
}, |
158 |
- oneMonthLater: COMMON_UTIL.yesterday(), |
|
159 | 159 |
logListByDate: [], |
160 | 160 |
logListByDateCount: 0, |
161 | 161 |
logTotalCount: {}, |
... | ... | @@ -263,7 +263,14 @@ |
263 | 263 |
} |
264 | 264 |
}, |
265 | 265 |
|
266 |
- /**날짜선택 유효성 검사 */ |
|
266 |
+ typeCheck: function() { |
|
267 |
+ if(this.selectType == 'view') { |
|
268 |
+ this.postLogList(); |
|
269 |
+ } else { |
|
270 |
+ this.dwldLogList(); |
|
271 |
+ } |
|
272 |
+ }, |
|
273 |
+ |
|
267 | 274 |
dateCheck: function() { |
268 | 275 |
if(COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) { |
269 | 276 |
alert("날짜를 선택해주세요."); |
... | ... | @@ -278,15 +285,15 @@ |
278 | 285 |
}, |
279 | 286 |
}, |
280 | 287 |
watch: { |
281 |
- 'postListSearch.startDate': function(newValue) { |
|
282 |
- let date = COMMON_UTIL.oneMonthLater(newValue); |
|
283 |
- this.postListSearch.endDate = null; |
|
284 |
- if(date > COMMON_UTIL.today()) { |
|
285 |
- this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
286 |
- } else { |
|
287 |
- this.oneMonthLater = date; |
|
288 |
- } |
|
289 |
- }, |
|
288 |
+ // 'postListSearch.startDate': function(newValue) { |
|
289 |
+ // let date = COMMON_UTIL.oneMonthLater(newValue); |
|
290 |
+ // this.postListSearch.endDate = null; |
|
291 |
+ // if(date > COMMON_UTIL.today()) { |
|
292 |
+ // this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
293 |
+ // } else { |
|
294 |
+ // this.oneMonthLater = date; |
|
295 |
+ // } |
|
296 |
+ // }, |
|
290 | 297 |
}, |
291 | 298 |
computed: { |
292 | 299 |
|
--- client/views/pages/admin/statistics/Visit.vue
+++ client/views/pages/admin/statistics/Visit.vue
... | ... | @@ -4,11 +4,12 @@ |
4 | 4 |
<div class="chart-top"> |
5 | 5 |
<div class="flex"> |
6 | 6 |
<div class="date-zone flex-start"> |
7 |
- <input type="date" name="" id="" min="2023-11-24" :max="visitListSearch.endDate" v-model="visitListSearch.startDate" /> |
|
7 |
+ <!-- <input type="date" name="" id="" min="2023-11-24" :max="visitListSearch.endDate" v-model="visitListSearch.startDate" /> --> |
|
8 |
+ <input type="date" name="" id="" v-model="visitListSearch.startDate" /> |
|
8 | 9 |
<span>~</span> |
9 |
- <input type="date" name="" id="" :min="visitListSearch.startDate" :max="oneMonthLater" |
|
10 |
- v-model="visitListSearch.endDate" /> |
|
11 |
- <button class="blue-btn" @click="visitSelectListCheck()">조회</button> |
|
10 |
+ <!-- <input type="date" name="" id="" :min="visitListSearch.startDate" :max="oneMonthLater" v-model="visitListSearch.endDate" /> --> |
|
11 |
+ <input type="date" name="" id="" v-model="visitListSearch.endDate" /> |
|
12 |
+ <button class="blue-btn" @click="visitSelectList()">조회</button> |
|
12 | 13 |
</div> |
13 | 14 |
<div class="date-check flex-end"> |
14 | 15 |
<div> |
... | ... | @@ -89,7 +90,7 @@ |
89 | 90 |
</div> |
90 | 91 |
<div class="bottom-wrap"> |
91 | 92 |
<PaginationButton v-model:currentPage="visitListSearch.currentPage" :perPage="visitListSearch.perPage" |
92 |
- :totalCount="visitListCount" :maxRange="5" :click="visitSelectListCheck" /> |
|
93 |
+ :totalCount="visitListCount" :maxRange="5" :click="visitSelectList" /> |
|
93 | 94 |
</div> |
94 | 95 |
</div> |
95 | 96 |
</template> |
... | ... | @@ -107,12 +108,12 @@ |
107 | 108 |
visitListSearch: { |
108 | 109 |
currentPage: 1, |
109 | 110 |
perPage: 7, |
110 |
- startDate: '2023-11-24', |
|
111 |
- endDate: COMMON_UTIL.yesterday(), |
|
111 |
+ startDate: null, |
|
112 |
+ endDate: null, |
|
112 | 113 |
type: 'day' |
113 | 114 |
}, |
114 | 115 |
|
115 |
- oneMonthLater: COMMON_UTIL.yesterday(), |
|
116 |
+ // oneMonthLater: COMMON_UTIL.yesterday(), |
|
116 | 117 |
visitList: [], |
117 | 118 |
visitListCount: 0, |
118 | 119 |
totalCount:{}, |
... | ... | @@ -146,14 +147,14 @@ |
146 | 147 |
}) |
147 | 148 |
}, |
148 | 149 |
|
149 |
- /**날짜선택 유효성 검사 */ |
|
150 |
- visitSelectListCheck: function() { |
|
151 |
- if(COMMON_UTIL.isEmpty(this.visitListSearch.endDate) === false) { |
|
152 |
- alert("날짜를 선택해주세요."); |
|
153 |
- } else { |
|
154 |
- this.visitSelectList(); |
|
155 |
- } |
|
156 |
- }, |
|
150 |
+ // /**날짜선택 유효성 검사 */ |
|
151 |
+ // visitSelectListCheck: function() { |
|
152 |
+ // if(COMMON_UTIL.isEmpty(this.visitListSearch.endDate) === false) { |
|
153 |
+ // alert("날짜를 선택해주세요."); |
|
154 |
+ // } else { |
|
155 |
+ // this.visitSelectList(); |
|
156 |
+ // } |
|
157 |
+ // }, |
|
157 | 158 |
|
158 | 159 |
/** 방문자 수 엑셀 다운로드 */ |
159 | 160 |
visitLogExcel: function() { |
... | ... | @@ -190,16 +191,16 @@ |
190 | 191 |
}, |
191 | 192 |
}, |
192 | 193 |
watch: { |
193 |
- 'visitListSearch.startDate': function(newValue) { |
|
194 |
- let date = COMMON_UTIL.oneMonthLater(newValue); |
|
195 |
- this.visitListSearch.endDate = null; |
|
196 |
- if(date > COMMON_UTIL.today()) { |
|
197 |
- this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
198 |
- } else { |
|
199 |
- this.oneMonthLater = date; |
|
200 |
- } |
|
201 |
- console.log(this.visitListSearch.endDate) |
|
202 |
- }, |
|
194 |
+ // 'visitListSearch.startDate': function(newValue) { |
|
195 |
+ // let date = COMMON_UTIL.oneMonthLater(newValue); |
|
196 |
+ // this.visitListSearch.endDate = null; |
|
197 |
+ // if(date > COMMON_UTIL.today()) { |
|
198 |
+ // this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
199 |
+ // } else { |
|
200 |
+ // this.oneMonthLater = date; |
|
201 |
+ // } |
|
202 |
+ // console.log(this.visitListSearch.endDate) |
|
203 |
+ // }, |
|
203 | 204 |
|
204 | 205 |
}, |
205 | 206 |
computed: { |
--- client/views/pages/admin/statistics/WgCommunity.vue
+++ client/views/pages/admin/statistics/WgCommunity.vue
... | ... | @@ -4,19 +4,20 @@ |
4 | 4 |
<div class="chart-top"> |
5 | 5 |
<div class="flex"> |
6 | 6 |
<div class="date-zone flex-start"> |
7 |
- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> |
|
7 |
+ <!-- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> --> |
|
8 |
+ <input type="date" name="" id="" v-model="postListSearch.startDate"> |
|
8 | 9 |
<span>~</span> |
9 |
- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" |
|
10 |
- v-model="postListSearch.endDate"> |
|
11 |
- <button class="blue-btn" @click="dateCheck()">조회</button> |
|
10 |
+ <!-- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" v-model="postListSearch.endDate"> --> |
|
11 |
+ <input type="date" name="" id="" v-model="postListSearch.endDate"> |
|
12 |
+ <button class="blue-btn" @click="typeCheck()">조회</button> |
|
12 | 13 |
</div> |
13 | 14 |
<div class="date-check flex-end"> |
14 | 15 |
<div> |
15 |
- <input type="radio" name="dayCategory" value="view" id="check" style="display:none" @change="dateCheck()" v-model="selectType"> |
|
16 |
+ <input type="radio" name="dayCategory" value="view" id="check" style="display:none" @change="typeCheck()" v-model="selectType"> |
|
16 | 17 |
<label for="check">조회수</label> |
17 | 18 |
</div> |
18 | 19 |
<div> |
19 |
- <input type="radio" name="dayCategory" value="dwld" id="download" style="display:none" @change="dateCheck()" v-model="selectType"> |
|
20 |
+ <input type="radio" name="dayCategory" value="dwld" id="download" style="display:none" @change="typeCheck()" v-model="selectType"> |
|
20 | 21 |
<label for="download">다운로드수</label> |
21 | 22 |
</div> |
22 | 23 |
</div> |
... | ... | @@ -101,9 +102,9 @@ |
101 | 102 |
<tbody> |
102 | 103 |
<tr> |
103 | 104 |
<th>합계</th> |
104 |
- <td>전체합계</td> |
|
105 |
- <td>기업회원합계</td> |
|
106 |
- <td>일반회원합계</td> |
|
105 |
+ <td>{{ logTotalCount.total }}</td> |
|
106 |
+ <td>{{ logTotalCount.company }}</td> |
|
107 |
+ <td>{{ logTotalCount.common }}</td> |
|
107 | 108 |
</tr> |
108 | 109 |
</tbody> |
109 | 110 |
</table> |
... | ... | @@ -117,16 +118,16 @@ |
117 | 118 |
<tbody> |
118 | 119 |
<tr> |
119 | 120 |
<th>합계</th> |
120 |
- <td>전체합계</td> |
|
121 |
- <td>기업회원합계</td> |
|
122 |
- <td>일반회원합계</td> |
|
121 |
+ <td>{{ logTotalCount.total }}</td> |
|
122 |
+ <td>{{ logTotalCount.company }}</td> |
|
123 |
+ <td>{{ logTotalCount.common }}</td> |
|
123 | 124 |
</tr> |
124 | 125 |
</tbody> |
125 | 126 |
</table> |
126 | 127 |
</div> |
127 | 128 |
<div class="bottom-wrap"> |
128 | 129 |
<PaginationButton v-model:currentPage="postListSearch.currentPage" :perPage="postListSearch.perPage" |
129 |
- :totalCount="logListByDateCount" :maxRange="5" :click="dateCheck" /> |
|
130 |
+ :totalCount="logListByDateCount" :maxRange="5" :click="typeCheck" /> |
|
130 | 131 |
</div> |
131 | 132 |
</div> |
132 | 133 |
</template> |
... | ... | @@ -150,11 +151,10 @@ |
150 | 151 |
postListSearch: { |
151 | 152 |
currentPage: 1, |
152 | 153 |
perPage: 7, |
153 |
- startDate: '2023-11-24', |
|
154 |
- endDate: COMMON_UTIL.yesterday(), |
|
154 |
+ startDate: null, |
|
155 |
+ endDate: null, |
|
155 | 156 |
bbs_id: '4' |
156 | 157 |
}, |
157 |
- oneMonthLater: COMMON_UTIL.yesterday(), |
|
158 | 158 |
logListByDate: [], |
159 | 159 |
logListByDateCount: 0, |
160 | 160 |
logTotalCount: {}, |
... | ... | @@ -262,7 +262,14 @@ |
262 | 262 |
} |
263 | 263 |
}, |
264 | 264 |
|
265 |
- /**날짜선택 유효성 검사 */ |
|
265 |
+ typeCheck: function() { |
|
266 |
+ if(this.selectType == 'view') { |
|
267 |
+ this.postLogList(); |
|
268 |
+ } else { |
|
269 |
+ this.dwldLogList(); |
|
270 |
+ } |
|
271 |
+ }, |
|
272 |
+ |
|
266 | 273 |
dateCheck: function() { |
267 | 274 |
if(COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) { |
268 | 275 |
alert("날짜를 선택해주세요."); |
... | ... | @@ -277,15 +284,15 @@ |
277 | 284 |
}, |
278 | 285 |
}, |
279 | 286 |
watch: { |
280 |
- 'postListSearch.startDate': function(newValue) { |
|
281 |
- let date = COMMON_UTIL.oneMonthLater(newValue); |
|
282 |
- this.postListSearch.endDate = null; |
|
283 |
- if(date > COMMON_UTIL.today()) { |
|
284 |
- this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
285 |
- } else { |
|
286 |
- this.oneMonthLater = date; |
|
287 |
- } |
|
288 |
- }, |
|
287 |
+ // 'postListSearch.startDate': function(newValue) { |
|
288 |
+ // let date = COMMON_UTIL.oneMonthLater(newValue); |
|
289 |
+ // this.postListSearch.endDate = null; |
|
290 |
+ // if(date > COMMON_UTIL.today()) { |
|
291 |
+ // this.oneMonthLater = COMMON_UTIL.yesterday(); |
|
292 |
+ // } else { |
|
293 |
+ // this.oneMonthLater = date; |
|
294 |
+ // } |
|
295 |
+ // }, |
|
289 | 296 |
}, |
290 | 297 |
computed: { |
291 | 298 |
|
--- client/views/pages/user/mypage/MatchingManager.vue
+++ client/views/pages/user/mypage/MatchingManager.vue
... | ... | @@ -280,7 +280,7 @@ |
280 | 280 |
matchingCompleteIdx: 0, |
281 | 281 |
|
282 | 282 |
selectedBox: 'inbox', |
283 |
- |
|
283 |
+ companyTop6List: [], |
|
284 | 284 |
//명함보기 모달창 |
285 | 285 |
isVisible: false, |
286 | 286 |
company_nm: null, |
... | ... | @@ -355,7 +355,8 @@ |
355 | 355 |
}, |
356 | 356 |
data: vm.pickCompleteListSearch |
357 | 357 |
}).then(function (response) { |
358 |
- vm.pickCompleteList = response.data; |
|
358 |
+ vm.pickCompleteList = response.data.pickCompleteList; |
|
359 |
+ vm.companyTop6List = response.data.companyTop6List |
|
359 | 360 |
// vm.pickReceptionListCount = vm.pickReceptionList; |
360 | 361 |
// vm.pickReceptionIdx = vm.pickReceptionList.length - (vm.pickReceptionListSearch.currentPage - 1) * vm.pickReceptionListSearch.perPage; |
361 | 362 |
|
... | ... | @@ -618,6 +619,28 @@ |
618 | 619 |
}) |
619 | 620 |
}, |
620 | 621 |
|
622 |
+ companyOnePage: function (item) { |
|
623 |
+ const vm = this; |
|
624 |
+ let best = 'non' |
|
625 |
+ for (let i = 0; i < vm.companyTop6List.length; i++) { |
|
626 |
+ if (vm.companyTop6List[i].company_id === item.company_id) { |
|
627 |
+ best = 'best'; |
|
628 |
+ } |
|
629 |
+ } |
|
630 |
+ axios({ |
|
631 |
+ url: '/matching/companyViewCountAdd.json', |
|
632 |
+ method: 'post', |
|
633 |
+ hearder: { |
|
634 |
+ 'Content-Type': "application/json; charset=UTF-8", |
|
635 |
+ }, |
|
636 |
+ data: { 'company_id': item.company_id } |
|
637 |
+ }).then(function (response) { |
|
638 |
+ vm.$router.push({ path: '/MatchingOne.page', query: { 'company_id': item.company_id, 'best': best } }); |
|
639 |
+ }).catch(function (error) { |
|
640 |
+ console.log("기업 상세조회 오류, 관리자에게 문의하세요."); |
|
641 |
+ }) |
|
642 |
+ }, |
|
643 |
+ |
|
621 | 644 |
hideDiv() { |
622 | 645 |
this.isVisible = false; |
623 | 646 |
} |
--- client/views/pages/user/networking/MatchingOne.vue
+++ client/views/pages/user/networking/MatchingOne.vue
... | ... | @@ -100,7 +100,8 @@ |
100 | 100 |
<img :src="'http://localhost:8080' + item.file_path + '/' + item.file_nm + '.' + item.file_extn_nm"> |
101 | 101 |
</p> |
102 | 102 |
</td> |
103 |
- <td> |
|
103 |
+ |
|
104 |
+ <td style=" text-align : center;"> |
|
104 | 105 |
{{ item.company_nm }} |
105 | 106 |
</td> |
106 | 107 |
<td> |
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?