From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/index.vue | 54 ++++++++++++++++++++++++------------------------------
1 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 11345da..6597ea4 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -33,7 +33,7 @@
</template>
</el-tab-pane>
</el-tabs>
- <el-table v-loading="loading" :data="dataList" stripe row-key="id" class="mb20" default-expand-all>
+ <el-table v-loading="loading" :data="dataList" stripe row-key="id" class="mb40" default-expand-all>
<el-table-column label="澶勭悊浜嬮」" min-width="160">
<template slot-scope="{ row }"> {{ row.title }}
</template>
@@ -102,7 +102,9 @@
isShowDriver: false,
filters: {
queryType: '0',
- // fastdate: 0
+ startDate: '',
+ endDate: '',
+ fastdate: '0'
},
queryFormConfig: {
formItems: [
@@ -115,14 +117,14 @@
{ label: '璁垮鎶ュ', value: '1' },
{ label: '鐢ㄨ溅鐢宠', value: '2' },
{ label: '闅愭偅闅忔墜鎷�', value: '3' },
- { label: '鐗╂祦杞︾敵璇�', value: '4' }
+ { label: '鐗╂祦杞︾敵璇�', value: '6' }
]
},
{
- filed: 'selTime',
- type: 'datetimerange',
- label: '璧锋鏃堕棿',
- pickerOptions: {}
+ filed1: 'startDate',
+ filed2: 'endDate',
+ type: 'datetime',
+ label: '璧锋鏃堕棿'
},
{
type: 'slot',
@@ -146,19 +148,20 @@
{ name: '璁垮鎶ュ', id: 1 },
{ name: '鐢ㄨ溅鐢宠', id: 2 },
{ name: '闅愭偅闅忔墜鎷�', id: 3 },
- { name: '鐗╂祦杞︾敵璇�', id: 4 }
+ { name: '鐗╂祦杞︾敵璇�', id: 6 }
]
}
},
created() {
// this.getHeadData()
- // this.changeRadio('0')
- this.getHeadData()
+ this.changeRadio('0')
+ // this.getHeadData()
},
methods: {
changeRadio(day) {
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.filters.startDate = arr[0]
+ this.filters.endDate = arr[1]
this.getHeadData()
},
SubSuccess(str) {
@@ -230,20 +233,11 @@
}
},
changeForm(str) {
- if (str === 'selTime') {
- this.$set(this.filters, 'fastdate', null)
- this.getHeadData()
- }
+ this.$set(this.filters, 'fastdate', null)
+ this.getHeadData()
},
getList(page) {
const { filters, pagination } = this
- if (filters.selTime && filters.selTime.length > 0) {
- filters.startDate = filters.selTime[0]
- filters.endDate = filters.selTime[1]
- } else {
- filters.startDate = null
- filters.endDate = null
- }
pagination.page = page || pagination.page
taskCenterPage({
model: { ...filters, queryType: Number(filters.queryType) },
@@ -262,17 +256,17 @@
},
getHeadData(page) {
const { filters } = this
- if (filters.selTime && filters.selTime.length > 0) {
- filters.startDate = filters.selTime[0]
- filters.endDate = filters.selTime[1]
- } else {
- filters.startDate = null
- filters.endDate = null
- }
+ // if (filters.selTime && filters.selTime.length > 0) {
+ // filters.startDate = filters.selTime[0]
+ // filters.endDate = filters.selTime[1]
+ // } else {
+ // filters.startDate = null
+ // filters.endDate = null
+ // }
this.loading = true
taskCenterHeadPC({ ...filters, queryType: Number(filters.queryType), isDetail: '1' }).then(res => {
this.headData = res
- this.getList(page)
+ this.getList(1)
}, () => {
this.loading = false
})
--
Gitblit v1.9.3