From a7184254cba1de6bdaee9039cb5fca80319e8e6e Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 9 Aug 2022 18:06:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98=E7=9F=A5?=
 =?UTF-8?q?=E8=AF=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/problemKnowledgeBaseList.vue   |   5 -
 .../problemKnowledgeBaseRelease.vue           | 114 +++++++++++++-----
 2 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index d7a10b460..8c2c3ff7c 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -50,13 +50,8 @@
                 <span class="text-header-text" style="cursor: pointer" v-html="item.title"></span>
               </a-tooltip>
             </div>
-            <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
-              <template slot="title">
-                <span v-html="item.content"></span>
-              </template>
               <div class="text-content" v-html="item.content">
               </div>
-            </a-tooltip>
           </div>
         </div>
       </li>
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
index b42131f4f..0a170f8d7 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
@@ -11,6 +11,17 @@
       </div>
       <div style="padding-top: 68px;background: #fff">
         <div class="detail-content" style="padding: 30px">
+          <div class="search-detail-wrap">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('searchContent')">
+                <span>{{$t('searchContent')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('searchContent')"
+                       v-model="searchStr"></a-input>
+              <a-button class="box-button" type="primary" @click="onSearch">{{$t('query')}}</a-button>
+              <a-button class="box-button" style="margin-left: 8px" @click="ResetSearch">{{$t('reset')}}</a-button>
+            </div>
+          </div>
           <div v-if="conList.length > 0" style="height: calc(100vh - 180px);overflow:auto;">
             <div v-for="(item,index) in conList" :key="item.id">
               <div style="margin-bottom: 10px;position: relative;overflow: hidden">
@@ -25,41 +36,36 @@
                       <span class="text-header-text" style="cursor: pointer" v-html="item.title"></span>
                     </a-tooltip>
                   </div>
-                  <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
-                    <template slot="title">
-                      <span v-html="item.content"></span>
-                    </template>
-                    <div class="text-content" v-html="item.content">
-                    </div>
-                  </a-tooltip>
-                </div>
-                <div class="text-text-right-text">
-                  <a style="margin-right: 10px" @click="edit(item)">{{$t('edit')}}</a>
-                  <a @click="deleteData(item)">{{$t('delete')}}</a>
+                  <div class="text-content" v-html="item.content">
+                  </div>
+                  <div class="text-text-right-text">
+                    <a style="margin-right: 10px" @click="edit(item)">{{$t('edit')}}</a>
+                    <a @click="deleteData(item)">{{$t('delete')}}</a>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
-          <div class="noData" v-else>
-            暂无数据
-          </div>
-          <div class="page" v-if="conList.length > 0">
-            <a-pagination
-              :show-total="total => $t('total')+` ${total} `+$t('strip')"
-              show-quick-jumper
-              show-size-changer
-              :page-size.sync="pageSize"
-              :total="total"
-              :current="pageNo"
-              @change="pageOnChange"
-              @showSizeChange="SizeChange"
-            />
+            <div class="noData" v-else>
+              暂无数据
+            </div>
+            <div class="page" v-if="conList.length > 0">
+              <a-pagination
+                :show-total="total => $t('total')+` ${total} `+$t('strip')"
+                show-quick-jumper
+                show-size-changer
+                :page-size.sync="pageSize"
+                :total="total"
+                :current="pageNo"
+                @change="pageOnChange"
+                @showSizeChange="SizeChange"
+              />
+            </div>
           </div>
         </div>
+        <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
       </div>
-      <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
     </div>
-  </div>
 </template>
 
 <script>
@@ -74,6 +80,7 @@
         conList: [],
         total: 0,
         pageSize: 10,
+        searchStr: '',
         loading: false,
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         pageNo: 1,
@@ -97,11 +104,21 @@
         this.pageSize = pageSize
         this.getList()
       },
+      onSearch() {
+        this.pageNo = 1
+        this.getList()
+      },
+      ResetSearch() {
+        this.searchStr = ''
+        this.pageNo = 1
+        this.getList()
+      },
       getList() {
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
-          createBy: this.userInfo().username
+          createBy: this.userInfo().username,
+          searchStr: this.searchStr
         }
         this.loading = true
         getAction(this.url.getInfoList, query).then((res) => {
@@ -299,4 +316,45 @@
     text-align: center;
     line-height: 10;
   }
+
+  .search-detail-wrap {
+    width: 100%;
+    margin: 0 auto;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+    text-align: center;
+    justify-content: center;
+  }
+
+  .title-text {
+    width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    /*min-width: 200px;*/
+    display: inline-block;
+    width: 50%;
+    height: 38px;
+    margin-top: 2px;
+    margin-right: 16px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
 </style>
\ No newline at end of file