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

liuyg

2021-04-09 9c67dc3526d8ad356e1dcd0cc80e4382866ea6a7

 src/views/animalHeat/animalHeat.vue

@@ -274,6 +274,15 @@
            ...this.query,
          };
        }

        if (this.$route.query.timeDesc) {
          values = {
            ...params,
            timeDesc: this.$route.query.timeDesc,
            ...this.query,
          };
        }

        this.loading = true;
        getList(page.currentPage, page.pageSize, values).then(res => {
          const data = res.data.data;