Commit @e38bd863dc56b4bcf6eccdc4840f097fe33afbe7

Stormen123 2023-12-01

231201 김성훈 매칭통계 총 합계 추가

@e38bd863dc56b4bcf6eccdc4840f097fe33afbe7

966cd37

e38bd86

client/views/pages/admin/statistics/CorporatePRCenter.vue

--- client/views/pages/admin/statistics/CorporatePRCenter.vue

+++ client/views/pages/admin/statistics/CorporatePRCenter.vue


             <div class="flex">
                 <div class="date-zone flex-start">
                     <!-- <input type="date" name="" id="" min="2023-11-24" :max="companyListSearch.endDate" v-model="companyListSearch.startDate"> -->
-                    <input type="date" name="" id="" v-model="companyListSearch.startDate">
+                    <input type="date" name="" id="" :max="companyListSearch.endDate" v-model="companyListSearch.startDate">
                     <span>~</span>
                     <!-- <input type="date" name="" id="" :min="companyListSearch.startDate" :max="oneMonthLater" v-model="companyListSearch.endDate"> -->
-                    <input type="date" name="" id="" v-model="companyListSearch.endDate">
+                    <input type="date" name="" id="" :min="companyListSearch.startDate" :max="yesterDay" v-model="companyListSearch.endDate">
                     <button class="blue-btn" @click="typeCheck()">조회</button>
                 </div>
                 <div class="date-check flex-end">

                 endDate: null,
             },
 
-            oneMonthLater: COMMON_UTIL.yesterday(),
+            yesterDay: COMMON_UTIL.yesterday(),
             companyListByDate: [],
             companyListByDateCount: 0,
             companyViewTotal: {},

         
         typeCheck: function() {
             if(this.selectType == 'view') {
-                    this.postLogList();
+                    this.companyLogList();
             } else {
-                this.dwldLogList();
+                this.profileLogList();
             }
         },
 
-        dateCheck: function() {
-            if(COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) {
-                alert("날짜를 선택해주세요.");
-            } else {
+        // dateCheck: function() {
+        //     if(COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) {
+        //         alert("날짜를 선택해주세요.");
+        //     } else {
 
-                if(this.selectType == 'view') {
-                    this.postLogList();
-                } else {
-                    this.dwldLogList();
-                }
-            }
-        },
+        //         if(this.selectType == 'view') {
+        //             this.companyLogList();
+        //         } else {
+        //             this.profileLogList();
+        //         }
+        //     }
+        // },
     },
     watch: {
         // 'companyListSearch.startDate': function(newValue) {

966cd37

e38bd86

client/views/pages/admin/statistics/Data.vue

--- client/views/pages/admin/statistics/Data.vue

+++ client/views/pages/admin/statistics/Data.vue


                 <div class="flex">
                     <div class="date-zone flex-start">
                         <!-- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> -->
-                        <input type="date" name="" id="" v-model="postListSearch.startDate">
+                        <input type="date" name="" id="" :max="postListSearch.endDate" v-model="postListSearch.startDate">
                         <span>~</span>
                         <!-- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" v-model="postListSearch.endDate"> -->
-                        <input type="date" name="" id="" v-model="postListSearch.endDate">
+                        <input type="date" name="" id="" :min="postListSearch.startDate" :max="yesterDay" v-model="postListSearch.endDate">
                         <button class="blue-btn" @click="typeCheck()">조회</button>
                     </div>
                     <div class="date-check flex-end">

                 bbs_id: '0'
             },
 
+            yesterDay: COMMON_UTIL.yesterday(),
             logListByDate: [],
             logListByDateCount: 0,
             logTotalCount: {},

                 this.dwldLogList();
             }
         },
