From bf33cfedf581e4d892447dd6d5ed2a1acc0f23a7 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 24 Mar 2022 17:38:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  2 +-
 jero-web/src/common/lang/zh-cn.js             |  2 +-
 jero-web/src/components/search/index.vue      |  2 +-
 jero-web/src/components/uploadFile/file.vue   |  2 +-
 .../library/docDetail/index.vue               |  4 +--
 .../components/DocumentLibrary.vue            | 32 ++++++++++++-------
 .../searchCenter/components/whole.vue         |  2 +-
 .../documentTools/searchCenter/index.vue      | 26 ++++++++-------
 .../src/views/system/UserAnnouncementList.vue |  1 -
 9 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 2042577cf..29f17786c 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -549,5 +549,5 @@ module.exports = {
   enterQuantity:'Please enter quantity',
   text:'text',
   picture:'picture',
-
+  searchScope:'Search Scope'
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 227c7a0bf..6405467bc 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -553,5 +553,5 @@ module.exports = {
   enterQuantity:'请输入数量',
   text:'文本',
   picture:'图片',
-
+  searchScope:'检索范围',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index b2c0eb79f..74294eb6a 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -220,7 +220,7 @@
 
   .title-text {
     width: 20%;
-    min-width: 90px;
+    min-width: 110px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;
diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue
index 851ed411e..b6391cf2c 100644
--- a/jero-web/src/components/uploadFile/file.vue
+++ b/jero-web/src/components/uploadFile/file.vue
@@ -194,7 +194,7 @@
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else {
-          downloadFile('/sys/common/download', fileQuery.fileName, { id: fileQuery.id })
+          downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
         }
       }
     }
diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index 0a5a6ee3a..94a623507 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -250,11 +250,11 @@
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else {
-          downloadFile('/sys/common/download', fileQuery.fileName, { id: fileQuery.id })
+          downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
         }
       },
       download(item) {
-        downloadFile('/sys/common/download', item.fileName, { id: item.id })
+        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id })
       },
       UpdateLog() {
         this.visible = true
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 817aaab35..2c60f3781 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -36,6 +36,7 @@
           <div class="text-left-select" v-if="item.field_show_type == '4'">
             <span class="text-sel">{{item.db_field_txt}}</span>
             <j-multi-select-tag class="text-select" v-model="queryParam[item.db_field_name]"
+                                :db_field_name="item.db_field_name"
                                 :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
                                 :triggerChange="false" :dictCode="item.dict_field"/>
           </div>
@@ -62,8 +63,8 @@
       <div class="text-right">
         <div class="search-text-list">
           <div class="search-text-title">
-            <span>检索范围：</span>
-            <span>纯电动</span>
+            <span>{{$t('searchScope')}}：</span>
+            <span>{{queryParamSeach}}</span>
             <div class="search-header-right">
               <a-icon type="appstore" class="header-list" :title="$t('list')"
                       :class="{'header-list-active':isTrue }"
@@ -289,7 +290,8 @@
         loading: false,
         selectModel: '',
         fileList: [],
-        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download'
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        queryParamSeach: ''
       }
     },
     watch: {
@@ -320,8 +322,8 @@
       selectListModel(val) {
         this.isTrue = val == 'list' ? true : false
       },
-      onSelectChange() {
-
+      onSelectChange(selectedRowKeys) {
+        this.selectedRowKeys = selectedRowKeys
       },
       checkedClick(item) {
         if (item.checked) {
@@ -414,6 +416,11 @@
           }
         })
       },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.getInfoList()
+      },
       searchQuery() {
         this.pageNo = 1
         this.getInfoList()
@@ -423,13 +430,20 @@
         this.selectModel = selectModel
         this.getInfoList()
       },
+      searchDataTwo(value) {
+        this.queryParam.selectValueTwo = value
+        this.getInfoList()
+      },
       getInfoList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        this.queryParamSeach = ''
         Object.keys(queryParam).forEach(val => {
           if (queryParam[val] instanceof Array) {
             queryParam[val] = queryParam[val].join(',')
           }
+          this.queryParamSeach = this.queryParamSeach + queryParam[val] + ','
         })
