From 75c2e06717c7d0b8916a9d9651e4fb4409ded089 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 10 Apr 2021 17:23:06 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
src/views/realTimePolice/real.vue | 11 +++++++++++
src/views/animalHeat/animalHeat.vue | 12 ++++++++++++
src/views/healthcode/healthcode.vue | 11 +++++++++++
src/views/parcel/parcel.vue | 5 -----
4 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index f0d9435..56cc8fd 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -128,6 +128,7 @@
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
searchRange: true,
+ searchValue:[this.getStartTime(),this.getEndTime()],
searchSpan: 5,
hide: true,
addDisplay: false,
@@ -216,6 +217,17 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
+ getStartTime(){
+ if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
+ return this.$route.query.startTime
+ }
+ },
+ getEndTime(){
+ if (this.$route.query.endTime != undefined && this.$route.query.endTime != null && this.$route.query.endTime != "" ) {
+ return this.$route.query.endTime
+ }
+ },
+ //修改行颜色
rowStyle({row, column, rowIndex}){
if(row.status=="1"){
return {
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 7bfccea..cb22e71 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -106,6 +106,7 @@
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
searchRange: true,
+ searchValue:[this.getStartTime(),this.getEndTime()],
searchSpan: 5,
hide: true,
addDisplay: false,
@@ -248,6 +249,16 @@
}
}
},
+ getStartTime(){
+ if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
+ return this.$route.query.startTime
+ }
+ },
+ getEndTime(){
+ if (this.$route.query.endTime != undefined && this.$route.query.endTime != null && this.$route.query.endTime != "" ) {
+ return this.$route.query.endTime
+ }
+ },
getHealthcodeType(){
if (this.$route.query.type != undefined) {
var type = this.$route.query.type+"";
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 3746049..5040757 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -216,11 +216,6 @@
},
methods: {
beforeOpen(done, type) {
- if (["view"].includes(type)) {
- getDetail(this.form.imgUrl).then(res => {
- this.form = res.data.data;
- });
- }
done();
},
searchReset() {
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 335a62e..c7a7234 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -479,6 +479,7 @@
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
searchRange: true,
+ searchValue:[this.getStartTime(),this.getEndTime()],
searchSpan: 5,
hide: true,
addDisplay: false,
@@ -818,6 +819,16 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
+ getStartTime(){
+ if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
+ return this.$route.query.startTime
+ }
+ },
+ getEndTime(){
+ if (this.$route.query.endTime != undefined && this.$route.query.endTime != null && this.$route.query.endTime != "" ) {
+ return this.$route.query.endTime
+ }
+ },
onLoad(page, params = {}) {
const { releaseTimeRange } = this.query;
let values = {
--
Gitblit v1.9.3