From 4f11d6a54ade61ba7daf8ba856014d2f8994badf Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 09 May 2021 08:34:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/animalHeat/animalHeat.vue | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index 5938672..b05232b 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -81,6 +81,7 @@
form: {},
query: {},
showViewer:false,
+ activeClass: 0,
imgUrl:'',
loading: true,
page: {
@@ -98,7 +99,6 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
- activeClass: 0,
index: true,
viewBtn: true,
selection: true,
@@ -211,11 +211,12 @@
this.query = {};
//清空this.$route.query
this.$router.push({ query: {} });
+ //清空后默认查当日的数据
+ this.activeClass=0;
this.onLoad(this.page);
},
//搜索按钮
searchChange(params, done) {
- console.log(params,222);
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
@@ -284,7 +285,6 @@
rowClick(row){
var that = this;
that.imgUrl = row.picture;
- console.log(that.imgUrl,111);
this.showViewer = true
},
// 关闭查看器
@@ -308,6 +308,7 @@
}
},
onLoad(page, params = {}) {
+ // debugger;
const { dateTime } = this.query;
let values = {
...params,
@@ -325,12 +326,14 @@
type:this.$route.query.type
};
}
+ this.activeClass=4;
}else if(this.$route.query.status != undefined){
params = {
status: this.$route.query.status,
begTime: this.$route.query.startTime,
endTime: this.$route.query.endTime
}
+ this.activeClass=4;
}else{
params = {
status:this.$route.query.status,
@@ -338,7 +341,14 @@
}
}
+ if(this.activeClass==0 && this.query.dateTime==null){
+ params = {
+ type:this.activeClass
+ }
+ }
+
if (dateTime) {
+ this.activeClass=4;
values = {
...params,
begTime: dateTime[0],
--
Gitblit v1.9.3