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/parcel/parcel.vue | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index ca1be49..f7ffd8d 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -76,6 +76,7 @@
form: {},
query: {},
showViewer: false, // 显示查看器
+ activeClass: 0,
imgUrl:'',
loading: true,
page: {
@@ -91,7 +92,6 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
- activeClass: 3,
border: false,
stripe:true,
index: true,
@@ -239,6 +239,7 @@
this.query = {};
//清空this.$route.query
this.$router.push({ query: {} });
+ this.activeClass=0;
this.onLoad(this.page);
},
searchChange(params, done) {
@@ -335,6 +336,7 @@
decisioDiagramResult:this.$route.query.decisioDiagramResult
};
}
+ this.activeClass=4;
}else{
if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
this.page.currentPage = 1;
@@ -342,6 +344,23 @@
startTime:this.$route.query.startTime,
endTime:this.$route.query.endTime
}
+ this.activeClass=4;
+ }
+
+ if(this.activeClass==0){
+ this.page.currentPage = 1;
+ // 当前时间
+ var date = new Date();
+ //年
+ var Y = date.getFullYear();
+ //月
+ var M = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+ //日
+ var D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+ params = {
+ startTime:Y + "-" + M + "-" + D + " 00:00:00",
+ endTime:Y +"-" +M +"-" + D + " 23:59:59"
+ }
}
}
--
Gitblit v1.9.3