From 1277353f3cdff2396cd6bfc5bfd32552873ccbf2 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 14 May 2021 12:13:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/parcel/parcelKind.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index 22decde..ff87846 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -13,6 +13,7 @@
@row-save="rowSave"
@row-del="rowDel"
@row-click="rowClick"
+ :search.sync="search"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@@ -97,6 +98,7 @@
return {
form: {},
query: {},
+ search:{},
showViewer: false, // 显示查看器
activeClass:0,
imgUrl:'',
@@ -312,23 +314,30 @@
this.$router.push({ query: {} });
that.activeClass = e;
var today = new Date();
+ var params ={};
if(e==0){
- var params = {
+ params = {
startTime:this.showToDay(today)+ " 00:00:00",
endTime:this.showToDay(today)+ " 23:59:59"
};
+ //修改搜索框中的值
+ this.search.dateTime=[this.showToDay(today)+ " 00:00:00",this.showToDay(today)+ " 23:59:59"]
}
if(e==1){
- var params = {
+ params = {
startTime:this.showWeekFirstDay(today)+ " 00:00:00",
endTime:this.showToDay(today)+ " 23:59:59"
};
+ //修改搜索框中的值
+ this.search.dateTime=[this.showWeekFirstDay(today)+ " 00:00:00",this.showToDay(today)+ " 23:59:59"]
}
if(e==2){
- var params = {
+ params = {
startTime:this.showMonthFirstDay(today)+ " 00:00:00",
endTime:this.showToDay(today)+ " 23:59:59"
};
+ //修改搜索框中的值
+ this.search.dateTime=[this.showMonthFirstDay(today)+ " 00:00:00",this.showToDay(today)+ " 23:59:59"]
}
this.query = params;
this.page.currentPage = 1;
@@ -396,8 +405,7 @@
//window.open(`http://localhost:8108/ureport/preview?_u=blade-parcelKind.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
window.open(`https://web.byisf.com/api/blade-report/ureport/preview?_u=blade-parcelKind.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
},
- onLoad(page, params) {
- debugger;
+ onLoad(page, params={}) {
const { dateTime } = this.query;
let values = {
...params,
--
Gitblit v1.9.3