+        this.queryParamSeach = this.queryParamSeach.substr(0, this.queryParamSeach.length - 1)
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
@@ -451,11 +465,7 @@
           }
         })
       },
-      searchReset() {
-        this.pageNo = 1
-        this.queryParam = {}
-        this.getInfoList()
-      },
+
       fileNameClick(row) {
         this.fileList = row.file_name || []
         if (this.fileList.length > 0) {
@@ -476,7 +486,7 @@
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else {
-          downloadFile('/sys/common/download', fileQuery.fileName, { id: fileQuery.id })
+          downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
         }
       },
       titleClick(item) {
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index ecdbd9be1..01531e35a 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div class="search-text-title">
-      <span>检索范围：</span>
+      <span>{{$t('searchScope')}}：</span>
       <span>{{ queryParam.selectValue }}</span>
     </div>
     <a-checkbox-group v-model="checkboxText" v-if="conList.length > 0">
diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue
index 222a5b74c..05f6542d5 100644
--- a/jero-web/src/views/documentTools/searchCenter/index.vue
+++ b/jero-web/src/views/documentTools/searchCenter/index.vue
@@ -13,7 +13,8 @@
               </a-select>
               <a-input-search
                 allowClear
-                style="width: 70%"
+                v-model="selectValueTwo"
+                style="width: calc(100% - 88px)"
                 placeholder="请输入搜索内容"
                 @search="onSearch"
               ></a-input-search>
@@ -26,7 +27,8 @@
               placeholder="请输入搜索内容"
               @search="wholeOnSearch"
             ></a-input-search>
-            <span  v-if="active === $t('whole')" class="textSearch" @click="wholeTextSearch(selectValueTwo)">结果中检索</span>
+            <span v-if="active === $t('whole') || active === $t('DocumentLibrary')" class="textSearch"
+                  @click="wholeTextSearch(selectValueTwo)">结果中检索</span>
           </div>
         </div>
         <div class="search-center-content">
@@ -70,7 +72,7 @@
         },
         selectModel: '',
         queryParam: {},
-        selectValueTwo:'',
+        selectValueTwo: ''
       }
     },
     mounted() {
@@ -82,19 +84,20 @@
       },
       onSearch(event) {
         this.queryParam[this.selectModel] = event
-        if (this.$refs.DocumentLibraryRef){
-          this.$refs.DocumentLibraryRef.searchData(this.queryParam,this.selectModel)
+        if (this.$refs.DocumentLibraryRef) {
+          this.$refs.DocumentLibraryRef.searchData(this.queryParam, this.selectModel)
         }
       },
-      wholeOnSearch(event){
-        if (this.$refs.wholeRef){
+      wholeOnSearch(event) {
+        if (this.$refs.wholeRef) {
           this.$refs.wholeRef.searchData(event)
         }
       },
-      wholeTextSearch(event){
-        console.log(event)
-        if (this.$refs.wholeRef){
+      wholeTextSearch(event) {
+        if (this.$refs.wholeRef) {
           this.$refs.wholeRef.searchDataTwo(event)
+        } else if (this.$refs.DocumentLibraryRef) {
+          this.$refs.DocumentLibraryRef.searchDataTwo(event)
         }
       },
       getCondition() {
@@ -203,7 +206,8 @@
   .input-group .ant-select {
     background: #F6F7FA;
   }
-  .textSearch{
+
+  .textSearch {
     line-height: 40px;
     display: inline-block;
     margin-left: 8px;
diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index da361e911..544745df7 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -110,7 +110,6 @@
             title: this.$t('MessageContent'),
             align: 'center',
             dataIndex: 'msgContent',
-            width: 600,
             ellipsis: true,
             scopedSlots: { customRender: 'msgContent' }
           },