-        
+
         dateCheck: function() {
             if(COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) {
                 alert("날짜를 선택해주세요.");

966cd37

e38bd86

client/views/pages/admin/statistics/MatchingStatistics.vue

--- client/views/pages/admin/statistics/MatchingStatistics.vue

+++ client/views/pages/admin/statistics/MatchingStatistics.vue


                         <div class="chart-top">
                             <div class="flex">
                                 <div class="date-zone flex-start">
-                                    <input type="date" name="" id="" min="2023-11-24" :max="listSearch.endDate"
-                                        v-model="listSearch.startDate">
+                                    <!-- <input type="date" name="" id="" min="2023-11-24" :max="listSearch.endDate" v-model="listSearch.startDate"> -->
+                                    <input type="date" name="" id="" :max="listSearch.endDate" v-model="listSearch.startDate">
                                     <span>~</span>
-                                    <input type="date" name="" id="" :min="listSearch.startDate" :max="oneMonthLater"
-                                        v-model="listSearch.endDate">
-                                    <button class="blue-btn" @click="listDateCheck()">조회</button>
+                                    <!-- <input type="date" name="" id="" :min="listSearch.startDate" :max="oneMonthLater" v-model="listSearch.endDate"> -->
+                                    <input type="date" name="" id="" :min="listSearch.startDate" :max="yesterDay" v-model="listSearch.endDate">
+                                    <button class="blue-btn" @click="listTypeCheck()">조회</button>
                                 </div>
                                 <div class="date-check flex-end">
                                     <div>

                                         <td>{{ item.progress_cnt }}</td>
                                         <td>{{ item.to_cnt }}</td>
                                         <td>{{ item.from_cnt }}</td>
-                                        <td>{{ item.to_cnt + item.from_cnt }}</td>
+                                        <td>{{ item.total_cnt }}</td>
                                     </tr>
                                 </tbody>
                             </table>

                                 <tbody>
                                     <tr>
                                         <th>합계</th>
-                                        <td>성공건수</td>
-                                        <td>실패건수</td>
-                                        <td>진행중인건수</td>
-                                        <td>요청받은건수</td>
-                                        <td>요청한 건수</td>
-                                        <td>전체 요청수</td>
+                                        <td>{{ totalCount.succesee_cnt }}</td>
+                                        <td>{{ totalCount.failed_cnt }}</td>
+                                        <td>{{ totalCount.progress_cnt }}</td>
+                                        <td>{{ totalCount.to_cnt }}</td>
+                                        <td>{{ totalCount.from_cnt }}</td>
+                                        <td>{{ totalCount.total_cnt}}</td>
                                     </tr>
                                 </tbody>
                             </table>
                         </div>
                         <div class="bottom-wrap">
                             <PaginationButton v-model:currentPage="listSearch.currentPage" :perPage="listSearch.perPage"
-                                :total-count="companySelectListCount" :max-range="5" :click="listDateCheck" />
+                                :total-count="companySelectListCount" :max-range="5" :click="listTypeCheck" />
                         </div>
                     </div>
                 </div>

                         <div class="chart-top">
                             <div class="flex">
                                 <div class="date-zone flex-start">
-                                    <input type="date" name="" id="" min="2023-11-24" :max="listSearch.endDate"
-                                        v-model="listSearch.startDate">
+                                    <!-- <input type="date" name="" id="" min="2023-11-24" :max="listSearch.endDate" v-model="listSearch.startDate"> -->
+                                    <input type="date" name="" id="" :max="listSearch.endDate" v-model="listSearch.startDate">
                                     <span>~</span>
-                                    <input type="date" name="" id="" :min="listSearch.startDate" :max="oneMonthLater"
-                                        v-model="listSearch.endDate">
-                                    <button class="blue-btn" @click="detailDateCheck()">조회</button>
+                                    <!-- <input type="date" name="" id="" :min="listSearch.startDate" :max="oneMonthLater" v-model="listSearch.endDate"> -->
+                                    <input type="date" name="" id="" :min="listSearch.startDate" :max="yesterDay" v-model="listSearch.endDate">
+                                    <button class="blue-btn" @click="detailTypeCheck()">조회</button>
                                 </div>
                                 <div class="date-check flex-end">
                                     <div>

                         </div>
                         <div class="bottom-wrap">
                             <PaginationButton v-model:currentPage="listSearch.currentPage" :perPage="listSearch.perPage"
-                                :total-count="companySelectListCount" :max-range="5" :click="detailDateCheck" />
+                                :total-count="companySelectListCount" :max-range="5" :click="detailTypeCheck" />
                         </div>
                     </div>
                 </div>

     </div>
 </template>
 <script>
-import { useStore } from "vuex";
 import axios from "axios";
 import COMMON_UTIL from '../../../../resources/js/commonUtil.js';
 import PaginationButton from '../../../component/pagination/PaginationButton.vue';
-
-
 
 export default {
 

             listSearch: {
                 currentPage: 1,
                 perPage: 10,
-                startDate: '2023-11-01',
-                endDate: COMMON_UTIL.today(),
+                startDate: null,
+                endDate: null,
             },
-            oneMonthLater: COMMON_UTIL.today(),
+            // oneMonthLater: COMMON_UTIL.today(),
+            yesterDay: COMMON_UTIL.yesterday(),
             companyList: [],
             companyStatisticsList: [],
             companySelectListCount: 0,
+            totalCount: {},
             companyDetailStatistics: [],
         };
     },

                 },
                 data: vm.listSearch
             }).then(function (response) {
-                vm.companyStatisticsList = response.data.companyPickStatistics;
+                vm.companyStatisticsList = response.data.data.companyPickStatistics;
                 vm.companySelectListCount = response.data.companySelectListCount;
+                vm.totalCount = response.data.data.totalCount;
             }).catch(function (error) {
                 console.log("error - ", error)
                 alert("PICK 통계 조회 오류, 관리자에게 문의하세요.");

                 },
                 data: vm.listSearch
             }).then(function (response) {
-                vm.companyStatisticsList = response.data.companyMatchingStatistics;
+                vm.companyStatisticsList = response.data.data.companyMatchingStatistics;
                 vm.companySelectListCount = response.data.companySelectListCount;
+                vm.totalCount = response.data.data.totalCount;
             }).catch(function (error) {
                 console.log("error - ", error)
                 alert("MATCHING 통계 조회 오류, 관리자에게 문의하세요.");

             })
         },
 
