From 89d4495d39f259d3cf4a76831b607547d3d4a464 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 31 Mar 2021 13:44:21 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
src/views/parcel/parcelKind.vue | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index e922997..3797f73 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -38,6 +38,7 @@
:preview-src-list="['data:image/png;base64,'+imgUrl]"
z-index=9999></el-image> -->
<el-image-viewer
+ class="img"
v-if="showViewer"
:on-close="closeViewer"
:url-list="['data:image/png;base64,'+imgUrl]" />
@@ -122,6 +123,7 @@
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
searchRange: true,
+ searchValue: [this.getStartTime(),this.getEndTime()],
searchSpan: 8,
hide: true,
addDisplay: false,
@@ -228,6 +230,18 @@
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 { dateTime } = this.query;
let values = {
@@ -283,9 +297,16 @@
});
},
// 关闭查看器
- closeViewer() {
- this.showViewer = false
- }
+ closeViewer() {
+ this.showViewer = false
+ }
}
};
</script>
+<style lang="scss">
+ .img {
+ .el-icon-circle-close {
+ color: white;
+ }
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.3