yjryu / KERIS star
Stormen123 2023-12-14
231214 김성훈 현재페이지 고정 진행중
@28fbc1bf6d32cfb34f0af3824b958af850aa43f9
client/views/pages/admin/mail/MailSelectList.vue
--- client/views/pages/admin/mail/MailSelectList.vue
+++ client/views/pages/admin/mail/MailSelectList.vue
@@ -58,7 +58,7 @@
             </div>
             <div class="bottom-wrap">
                 <PaginationButton v-model:currentPage="mailListSearch.currentPage" :perPage="mailListSearch.perPage"
-                    :totalCount="mailListCount" :maxRange="5" :click="mailSelectList" />
+                    :totalCount="mailListCount" :maxRange="5" :click="mailSelectListPage" />
             </div>
         </div>
     </div>
@@ -73,7 +73,7 @@
     data() {
         return {
             mailListSearch: {
-                currentPage: 1,
+                currentPage: 0,
                 perPage: 10,
                 searchType: 'all',
                 searchText: null,
@@ -127,7 +127,11 @@
 
         //메일 상세조회 페이지로 이동
         mailSelectOnePage: function (item) {
-            this.$router.push({ path: '/adm/mailSelectOne.page', query: { 'eml_id': item.eml_id } });
+            this.$router.push({ path: '/adm/mailSelectOne.page', query: { 'eml_id': item.eml_id, 'page': this.mailListSearch.currentPage } });
+        },
+
+        mailSelectListPage: function() {
+            this.$router.push({ path: '/adm/mailSelectList.page', query: { 'page': this.mailListSearch.currentPage } });
         },
 
         mailSelectList: function () {
@@ -150,13 +154,27 @@
             })
         },
     },
-    watch: {},
+    watch: {
+        'mailListSearch.currentPage': function () {
+            this.mailSelectList();
+        },
+    },
     computed: {},
     components: {
         PaginationButton: PaginationButton,
     },
+    created() {
+        if(this.$route.query.page) {
+            this.mailListSearch.currentPage = Number(this.$route.query.page);
+        } else {
+            this.mailListSearch.currentPage = 1;
+        }
+    },
     mounted() {
-        this.mailSelectList();
+        if(!this.$route.query.page) {
+            
+            this.mailSelectList();
+        }
     }
 };
 </script>
client/views/pages/admin/mail/MailSelectOne.vue
--- client/views/pages/admin/mail/MailSelectOne.vue
+++ client/views/pages/admin/mail/MailSelectOne.vue
@@ -155,7 +155,7 @@
 
         // 리스트 페이지로
         selectList: function () {
-            this.$router.push({ path: '/adm/mailSelectList.page' });
+            this.$router.push({ path: '/adm/mailSelectList.page', query:{'page': this.$route.query.page} });
         }
     },
     watch: {},
client/views/pages/admin/networking/NetworkingSelectList.vue
--- client/views/pages/admin/networking/NetworkingSelectList.vue
+++ client/views/pages/admin/networking/NetworkingSelectList.vue
@@ -56,7 +56,7 @@
                 </div> -->
                 <div class="bottom-wrap">
                 <PaginationButton v-model:currentPage="companyListSearch.currentPage" :perPage="companyListSearch.perPage"
-                    :totalCount="companyListCount" :maxRange="5" :click="companySelectList" />
+                    :totalCount="companyListCount" :maxRange="5" :click="companySelectListPage" />
             </div>
             </div>
         </div>
