Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-05-09 6582b5dd37e5779cc2eead7337e4b2cd7319a36d

 src/views/animalHeat/animalHeat.vue

@@ -217,6 +217,8 @@
      },
      //搜索按钮
      searchChange(params, done) {
        //清空this.$route.query
        this.$router.push({ query: {} });
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
@@ -308,7 +310,6 @@
          }
      },
      onLoad(page, params = {}) {
        // debugger;
        const { dateTime } = this.query;
        let values = {
          ...params,