From bdad06349901c13f8ce2c9381a3ace2b7f80c652 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 三月 2025 14:33:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/platformEvent.vue | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/admin/src/views/business/platformEvent.vue b/admin/src/views/business/platformEvent.vue
index 97f2557..438a834 100644
--- a/admin/src/views/business/platformEvent.vue
+++ b/admin/src/views/business/platformEvent.vue
@@ -12,16 +12,17 @@
<el-form-item label="" prop="plateNo">
<el-input v-model="searchForm.plateNo" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="" prop="eventType">
+ <el-form-item label="" prop="motionStatus">
<el-select v-model="searchForm.motionStatus" placeholder="璇烽�夋嫨杩涘嚭绫诲瀷">
<el-option label="绂诲紑" value="leave"></el-option>
<el-option label="杩涘叆" value="enter"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="startDate">
- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
+ <el-form-item label="" prop="startDate">
+ <el-date-picker @change="changeDate" v-model="searchForm.startDate" type="datetime"
+ format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫椂闂�" />
+ <el-date-picker @change="changeDate" v-model="searchForm.endDate" type="datetime" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫椂闂�" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -120,26 +121,33 @@
})
},
methods: {
+ changeDate(e) {
+ if ((this.searchForm.startDate && this.searchForm.endDate) && this.searchForm.startDate > this.searchForm.endDate) {
+ this.searchForm.endDate = this.searchForm.startDate
+ this.search()
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ }else{
+ this.search()
+ }
+ },
changeRadio(e) {
if (e === '0') {
this.searchForm.startDate = timeForMat(0)[0]
this.searchForm.endDate = timeForMat(0)[1]
- this.time = timeForMat(0)
+ // this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startDate = timeForMat(6)[0]
this.searchForm.endDate = timeForMat(6)[1]
- this.time = timeForMat(6)
+ // this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startDate = timeForMat(29)[0]
this.searchForm.endDate = timeForMat(29)[1]
- this.time = timeForMat(29)
+ // this.time = timeForMat(29)
}
- this.search()
- },
- seleTime(e) {
- this.searchForm.startDate = e[0]
- this.searchForm.endDate = e[1]
- this.searchForm.radio = null
+ if ((this.searchForm.startDate && this.searchForm.endDate) && this.searchForm.startDate > this.searchForm.endDate) {
+ this.searchForm.startDate = this.searchForm.endDate
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ }
this.search()
},
reset() {
@@ -147,7 +155,6 @@
this.searchForm.startDate = ''
this.searchForm.endDate = ''
this.searchForm.radio = ''
- this.time = []
this.search()
}
}
--
Gitblit v1.9.3