@@ -73,7 +73,7 @@
     data() {
         return {
             companyListSearch: {
-                currentPage: 1,
+                currentPage: 0,
                 perPage: 10,
                 searchType: 'company_name',
                 searchText: null,
@@ -129,17 +129,34 @@
 
         //게시글 상세조회 페이지로 이동
         companySelectOnePage: function (item) {
-            this.$router.push({ path: '/adm/networkingSelectOne.page', query: { "company_id" : item.company_id, "user_id": item.user_id } });
+            this.$router.push({ path: '/adm/networkingSelectOne.page', query: { "company_id" : item.company_id, "page": this.companyListSearch.currentPage } });
         },
+
+        companySelectListPage: function() {
+            this.$router.push({ path: '/adm/networkingSelectList.page', query: { 'page': this.companyListSearch.currentPage} });
+        }
         
     },
-    watch: {},
+    watch: {
+        'companyListSearch.currentPage': function () {
+            this.companySelectList();
+        },
+    },
     computed: {},
     components: {
         PaginationButton: PaginationButton,
     },
+    created() {
+        if(this.$route.query.page) {
+            this.companyListSearch.currentPage = Number(this.$route.query.page);
+        } else {
+            this.companyListSearch.currentPage = 1;
+        }
+    },
     mounted(){
-        this.companySelectList()
+        if(!this.$route.query.page) {
+            this.companySelectList();
+        }
     }
 };
 </script>
client/views/pages/admin/networking/NetworkingSelectOne.vue
--- client/views/pages/admin/networking/NetworkingSelectOne.vue
+++ client/views/pages/admin/networking/NetworkingSelectOne.vue
@@ -112,7 +112,7 @@
             vm.best = vm.route.query.best;
 
             axios({
-                url: '/matching/companySelectOne.json',
+                url: '/company/companySelectOne.json',
                 method: 'post',
                 hearder: {
                     'Content-Type': "application/json; charset=UTF-8",
@@ -183,7 +183,7 @@
             });
         },
         postSelectListPage: function () {
-            this.$router.push({ path: '/adm/networkingSelectList.page' });
+            this.$router.push({ path: '/adm/networkingSelectList.page', query: {'page' : this.$route.query.page} });
         },
     },
     watch: {
client/views/pages/admin/popup/PopupSelectList.vue
--- client/views/pages/admin/popup/PopupSelectList.vue
+++ client/views/pages/admin/popup/PopupSelectList.vue
@@ -76,7 +76,7 @@
             </div>
             <div class="bottom-wrap">
                 <PaginationButton v-model:currentPage="popupListSearch.currentPage" :perPage="popupListSearch.perPage"
-                    :totalCount="popupListCount" :maxRange="5" :click="popupSelectList" />
+                    :totalCount="popupListCount" :maxRange="5" :click="popupSelectListPage" />
             </div>
         </div>
     </div>
@@ -91,7 +91,7 @@
     data() {
         return {
             popupListSearch: {
-                currentPage: 1,
+                currentPage: 0,
                 perPage: 10,
                 searchType: 'all',
                 searchText: null,
@@ -123,7 +123,7 @@
         },
         //게시글 상세조회 페이지로 이동
         popupSelectOnePage: function (item) {
-            this.$router.push({ path: '/adm/popupSelectOne.page', query: { "post_id" : item.post_id, "file_id": item.file_id } });
+            this.$router.push({ path: '/adm/popupSelectOne.page', query: { "post_id" : item.post_id, "file_id": item.file_id, 'page': this.popupListSearch.currentPage } });
         },
         
         popupInsertPage: function () {
@@ -132,6 +132,10 @@
 
         popupUpdatePage: function (item) {
             this.$router.push({ path: '/adm/popupUpdate.page', query: { 'post_id': item.post_id, 'file_id': item.file_id } });
+        },
+
+        popupSelectListPage: function() {
+            this.$router.push({ path: '/adm/popupSelectList.page', query: { 'page': this.popupListSearch.currentPage} });
         },
 
         popupSelectList: function () {
@@ -183,13 +187,26 @@
 
 
     },
-    watch: {},
+    watch: {
+        'popupListSearch.currentPage': function () {
+            this.popupSelectList();
+        },
+    },
     computed: {},
     components: {
         PaginationButton: PaginationButton,
     },
+    created() {
+        if(this.$route.query.page) {
+            this.popupListSearch.currentPage = Number(this.$route.query.page);
+        } else {
+            this.popupListSearch.currentPage = 1;
+        }
+    },
     mounted() {
-        this.popupSelectList();
+        if(!this.$route.query.page) {
+            this.popupSelectList();
+        }
     }
 };
 </script>
client/views/pages/admin/popup/PopupSelectOne.vue
--- client/views/pages/admin/popup/PopupSelectOne.vue
+++ client/views/pages/admin/popup/PopupSelectOne.vue
@@ -22,7 +22,7 @@
                         </tr>
                         <tr>
                             <td colspan="2" style="border-bottom: 1px solid #007aff;">
-                                <img :src="'http://211.253.8.180:8082' + file.file_path + '/' + file.file_nm + '.' + file.file_extn_nm" style="max-width:100%; height:auto;"  alt="">
+                                <img :src="'http://localhost:8080' + file.file_path + '/' + file.file_nm + '.' + file.file_extn_nm" style="max-width:100%; height:auto;"  alt="">
                             </td>
                         </tr>
                         <tr>
@@ -201,7 +201,7 @@
         },
 
         popupSelectListPage: function () {
-            this.$router.push({ path: '/adm/popupSelectList.page' });
+            this.$router.push({ path: '/adm/popupSelectList.page', query: {'page' : this.$route.query.page} });
         },
 
         popupUpdatePage: function () {
client/views/pages/admin/user/UserSelectList.vue
--- client/views/pages/admin/user/UserSelectList.vue
+++ client/views/pages/admin/user/UserSelectList.vue
@@ -59,7 +59,7 @@
                         <div class="flex-center">
                             <PaginationButton v-if="userListCount > 0" v-model:currentPage="userListSearch.currentPage"
                                 :perPage="userListSearch.perPage" :totalCount="userListCount" :maxRange="5"
-                                :click="userSelectList" />
+                                :click="userSelectListPage" />
                         </div>
                     </div>
                     <div v-show="currentTab == 1">
@@ -111,7 +111,7 @@
                         <div class="flex-center">
                             <PaginationButton v-if="companyListCount > 0" v-model:currentPage="companyListSearch.currentPage"
                                 :perPage="companyListSearch.perPage" :totalCount="companyListCount" :maxRange="5"
-                                :click="companySelectList" />
+                                :click="companySelectListPage" />
                         </div>
                     </div>
                     <div v-show="currentTab == 2">
@@ -158,7 +158,7 @@
                         <div class="flex-center">
                             <PaginationButton v-if="mngrListCount > 0" v-model:currentPage="managerListSearch.currentPage"
                                 :perPage="managerListSearch.perPage" :totalCount="mngrListCount" :maxRange="5"
-                                :click="managerSelectList" />
+                                :click="managerSelectListPage" />
                         </div>
                         <div class="btn-wrap">
                             <button class="blue-btn" @click="modalType = 'userInsert'">등록</button>
@@ -248,7 +248,7 @@
 
             // 관리자 목록조회
             managerListSearch: {
-                currentPage: 1,
+                currentPage: 0,
                 perPage: 10,
                 searchType: 'id',
                 searchText: null,
@@ -261,7 +261,7 @@
 
             // 사용자 목록조회
             userListSearch: {
-                currentPage: 1,
+                currentPage: 0,
                 perPage: 10,
                 searchType: 'id',
                 searchText: null,
@@ -274,13 +274,14 @@
 
             // 기관회원 목록조회
             companyListSearch: {
-                currentPage: 1,
+                currentPage: 0,
                 perPage: 10,
                 searchType: 'id',
                 searchText: null,
                 user_id: null,
                 user_nm: null
             },
+
             companyList: [],
             companyListCount: 0,
             companyIdx: 0,
@@ -586,19 +587,31 @@
             });
         },
 
-        //상세조회 페이지로 이동
-        userSelectOnePage: function (user) {
-            this.$router.push({ path: '/adm/userSelectOne.page', query: { 'user_id': user.user_id } });
+         //상세조회 페이지로 이동
+         userSelectOnePage: function (user) {
+            this.$router.push({ path: '/adm/userSelectOne.page', query: { 'user_id': user.user_id, 'Upage': this.userListSearch.currentPage } });
         },
 
         companySelectOnePage: function (company) {
-            this.$router.push({ path: '/adm/companySelectOne.page', query: { 'user_id': company.user_id } });
+            this.$router.push({ path: '/adm/companySelectOne.page', query: { 'user_id': company.user_id, 'Cpage': this.companyListSearch.currentPage} });
         },
 
         //상세조회 페이지로 이동
         adminSelectOnePage: function (admin) {
-            this.$router.push({ path: '/adm/userSelectOne.page', query: { 'mngr_id': admin.mngr_id } });
+            this.$router.push({ path: '/adm/userSelectOne.page', query: { 'mngr_id': admin.mngr_id, 'Mpage':  this.managerListSearch.currentPage } });
         },
+
+        userSelectListPage: function() {
+            this.$router.push({ path: '/adm/userSelectList.page', query: { 'Upage': this.userListSearch.currentPage } });
+        },
+
+        companySelectListPage: function() {
+            this.$router.push({ path: '/adm/userSelectList.page', query: { 'Cpage': this.companyListSearch.currentPage } });
+        },
+
+        managerSelectListPage: function() {
+            this.$router.push({ path: '/adm/userSelectList.page', query: { 'Mpage': this.managerListSearch.currentPage } });
+        }
     },
     watch: {
         "modalType": function (newValue, oldValue) {
@@ -608,17 +621,57 @@
         },
         "mngr.mngr_id": function(newVal, oldVal){
             this.idCheck_boolean = false;
-        }
+        },
+        
+        'userListSearch.currentPage': function () {
+            this.userSelectList();
+        },
+
+        'companyListSearch.currentPage': function () {
+            this.companySelectList();
+        },
+
+        'managerListSearch.currentPage': function () {
+            this.managerSelectList();
+        },
         
     },
     computed: {},
     components: {
         'PaginationButton': PaginationButton,
     },
+    created() {
+        if(this.$route.query.Upage) {
+            this.userListSearch.currentPage = Number(this.$route.query.Upage);
+        } else {
+            this.userListSearch.currentPage = 1;
+        }
+
+        if(this.$route.query.Cpage) {
+            this.companyListSearch.currentPage = Number(this.$route.query.Cpage);
+        } else {
+            this.companyListSearch.currentPage = 1;
+        }
+
+        if(this.$route.query.Mpage) {
+            this.managerListSearch.currentPage = Number(this.$route.query.Mpage);
+        } else {
+            this.managerListSearch.currentPage = 1;
+        }
+    },
+
     mounted() {
-        this.managerSelectList();
-        this.userSelectList();
-        this.companySelectList();
+        if(!this.$route.query.Mpage) {
+            this.managerSelectList();
+        }
+
+        if(!this.$route.query.Upage) {
+            this.userSelectList();
+        }
+
+        if(!this.$route.query.Cpage) {
+            this.companySelectList();
+        }
     },
 };
 </script>
client/views/pages/user/Data/Technology.vue
--- client/views/pages/user/Data/Technology.vue
+++ client/views/pages/user/Data/Technology.vue
@@ -133,7 +133,7 @@
             </ul>
             <div class="bottom-wrap">
                 <PaginationButton v-model:currentPage="postListSearch.currentPage" :perPage="postListSearch.perPage"
-                    :totalCount="postListCount" :maxRange="5" :click="postSelectList" />
+                    :totalCount="postListCount" :maxRange="5" :click="postSelectListPage" />
             </div>
         </div>
     </div>
@@ -147,7 +147,7 @@
     data() {
         return {
             postListSearch: {
-                currentPage: 1,
+                currentPage: 0,
                 perPage: 9,
                 searchType: 'all',
                 searchText: null,
@@ -168,7 +168,7 @@
                 { name: '제목', value: 'title' },
                 { name: '내용', value: 'content' },
                 { name: '작성자', value: 'writer' },
-            ]
+            ],
         }
     },
     methods: {
@@ -190,7 +190,7 @@
                 },
                 data: { 'post_id': item.post_id, 'bbs_id': item.bbs_id }
             }).then(function (response) {
-                vm.$router.push({ path: '/TechnologyOne.page', query: { 'post_id': item.post_id, 'file_id': item.file_id, 'bbs_id': item.bbs_id, 'tech_doc_dt': item.tech_doc_dt } });
+                vm.$router.push({ path: '/TechnologyOne.page', query: { 'post_id': item.post_id, 'file_id': item.file_id, 'bbs_id': item.bbs_id, 'tech_doc_dt': item.tech_doc_dt, 'page':vm.postListSearch.currentPage } });
             }).catch(function (error) {
                 alert("기술문서 상세보기 오류, 관리자에게 문의바랍니다.");
             })
