From d856a70a4e764579e1467a254f28581cdac80427 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Wed, 15 Feb 2023 17:16:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/views/home/components/bottomContainer.vue | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/views/home/components/bottomContainer.vue b/src/views/home/components/bottomContainer.vue
index 40b88b6..5d1a486 100644
--- a/src/views/home/components/bottomContainer.vue
+++ b/src/views/home/components/bottomContainer.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-01-13 15:52:59
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-02-13 09:59:47
+ * @LastEditTime: 2023-02-15 16:01:18
* @FilePath: \srs-police-affairs\src\views\home\components\bottomContainer.vue
* @Description:
*
@@ -395,7 +395,24 @@
handleCurrentChange: function (currentPage) {
this.currentPage = currentPage
- this.getAlarmList({ current: this.currentPage })
+ if (this.timetype == 0) {
+
+ this.getAlarmList({ type: this.timetype, time: this.dateFormat(this.currentWeekTime), current: this.currentPage })
+
+ } else if (this.timetype == 1) {
+
+ this.getAlarmList({ type: this.timetype, time: this.dateFormat(this.currentMonthTime), current: this.currentPage })
+
+ } else {
+
+ const date = this.currentTime.map(item => {
+ return this.dateFormat(item)
+ })
+
+ this.getAlarmList({ start: date[0], end: date[1], current: this.currentPage })
+
+ }
+
},
// 设置默认时间
--
Gitblit v1.9.3