Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

86134

2023-11-07 000b6f8c42b1eb52a75d3fdf58a950a26bfe18f6

 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