From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/business/deviceEvent.vue | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 18b6ada..d86b88f 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -28,10 +28,17 @@
<el-option label="浜鸿劯璁よ瘉閫氳繃" value="196893"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="闂ㄧ鐐�" prop="srcName">
+ <el-input v-model="searchForm.srcName" placeholder="璇疯緭鍏ラ棬绂佺偣" @keypress.enter.native="search"></el-input>
+ </el-form-item>
<el-form-item label="璧锋鏃堕棿" prop="eventType">
- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+ <!-- <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-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -48,11 +55,9 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:deviceevent:exportExcel']">
- <!--
<li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:deviceevent:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
--->
</ul>
- <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
<!-- <el-table-column prop="userType" label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.personType == 0">鍔冲姟璁垮</span>
@@ -63,7 +68,7 @@
</el-table-column> -->
<el-table-column prop="personName" label="濮撳悕" min-width="80px"></el-table-column>
<el-table-column prop="personPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="personIdcardDecode" label="璇佷欢鍙�" min-width="140px"></el-table-column>
+ <el-table-column prop="personIdcardDecode" label="韬唤璇佸彿" min-width="140px"></el-table-column>
<el-table-column prop="personCompanyName" label="缁勭粐" min-width="100px"></el-table-column>
<el-table-column label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{ row }">
@@ -84,14 +89,9 @@
</el-table-column>
<el-table-column label="鎶撴媿鐓х墖" min-width="100px">
<template slot-scope="{row}">
- <el-image v-if="row.extEventPictureURL" style="width: 80px; height: 80px" :src="row.extEventPictureURL"
- :preview-src-list="[row.extEventPictureURL]">
- </el-image>
+ <el-image v-if="row.extEventPictureURL" style="width: 80px; height: 80px" :src="row.extEventPictureURL" :preview-src-list="[row.extEventPictureURL]"> </el-image>
</template>
</el-table-column>
-
-
-
</el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
@@ -118,7 +118,8 @@
eventType: '',
startTime: '',
endTime: '',
- radio: 0
+ radio: 0,
+ srcName: ''
},
time: []
}
@@ -142,15 +143,19 @@
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startTime = timeForMat(6)[0]
this.searchForm.endTime = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startTime = timeForMat(29)[0]
this.searchForm.endTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startTime = ''
+ return
}
this.search()
},
@@ -162,7 +167,15 @@
},
reset() {
this.$refs.searchForm.resetFields()
- this.time = []
+ this.searchForm = {
+ keyWords: '',
+ companyName: '',
+ personType: '',
+ eventType: '',
+ startTime: '',
+ endTime: '',
+ radio: 0
+ }
this.searchForm.radio = ''
// this.changeRadio('0')
this.search()
--
Gitblit v1.9.3