From 34fadc1ddf887fc772f62b46476e752b624ea06c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 18 Aug 2022 14:36:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA--=E8=B5=84=E8=AE=AF=E8=A1=8C=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/report/entity/LawsMonthlyReportWriteEO.java    | 3 ++-
 .../report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml   | 3 ++-
 .../main/java/com/jero/modules/report/util/WordUtil.java   | 7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
index 03a7c2498..b76f1b294 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
@@ -196,7 +196,8 @@ public class LawsMonthlyReportWriteEO implements Serializable {
     //新添字段
     private String relatedAreasCn;//相关领域中文
     private String relatedAreasEn;//相关领域英文
-    private String source;//来源
+    private String sourceCn;//来源中文
+    private String sourceEn;//来源英文
     private String time;//日期
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml
index 6b2ef20e5..699e217ff 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml
@@ -31,7 +31,8 @@
         <result column="export_state" property="exportState" />
         <result column="related_areas_cn" property="relatedAreasCn" />
         <result column="related_areas_en" property="relatedAreasEn" />
-        <result column="source" property="source" />
+        <result column="source_cn" property="sourceCn" />
+        <result column="source_en" property="sourceEn" />
         <result column="time" property="time" />
     </resultMap>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
index 6cb4f2bcf..6ecc9ce43 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
@@ -519,7 +519,8 @@ public class WordUtil {
                                               String cut) {
         String relatedAreasCn = lawsMonthlyReportWriteEO.getRelatedAreasCn();//相关领域中文
         String relatedAreasEn = lawsMonthlyReportWriteEO.getRelatedAreasEn();//相关领域英文
-        String source = lawsMonthlyReportWriteEO.getSource();//来源
+        String sourceCn = lawsMonthlyReportWriteEO.getSourceCn();//来源
+        String sourceEn = lawsMonthlyReportWriteEO.getSourceEn();
         String time = lawsMonthlyReportWriteEO.getTime();//日期
         String contentCn = lawsMonthlyReportWriteEO.getContentCn();//主要内容中文
         String contentEn = lawsMonthlyReportWriteEO.getContentEn();//主要内容英文
@@ -545,7 +546,7 @@ public class WordUtil {
             //第1行
             setCell(table, 0, "相关领域",relatedAreasCn);
             //第2行
-            setCell(table,1, "来源",source);
+            setCell(table,1, "来源",sourceCn);
             //第3行
             setCell(table,2, "日期",time);
             //第4行
@@ -556,7 +557,7 @@ public class WordUtil {
             //第1行
             setCell(table,0, "Related Areas",relatedAreasEn);
             //第2行
-            setCell(table,1,"source",source);
+            setCell(table,1,"Source",sourceEn);
             //第3行
             setCell(table,2,"Date",time);
             //第4行

From d479f580ddb1e47f3de37c672f55e009f7d1a445 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 18 Aug 2022 14:54:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=9C=88=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DocumentLibrary.vue            | 35 ++++++++++----
 .../components/monthlyReportRegulations.vue   | 48 +++++++++++++++----
 .../components/problemKnowledgeBase.vue       |  2 +-
 .../searchCenter/components/whole.vue         | 46 +++++++++++++++---
 .../documentTools/searchCenter/index.vue      |  6 +++
 5 files changed, 109 insertions(+), 28 deletions(-)

diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index e4abc53ed..db047cf8f 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -133,33 +133,34 @@
                        @click="checkedClick(item)"
                        :class="{ 'null-input':item.checked }">
                     <div class="text-header">
-                      <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
+                      <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
                         <template slot="title">
                           <span v-html="item.module_type"></span>
                         </template>
                         <span v-html="item.module_type"></span>
                       </a-tooltip>
-                      <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
+                      <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
                         <template slot="title">
                           <span v-html="item.serial_number"></span>
                         </template>
                         <span style="cursor: pointer"
                               @click="titleClick(item)" v-html="item.serial_number"></span>
                       </a-tooltip>
-                      <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
+                      <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
                         <template slot="title">
                           <span v-html="item.title"></span>
                         </template>
                         <span style="cursor: pointer" v-html="item.title" @click="titleClick(item)"></span>
                       </a-tooltip>
-                      <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
+                      <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
                         <template slot="title">
                           <span v-html="item.file_name"></span>
                         </template>
                         <span style="cursor: pointer" v-html="item.file_name" @click="titleClick(item)"></span>
                       </a-tooltip>
                     </div>
-                    <a-tooltip placement="topLeft" :mouseEnterDelay="0.5" v-if="selectModel == ''">
+                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
+                               v-if="selectModel == ''">
                       <template slot="title">
                         <span v-html="item.content"></span>
                       </template>
@@ -167,21 +168,21 @@
                       >
                       </div>
                     </a-tooltip>
-                    <a-tooltip placement="topLeft" :mouseEnterDelay="0.5"
+                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
                                v-else-if="(item.file_text instanceof Array) && selectModel != ''">
                       <template slot="title">
                         <span v-html="item.content"></span>
                       </template>
                       <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
                     </a-tooltip>
-                    <a-tooltip placement="topLeft" :mouseEnterDelay="0.5"
+                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
                                v-else-if="!item.file_text && selectModel != ''">
                       <template slot="title">
                         <span v-html="item.content"></span>
                       </template>
                       <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
                     </a-tooltip>
-                    <a-tooltip placement="topLeft" :mouseEnterDelay="0.5" v-else>
+                    <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" v-else>
                       <template slot="title">
                         <span v-html="item.file_text"></span>
                       </template>
@@ -684,7 +685,7 @@
         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+'&userName='+this.userInfo().username))
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
         } else if (fileSuffix == '.docx') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
@@ -720,6 +721,10 @@
     height: 18px !important;
     line-height: 18px !important;
   }
