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 | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 5c3049a..ca44648 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -85,7 +85,7 @@
row-key="id"
default-expand-all
>
- <el-table-column prop="name" label="浠诲姟绫诲瀷" min-width="100">
+<!-- <el-table-column prop="name" label="浠诲姟绫诲瀷" min-width="100">
<template v-slot="scope">
<span
v-if="
@@ -95,12 +95,12 @@
>{{ cateList[scope.row.objType].name }}</span
>
</template>
- </el-table-column>
- <el-table-column label="鎻愪氦浜�" min-width="80">
- <template v-slot="scope">
- <span v-if="scope.row.title">{{
- scope.row.title.split(" - ")[1]
- }}</span>
+ </el-table-column>-->
+ <el-table-column label="澶勭悊浜嬮」" min-width="200">
+ <template slot-scope="{ row }"> {{ row.title}}
+<!-- <span v-if="row.title">{{
+ row.title.split("-")[1]
+ }}</span>-->
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100">
@@ -183,9 +183,10 @@
]
},
{
- filed: 'selDate',
- type: 'daterange',
- label: '璧峰鏃ユ湡'
+ filed: 'selTime',
+ type: 'datetimerange',
+ label: '璧锋鏃堕棿',
+ pickerOptions: {}
},
{
type: 'slot',
@@ -214,13 +215,14 @@
}
},
created () {
- this.getHeadData()
+ // this.getHeadData()
this.changeRadio('0')
+ this.getList()
},
methods: {
changeRadio (day) {
- const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
- 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) {
@@ -254,17 +256,18 @@
}
},
changeForm (str) {
- if (str === 'selDate') {
+ if (str === 'selTime') {
this.$set(this.filters, 'fastdate', null)
this.getList()
}
},
getList (page) {
+ 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