-        /**매칭관리 날짜선택 유효성 검사 */
-        listDateCheck: function () {
-            if (COMMON_UTIL.isEmpty(this.listSearch.endDate) === false) {
-                alert("날짜를 선택해주세요.");
+        /**매칭관리 타입 검사 */
+        listTypeCheck: function () {
+            if (this.selectedOption1 == 'pick') {
+                this.companyPickStatistics();
             } else {
-
-                if (this.selectedOption1 == 'pick') {
-                    this.companyPickStatistics();
-                } else {
-                    this.companyMatchingStatistics();
-                }
+                this.companyMatchingStatistics();
             }
         },
 
-        /**매칭관리 세부통계 날짜선택 유효성 검사 */
-        detailDateCheck: function () {
-            if (COMMON_UTIL.isEmpty(this.listSearch.endDate) === false) {
-                alert("날짜를 선택해주세요.");
-            } else {
+        // /**매칭관리 날짜선택 유효성 검사 */
+        // listDateCheck: function () {
+        //     if (COMMON_UTIL.isEmpty(this.listSearch.endDate) === false) {
+        //         alert("날짜를 선택해주세요.");
+        //     } else {
+        //         if (this.selectedOption1 == 'pick') {
+        //             this.companyPickStatistics();
+        //         } else {
+        //             this.companyMatchingStatistics();
+        //         }
+        //     }
+        // },
 
-                if (this.selectedOption1 == 'pick') {
-                    this.companyPickStatistics();
-                } else {
-                    this.companyMatchingStatistics();
-                }
+        /**매칭관리 세부통계 타입 검사 */
+        detailTypeCheck: function () {
+            if (this.selectedOption1 == 'pick') {
+                this.companyPickStatistics();
+            } else {
+                this.companyMatchingStatistics();
             }
         },
+
+        // /**매칭관리 세부통계 날짜선택 유효성 검사 */
+        // detailDateCheck: function () {
+        //     if (COMMON_UTIL.isEmpty(this.listSearch.endDate) === false) {
+        //         alert("날짜를 선택해주세요.");
+        //     } else {
+
+        //         if (this.selectedOption1 == 'pick') {
+        //             this.companyPickStatistics();
+        //         } else {
+        //             this.companyMatchingStatistics();
+        //         }
+        //     }
+        // },
 
         /** 기업 리스트 */
         companySelectList: function () {

         },
     },
     watch: {
-        'listSearch.startDate': function (newValue) {
-            let date = COMMON_UTIL.oneMonthLater(newValue);
-            this.listSearch.endDate = null;
-            if (date > COMMON_UTIL.today()) {
-                this.oneMonthLater = COMMON_UTIL.today();
-            } else {
-                this.oneMonthLater = date;
-            }
-        },
+        // 'listSearch.startDate': function (newValue) {
+        //     let date = COMMON_UTIL.oneMonthLater(newValue);
+        //     this.listSearch.endDate = null;
+        //     if (date > COMMON_UTIL.today()) {
+        //         this.oneMonthLater = COMMON_UTIL.today();
+        //     } else {
+        //         this.oneMonthLater = date;
+        //     }
+        // },
     },
     computed: {},
     components: {

966cd37

e38bd86

client/views/pages/admin/statistics/Member.vue

--- client/views/pages/admin/statistics/Member.vue

+++ client/views/pages/admin/statistics/Member.vue


             <div class="flex">
                 <div class="date-zone flex-start">
                     <!-- <input type="date" name="" id="" min="2023-11-24" :max="loginListSearch.endDate" v-model="loginListSearch.startDate"> -->
-                    <input type="date" name="" id="" v-model="loginListSearch.startDate">
+                    <input type="date" name="" id="" :max="loginListSearch.endDate" v-model="loginListSearch.startDate">
                     <span>~</span>
                     <!-- <input type="date" name="" id="" :min="loginListSearch.startDate" :max="oneMonthLater" v-model="loginListSearch.endDate"> -->
-                    <input type="date" name="" id="" v-model="loginListSearch.endDate">
+                    <input type="date" name="" id="" :min="loginListSearch.startDate" :max="yesterDay" v-model="loginListSearch.endDate">
                     <button class="blue-btn" @click="loginLogList()">조회</button>
                 </div>
                 <div class="date-check flex-end">

                 type: 'day'
             },
             // oneMonthLater: COMMON_UTIL.yesterday(),
+            yesterDay: COMMON_UTIL.yesterday(),
             loginLogListByDate: [],
             loginLogListByDateCount: 0,
             loginSelectTotal:{},

966cd37

e38bd86

client/views/pages/admin/statistics/MenuStatistics.vue

--- client/views/pages/admin/statistics/MenuStatistics.vue

+++ client/views/pages/admin/statistics/MenuStatistics.vue


                 <div class="flex">
                     <div class="date-zone flex-start">
                         <!-- <input type="date" name="" id="" min="2023-11-24" :max="logListSearch.endDate" v-model="logListSearch.startDate"> -->
-                        <input type="date" name="" id="" v-model="logListSearch.startDate">
+                        <input type="date" name="" id="" :max="logListSearch.endDate" v-model="logListSearch.startDate">
                         <span>~</span>
                         <!-- <input type="date" name="" id="" :min="logListSearch.startDate" :max="oneMonthLater" v-model="logListSearch.endDate"> -->
-                        <input type="date" name="" id="" v-model="logListSearch.endDate">
+                        <input type="date" name="" id="" :min="logListSearch.startDate" :max="yesterDay" v-model="logListSearch.endDate">
                         <button class="blue-btn" @click="typeCheck()">조회</button>
                     </div>
                     <div class="date-check flex-end">

             },
 
             // oneMonthLater: COMMON_UTIL.yesterday(),
+            yesterDay: COMMON_UTIL.yesterday(),
             logListByDate: [],
             logListByDateCount: 0,
             logTotal: {},

966cd37

e38bd86

client/views/pages/admin/statistics/NewsAndPr.vue

--- client/views/pages/admin/statistics/NewsAndPr.vue

+++ client/views/pages/admin/statistics/NewsAndPr.vue


             <div class="flex">
                 <div class="date-zone flex-start">
                     <!-- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> -->
-                    <input type="date" name="" id="" v-model="postListSearch.startDate">
+                    <input type="date" name="" id="" :max="postListSearch.endDate" v-model="postListSearch.startDate">
                         <span>~</span>
                         <!-- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" v-model="postListSearch.endDate"> -->
-                        <input type="date" name="" id="" v-model="postListSearch.endDate">
+                        <input type="date" name="" id="" :min="postListSearch.startDate" :max="yesterDay" v-model="postListSearch.endDate">
                     <button class="blue-btn" @click="typeCheck()">조회</button>
                 </div>
                 <div class="date-check flex-end">

                 endDate: null,
                 bbs_id: '1'
             },
+            yesterDay: COMMON_UTIL.yesterday(),
             logListByDate: [],
             logListByDateCount: 0,
             logTotalCount: {},

966cd37

e38bd86

client/views/pages/admin/statistics/Notice.vue

--- client/views/pages/admin/statistics/Notice.vue

+++ client/views/pages/admin/statistics/Notice.vue


             <div class="flex">
                 <div class="date-zone flex-start">
                     <!-- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> -->
-                    <input type="date" name="" id="" v-model="postListSearch.startDate">
+                    <input type="date" name="" id="" :max="postListSearch.endDate" v-model="postListSearch.startDate">
                     <span>~</span>
                     <!-- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" v-model="postListSearch.endDate"> -->
-                    <input type="date" name="" id="" v-model="postListSearch.endDate">
+                    <input type="date" name="" id="" :min="postListSearch.startDate" :max="yesterDay" v-model="postListSearch.endDate">
                     <button class="blue-btn" @click="typeCheck()">조회</button>
                 </div>
                 <div class="date-check flex-end">

                 endDate: null,
                 bbs_id: '2'
             },
