From f2928f335c861efc0cff316fc462e6adb0f0a4d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 8 May 2023 10:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E3=80=81=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E3=80=81=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/App.vue                          | 21 +++--
 .../components/virtualListDetails.vue         | 49 ++++++++++--
 .../components/listOfRegulations.vue          | 78 ++++++++++---------
 .../certificationListMaintenance.vue          | 52 +++++++++++--
 4 files changed, 148 insertions(+), 52 deletions(-)

diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue
index 3439653a2..d4bd69fbf 100644
--- a/jero-web/src/App.vue
+++ b/jero-web/src/App.vue
@@ -180,18 +180,18 @@
   }
 
   .ant-table-column-title {
-    font-weight: bold!important;
+    font-weight: bold !important;
   }
 
   .ant-table-thead > tr > th {
-    background: #f3f6f6!important;
-    padding-top: 12px!important;
-    padding-bottom: 12px!important;
+    background: #f3f6f6 !important;
+    padding-top: 12px !important;
+    padding-bottom: 12px !important;
   }
 
   .ant-table-tbody > tr > td {
-    padding-top: 12px!important;
-    padding-bottom: 12px!important;
+    padding-top: 12px !important;
+    padding-bottom: 12px !important;
   }
 
   .ant-tooltip-inner {
@@ -206,4 +206,13 @@
   .ant-menu-inline-collapsed-tooltip a {
     color: #333 !important;
   }
+
+  .page .ant-select-selection--single {
+    height: 32px !important;
+    line-height: 32px !important;
+  }
+  .page .ant-select-selection__rendered{
+    height: 32px !important;
+    line-height: 32px !important;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 1b8c32b24..8caae84e1 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -314,9 +314,22 @@
                 <span v-else>--</span>
               </span>
             </a-table>
-            <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
-              {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}
+            <div class="page" v-if="dataSource.length > 0">
+              <a-pagination
+                :show-total="total => $t('total')+` ${total} `+$t('strip')"
+                show-quick-jumper
+                show-size-changer
+                :page-size.sync="pageSize"
+                :total="total"
+                :pageSizeOptions="['50','100','200','300']"
+                :current="pageNo"
+                @change="onChangeSize"
+                @showSizeChange="SizeChange"
+              />
             </div>
+<!--            <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
+<!--              {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}-->
+<!--            </div>-->
           </div>
         </a-card>
       </div>
@@ -403,6 +416,9 @@
         orderBy: '1',
         istable: true,
         orderByField: '',
+        pageNo: 1,
+        pageSize: 50,
+        total: 0,
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         dataSourceFile: [],
@@ -424,7 +440,7 @@
         url: {
           addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy',
           queryConditionInventory: '/dummy/dummyInventoryInfoEO/queryConditionInventory',
-          list: '/dummy/dummyInventoryInfoEO/list',
+          list: '/dummy/dummyInventoryInfoEO/page',
           addModel: '/dummy/dummyInventoryInfoEO/add',
           editModel: '/dummy/dummyInventoryInfoEO/edit',
           deleteBatch: '/dummy/dummyInventoryInfoEO/deleteBatch',
@@ -1231,6 +1247,15 @@
           }
         })
       },
