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/healthcode/healthcode.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index ae02016..16406b3 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -71,6 +71,7 @@
query: {},
search:{},
loading: true,
+ activeClass: 0,
page: {
pageSize: 10,
currentPage: 1,
@@ -86,7 +87,6 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
- activeClass: 0,
index: true,
viewBtn: true,
selection: true,
@@ -236,6 +236,7 @@
this.query = {};
//清空this.$route.query
this.$router.push({ query: {} });
+ this.activeClass=0;
this.onLoad(this.page);
},
searchChange(params, done) {
@@ -321,37 +322,43 @@
let values = {
...params,
};
-
+ debugger;
if (this.$route.query.status!=undefined && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
if (this.$route.query.type != undefined) {
- this.activeClass = this.$route.query.status;
this.page.currentPage = 1;
params = {
status:this.$route.query.status,
type:this.$route.query.type
}
} else {
- this.activeClass = 0;
this.page.currentPage = 1;
params = {
type:this.$route.query.status
};
}
+ this.activeClass =4;
}else if(this.$route.query.type != undefined){
params = {
type: this.$route.query.type,
begTime: this.$route.query.startTime,
endTime: this.$route.query.endTime
}
+ this.activeClass =4;
}else{
- params = {
- status:this.$route.query.status,
- type:this.$route.query.type
- }
+ params = {
+ status:this.$route.query.status,
+ type:this.$route.query.type
+ }
+ }
+ if(this.activeClass == 0 && this.query.dateTime==null){
+ params = {
+ status:this.activeClass,
+ }
}
if (dateTime) {
+ this.activeClass =4;
values = {
...params,
begTime: dateTime[0],
--
Gitblit v1.9.3