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 ++-
src/views/realTimePolice/real.vue | 79 ++++++++++++++-
src/views/animalHeat/animalHeat.vue | 63 ++++++++++++
src/views/healthcode/healthcode.vue | 63 ++++++++++++
src/views/parcel/parcel.vue | 24 ++++
5 files changed, 226 insertions(+), 21 deletions(-)
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index fe51a63..05a1f97 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -8,6 +8,7 @@
:before-open="beforeOpen"
v-model="form"
ref="crud"
+ :search.sync="search"
:row-style="rowStyle"
@row-update="rowUpdate"
@row-save="rowSave"
@@ -80,6 +81,7 @@
return {
form: {},
query: {},
+ search:{},
showViewer:false,
activeClass: 0,
imgUrl:'',
@@ -275,11 +277,68 @@
this.query={};
this.$router.push({ query: {} });
//type 0:本日 1：本周 2：本月 status: 0:正常 1：异常
- var params = {
+ var today = new Date();
+ var params ={};
+ if(e==0){
+ //修改搜索框中的值
+ this.search.releaseTimeRange=[this.showToDay(today)+" 00:00:00",this.showToDay(today)+" 23:59:59"]
+ }
+ if(e==1){
+ //修改搜索框中的值
+ this.search.releaseTimeRange=[this.showWeekFirstDay(today)+" 00:00:00",this.showToDay(today)+" 23:59:59"]
+ }
+ if(e==2){
+ //修改搜索框中的值
+ this.search.releaseTimeRange=[this.showMonthFirstDay(today)+" 00:00:00",this.showToDay(today)+" 23:59:59"]
+ }
+ params = {
type: e
};
+ if(this.search.status){
+ params = {
+ ... params,
+ status: this.search.status
+ };
+ }
+ this.query=params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
+ },
+ //本日
+ showToDay(Nowdate){
+ var M=Number(Nowdate.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ var day = Nowdate.getDate();
+ if(day<10){
+ day = "0"+day;
+ }
+ return Nowdate.getFullYear()+"-"+M+"-"+day;
+ },
+
+ //本周第一天
+ showWeekFirstDay(Nowdate){
+ var WeekFirstDay=new Date(Nowdate-(Nowdate.getDay()-1)*86400000);
+ var M=Number(WeekFirstDay.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ var day = WeekFirstDay.getDate();
+ if(day<10){
+ day = "0"+day;
+ }
+ return WeekFirstDay.getFullYear()+"-"+M+"-"+day;
+ },
+
+ //本月第一天
+ showMonthFirstDay(Nowdate){
+ var MonthFirstDay=new Date(Nowdate.getFullYear(),Nowdate.getMonth(),1);
+ var M=Number(MonthFirstDay.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ return MonthFirstDay.getFullYear()+"-"+M+"-"+"0"+MonthFirstDay.getDate();
},
//数据导出
@@ -330,7 +389,7 @@
return this.$route.query.status
}
},
- onLoad(page, params) {
+ onLoad(page, params={}) {
const { dateTime } = this.query;
let values = {
...params,
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 424675e..973b5e4 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -311,13 +311,70 @@
this.$router.push({ query: {} });
that.activeClass = e;
//status 0:本日 1：本月 2：本年 type: 1:绿色 2：黄色 3：红色
- var params = {
+ var today = new Date();
+ var params ={};
+ if(e==0){
+ //修改搜索框中的值
+ this.search.releaseTimeRange=[this.showToDay(today)+" 00:00:00",this.showToDay(today)+" 23:59:59"]
+ }
+ if(e==1){
+ //修改搜索框中的值
+ this.search.releaseTimeRange=[this.showWeekFirstDay(today)+" 00:00:00",this.showToDay(today)+" 23:59:59"]
+ }
+ if(e==2){
+ //修改搜索框中的值
+ this.search.releaseTimeRange=[this.showMonthFirstDay(today)+" 00:00:00",this.showToDay(today)+" 23:59:59"]
+ }
+ params = {
+ ... params,
status: e
};
+ if(this.search.type){
+ params = {
+ ... params,
+ type: this.search.type
+ };
+ }
+ this.query=params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
},
-
+ //本日
+ showToDay(Nowdate){
+ var M=Number(Nowdate.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ var day = Nowdate.getDate();
+ if(day<10){
+ day = "0"+day;
+ }
+ return Nowdate.getFullYear()+"-"+M+"-"+day;
+ },
+
+ //本周第一天
+ showWeekFirstDay(Nowdate){
+ var WeekFirstDay=new Date(Nowdate-(Nowdate.getDay()-1)*86400000);
+ var M=Number(WeekFirstDay.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ var day = WeekFirstDay.getDate();
+ if(day<10){
+ day = "0"+day;
+ }
+ return WeekFirstDay.getFullYear()+"-"+M+"-"+day;
+ },
+
+ //本月第一天
+ showMonthFirstDay(Nowdate){
+ var MonthFirstDay=new Date(Nowdate.getFullYear(),Nowdate.getMonth(),1);
+ var M=Number(MonthFirstDay.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ return MonthFirstDay.getFullYear()+"-"+M+"-"+"0"+MonthFirstDay.getDate();
+ },
//数据导出
handleExport() {
this.$confirm("是否导出健康码数据?", "提示", {
@@ -337,7 +394,7 @@
//window.open(`http://localhost:8108/ureport/excel?_u=blade-healthcode.statis.xml.ureport.xml&begTime=${begTime}&endTime=${endTime}&type=${type}&timeDesc=${timeDesc}`);
window.open(`https://web.byisf.com/api/blade-report/ureport/preview?_u=blade-healthcode.statis.xml.ureport.xml&begTime=${begTime}&endTime=${endTime}&type=${type}&timeDesc=${timeDesc}`);
},
- onLoad(page, params) {
+ onLoad(page, params={}) {
const { dateTime } = this.query;
let values = {
...params,
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 1a52596..6e98766 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -9,6 +9,7 @@
v-model="form"
ref="crud"
:row-style="rowStyle"
+ :search.sync="search"
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
@@ -96,6 +97,7 @@
return {
form: {},
query: {},
+ search:{},
showViewer: false, // 显示查看器
activeClass: 0,
imgUrl:'',
@@ -343,23 +345,37 @@
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"]
+ }
+
+ if(this.search.decisioDiagramResult){
+ params= {
+ ... params,
+ decisioDiagramResult:this.search.decisioDiagramResult
+ }
}
this.query = params;
this.page.currentPage = 1;
@@ -420,7 +436,7 @@
//window.open(`http://localhost:8108/ureport/excel?_u=blade-parcel.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
window.open(`https://web.byisf.com/api/blade-report/ureport/preview?_u=blade-parcel.statis.ureport.xml&startTime=${startTime}&endTime=${endTime}&decisioDiagramResult=${decisioDiagramResult}&timeDesc=${timeDesc}`);
},
- onLoad(page, params) {
+ onLoad(page, params={}) {
const { dateTime } = this.query;
let values = {
...params,
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,
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 0db564c..6600b59 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -13,6 +13,7 @@
@row-save="rowSave"
:before-open="beforeOpen"
:row-style="rowStyle"
+ :search.sync="search"
row-class-name="tabFontSize"
@search-change="searchChange"
@search-reset="searchReset"
@@ -45,13 +46,13 @@
<el-button
v-bind:class="activeClass == 1 ? 'btn-color' : ''"
size="mini"
- @click="getBZdata(1)"
+ @click="getBRdata(1)"
>本周
</el-button>
<el-button
v-bind:class="activeClass == 2 ? 'btn-color' : ''"
size="mini"
- @click="getBYdata(2)"
+ @click="getBRdata(2)"
>本月
</el-button>
<el-button
@@ -163,6 +164,7 @@
activeClass: 3,
form: {},
query: {},
+ search:{},
dateTime: [],
loading: true,
page: {
@@ -725,13 +727,74 @@
},
getBRdata(e) {
this.activeClass = e;
- var params = {
- beginTime: this.dateTime.day.beginTime,
- endTime: this.dateTime.day.endTime,
- };
- this.query = params;
+ this.query={};
+ this.$router.push({ query: {} });
+ var today = new Date();
+ var params ={};
+
+ if(e==0){
+ params = {
+ beginTime: this.showToDay(today)+" 00:00:00",
+ endTime: this.showToDay(today)+" 23:59:59",
+ };
+ //修改搜索框中的值
+ this.search.releaseTimeRange=[this.showToDay(today)+" 00:00:00",this.showToDay(today)+" 23:59:59"]
+ }
+ if(e==1){
+ params = {
+ beginTime: this.showWeekFirstDay(today)+" 00:00:00",
+ endTime: this.showToDay(today)+" 23:59:59",
+ };
+ //修改搜索框中的值
+ this.search.releaseTimeRange=[this.showWeekFirstDay(today)+" 00:00:00",this.showToDay(today)+" 23:59:59"]
+ }
+ if(e==2){
+ params = {
+ beginTime: this.showMonthFirstDay(today)+" 00:00:00",
+ endTime: this.showToDay(today)+" 23:59:59",
+ };
+ //修改搜索框中的值
+ this.search.releaseTimeRange=[this.showMonthFirstDay(today)+" 00:00:00",this.showToDay(today)+" 23:59:59"]
+ }
+ this.query=params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
+ },
+ //本日
+ showToDay(Nowdate){
+ var M=Number(Nowdate.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ var day = Nowdate.getDate();
+ if(day<10){
+ day = "0"+day;
+ }
+ return Nowdate.getFullYear()+"-"+M+"-"+day;
+ },
+
+ //本周第一天
+ showWeekFirstDay(Nowdate){
+ var WeekFirstDay=new Date(Nowdate-(Nowdate.getDay()-1)*86400000);
+ var M=Number(WeekFirstDay.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ var day = WeekFirstDay.getDate();
+ if(day<10){
+ day = "0"+day;
+ }
+ return WeekFirstDay.getFullYear()+"-"+M+"-"+day;
+ },
+
+ //本月第一天
+ showMonthFirstDay(Nowdate){
+ var MonthFirstDay=new Date(Nowdate.getFullYear(),Nowdate.getMonth(),1);
+ var M=Number(MonthFirstDay.getMonth())+1;
+ if(M<10){
+ M="0"+M;
+ }
+ return MonthFirstDay.getFullYear()+"-"+M+"-"+"0"+MonthFirstDay.getDate();
},
getBZdata(e) {
this.activeClass = e;
@@ -754,6 +817,8 @@
this.onLoad(this.page, params);
},
getQBdata(e) {
+ debugger;
+ this.search.releaseTimeRange=["",""];
this.activeClass = e;
var params = {};
this.query = params;
--
Gitblit v1.9.3