+
+            yesterDay: COMMON_UTIL.yesterday(),
             logListByDate: [],
             logListByDateCount: 0,
             logTotalCount: {},

966cd37

e38bd86

client/views/pages/admin/statistics/Tech.vue

--- client/views/pages/admin/statistics/Tech.vue

+++ client/views/pages/admin/statistics/Tech.vue


             <div class="flex">
                 <div class="date-zone flex-start">
                     <!-- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> -->
-                    <input type="date" name="" id="" v-model="postListSearch.startDate">
+                    <input type="date" name="" id="" :max="postListSearch.endDate" v-model="postListSearch.startDate">
                     <span>~</span>
                     <!-- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" v-model="postListSearch.endDate"> -->
-                    <input type="date" name="" id="" v-model="postListSearch.endDate">
+                    <input type="date" name="" id="" :min="postListSearch.startDate" :max="yesterDay" v-model="postListSearch.endDate">
                         <button class="blue-btn" @click="typeCheck()">조회</button>
                 </div>
                 <div class="date-check flex-end">

                 endDate: null,
                 bbs_id: '3'
             },
+
+            yesterDay: COMMON_UTIL.yesterday(),
             logListByDate: [],
             logListByDateCount: 0,
             logTotalCount: {},

966cd37

e38bd86

client/views/pages/admin/statistics/Visit.vue

