From d0d13171f1dbc7160bde80600e4c543ac495938c Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 20 Jun 2022 17:45:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js                   |  6 +++---
 jero-web/src/common/lang/zh-cn.js                   |  2 +-
 jero-web/src/views/dashboard/customContentList.vue  |  2 +-
 .../documentTools/searchCenter/components/whole.vue |  5 ++++-
 .../src/views/documentTools/searchCenter/index.vue  | 13 +++++++++++++
 jero-web/src/views/system/UserAnnouncementList.vue  |  2 +-
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 7b534e09c..34507c021 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -902,11 +902,11 @@ module.exports = {
   testReportLocation: 'Report Location',
   explain: 'Comment',
   dataCannotEmpty: 'Data Cannot Empty',
-  documentDynamics: 'Document Dynamics',
+  documentDynamics: 'Document Update',
   theNumberAgain: 'The number already exists and cannot be added again',
   myList: 'My to-do list',
-  myNews: 'My News',
-  monthlyReportRegulations: 'Monthly report regulations',
+  myNews: 'My Message',
+  monthlyReportRegulations: 'Regulation Monthly Report',
   Pending: 'Pending',
   custom: 'Custom',
   notSelected: 'Not selected',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index c99f0daca..b7d2738aa 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -868,7 +868,7 @@ module.exports = {
   listConfirmationProgress: '清单确认进度',
   taskConfirmationProgress: '任务确认进度',
   designComplianceConfirmationProgress: '设计符合性确认进度',
-  preHomeConfirmProgress: 'Pre-Home确认进度',
+  preHomeConfirmProgress: 'Pre-Homo确认进度',
   verificationComplianceConfirmationProgress: '验证符合性确认进度',
   totalTable: '总数',
   applicableSupplement: '适用增补件',
diff --git a/jero-web/src/views/dashboard/customContentList.vue b/jero-web/src/views/dashboard/customContentList.vue
index 4d1e3016a..130996eaf 100644
--- a/jero-web/src/views/dashboard/customContentList.vue
+++ b/jero-web/src/views/dashboard/customContentList.vue
@@ -39,7 +39,7 @@
       :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
       :columns="columns"
       :dataSource="dataSource"
-      :scroll="{x: 1600}"
+      :scroll="{x: '100%'}"
       :pagination="ipagination"
       :loading="loading"
       @change="handleTableChange">
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index fde6d2f2d..3d5dc8df3 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -124,7 +124,10 @@
       }
     },
     mounted() {
-      this.getList()
+      this.conList = []
+      // if (!this.queryParam.selectValue) {
+      //   this.getList()
+      // }
     },
     methods: {
       checkedClick(item) {
diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue
index 3363b6a2e..15cd518b7 100644
--- a/jero-web/src/views/documentTools/searchCenter/index.vue
+++ b/jero-web/src/views/documentTools/searchCenter/index.vue
@@ -105,12 +105,25 @@
             this.$refs.wholeRef.searchData(this.selectValueTwo)
           }
         })
+      } else {
+        this.$nextTick(() => {
+          if (this.$refs.wholeRef) {
+            this.$refs.wholeRef.searchData()
+          }
+        })
       }
     },
     methods: {
       callback(key) {
         this.active = key
         this.selectValueTwo = ''
+        if (this.active == this.$t('whole')) {
+          this.$nextTick(() => {
+            if (this.$refs.wholeRef) {
+              this.$refs.wholeRef.searchData()
+            }
+          })
+        }
       },
       ResetSearch() {
         this.selectValueTwo = ''
diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index c3a8ed208..8a258b4a9 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -61,7 +61,7 @@
       :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
       :columns="columns"
       :dataSource="dataSource"
-      :scroll="{x: 1600}"
+      :scroll="{x: '100%'}"
       :pagination="ipagination"
       :loading="loading"
       @change="handleTableChange">