+
+  .tooltip-index {
+    max-width: calc(100% - 300px) !important;
+  }
 </style>
 <style lang="less" scoped>
 
@@ -879,6 +884,15 @@
     font-weight: 400;
     color: #040B29;
     opacity: 0.7;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 4;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
   }
 
   .box-content {
@@ -919,7 +933,8 @@
     text-justify: inter-ideograph;
     word-break: break-all
   }
-  ::v-deep .ant-select{
+
+  ::v-deep .ant-select {
     max-width: calc(100% - 126px) !important;
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue
index 85b4932ba..a1e8e6ef0 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue
@@ -10,7 +10,7 @@
           <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>
           <div class="text-text-right"
                :class="{ 'null-input':item.checked }">
-            <div class="text-header" @click="titleClick(item)">
+            <div class="text-header" @click="checkedClick(item)">
               <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
                 <template slot="title">
                   <span v-html="item.title"></span>
@@ -18,7 +18,8 @@
                 <span class="text-header-text" style="cursor: pointer" v-html="item.title"></span>
               </a-tooltip>
             </div>
-            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
+            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" v-if="!queryParam.selectValue"
+                       :mouseEnterDelay="0.5">
               <template slot="title">
                 <span v-html="item.content"></span>
               </template>
@@ -26,6 +27,27 @@
               >
               </div>
             </a-tooltip>
+            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
+                       v-else-if="(item.file_text instanceof Array) && queryParam.selectValue">
+              <template slot="title">
+                <span v-html="item.content"></span>
+              </template>
+              <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
+            </a-tooltip>
+            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
+                       v-else-if="!item.file_text && queryParam.selectValue">
+              <template slot="title">
+                <span v-html="item.content"></span>
+              </template>
+              <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
+            </a-tooltip>
+            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" v-else>
+              <template slot="title">
+                <span v-html="item.file_text"></span>
+              </template>
+              <div class="text-content" @click="checkedClick(item)" v-html="item.file_text">
+              </div>
+            </a-tooltip>
           </div>
         </div>
       </li>
@@ -60,7 +82,7 @@
       return {
         checkboxText: [],
         url: {
-          getInfoList: 'search/document/getFullTextInfoList'
+          getInfoList: '/search/lawsMonthlyReport/page'
         },
         loading: false,
         conList: [],
@@ -95,12 +117,18 @@
     methods: {
       ...mapGetters(['userInfo']),
       checkedClick(item) {
-        if (item.checked) {
-          this.checkboxText = this.checkboxText.filter(res => {
-            return res !== item.id
-          })
-        } else {
-          this.checkboxText.push(item.id)
+        let fileName = item.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=' + item.file_id + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix == '.docx') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
+          window.open(url, '_blank')
         }
       },
       ResetSearch() {
@@ -190,7 +218,7 @@
   }
 
   .tooltip-index {
-    max-width: 600px !important;
+    max-width: calc(100% - 300px) !important;
   }
 </style>
 <style scoped lang="less">
diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
index 448483f82..26a874dac 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
@@ -335,7 +335,7 @@
   }
 
   .tooltip-index {
-    max-width: 600px !important;
+    max-width: calc(100% - 300px) !important;
   }
 </style>
 <style lang="less" scoped>
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index 58f5f365c..12fe07c90 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -11,7 +11,7 @@
           <div class="text-text-right"
                :class="{ 'null-input':item.checked }">
             <div class="text-header" @click="titleClick(item)">
-              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
+              <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
                 <template slot="title">
                   <span v-html="item.module_type"></span>
                 </template>
@@ -21,15 +21,17 @@
                 </template>
                 <span style="cursor: pointer"
                       class="text-header-text"
+                      v-if="item.serial_number"
                       v-html="item.serial_number"></span>
                 <template slot="title">
                   <span v-html="item.title"></span>
                 </template>
-                <span class="text-header-text" style="cursor: pointer" v-html="item.title"></span>
+                <span class="text-header-text" v-if="item.title" style="cursor: pointer" v-html="item.title"></span>
                 <template slot="title">
                   <span v-html="item.file_name"></span>
                 </template>
-                <span class="text-header-text" style="cursor: pointer" v-html="item.file_name"></span>
+                <span class="text-header-text" v-if="item.file_name" style="cursor: pointer"
+                      v-html="item.file_name"></span>
               </a-tooltip>
               <!--              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">-->
 
@@ -41,7 +43,8 @@
 
               </a-tooltip>
             </div>
-            <a-tooltip placement="topLeft" v-if="!queryParam.selectValue" :mouseEnterDelay="0.5">
+            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" v-if="!queryParam.selectValue"
+                       :mouseEnterDelay="0.5">
               <template slot="title">
                 <span v-html="item.content"></span>
               </template>
@@ -49,20 +52,21 @@
               >
               </div>
             </a-tooltip>
-            <a-tooltip placement="topLeft" :mouseEnterDelay="0.5"
+            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
                        v-else-if="(item.file_text instanceof Array) && queryParam.selectValue">
               <template slot="title">
                 <span v-html="item.content"></span>
               </template>
               <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
             </a-tooltip>
-            <a-tooltip placement="topLeft" :mouseEnterDelay="0.5" v-else-if="!item.file_text && queryParam.selectValue">
+            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
+                       v-else-if="!item.file_text && queryParam.selectValue">
               <template slot="title">
                 <span v-html="item.content"></span>
               </template>
               <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
             </a-tooltip>
-            <a-tooltip placement="topLeft" :mouseEnterDelay="0.5" v-else>
+            <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" v-else>
               <template slot="title">
                 <span v-html="item.file_text"></span>
               </template>
@@ -211,6 +215,21 @@
           }
         })
       },
