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/realTimePolice/real.vue | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 7 deletions(-)
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