From e2499a631708b565922aa3ce24da8a2a5dddc637 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 23:51:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/healthcode/healthcode.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 40d1ef0..ca6170e 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -249,8 +249,8 @@
...params,
};
- if (this.$route.query.status && this.$route.query != undefined && this.$route.query != null && this.$route.query != "" ) {
- if (this.$route.query.type != undefined && this.$route.query.type != null && this.$route.query.type != "" ) {
+ 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 = {
@@ -264,10 +264,10 @@
type:this.$route.query.status
};
}
- }else if(this.$route.query.type != undefined && this.$route.query.type != null && this.$route.query.type != "" ){
+ }else if(this.$route.query.type != undefined){
params = {
type: this.$route.query.type,
- beginTime: this.$route.query.startTime,
+ begTime: this.$route.query.startTime,
endTime: this.$route.query.endTime
}
}else{
--
Gitblit v1.9.3