From bd40e1b6e8359fd2d5bf7200469d87d8db68b11a Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 22 Aug 2022 09:56:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/problemKnowledgeBaseAdd.vue        |  2 +-
 .../components/problemKnowledgeBaseList.vue       | 15 +++++++++++----
 .../components/problemKnowledgeBaseView.vue       |  4 ++--
 .../searchCenter/components/DocumentLibrary.vue   | 10 ++++++++++
 .../components/monthlyReportRegulations.vue       |  9 +++++++++
 .../components/problemKnowledgeBase.vue           | 13 ++++++++++++-
 .../searchCenter/components/whole.vue             |  9 +++++++++
 .../views/documentTools/searchCenter/index.vue    |  8 ++++----
 8 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
index 80477ef65..2319f6904 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
@@ -6,7 +6,7 @@
            <span style="line-height: 66px;display: inline-block;float: left;cursor: pointer" @click="backClick">
              <a-icon type="arrow-left" style="margin-right: 6px;"/>
            </span>
-          {{$t('newlyAdded')}}
+          {{this.$route.query.id ? $t('edit') :$t('newlyAdded')}}
         </div>
       </div>
       <div style="padding-top: 68px;background: #fff">
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index ec476304d..847fd0229 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -365,14 +365,21 @@
   ::v-deep .ant-tag {
     padding: 2px 4px;
     background: #9B9DA9;
-    color: #fff!important;
+    color: #fff !important;
   }
-  ::v-deep .ant-tag-checkable:not(.ant-tag-checkable-checked):hover{
-    color: #fff!important;
+
+  ::v-deep .ant-tag-checkable:not(.ant-tag-checkable-checked):hover {
+    color: #fff !important;
   }
-  ::v-deep .ant-tag-checkable-checked{
+
+  ::v-deep .ant-tag-checkable-checked {
     background: #21c9cc;
   }
+
+  ::v-deep p {
+    margin: 0;
+    padding: 0;
+  }
 </style>
 <style>
   .box-content-left .ant-tag {
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
index 377cda7ef..10fc09c50 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
@@ -6,7 +6,7 @@
            <span style="line-height: 66px;display: inline-block;float: left">
              <a-icon type="arrow-left" style="margin-right: 6px;"/>
            </span>
-          {{$t('applicableInstructionsMarketList')}}
+          {{queryForm.title}}
         </div>
         <div class="doc-detail-right">
           <div @click="forwardClick" class="operator-text-text" :title="$t('forward')">
@@ -123,7 +123,7 @@
             value: 'standNumber'
           },
           {
-            title: this.$t('standardName'),
+            title: this.$t('title'),
             value: 'title'
           },
           {
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 9b896b18f..25037d858 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -666,6 +666,11 @@
         postAction(this.url.getParagraphInfoList, query).then((res) => {
           if (res.success) {
             this.conList = res.result.records
+            if (this.conList && this.conList.length > 0) {
+              this.conList.forEach(val => {
+                val.content = val.content.replace(/<img .*?>/g, '')
+              })
+            }
             this.total = res.result.total
             this.loading = false
           } else {
@@ -934,6 +939,11 @@
     word-break: break-all
   }
 
+  ::v-deep p {
+    margin: 0;
+    padding: 0;
+  }
+
   /*::v-deep .ant-select {*/
   /*  max-width: calc(100% - 126px) !important;*/
   /*}*/
diff --git a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue
index 1c148031a..fa6401b60 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue
@@ -191,6 +191,11 @@
         postAction(this.url.getInfoList, query).then((res) => {
           if (res.success) {
             this.conList = res.result.records
+            if (this.conList && this.conList.length > 0) {
+              this.conList.forEach(val => {
+                val.content = val.content.replace(/<img .*?>/g, '')
+              })
+            }
             this.total = res.result.total
             this.loading = false
           } else {
@@ -305,4 +310,8 @@
     text-align: center;
     line-height: 10;
   }
+  ::v-deep p{
+     margin: 0;
+     padding: 0;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
index b66553e89..c37ad0f67 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
@@ -220,7 +220,9 @@
         return words.replace(/\s/g, '') //这里是去除空格
       },
       getParagraphInfoList() {
-        let queryParamOne = Object.assign(this.queryParam, this.queryParamOne)
+        let queryParamIndex = JSON.parse(JSON.stringify(this.queryParam))
+        let queryParamAdmin = JSON.parse(JSON.stringify(this.queryParamOne))
+        let queryParamOne = Object.assign(queryParamIndex, queryParamAdmin)
         let queryParam = JSON.parse(JSON.stringify(queryParamOne))
         Object.keys(queryParam).forEach(val => {
           if (queryParam[val] instanceof Array) {
@@ -238,6 +240,11 @@
         postAction(this.url.getParagraphInfoList, query).then((res) => {
           if (res.success) {
             this.conList = res.result.records
+            if (this.conList && this.conList.length > 0) {
+              this.conList.forEach(val => {
+                val.content = val.content.replace(/<img .*?>/g, '')
+              })
+            }
             this.total = res.result.total
             this.loading = false
           } else {
@@ -482,4 +489,8 @@
     overflow: hidden;
     text-overflow: ellipsis;
   }
+  ::v-deep p{
+    margin: 0;
+    padding: 0;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index cc7d965e3..e9dd5df68 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -213,6 +213,11 @@
         postAction(this.url.getInfoList, query).then((res) => {
           if (res.success) {
             this.conList = res.result.records
+            if (this.conList && this.conList.length > 0) {
+              this.conList.forEach(val => {
+                val.content = val.content.replace(/<img .*?>/g, '')
+              })
+            }
             this.total = res.result.total
           } else {
             this.conList = []
@@ -351,4 +356,8 @@
     text-align: center;
     line-height: 10;
   }
+  ::v-deep p{
+    margin: 0;
+    padding: 0;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue
index 7e7cd2b69..8270a0c4b 100644
--- a/jero-web/src/views/documentTools/searchCenter/index.vue
+++ b/jero-web/src/views/documentTools/searchCenter/index.vue
@@ -65,10 +65,10 @@
                 <a-tab-pane :key="$t('whole')" :tab="$t('whole')"></a-tab-pane>
                 <a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')" force-render>
                 </a-tab-pane>
-<!--                <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>-->
-<!--                </a-tab-pane>-->
-<!--                <a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>-->
-<!--                </a-tab-pane>-->
+                <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>
+                </a-tab-pane>
+                <a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>
+                </a-tab-pane>
               </a-tabs>
             </div>
           </div>