+      onChangeSize(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
       getList() {
         if (this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String && this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String instanceof Array) {
           this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String = this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String.join(',')
@@ -1243,12 +1268,21 @@
           ...this.queryParamQuery,
           orderBy: this.orderBy,
           orderByField: this.orderByField,
-          dummyInventoryBaseId: this.$route.query.id
+          dummyInventoryBaseId: this.$route.query.id,
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
         }
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
-            this.dataSource = res.result || []
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            // this.dataSource = res.result || []
             if (this.dataSource.length == 0) {
               this.$nextTick(() => {
                 let anttablebody = document.getElementsByClassName('ant-table-body')
@@ -1727,6 +1761,11 @@
     padding-left: 16px!important;
     border-right: 1px solid #e8e8e8;
   }
+  .page {
+    text-align: right;
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
 </style>
 <style lang="less">
   .popconfirm {
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 0f62ff8c9..ec38b56f9 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -388,22 +388,22 @@
               :title="text">{{text}}</a>
         </span>
       </a-table>
-      <!--      <div class="page" v-if="dataSource.length > 0">-->
-      <!--        <a-pagination-->
-      <!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
-      <!--          show-quick-jumper-->
-      <!--          show-size-changer-->
-      <!--          :page-size.sync="pageSize"-->
-      <!--          :total="total"-->
-      <!--          :pageSizeOptions="['50','100','200','300']"-->
-      <!--          :current="pageNo"-->
-      <!--          @change="onChangeSize"-->
-      <!--          @showSizeChange="SizeChange"-->
-      <!--        />-->
-      <!--      </div>-->
-      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
-        {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
+      <div class="page" v-if="dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :pageSizeOptions="['50','100','200','300']"
+          :current="pageNo"
+          @change="onChangeSize"
+          @showSizeChange="SizeChange"
+        />
       </div>
+<!--      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
+<!--        {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}-->
+<!--      </div>-->
     </div>
     <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
     <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
@@ -1176,7 +1176,7 @@
         url: {
           addModelList: '/project/projectLawsInventoryEO/queryPageDummy',
           queryConditionInventory: '/project/projectLawsInventoryEO/queryConditionInventory',
-          list: '/project/projectLawsInventoryEO/list',
+          list: '/project/projectLawsInventoryEO/page',
           addModel: 'project/projectLawsInventoryEO/add',
           editModel: '/project/projectLawsInventoryEO/edit',
           deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
@@ -1518,7 +1518,7 @@
         }
       },
       modifyOperatorForm() {
-        this
+        this.pageNo = 1
         this.getList()
       },
       //收起/展开
@@ -2101,6 +2101,7 @@
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
                 _this.selectedRowKeys = []
+                _this.pageNo = 1
                 _this.getList()
               } else {
                 _this.$message.warning(_this.$t('operationFailed'))
@@ -2133,6 +2134,7 @@
             // this.confirmLoadingRoleSwitching = false
             this.$emit('getRoleSwitch', roleSwitchingCode)
             this.selectedRowKeys = []
+            this.pageNo = 1
             this.getList()
           } else {
             this.confirmLoadingRoleSwitching = false
@@ -2251,6 +2253,7 @@
       //搜索
       searchQuery() {
         this.selectedRowKeys = []
+        this.pageNo = 1
         this.getList()
       },
       //重置
@@ -2264,6 +2267,7 @@
 
       addModelList() {
         this.selectedRowKeys = []
+        this.pageNo = 1
         this.getList()
       },
       customizeListForm(val) {
@@ -2274,6 +2278,7 @@
       },
       transferListFormHomo() {
         this.$refs.transferListRef.handleCancel()
+        this.pageNo = 1
         this.getList()
       },
       handleSuperQuery(params, matchType) {
@@ -2287,6 +2292,7 @@
           sqp['superQueryMatchType'] = matchType
         }
         this.queryParamQuery = sqp
+        this.pageNo = 1
         this.getList()
       },
 
@@ -2313,15 +2319,15 @@
         }
         this.getList()
       },
-      // onChangeSize(page, pageSize) {
-      //   this.pageNo = page
-      //   this.getList()
-      // },
-      // SizeChange(page, pageSize) {
-      //   this.pageNo = 1
-      //   this.pageSize = pageSize
-      //   this.getList()
-      // },
+      onChangeSize(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
       getList() {
         let roleCode = this.roleSwitchingCode
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -2340,20 +2346,20 @@
           projectLibraryId: this.$route.query.id,
           orderBy: this.orderBy,
           orderByField: this.orderByField,
-          roleCode: roleCode
-          // pageNo: this.pageNo,
-          // pageSize: this.pageSize
+          roleCode: roleCode,
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
         }
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
-            // if (res.result.current > 1 && res.result.records.length == 0) {
-            //   this.pageNo = 1
-            //   this.getList()
-            //   return
-            // }
-            this.dataSource = res.result || []
-            // this.total = res.result.total
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
             this.loading = false
             this.JLoading = false
             if (this.dataSource.length == 0) {
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index 3d54dc18e..7144a6cfe 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -237,9 +237,22 @@
               </span>
 
             </a-table>
-            <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
-              {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}
+            <div class="page" v-if="dataSource.length > 0">
+              <a-pagination
+                :show-total="total => $t('total')+` ${total} `+$t('strip')"
+                show-quick-jumper
+                show-size-changer
+                :page-size.sync="pageSize"
+                :total="total"
+                :pageSizeOptions="['50','100','200','300']"
+                :current="pageNo"
+                @change="onChangeSize"
+                @showSizeChange="SizeChange"
+              />
             </div>
+<!--            <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
+<!--              {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}-->
+<!--            </div>-->
           </div>
         </a-card>
       </div>
@@ -288,8 +301,11 @@
         isbutton: false,
         toggleSearchStatus:false,
         dataSource: [],
+        pageNo: 1,
+        pageSize: 50,
+        total: 0,
         url: {
-          list: '/authDummy/authDummyInventoryInfoEO/list',
+          list: '/authDummy/authDummyInventoryInfoEO/page',
           logList: '/authDummy/authDummyLog/page',//更新log
           exportTemplate: '/authDummy/authDummyInventoryInfoEO/exportTemplate',//模板下载
           exportData: '/authDummy/authDummyInventoryInfoEO/exportData',//导出
@@ -535,17 +551,35 @@
       getPersonnelList(){
          this.getList()
       },
+      onChangeSize(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
       getList() {
         let query = {
           ...this.queryParam,
           orderBy: this.orderBy,
           orderByField: this.orderByField,
-          authDummyInventoryBaseId: this.$route.query.id
+          authDummyInventoryBaseId: this.$route.query.id,
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
         }
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
-            this.dataSource = res.result || []
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            // this.dataSource = res.result || []
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
             this.loading = false
           } else {
             this.loading = false
@@ -723,4 +757,12 @@
     color: #00B3BE;
     cursor: pointer;
   }
+  .page {
+    text-align: right;
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
+  ::v-deep .ant-card-body {
+    padding: 14px 32px 0 32px;
+  }
 </style>
\ No newline at end of file