@@ -272,10 +272,17 @@
                 this.postListSearch.ctgry_nm = null
             }
             this.postSelectList();
+        },
+
+        postSelectListPage: function() {
+            this.$router.push({ path: '/Technology.page', query: { 'page': this.postListSearch.currentPage} });
         }
+
     },
     watch: {
-
+        'postListSearch.currentPage': function () {
+            this.postSelectList();
+        },
     },
     computed: {
         emptySpaces() {
@@ -285,9 +292,19 @@
     components: {
         PaginationButton: PaginationButton,
     },
+    created() {
+        if(this.$route.query.page) {
+            this.postListSearch.currentPage = Number(this.$route.query.page);
+        } else {
+            this.postListSearch.currentPage = 1;
+        }
+    },
     mounted() {
         this.pageLogInsert();
-        this.postSelectList();
+        if(!this.$route.query.page) {
+            this.postSelectList();
+        }
+        
     }
 }
 </script>
client/views/pages/user/Data/TechnologyOne.vue
--- client/views/pages/user/Data/TechnologyOne.vue
+++ client/views/pages/user/Data/TechnologyOne.vue
@@ -141,7 +141,7 @@
     },
     methods: {
         goToPage4() {
-            this.$router.push('/Technology.page'),
+            this.$router.push({path:'/Technology.page', query: {'page': this.route.query.page}}),
                 window.scrollTo({
                     top: 0,
                     behavior: 'smooth'
Add a comment
List