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/animalHeat/animalHeat.vue | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 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,
--
Gitblit v1.9.3