From bccea4cf5c32e09308014dea9a468cbe57194876 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 22 Apr 2022 11:18:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=80=BC=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/CnDataList.vue | 6 +-----
 src/mixins/data-list.js             | 4 +++-
 src/views/report/builtinReport.vue  | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/components/table/CnDataList.vue b/src/components/table/CnDataList.vue
index 2d8ee620..443792b5 100644
--- a/src/components/table/CnDataList.vue
+++ b/src/components/table/CnDataList.vue
@@ -69,9 +69,6 @@ export default {
     tableId: {
       type: String
     },
-    builtinId: {
-      type: Number
-    },
     tableTitle: {
       type: Array
     },
@@ -99,8 +96,7 @@ export default {
     },
     onsearch () {
       const params = {
-        q: this.keyWord,
-        id: this.builtinId
+        q: this.keyWord
       }
       this.$emit('search', params)
     }
diff --git a/src/mixins/data-list.js b/src/mixins/data-list.js
index ddbacd0f..fa20b9a4 100644
--- a/src/mixins/data-list.js
+++ b/src/mixins/data-list.js
@@ -76,8 +76,10 @@ export default {
     getTableData (params) {
       if (params) {
         this.searchLabel = { ...this.searchLabel, ...params }
+      } else {
+        this.searchLabel = {}
       }
-      this.searchLabel = { ...this.searchLabel, ...this.pageObj}
+      this.searchLabel = { ...this.searchLabel, ...this.pageObj }
       this.tools.loading = true
       delete this.searchLabel.total
       let listUrl = this.url
diff --git a/src/views/report/builtinReport.vue b/src/views/report/builtinReport.vue
index 3c8e0e02..fe5ff8e6 100644
--- a/src/views/report/builtinReport.vue
+++ b/src/views/report/builtinReport.vue
@@ -17,7 +17,6 @@
           :tableId="tableId"
           v-model:custom-table-title="tools.customTableTitle"
           :api="url"
-          :builtinId="builtinId"
           :from="fromRoute.builtinReport"
           :layout="['search']"
           @search="search"