From a472d1349989b398f8124165f94025d16381f470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 6 Apr 2023 14:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E6=A0=87=E5=8F=B7=E5=A2=9E=E5=8A=A0=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=BA=93=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue          | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index cd2525ac9..e48bde731 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -347,22 +347,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>-->
+<!--      <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"/>
@@ -1054,7 +1054,7 @@
         url: {
           addModelList: '/project/projectLawsInventoryEO/queryPageDummy',
           queryConditionInventory: '/project/projectLawsInventoryEO/queryConditionInventory',
-          list: '/project/projectLawsInventoryEO/page',
+          list: '/project/projectLawsInventoryEO/list',
           addModel: 'project/projectLawsInventoryEO/add',
           editModel: '/project/projectLawsInventoryEO/edit',
           deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
@@ -2055,15 +2055,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))
@@ -2083,19 +2083,19 @@
           orderBy: this.orderBy,
           orderByField: this.orderByField,
           roleCode: roleCode,
-          pageNo: this.pageNo,
-          pageSize: this.pageSize
+          // 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.records || []
-            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 || []
+            // this.total = res.result.total
             this.loading = false
             this.JLoading = false
             if (this.dataSource.length == 0) {