+      monthlyReportClick(item) {
+        let fileName = item.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=' + item.file_id + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix == '.docx') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
+          window.open(url, '_blank')
+        }
+      },
       titleClick(item) {
         let newUrl = this.$router.resolve({
           path: '/docManage/library/detail',
@@ -229,6 +248,10 @@
   .highlight-class {
     color: #21c9cc;
   }
+
+  .tooltip-index {
+    max-width: calc(100% - 300px) !important;
+  }
 </style>
 <style scoped lang="less">
   .box {
@@ -291,6 +314,15 @@
     font-weight: 400;
     color: #040B29;
     opacity: 0.7;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 4;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
   }
 
   .page {
diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue
index 8d6826fc5..16b279130 100644
--- a/jero-web/src/views/documentTools/searchCenter/index.vue
+++ b/jero-web/src/views/documentTools/searchCenter/index.vue
@@ -146,6 +146,8 @@
           this.$refs.wholeRef.ResetSearch()
         } else if (this.$refs.DocumentLibraryRef) {
           this.$refs.DocumentLibraryRef.ResetSearch()
+        }else if (this.$refs.monthlyReportRegulationsRef) {
+          this.$refs.monthlyReportRegulationsRef.ResetSearch()
         }
       },
       onSearch(event) {
@@ -164,6 +166,8 @@
       wholeOnSearch(event) {
         if (this.$refs.wholeRef) {
           this.$refs.wholeRef.searchData(event)
+        }else if(this.$refs.monthlyReportRegulationsRef){
+          this.$refs.monthlyReportRegulationsRef.searchData(event)
         }
       },
       wholeTextSearch(event) {
@@ -177,6 +181,8 @@
             this.queryParam[this.selectModel] = event
             this.$refs.DocumentLibraryRef.searchDataTwo(this.queryParam, this.selectModel, this.selectModelName)
           }
+        }else if(this.$refs.monthlyReportRegulationsRef){
+          this.$refs.monthlyReportRegulationsRef.searchDataTwo(event)
         }
       },
       getCondition() {