From 83c7cfa4ecd5d59106b09efff26be43141e38386 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十二月 2023 09:10:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/deviceEvent.vue | 115 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 84 insertions(+), 31 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index c5be976..f055fb4 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -1,53 +1,53 @@
<template>
- <TableLayout :permissions="['business:member:query']">
+ <TableLayout :permissions="['business:deviceevent:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="eventType">
- <el-input v-model="searchForm.eventType" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ <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="eventType">
- <el-input v-model="searchForm.eventType" placeholder="璇疯緭鍏ュ叕鍙�/缁勭粐鍚嶇О" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鍏徃/缁勭粐鍚嶇О" prop="personCompanyName">
+ <el-input v-model="searchForm.personCompanyName" placeholder="璇疯緭鍏ュ叕鍙�/缁勭粐鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="浜哄憳绫诲瀷" prop="userType">
- <el-select v-model="searchForm.userType" placeholder="璇烽�夋嫨">
- <el-option label="鏈煡" value="0"></el-option>
- <el-option label="鏅��" value="1"></el-option>
- <el-option label="鏉ュ" value="2"></el-option>
- <el-option label="榛戝悕鍗�" value="3"></el-option>
- <el-option label="绠＄悊鍛�" value="4"></el-option>
+ <el-form-item label="浜哄憳绫诲瀷" prop="personType">
+ <el-select v-model="searchForm.personType" placeholder="璇烽�夋嫨">
+ <el-option label="鍔冲姟璁垮" value="0"></el-option>
+ <el-option label="鏅�氳瀹�" value="1"></el-option>
+ <el-option label="鍐呴儴浜哄憳" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
<el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
- <el-option label="鏈煡" value="0"></el-option>
- <el-option label="鏅��" value="1"></el-option>
- <el-option label="鏉ュ" value="2"></el-option>
- <el-option label="榛戝悕鍗�" value="3"></el-option>
- <el-option label="绠＄悊鍛�" value="4"></el-option>
+ <el-option label="浜鸿劯璁よ瘉澶辫触" value="197163"></el-option>
+ <el-option label="浜鸿劯璁よ瘉閫氳繃" value="196893"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璧峰鏃堕棿" prop="eventType">
<el-date-picker
- v-model="searchForm.eventType"
- type="daterange"
+ @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>
- <el-radio-group v-model="searchForm.eventType" size="small">
- <el-radio-button label="褰撳ぉ"></el-radio-button>
- <el-radio-button label="杩�7澶�"></el-radio-button>
- <el-radio-button label="杩�30澶�"></el-radio-button>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
</el-radio-group>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<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"
:data="tableData.list"
@@ -63,12 +63,26 @@
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="idcard" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="company" label="鍏徃/缁勭粐" min-width="100px"></el-table-column>
- <el-table-column prop="srcName" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="personCompanyName" label="鍏徃/缁勭粐" min-width="100px"></el-table-column>
+ <el-table-column prop="devName" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="srcName" label="闂ㄧ鐐�" min-width="100px"></el-table-column>
- <el-table-column prop="eventType" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="eventType" label="鍑哄叆绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="extEventPictureURL" label="鎶撴媿鐓х墖" min-width="100px"></el-table-column>
+ <el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
+ <el-table-column label="鍑哄叆绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.extEventInOut === 1">杩�</span>
+ <span v-if="row.extEventInOut === 0">鍑�</span>
+ <span v-if="row.extEventInOut === -1">鏈煡</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎶撴媿鐓х墖" min-width="100px">
+ <template slot-scope="{row}">
+ <el-image
+ style="width: 80px; height: 80px"
+ :src="row.extEventPictureURL"
+ :preview-src-list="[row.extEventPictureURL]">
+ </el-image>
+ </template>
+ </el-table-column>
<el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
</el-table>
<pagination
@@ -85,6 +99,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import { timeForMat } from '@/utils/util'
export default {
name: 'DeviceEvent',
extends: BaseTable,
@@ -93,9 +108,15 @@
return {
// 鎼滅储
searchForm: {
+ keyWords: '',
+ personCompanyName: '',
+ personType: '',
eventType: '',
- userType: ''
- }
+ startTime: '',
+ endTime: '',
+ radio: null
+ },
+ time: []
}
},
created () {
@@ -106,6 +127,38 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ changeRadio (e) {
+ if (e === '0') {
+ this.searchForm.startTime = timeForMat(1)[0]
+ this.searchForm.endTime = timeForMat(1)[1]
+ this.time = timeForMat(1)
+ } else if (e === '1') {
+ this.searchForm.startTime = timeForMat(7)[0]
+ this.searchForm.endTime = timeForMat(7)[1]
+ this.time = timeForMat(7)
+ } else if (e === '2') {
+ this.searchForm.startTime = timeForMat(30)[0]
+ this.searchForm.endTime = timeForMat(30)[1]
+ this.time = timeForMat(30)
+ }
+ this.search()
+ },
+ seleTime (e) {
+ this.searchForm.startTime = e[0]
+ this.searchForm.endTime = e[1]
+ this.searchForm.radio = null
+ this.search()
+ },
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.startTime = ''
+ this.searchForm.endTime = ''
+ this.time = []
+ this.searchForm.radio = null
+ this.search()
+ }
}
}
</script>
--
Gitblit v1.9.3