From c969e356e14a6bfbc754ef5b64df7ab500485067 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 1 Apr 2022 14:19:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/utils/request.js | 3 --- .../documentTools/searchCenter/index.vue | 22 ++++++++++++++----- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/jero-web/src/utils/request.js b/jero-web/src/utils/request.js index 275b3978c..931b843fe 100644 --- a/jero-web/src/utils/request.js +++ b/jero-web/src/utils/request.js @@ -21,7 +21,6 @@ const service = axios.create({ }) const err = (error) => { - console.log(error) if (error.response) { let data = error.response.data const token = Vue.ls.get(ACCESS_TOKEN) @@ -199,9 +198,7 @@ function blobToJson(data) { fileReader.onload = function() { try { let jsonData = JSON.parse(this.result) // 说明是普通对象数据,后台转换失败 - console.log('jsonData', jsonData) if (jsonData.status === 500) { - console.log('token----------》', token) if (token && jsonData.message.includes('Token失效')) { Modal.error({ title: '登录已过期', diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 89f7aa482..92ce01cb9 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -97,9 +97,16 @@ } }, onSearch(event) { - this.queryParam[this.selectModel] = event - if (this.$refs.DocumentLibraryRef) { - this.$refs.DocumentLibraryRef.searchData(this.queryParam, this.selectModel, this.selectModelName) + if (event == '' || !event) { + this.queryParam = {} + if (this.$refs.DocumentLibraryRef) { + this.$refs.DocumentLibraryRef.searchData(this.queryParam, this.selectModel, this.selectModelName) + } + } else { + this.queryParam[this.selectModel] = event + if (this.$refs.DocumentLibraryRef) { + this.$refs.DocumentLibraryRef.searchData(this.queryParam, this.selectModel, this.selectModelName) + } } }, wholeOnSearch(event) { @@ -111,8 +118,13 @@ if (this.$refs.wholeRef) { this.$refs.wholeRef.searchDataTwo(event) } else if (this.$refs.DocumentLibraryRef) { - this.queryParam[this.selectModel] = event - this.$refs.DocumentLibraryRef.searchDataTwo(this.queryParam, this.selectModel, this.selectModelName) + if (event == '' || !event) { + this.queryParam = {} + this.$refs.DocumentLibraryRef.searchDataTwo(this.queryParam, this.selectModel, this.selectModelName) + } else { + this.queryParam[this.selectModel] = event + this.$refs.DocumentLibraryRef.searchDataTwo(this.queryParam, this.selectModel, this.selectModelName) + } } }, getCondition() {