From 514bbb98741f72e8c8cd0df2f5764bc3a71edf9b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 27 Jul 2021 10:46:16 +0800
Subject: [PATCH] 增加周月日时间筛选
---
src/views/InstallClent/installClent.vue | 95 ++++++++++++++++++++++++++++++-
src/views/realTimePolice/real.vue | 72 +++++++++++++++++++++--
src/api/installClent/installClent.js | 4 +
src/api/real/real.js | 8 ++
4 files changed, 165 insertions(+), 14 deletions(-)
diff --git a/src/api/installClent/installClent.js b/src/api/installClent/installClent.js
index 8a069e7..68e66c7 100644
--- a/src/api/installClent/installClent.js
+++ b/src/api/installClent/installClent.js
@@ -52,7 +52,9 @@
return request({
url: '/api/blade-jfpts/alarm/alarm/getChartData',
method: 'get',
- data: row
+ params: {
+ ...row,
+ }
})
}
diff --git a/src/api/real/real.js b/src/api/real/real.js
index 9b7551c..61b4cce 100644
--- a/src/api/real/real.js
+++ b/src/api/real/real.js
@@ -52,7 +52,9 @@
return request({
url: '/api/blade-jfpts/alarm/alarm/getChartDataAlarm',
method: 'get',
- data: row
+ params: {
+ ...row
+ }
})
}
@@ -60,7 +62,9 @@
return request({
url: '/api/blade-jfpts/alarm/alarm/getChartDataAlarmBs',
method: 'get',
- data: row
+ params: {
+ ...row
+ }
})
}
diff --git a/src/views/InstallClent/installClent.vue b/src/views/InstallClent/installClent.vue
index 1762a2f..2a692e8 100644
--- a/src/views/InstallClent/installClent.vue
+++ b/src/views/InstallClent/installClent.vue
@@ -48,6 +48,30 @@
</avue-crud>
<el-row v-show="switchChartType == 1">
+ <el-button
+ v-bind:class="activeClass == 0 ? 'btn-color' : ''"
+ size="small"
+ @click="getswitchChartdate(0)"
+ >本日
+ </el-button>
+ <el-button
+ v-bind:class="activeClass == 1 ? 'btn-color' : ''"
+ size="small"
+ @click="getswitchChartdate(1)"
+ >本周
+ </el-button>
+ <el-button
+ v-bind:class="activeClass == 2 ? 'btn-color' : ''"
+ size="small"
+ @click="getswitchChartdate(2)"
+ >本月
+ </el-button>
+ <el-button
+ v-bind:class="activeClass == 3 ? 'btn-color' : ''"
+ size="small"
+ @click="getswitchChartdate(3)"
+ >全部
+ </el-button>
<el-button type="success"
size="small"
icon="el-icon-s-marketing"
@@ -75,6 +99,7 @@
return {
form: {},
query: {},
+ activeClass: 3,
switchChartType: 0,
loading: true,
page: {
@@ -371,12 +396,12 @@
} else {
this.switchChartType = 1;
setTimeout(function () {
- that.getChartData();
+ that.getChartData(null);
}, 0);
}
- }, getChartData() {
+ }, getChartData(date) {
var that = this;
- getChartData(null).then(res => {
+ getChartData(date).then(res => {
var data = res.data.data;
var sum = 0;
for (let i = 0; i < data.length; i++) {
@@ -436,6 +461,70 @@
});
},
+ getswitchChartdate(e){
+ var params = {};
+ var today = new Date();
+ this.activeClass = e;
+ if (e == 0) {
+ params = {
+ beginTime: this.showToDay(today) + " 00:00:00",
+ endTime: this.showToDay(today) + " 23:59:59",
+ };
+ }
+ if (e == 1) {
+ params = {
+ beginTime: this.showWeekFirstDay(today) + " 00:00:00",
+ endTime: this.showToDay(today) + " 23:59:59",
+ };
+ }
+ if (e == 2) {
+ params = {
+ beginTime: this.showMonthFirstDay(today) + " 00:00:00",
+ endTime: this.showToDay(today) + " 23:59:59",
+ };
+ }
+
+ if (e == 3){
+ params = null;
+ }
+ this.getChartData(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();
+ },
}
};
</script>
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index c8ecaad..71e0e38 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -154,8 +154,32 @@
</avue-crud>
<el-row v-show="switchChartType == 1">
+ <el-button
+ v-bind:class="activeClass == 0 ? 'btn-color' : ''"
+ size="mini"
+ @click="getswitchChartdate(0)"
+ >本日
+ </el-button>
+ <el-button
+ v-bind:class="activeClass == 1 ? 'btn-color' : ''"
+ size="mini"
+ @click="getswitchChartdate(1)"
+ >本周
+ </el-button>
+ <el-button
+ v-bind:class="activeClass == 2 ? 'btn-color' : ''"
+ size="mini"
+ @click="getswitchChartdate(2)"
+ >本月
+ </el-button>
+ <el-button
+ v-bind:class="activeClass == 3 ? 'btn-color' : ''"
+ size="mini"
+ @click="getswitchChartdate(3)"
+ >全部
+ </el-button>
<el-button type="success"
- size="small"
+ size="mini"
icon="el-icon-s-marketing"
@click="switchChart">表 格
</el-button>
@@ -815,6 +839,39 @@
this.page.currentPage = 1;
this.onLoad(this.page, params);
},
+
+ getswitchChartdate(e){
+ var params = {};
+ var today = new Date();
+ this.activeClass = e;
+ if (e == 0) {
+ params = {
+ beginTime: this.showToDay(today) + " 00:00:00",
+ endTime: this.showToDay(today) + " 23:59:59",
+ };
+ }
+ if (e == 1) {
+ params = {
+ beginTime: this.showWeekFirstDay(today) + " 00:00:00",
+ endTime: this.showToDay(today) + " 23:59:59",
+ };
+ }
+ if (e == 2) {
+ params = {
+ beginTime: this.showMonthFirstDay(today) + " 00:00:00",
+ endTime: this.showToDay(today) + " 23:59:59",
+ };
+ }
+
+ if (e == 3){
+ params = null;
+ }
+
+ this.getData(params);
+ this.getDataBs(params);
+
+ },
+
//本日
showToDay(Nowdate) {
var M = Number(Nowdate.getMonth()) + 1;
@@ -872,7 +929,6 @@
this.onLoad(this.page, params);
},
getQBdata(e) {
- debugger;
this.search.releaseTimeRange = ["", ""];
this.activeClass = e;
var params = {};
@@ -1056,13 +1112,13 @@
} else {
this.switchChartType = 1;
setTimeout(function () {
- that.getData();
- that.getDataBs();
+ that.getData(null);
+ that.getDataBs(null);
}, 0);
}
- }, getData() {
+ }, getData(data) {
var that = this;
- getChartData(null).then(res => {
+ getChartData(data).then(res => {
var data = res.data.data;
var sum = 0;
for (let i = 0; i < data.length; i++) {
@@ -1121,9 +1177,9 @@
myChart.setOption(option);
});
},
- getDataBs() {
+ getDataBs(data) {
var that = this;
- getChartDataBs(null).then(res => {
+ getChartDataBs(data).then(res => {
var data = res.data.data;
var sum = 0;
for (let i = 0; i < data.length; i++) {
--
Gitblit v1.9.3