From 25a3a49bda5e830eafb8a0ab8ae5c2b4c95e8444 Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Mon, 6 May 2024 20:49:06 +0800
Subject: [PATCH] =?UTF-8?q?flat:=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/applicationsRecord/sub/detail.vue  |  1 -
 src/views/manage/survey/sub/detail.vue        |  1 -
 .../tenant/main/serve/Dialog/pushService.vue  | 33 ++++++++++++++++---
 vue.config.js                                 |  2 +-
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/views/manage/applicationsRecord/sub/detail.vue b/src/views/manage/applicationsRecord/sub/detail.vue
index 00d343f..b95ce7f 100644
--- a/src/views/manage/applicationsRecord/sub/detail.vue
+++ b/src/views/manage/applicationsRecord/sub/detail.vue
@@ -97,7 +97,6 @@ export default {
           }, {
             label: '手机号',
             prop: 'surveyContent',
-            search: true,
           }, {
             label: '创建人',
             prop: 'createUser',
diff --git a/src/views/manage/survey/sub/detail.vue b/src/views/manage/survey/sub/detail.vue
index 5925f27..577e8d8 100644
--- a/src/views/manage/survey/sub/detail.vue
+++ b/src/views/manage/survey/sub/detail.vue
@@ -97,7 +97,6 @@ export default {
           }, {
             label: '手机号',
             prop: 'surveyContent',
-            search: true,
           }, {
             label: '创建人',
             prop: 'createUser',
diff --git a/src/views/tenant/main/serve/Dialog/pushService.vue b/src/views/tenant/main/serve/Dialog/pushService.vue
index a1a67b8..f2163ca 100644
--- a/src/views/tenant/main/serve/Dialog/pushService.vue
+++ b/src/views/tenant/main/serve/Dialog/pushService.vue
@@ -42,6 +42,7 @@
         <div class="content-right relative">
           <avue-crud height="900" ref="crud2" :data="rightDataList"
                      :option="rightTabs ? rightPostOptions : rightPolicyOptions" :page.sync="rightPages"
+                     @current-change="rightCurrentPageChange" @size-change="rightSizePageChange"
                      @selection-change="rightSelectionChange">
             <template slot="menuLeft">
               <el-input style="width: 300px" placeholder="搜索岗位" v-show="rightTabs === 1"
@@ -289,6 +290,16 @@ export default {
       this.getLeftUserList()
       console.log('leftpages:', this.leftPages)
     },
+    rightCurrentPageChange(current) {
+      this.rightPages.currentPage = current
+      this.rightTabs === 0 && this.getRightListPolicy()
+      this.rightTabs === 1 && this.getRightSearchByUserId()
+    },
+    rightSizePageChange(current) {
+      this.rightPages.size = current
+      this.rightTabs === 0 && this.getRightListPolicy()
+      this.rightTabs === 1 && this.getRightSearchByUserId()
+    },
     leftSelectionChange(val) {
       this.leftUserSelections = val
       console.log(val, '--------------------00000');
@@ -374,28 +385,42 @@ export default {
       }
     },
     async getRightSearchByUserId() {
+      const {currentPage, size} = this.rightPages
       const ids = this.leftUserSelections.map(item => item.userId).join(',');
       const createTime = Date.now() + 3000
       this.rightLoading = true
-      let resData = await getSearchAllByUserId({ids})
+      let params = {
+        ids, current: currentPage,
+        size,
+      }
+      let resData = await getSearchAllByUserId(params)
       if (resData.data.code === 200) {
         const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
         setTimeout(() => {
+          const {records, total, size, current} = resData.data.data
           this.rightLoading = false
-          this.rightDataList = resData.data.data
+          this.rightDataList = records
+          this.rightPages = {total, size, currentPage: current}
         }, timed)
       }
     },
     async getRightListPolicy() {
-      let params = {ids: this.rowData.policyIds}
+      const {currentPage, size} = this.rightPages
+      let params = {
+        ids: this.rowData.policyIds,
+        current: currentPage,
+        size,
+      }
       const createTime = Date.now() + 3000
       this.rightLoading = true
       let resData = await getListByids(params)
       if (resData.data.code === 200) {
         const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
         setTimeout(() => {
+          const {records, total, size, current} = resData.data.data
           this.rightLoading = false
-          this.rightDataList = resData.data.data
+          this.rightDataList = records
+          this.rightPages = {total, size, currentPage: current}
         }, timed)
       }
     },
diff --git a/vue.config.js b/vue.config.js
index 30536d1..59fcc13 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,7 +23,7 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        target: 'http://10.165.0.173:8000',
+        target: 'http://192.168.1.105:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {