From a72b7dafd4d8b37cbd99b19380c27ee8f122a4e9 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 18 Aug 2022 10:25:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/externalReports/index.vue              | 2 +-
 .../src/views/regulationsKanban/components/addModel.vue   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index ab260fc29..d3f70cdd8 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -1085,7 +1085,7 @@ export default {
 /deep/.ant-table td{
   white-space: nowrap;
 }
-.ant-calendar-range-picker-input{
+/deep/.ant-calendar-range-picker-input{
   width: 46% !important;
 }
 .title-text {
diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
index 24ebea27a..a77965814 100644
--- a/jero-web/src/views/regulationsKanban/components/addModel.vue
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -70,8 +70,7 @@
       :dataSource='areaTable'
       :pagination='false'
       :loading='loading'
-      :scroll='{x: 600}'
-
+      :scroll="{x: '100%',y:370}"
       @change='handleTableChange'>
       <span slot="status" slot-scope="text,record" :title="text" >
         <a v-if="record.designFlowTaskStatus == 'Compliance'" style='color: #26BD4B'>{{ text }}</a>
@@ -282,6 +281,8 @@ export default {
         dutyTerritory:this.formData.dutyTerritory?this.formData.dutyTerritory:'',
         projectName:this.formData.projectName?this.formData.projectName:'',
         projectNameId:this.formData.projectNameId?this.formData.projectNameId:'',
+        // pageNo: this.pageNo,
+        // pageSize: this.pageSize,
       }
       this.loading = true
       getAction('project/lawsComplianceBoard/queryComplianceResultList', params).then((res) => {
@@ -289,6 +290,7 @@ export default {
           this.areaTable = res.result.complianceResultList
           this.opinionGather = res.result.opinionGather
           this.technologyEvaluation = res.result.technologyEvaluation
+          // this.total = res.result.total
           this.loading = false
         }else{
           this.loading = false
@@ -304,10 +306,12 @@ export default {
       downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.item.serialNumber  +'.xls', query, this.Deselect)
     },
     searchQuery() {
+      this.pageNo = 1
       this.loadData()
     },
     searchReset() {
       this.formData = {}
+      this.pageNo = 1
       this.loadData()
     },
     handleCancel() {