From 2672eaeda5b32e17a00f2ff32c94207d6afeab98 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期四, 20 六月 2024 23:29:59 +0800
Subject: [PATCH] update
---
src/views/mdc/components/TimeAlarm.vue | 76 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/src/views/mdc/components/TimeAlarm.vue b/src/views/mdc/components/TimeAlarm.vue
index 8f1072e..b5c3af9 100644
--- a/src/views/mdc/components/TimeAlarm.vue
+++ b/src/views/mdc/components/TimeAlarm.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-22 22:32:05
+ * @LastEditTime: 2024-06-20 23:20:15
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/TimeAlarm.vue
-->
<template>
@@ -113,10 +113,7 @@
this.getTime({
endDate: params.endDate,
startDate: params.startDate,
- }).then(res => {
-
})
-
},
getTime(data) {
return Promise.all([
@@ -125,15 +122,18 @@
statisticalMethod: "DAY"
}).then(res => {
if (res.code === 200) {
- this.btnListDay = res.data.map(item => ({
- label: item.title,
- value: item.id,
- startDate: item.startDate,
- endDate: item.endDate,
- week: moment(item.id).week(),
- month: moment(item.id).month() + 1,
- year: moment(item.id).year()
- })).reverse()
+ this.btnListDay = res.data.map(item => {
+ return {
+ label: item.title,
+ value: item.id,
+ startDate: item.startDate,
+ endDate: item.endDate,
+ week: moment(item.id).week(),
+ month: moment(item.id).month() + 1,
+ year: moment(item.id).year()
+ }
+
+ }).reverse()
}
this.queryDay(this.btnListDay[0])
}),
@@ -142,15 +142,18 @@
statisticalMethod: "WEEK"
}).then(res => {
if (res.code === 200) {
- this.btnListWeek = res.data.map(item => ({
- label: item.title,
- value: item.id,
- startDate: item.startDate,
- endDate: item.endDate,
- week: moment(item.startDate).week(),
- month: moment(item.startDate).month() + 1,
- year: moment(item.startDate).year()
- })).reverse()
+ this.btnListWeek = res.data.map(item => {
+ return {
+ label: item.title,
+ value: item.id,
+ startDate: item.startDate,
+ endDate: item.endDate,
+ week: moment(item.startDate).week(),
+ month: moment(item.startDate).month() + 1,
+ year: moment(item.startDate).year()
+ }
+
+ }).reverse()
}
}),
@@ -159,15 +162,20 @@
statisticalMethod: "MONTH"
}).then(res => {
if (res.code === 200) {
- this.btnListMonth = res.data.map(item => ({
- label: item.title,
- value: item.id,
- startDate: item.startDate,
- endDate: item.endDate,
- week: moment(item.id + '-1').week(),
- month: moment(item.id + '-1').month() + 1,
- year: moment(item.id + '-1').year()
- })).reverse()
+ this.btnListMonth = res.data.map(item => {
+ let startDate = moment(item.id).startOf('month').format('YYYY-MM-DD')
+ let endDate = moment(item.id).endOf('month').format('YYYY-MM-DD')
+ return {
+ label: item.title,
+ value: item.id,
+ startDate,
+ endDate,
+ week: moment(item.id + '-1').week(),
+ month: moment(item.id + '-1').month() + 1,
+ year: moment(item.id + '-1').year()
+ }
+
+ }).reverse()
}
})
@@ -217,8 +225,10 @@
})
},
query(data, flag) {
- console.log('--------')
- this.queryTableData(data, flag)
+ if (this.isShowTable) {
+ return this.queryTableData(data, flag)
+ }
+
return this.$HTTP.post(this.url, data, {}).then(res => {
return this.setOptions(res.data.res)
})
--
Gitblit v1.9.3