--- client/views/pages/admin/statistics/Visit.vue

+++ client/views/pages/admin/statistics/Visit.vue


             <div class="flex">
                 <div class="date-zone flex-start">
                     <!-- <input type="date" name="" id="" min="2023-11-24" :max="visitListSearch.endDate" v-model="visitListSearch.startDate" /> -->
-                    <input type="date" name="" id="" v-model="visitListSearch.startDate" />
+                    <input type="date" name="" id="" :max="visitListSearch.endDate" v-model="visitListSearch.startDate" />
                     <span>~</span>
                     <!-- <input type="date" name="" id="" :min="visitListSearch.startDate" :max="oneMonthLater" v-model="visitListSearch.endDate" /> -->
-                    <input type="date" name="" id="" v-model="visitListSearch.endDate" />
+                    <input type="date" name="" id="" :min="visitListSearch.startDate" :max="yesterDay" v-model="visitListSearch.endDate" />
                     <button class="blue-btn" @click="visitSelectList()">조회</button>
                 </div>
                 <div class="date-check flex-end">

             },
 
             // oneMonthLater: COMMON_UTIL.yesterday(),
+            yesterDay: COMMON_UTIL.yesterday(),
             visitList: [],
             visitListCount: 0,
             totalCount:{},

966cd37

e38bd86

client/views/pages/admin/statistics/WgCommunity.vue

--- client/views/pages/admin/statistics/WgCommunity.vue

+++ client/views/pages/admin/statistics/WgCommunity.vue


             <div class="flex">
                 <div class="date-zone flex-start">
                     <!-- <input type="date" name="" id="" min="2023-11-24" :max="postListSearch.endDate" v-model="postListSearch.startDate"> -->
-                    <input type="date" name="" id="" v-model="postListSearch.startDate">
+                    <input type="date" name="" id="" :max="postListSearch.endDate" v-model="postListSearch.startDate">
                     <span>~</span>
                     <!-- <input type="date" name="" id="" :min="postListSearch.startDate" :max="oneMonthLater" v-model="postListSearch.endDate"> -->
-                    <input type="date" name="" id="" v-model="postListSearch.endDate">
+                    <input type="date" name="" id="" :min="postListSearch.startDate" :max="yesterDay" v-model="postListSearch.endDate">
                     <button class="blue-btn" @click="typeCheck()">조회</button>
                 </div>
                 <div class="date-check flex-end">

                 endDate: null,
                 bbs_id: '4'
             },
+
+            yesterDay: COMMON_UTIL.yesterday(),
             logListByDate: [],
             logListByDateCount: 0,
             logTotalCount: {},

Add a comment

Open 0
Closed 0

List

...	...	@@ -4,10 +4,10 @@
4	4	<div class="flex">
5	5	<div class="date-zone flex-start">
6	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	+ <input type="date" name="" id="" :max="companyListSearch.endDate" v-model="companyListSearch.startDate">
8	8	<span>~</span>
9	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">
	10	+ <input type="date" name="" id="" :min="companyListSearch.startDate" :max="yesterDay" v-model="companyListSearch.endDate">
