diff --git a/src/components/advancedSearch/meta/parser.js b/src/components/advancedSearch/meta/parser.js index 93ccfe21..ca890c5f 100644 --- a/src/components/advancedSearch/meta/parser.js +++ b/src/components/advancedSearch/meta/parser.js @@ -857,7 +857,11 @@ export function handleMetaListToStr (metaList) { for (const i in lastObj) { str += lastObj[i] + ' AND ' } - str = str.slice(0, -5) + ' ' + hasStr.slice(0, -5) + if (hasStr !== '') { + str = str + hasStr.slice(0, -5) + } else { + str = str.slice(0, -5) + } return str } diff --git a/src/utils/tools.js b/src/utils/tools.js index 5ef290d3..465d66b8 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -1586,9 +1586,12 @@ const handleStrToUniteStr = (str) => { for (const i in lastObj) { lastStr += lastObj[i] + ' AND ' } - lastStr = lastStr.slice(0, -5) const hasStr = hasArr.join(' AND ') - lastStr = lastStr + ' ' + hasStr + if (hasStr !== '') { + lastStr = lastStr + hasStr + } else { + lastStr = lastStr.slice(0, -5) + } return lastStr } diff --git a/src/views/charts/charts/chartDetectionPagination.vue b/src/views/charts/charts/chartDetectionPagination.vue index 839a360c..cacf170d 100644 --- a/src/views/charts/charts/chartDetectionPagination.vue +++ b/src/views/charts/charts/chartDetectionPagination.vue @@ -12,7 +12,7 @@ > / {{totalPage}} - +