From d8853e0e208de0bd9736bd8fab4931d3d1e7c8e3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 六月 2024 11:43:22 +0800
Subject: [PATCH] ‘’
---
admin/src/views/task/index.vue | 19 ++++++++++---------
admin/src/views/meeting/bookings.vue | 2 +-
admin/src/views/business/retention.vue | 6 +++---
admin/src/views/business/interfaceLog.vue | 6 +++---
admin/src/views/system/InterfaceLog.vue | 2 +-
admin/src/views/business/deviceEvent.vue | 6 +++---
6 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index f4d59ae..d9b3d60 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -20,7 +20,7 @@
<el-option label="浜鸿劯璁よ瘉閫氳繃" value="196893"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璧峰鏃堕棿" prop="eventType">
+ <el-form-item label="璧锋鏃堕棿" prop="eventType">
<el-date-picker
@change="seleTime"
v-model="time"
@@ -28,8 +28,8 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
+ start-placeholder="寮�濮嬫椂闂�"
+ end-placeholder="缁撴潫鏃堕棿">
</el-date-picker>
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
diff --git a/admin/src/views/business/interfaceLog.vue b/admin/src/views/business/interfaceLog.vue
index 929616a..910a21c 100644
--- a/admin/src/views/business/interfaceLog.vue
+++ b/admin/src/views/business/interfaceLog.vue
@@ -11,7 +11,7 @@
<el-option label="鎺ㄩ�佹帴鍙�" value="1"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璧峰鏃堕棿" prop="startDate">
+ <el-form-item label="璧锋鏃堕棿" prop="startDate">
<el-date-picker
@change="seleTime"
v-model="time"
@@ -19,8 +19,8 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
+ start-placeholder="寮�濮嬫椂闂�"
+ end-placeholder="缁撴潫鏃堕棿">
</el-date-picker>
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index b5e51fb..1868708 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -29,7 +29,7 @@
<el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璧峰鏃堕棿" prop="startTime">
+ <el-form-item label="璧锋鏃堕棿" prop="startTime">
<el-date-picker
@change="seleTime"
v-model="time"
@@ -37,8 +37,8 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
+ start-placeholder="寮�濮嬫椂闂�"
+ end-placeholder="缁撴潫鏃堕棿"
>
</el-date-picker>
</el-form-item>
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index a149596..1cb742c 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -46,7 +46,7 @@
<el-option v-for="item in status" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
- <el-form-item label="浼氳鏃堕棿" prop="startTime">
+ <el-form-item label="璧锋鏃堕棿" prop="startTime">
<el-date-picker
v-model="date"
type="datetimerange"
diff --git a/admin/src/views/system/InterfaceLog.vue b/admin/src/views/system/InterfaceLog.vue
index c126f15..24242ea 100644
--- a/admin/src/views/system/InterfaceLog.vue
+++ b/admin/src/views/system/InterfaceLog.vue
@@ -108,7 +108,7 @@
{
filed: 'selTime',
type: 'datetimerange',
- label: '璧峰鏃堕棿'
+ label: '璧锋鏃堕棿'
},
{
type: 'slot',
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index 5c3049a..cd6a515 100644
--- a/admin/src/views/task/index.vue
+++ b/admin/src/views/task/index.vue
@@ -183,9 +183,10 @@
]
},
{
- filed: 'selDate',
- type: 'daterange',
- label: '璧峰鏃ユ湡'
+ filed: 'selTime',
+ type: 'datetimerange',
+ label: '璧锋鏃堕棿',
+ pickerOptions: {}
},
{
type: 'slot',
@@ -219,8 +220,8 @@
},
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,7 +255,7 @@
}
},
changeForm (str) {
- if (str === 'selDate') {
+ if (str === 'selTime') {
this.$set(this.filters, 'fastdate', null)
this.getList()
}
@@ -262,9 +263,9 @@
getList (page) {
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