From d0c1633b3a1554ae2e21f96167f8fbe7c1e8a893 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 11:49:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/index.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index f8e89d2..ca44648 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -183,9 +183,10 @@
]
},
{
- filed: 'selDate',
+ filed: 'selTime',
type: 'datetimerange',
- label: '璧峰鏃ユ湡'
+ label: '璧锋鏃堕棿',
+ pickerOptions: {}
},
{
type: 'slot',
@@ -220,8 +221,8 @@
},
methods: {
changeRadio (day) {
- const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
- this.$set(this.filters, 'selDate', arr)
+ const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
+ this.$set(this.filters, 'selTime', arr)
this.getList()
},
handleDetail (row) {
@@ -255,7 +256,7 @@
}
},
changeForm (str) {
- if (str === 'selDate') {
+ if (str === 'selTime') {
this.$set(this.filters, 'fastdate', null)
this.getList()
}
@@ -264,9 +265,9 @@
this.getHeadData()
console.log(this.filters)
const { filters, pagination } = this
- if (filters.selDate && filters.selDate.length > 0) {
- filters.startDate = filters.selDate[0]
- filters.endDate = filters.selDate[1]
+ if (filters.selTime && filters.selTime.length > 0) {
+ filters.startDate = filters.selTime[0]
+ filters.endDate = filters.selTime[1]
} else {
filters.startDate = null
filters.endDate = null
--
Gitblit v1.9.3