From a47e864ca8071792642527aaa45ccdb36347e55b Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 06 十一月 2023 17:32:14 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/common/ztt-table.vue |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 724a966..8f65553 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -819,6 +819,7 @@
             this.isCleanInfo = true
           }
         }
+        this.$emit("queryParam",this.queryParam)
       },
       deep: true
     },
@@ -936,7 +937,7 @@
       }
     },
     getDataList(selectedId) {
-      this.dataListLoading = true
+      // this.dataListLoading = true
       var criteria = {}
       criteria.dateTimeFilters = this.dateTimeFilters
       criteria.multiSearchFilter = this.multiSearchFilter
@@ -959,7 +960,6 @@
           arr.push(this.paramArr[i])
         }
       }
-
       return this.doCallback(this.ajaxFun, arr, selectedId)
     },
     doCallback(fn, args, selectedId) {
@@ -1000,6 +1000,7 @@
               this.clickTable(selectObj)
             }
           }
+        this.$emit('change',resultData);
         })
         .catch((error) => {
           this.dataListLoading = false
@@ -1532,6 +1533,7 @@
           }
         }
       }
+      console.log(this.columnList);
       this.tableKey = Math.random()
       // this.$forceUpdate();
       const currPathColumnOrder = this.currPath + '_column'

--
Gitblit v1.9.3