11	11	<button class="blue-btn" @click="typeCheck()">조회</button>
12	12	</div>
13	13	<div class="date-check flex-end">
...	...	@@ -123,7 +123,7 @@
123	123	endDate: null,
124	124	},
125	125
126		- oneMonthLater: COMMON_UTIL.yesterday(),
	126	+ yesterDay: COMMON_UTIL.yesterday(),
127	127	companyListByDate: [],
128	128	companyListByDateCount: 0,
129	129	companyViewTotal: {},
...	...	@@ -233,24 +233,24 @@
233	233
234	234	typeCheck: function() {
235	235	if(this.selectType == 'view') {
236		- this.postLogList();
	236	+ this.companyLogList();
237	237	} else {
238		- this.dwldLogList();
	238	+ this.profileLogList();
239	239	}
240	240	},
241	241
242		- dateCheck: function() {
243		- if(COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) {
244		- alert("날짜를 선택해주세요.");
245		- } else {
	242	+ // dateCheck: function() {
	243	+ // if(COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) {
	244	+ // alert("날짜를 선택해주세요.");
	245	+ // } else {
246	246
247		- if(this.selectType == 'view') {
248		- this.postLogList();
249		- } else {
250		- this.dwldLogList();
251		- }
252		- }
253		- },
	247	+ // if(this.selectType == 'view') {
	248	+ // this.companyLogList();
	249	+ // } else {
	250	+ // this.profileLogList();
	251	+ // }
	252	+ // }
	253	+ // },
254	254	},
255	255	watch: {
256	256	// 'companyListSearch.startDate': function(newValue) {

...	...	@@ -5,10 +5,10 @@
5	5	<div class="flex">
6	6	<div class="date-zone flex-start">
7	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	+ <input type="date" name="" id="" :max="postListSearch.endDate" v-model="postListSearch.startDate">
9	9	<span>~</span>
10	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">
	11	+ <input type="date" name="" id="" :min="postListSearch.startDate" :max="yesterDay" v-model="postListSearch.endDate">
12	12	<button class="blue-btn" @click="typeCheck()">조회</button>
13	13	</div>
14	14	<div class="date-check flex-end">
...	...	@@ -159,6 +159,7 @@
159	159	bbs_id: '0'
160	160	},
161	161
	162	+ yesterDay: COMMON_UTIL.yesterday(),
162	163	logListByDate: [],
163	164	logListByDateCount: 0,
164	165	logTotalCount: {},
...	...	@@ -274,7 +275,7 @@
274	275	this.dwldLogList();
275	276	}
276	277	},
277		-
	278	+
