From 687d9ab1e03df5ea77a873a033815388470436e8 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 30 Mar 2022 16:59:06 +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

---
 .../components/DocumentLibrary.vue            | 16 +++++++++++++
 .../searchCenter/components/whole.vue         | 23 +++++++++++--------
 .../documentTools/searchCenter/index.vue      | 10 ++++++++
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 5871d6f63..00df675ac 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -529,6 +529,22 @@
           this.getParagraphInfoList(2)
         }
       },
+      ResetSearch() {
+        this.queryParam = {}
+        this.queryParamOne = {}
+        this.searchQueryOne = {}
+        this.checkboxText = []
+        this.selectedRowKeys = []
+        this.selectModel = ''
+        this.selectModelName = ''
+        this.ParamSeach()
+        this.pageNo = 1
+        if (this.isTrue) {
+          this.getInfoList(1)
+        } else {
+          this.getParagraphInfoList(1)
+        }
+      },
       changeQuery(val, name) {
         this.queryParamOne[name + '_name'] = val
       },
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index f53740421..fde6d2f2d 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -5,7 +5,7 @@
       <span>{{ queryParam.selectValue }}</span>
     </div>
     <a-checkbox-group v-model="checkboxText" v-if="conList.length > 0">
-      <li v-for="(item,index) in conList" :key="index">
+      <li v-for="(item,index) in conList" :key="item.id">
         <div style="margin-bottom: 10px;position: relative">
           <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>
           <div class="text-text-right"
@@ -103,7 +103,6 @@
         total: 0,
         pageSize: 10,
         pageNo: 1,
-        loading: false,
         queryParam: {}
       }
     },
@@ -137,21 +136,27 @@
           this.checkboxText.push(item.id)
         }
       },
+      ResetSearch() {
+        this.pageNo = 1
+        this.checkboxText = []
+        this.queryParam = {}
+        this.getList()
+      },
       fileClick(fileQuery) {
         let fileName = fileQuery.file_name
         let index1 = fileName.lastIndexOf('.')
         let index2 = fileName.length
         let fileSuffix = fileName.substring(index1, index2)
         if (fileSuffix == '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id.slice(0,32)))
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id.slice(0, 32)))
         } else if (fileSuffix == '.docx') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0,32) + fileSuffix)
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
           window.open(url, '_blank')
         } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0,32) + fileSuffix)
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
           window.open(url, '_blank')
         } else {
-          downloadFile('/sys/common/downLoadFile', fileQuery.file_name, { id: fileQuery.id.slice(0,32) })
+          downloadFile('/sys/common/downLoadFile', fileQuery.file_name, { id: fileQuery.id.slice(0, 32) })
         }
       },
       pageOnChange(page, pageSize) {
@@ -179,7 +184,6 @@
             queryParam[val] = queryParam[val].join(',')
           }
         })
-        this.loading = true
         let checkboxText = JSON.parse(JSON.stringify(this.checkboxText))
         let query = {
           pageNo: this.pageNo,
@@ -191,9 +195,8 @@
           if (res.success) {
             this.conList = res.result.records
             this.total = res.result.total
-            this.loading = false
           } else {
-            this.loading = false
+            this.conList = []
           }
         })
       },
@@ -201,7 +204,7 @@
         let newUrl = this.$router.resolve({
           path: '/docManage/library/detail',
           query: {
-            id: item.id.slice(0,32),
+            id: item.id.slice(0, 32),
             title: item.title,
             serial_number: item.serial_number
           }
diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue
index 4a60dabe2..60f849208 100644
--- a/jero-web/src/views/documentTools/searchCenter/index.vue
+++ b/jero-web/src/views/documentTools/searchCenter/index.vue
@@ -29,6 +29,8 @@
             ></a-input-search>
             <span v-if="active === $t('whole') || active === $t('DocumentLibrary')" class="textSearch"
                   @click="wholeTextSearch(selectValueTwo)">结果中检索</span>
+            <span v-if="active === $t('whole') || active === $t('DocumentLibrary')" class="textSearch"
+                  @click="ResetSearch()">重置</span>
           </div>
         </div>
         <div class="search-center-content">
@@ -84,6 +86,14 @@
         this.active = key
         this.selectValueTwo = ''
       },
+      ResetSearch() {
+        this.selectValueTwo = ''
+        if (this.$refs.wholeRef) {
+          this.$refs.wholeRef.ResetSearch()
+        } else if (this.$refs.DocumentLibraryRef) {
+          this.$refs.DocumentLibraryRef.ResetSearch()
+        }
+      },
       onSearch(event) {
         this.queryParam[this.selectModel] = event
         if (this.$refs.DocumentLibraryRef) {