From d7015d373b9972cac940229a8053a09885e25ffd Mon Sep 17 00:00:00 2001
From: Xia Zekun <xiazekun@sinotruk.com>
Date: Mon, 3 Jun 2024 09:40:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E7=95=99=E6=90=9C=E7=B4=A2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 54d79be338e6c3de14c18e29086f31f3b3c2c1f1)
---
 src/views/FilePreview/FilePreview.vue |  2 +-
 src/views/search/generalSearch.vue    | 26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/views/FilePreview/FilePreview.vue b/src/views/FilePreview/FilePreview.vue
index 4085af8..936ad27 100644
--- a/src/views/FilePreview/FilePreview.vue
+++ b/src/views/FilePreview/FilePreview.vue
@@ -1,6 +1,6 @@
 <template>
 <!--  <div class="iframe-container">-->
-    <iframe :src="previewUrl" class="responsive-iframe" frameborder="0"></iframe>
+    <iframe :src="previewUrl" class="responsive-iframe"></iframe>
 <!--  </div>-->
 </template>
 
diff --git a/src/views/search/generalSearch.vue b/src/views/search/generalSearch.vue
index 00ec190..fd0ef54 100644
--- a/src/views/search/generalSearch.vue
+++ b/src/views/search/generalSearch.vue
@@ -185,6 +185,7 @@ export default {
       selectOptionLoading: false, // 其他筛选条件部分的loading
       loading: false,
       searchValue: '', // 搜索框内容
+      searchParam: '', // 搜索条件集合
       toggleSearchStatus: false, // 检索条件收缩还是展开， false收缩状态
       // 检索方式可选择项
       retrievalModeOptions: [
@@ -261,10 +262,25 @@ export default {
     if (this.searchValue) {
       this.onSearch(1)
     }
+
+    this.loadResultFromSession()
   },
   methods: {
     isHasPermission,
 
+    loadResultFromSession () {
+      // 从session获取搜索结果
+      this.searchParam = JSON.parse(sessionStorage.getItem('searchParam'))
+      if (!this.searchParam) return
+      this.searchValue = this.searchParam.searchContent
+      this.resourceTypeCurrent = this.searchParam.resourceType
+      this.retrievalModeCurrent = this.searchParam.searchMode
+      this.standardStatusSetCurrent = this.searchParam.standardStateSet
+      this.initFilterData()
+      this.dataSource = JSON.parse(sessionStorage.getItem('dataSource'))
+      this.ipagination = JSON.parse(sessionStorage.getItem('ipagination'))
+    },
+
     // 判断是否是废止标准
     judgeAbolish (item) {
       // console.log('judgeAbolish')
@@ -373,7 +389,7 @@ export default {
       if (arg === 1) {
         this.ipagination.current = 1
       }
-      const param = this.getSearchParam()
+      this.searchParam = this.getSearchParam()
       let func
       if (this.retrievalModeCurrent === '1') {
         // 是全文检索
@@ -383,16 +399,20 @@ export default {
         func = generalSearchTitleSearch
       }
       this.loading = true
-      func(param).then(res => {
+      func(this.searchParam).then(res => {
         if (res.success) {
           this.dataSource = res.result.records
-          console.log('this.ipagination', this.ipagination)
           if (res.result.total) {
             this.ipagination.total = res.result.total
             this.ipagination.pageCount = Math.ceil(this.ipagination.total / this.ipagination.pageSize)
           } else {
             this.ipagination.total = 0
           }
+          // 保存搜索和结果
+          sessionStorage.setItem('searchParam', JSON.stringify(this.searchParam))
+          sessionStorage.setItem('dataSource', JSON.stringify(this.dataSource))
+          sessionStorage.setItem('ipagination', JSON.stringify(this.ipagination))
+          // console.log('this.ipagination', this.ipagination)
         } else {
           this.$message.warning(res.message)
         }