278	279	dateCheck: function() {
279	280	if(COMMON_UTIL.isEmpty(this.postListSearch.endDate) === false) {
280	281	alert("날짜를 선택해주세요.");

...	...	@@ -12,12 +12,12 @@
12	12	<div class="chart-top">
13	13	<div class="flex">
14	14	<div class="date-zone flex-start">
15		- <input type="date" name="" id="" min="2023-11-24" :max="listSearch.endDate"
16		- v-model="listSearch.startDate">
	15	+ <!-- <input type="date" name="" id="" min="2023-11-24" :max="listSearch.endDate" v-model="listSearch.startDate"> -->
	16	+ <input type="date" name="" id="" :max="listSearch.endDate" v-model="listSearch.startDate">
17	17	<span>~</span>
18		- <input type="date" name="" id="" :min="listSearch.startDate" :max="oneMonthLater"
19		- v-model="listSearch.endDate">
20		- <button class="blue-btn" @click="listDateCheck()">조회</button>
	18	+ <!-- <input type="date" name="" id="" :min="listSearch.startDate" :max="oneMonthLater" v-model="listSearch.endDate"> -->
	19	+ <input type="date" name="" id="" :min="listSearch.startDate" :max="yesterDay" v-model="listSearch.endDate">
	20	+ <button class="blue-btn" @click="listTypeCheck()">조회</button>
21	21	</div>
22	22	<div class="date-check flex-end">
23	23	<div>
...	...	@@ -72,7 +72,7 @@
72	72	<td>{{ item.progress_cnt }}</td>
73	73	<td>{{ item.to_cnt }}</td>
74	74	<td>{{ item.from_cnt }}</td>
75		- <td>{{ item.to_cnt + item.from_cnt }}</td>
	75	+ <td>{{ item.total_cnt }}</td>
76	76	</tr>
77	77	</tbody>
78	78	</table>
...	...	@@ -89,19 +89,19 @@
89	89	<tbody>
90	90	<tr>
91	91	<th>합계</th>
92		- <td>성공건수</td>
93		- <td>실패건수</td>
94		- <td>진행중인건수</td>
95		- <td>요청받은건수</td>
96		- <td>요청한 건수</td>
97		- <td>전체 요청수</td>
	92	+ <td>{{ totalCount.succesee_cnt }}</td>
	93	+ <td>{{ totalCount.failed_cnt }}</td>
	94	+ <td>{{ totalCount.progress_cnt }}</td>
	95	+ <td>{{ totalCount.to_cnt }}</td>
	96	+ <td>{{ totalCount.from_cnt }}</td>
	97	+ <td>{{ totalCount.total_cnt}}</td>
98	98	</tr>
99	99	</tbody>
100	100	</table>
101	101	</div>
102	102	<div class="bottom-wrap">
103	103	<PaginationButton v-model:currentPage="listSearch.currentPage" :perPage="listSearch.perPage"
104		- :total-count="companySelectListCount" :max-range="5" :click="listDateCheck" />
	104	+ :total-count="companySelectListCount" :max-range="5" :click="listTypeCheck" />
105	105	</div>
106	106	</div>
107	107	</div>
...	...	@@ -110,12 +110,12 @@
110	110	<div class="chart-top">
111	111	<div class="flex">
112	112	<div class="date-zone flex-start">
113		- <input type="date" name="" id="" min="2023-11-24" :max="listSearch.endDate"
114		- v-model="listSearch.startDate">
	113	+ <!-- <input type="date" name="" id="" min="2023-11-24" :max="listSearch.endDate" v-model="listSearch.startDate"> -->
	114	+ <input type="date" name="" id="" :max="listSearch.endDate" v-model="listSearch.startDate">
115	115	<span>~</span>
116		- <input type="date" name="" id="" :min="listSearch.startDate" :max="oneMonthLater"
117		- v-model="listSearch.endDate">
118		- <button class="blue-btn" @click="detailDateCheck()">조회</button>
	116	+ <!-- <input type="date" name="" id="" :min="listSearch.startDate" :max="oneMonthLater" v-model="listSearch.endDate"> -->
	117	+ <input type="date" name="" id="" :min="listSearch.startDate" :max="yesterDay" v-model="listSearch.endDate">
	118	+ <button class="blue-btn" @click="detailTypeCheck()">조회</button>
119	119	</div>
120	120	<div class="date-check flex-end">
121	121	<div>
...	...	@@ -184,7 +184,7 @@
184	184	</div>
185	185	<div class="bottom-wrap">
186	186	<PaginationButton v-model:currentPage="listSearch.currentPage" :perPage="listSearch.perPage"
187		- :total-count="companySelectListCount" :max-range="5" :click="detailDateCheck" />
	187	+ :total-count="companySelectListCount" :max-range="5" :click="detailTypeCheck" />
188	188	</div>
189	189	</div>
190	190	</div>
...	...	@@ -193,12 +193,9 @@
193	193	</div>
194	194	</template>
195	195	<script>
196		-import { useStore } from "vuex";
197	196	import axios from "axios";
198	197	import COMMON_UTIL from '../../../../resources/js/commonUtil.js';
199	198	import PaginationButton from '../../../component/pagination/PaginationButton.vue';
200		-
201		-
202	199
203	200	export default {
204	201
...	...	@@ -212,13 +209,15 @@
212	209	listSearch: {
213	210	currentPage: 1,
214	211	perPage: 10,
215		- startDate: '2023-11-01',
216		- endDate: COMMON_UTIL.today(),
	212	+ startDate: null,
	213	+ endDate: null,
217	214	},
218		- oneMonthLater: COMMON_UTIL.today(),
	215	+ // oneMonthLater: COMMON_UTIL.today(),
	216	+ yesterDay: COMMON_UTIL.yesterday(),
219	217	companyList: [],
220	218	companyStatisticsList: [],
221	219	companySelectListCount: 0,
	220	+ totalCount: {},
222	221	companyDetailStatistics: [],
223	222	};
224	223	},
...	...	@@ -253,8 +252,9 @@
253	252	},
254	253	data: vm.listSearch
255	254	}).then(function (response) {
256		- vm.companyStatisticsList = response.data.companyPickStatistics;
	255	+ vm.companyStatisticsList = response.data.data.companyPickStatistics;
257	256	vm.companySelectListCount = response.data.companySelectListCount;
	257	+ vm.totalCount = response.data.data.totalCount;
258	258	}).catch(function (error) {
259	259	console.log("error - ", error)
260	260	alert("PICK 통계 조회 오류, 관리자에게 문의하세요.");
...	...	@@ -272,8 +272,9 @@
272	272	},
273	273	data: vm.listSearch
274	274	}).then(function (response) {
275		- vm.companyStatisticsList = response.data.companyMatchingStatistics;
	275	+ vm.companyStatisticsList = response.data.data.companyMatchingStatistics;
276	276	vm.companySelectListCount = response.data.companySelectListCount;
	277	+ vm.totalCount = response.data.data.totalCount;
277	278	}).catch(function (error) {
278	279	console.log("error - ", error)
279	280	alert("MATCHING 통계 조회 오류, 관리자에게 문의하세요.");
...	...	@@ -318,33 +319,50 @@
318	319	})
319	320	},
320	321
321		- /*매칭관리 날짜선택 유효성 검사 /
322		- listDateCheck: function () {
323		- if (COMMON_UTIL.isEmpty(this.listSearch.endDate) === false) {
324		- alert("날짜를 선택해주세요.");
	322	+ /*매칭관리 타입 검사 /
	323	+ listTypeCheck: function () {
	324	+ if (this.selectedOption1 == 'pick') {
	325	+ this.companyPickStatistics();
325	326	} else {
326		-
327		- if (this.selectedOption1 == 'pick') {
328		- this.companyPickStatistics();
329		- } else {
330		- this.companyMatchingStatistics();
331		- }
	327	+ this.companyMatchingStatistics();
332	328	}
333	329	},
334	330
335		- /*매칭관리 세부통계 날짜선택 유효성 검사 /
336		- detailDateCheck: function () {
337		- if (COMMON_UTIL.isEmpty(this.listSearch.endDate) === false) {
338		- alert("날짜를 선택해주세요.");
339		- } else {
	331	+ // /*매칭관리 날짜선택 유효성 검사 /
	332	+ // listDateCheck: function () {
	333	+ // if (COMMON_UTIL.isEmpty(this.listSearch.endDate) === false) {
	334	+ // alert("날짜를 선택해주세요.");
	335	+ // } else {
	336	+ // if (this.selectedOption1 == 'pick') {
	337	+ // this.companyPickStatistics();
	338	+ // } else {
	339	+ // this.companyMatchingStatistics();
	340	+ // }
	341	+ // }
	342	+ // },
340	343
341		- if (this.selectedOption1 == 'pick') {
342		- this.companyPickStatistics();
343		- } else {
344		- this.companyMatchingStatistics();
345		- }
	344	+ /*매칭관리 세부통계 타입 검사 /
	345	+ detailTypeCheck: function () {
	346	+ if (this.selectedOption1 == 'pick') {
	347	+ this.companyPickStatistics();
	348	+ } else {
	349	+ this.companyMatchingStatistics();
346	350	}
347	351	},
	352	+
	353	+ // /*매칭관리 세부통계 날짜선택 유효성 검사 /
	354	+ // detailDateCheck: function () {
	355	+ // if (COMMON_UTIL.isEmpty(this.listSearch.endDate) === false) {
	356	+ // alert("날짜를 선택해주세요.");
	357	+ // } else {
	358	+
	359	+ // if (this.selectedOption1 == 'pick') {
	360	+ // this.companyPickStatistics();
	361	+ // } else {
	362	+ // this.companyMatchingStatistics();
	363	+ // }
	364	+ // }
	365	+ // },
348	366
349	367	/** 기업 리스트 */
350	368	companySelectList: function () {
...	...	@@ -365,15 +383,15 @@
365	383	},
366	384	},
367	385	watch: {
368		- 'listSearch.startDate': function (newValue) {
369		- let date = COMMON_UTIL.oneMonthLater(newValue);
370		- this.listSearch.endDate = null;
371		- if (date > COMMON_UTIL.today()) {
372		- this.oneMonthLater = COMMON_UTIL.today();
373		- } else {
374		- this.oneMonthLater = date;
375		- }
376		- },
	386	+ // 'listSearch.startDate': function (newValue) {
	387	+ // let date = COMMON_UTIL.oneMonthLater(newValue);
	388	+ // this.listSearch.endDate = null;
	389	+ // if (date > COMMON_UTIL.today()) {
	390	+ // this.oneMonthLater = COMMON_UTIL.today();
	391	+ // } else {
	392	+ // this.oneMonthLater = date;
	393	+ // }
	394	+ // },
377	395	},
378	396	computed: {},
379	397	components: {

Delete comment