From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/deviceEvent.vue | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index be0f47b..d9b3d60 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -5,8 +5,8 @@
<el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
<el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍏徃/缁勭粐鍚嶇О" prop="personCompanyName">
- <el-input v-model="searchForm.personCompanyName" placeholder="璇疯緭鍏ュ叕鍙�/缁勭粐鍚嶇О" @keypress.enter.native="search"></el-input>
+ <el-form-item label="缁勭粐" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="浜哄憳绫诲瀷" prop="personType">
<el-select v-model="searchForm.personType" placeholder="璇烽�夋嫨">
@@ -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">
@@ -45,7 +45,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
v-loading="isWorking.search"
@@ -83,7 +85,7 @@
<el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="personPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="personIdcardDecode" label="璇佷欢鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="personCompanyName" label="鍏徃/缁勭粐" min-width="100px"></el-table-column>
+ <el-table-column prop="personCompanyName" label="缁勭粐" min-width="100px"></el-table-column>
</el-table>
<pagination
@@ -110,12 +112,12 @@
// 鎼滅储
searchForm: {
keyWords: '',
- personCompanyName: '',
+ companyName: '',
personType: '',
eventType: '',
startTime: '',
endTime: '',
- radio: null
+ radio: 0
},
time: []
}
@@ -127,22 +129,22 @@
'field.id': 'id',
'field.main': 'id'
})
- this.search()
+ this.changeRadio('0')
},
methods: {
changeRadio (e) {
if (e === '0') {
- this.searchForm.startTime = timeForMat(1)[0]
- this.searchForm.endTime = timeForMat(1)[1]
- this.time = timeForMat(1)
+ this.searchForm.startTime = timeForMat(0)[0]
+ this.searchForm.endTime = timeForMat(0)[1]
+ this.time = timeForMat(0)
} else if (e === '1') {
- this.searchForm.startTime = timeForMat(7)[0]
- this.searchForm.endTime = timeForMat(7)[1]
- this.time = timeForMat(7)
+ this.searchForm.startTime = timeForMat(6)[0]
+ this.searchForm.endTime = timeForMat(6)[1]
+ this.time = timeForMat(6)
} else if (e === '2') {
- this.searchForm.startTime = timeForMat(30)[0]
- this.searchForm.endTime = timeForMat(30)[1]
- this.time = timeForMat(30)
+ this.searchForm.startTime = timeForMat(29)[0]
+ this.searchForm.endTime = timeForMat(29)[1]
+ this.time = timeForMat(29)
}
this.search()
},
@@ -154,10 +156,9 @@
},
reset () {
this.$refs.searchForm.resetFields()
- this.searchForm.startTime = ''
- this.searchForm.endTime = ''
this.time = []
- this.searchForm.radio = null
+ this.searchForm.radio = '0'
+ this.changeRadio('0')
this.search()
}
}
--
Gitblit v1.9.3