From 00f774f72e2f607b4da23d7183ff4db3bc8c6cb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 十月 2024 18:21:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/deviceEvent.vue | 181 ++++++++++++++++++++++-----------------------
1 files changed, 89 insertions(+), 92 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index d9b3d60..f6b4a8f 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -1,101 +1,98 @@
<template>
- <TableLayout :permissions="['business:deviceevent:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <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="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="璇烽�夋嫨">
- <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="197163"></el-option>
- <el-option label="浜鸿劯璁よ瘉閫氳繃" value="196893"></el-option>
- </el-select>
- </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"
- 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.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 @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:deviceevent:exportExcel']">
-<!--
+ <TableLayout :permissions="['business:deviceevent:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <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="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="璇烽�夋嫨">
+ <el-option label="澶栨潵璁垮" value="1"></el-option>
+ <el-option label="鍐呴儴浜哄憳" value="2"></el-option>
+ </el-select>
+ </el-form-item> -->
+ <el-form-item label="浜哄憳绫诲瀷" prop="memberType">
+ <el-select v-model="searchForm.queryUserType" 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="197163"></el-option>
+ <el-option label="浜鸿劯璁よ瘉閫氳繃" value="196893"></el-option>
+ </el-select>
+ </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"
+ 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.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 @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"
- stripe
- >
- <el-table-column prop="userType" label="浜哄憳绫诲瀷" min-width="100px">
+ </ul>
+ <el-table 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>
<span v-if="row.personType == 1">鏅�氳瀹�</span>
<span v-if="row.personType == 2">鍐呴儴浜哄憳</span>
<span v-if="row.personType == null">澶栨潵璁垮</span>
</template>
- </el-table-column>
- <el-table-column prop="happenTime" 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="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 != 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> -->
+ <el-table-column label="浜哄憳绫诲瀷" min-width="100px">
+ <template slot-scope="{ row }">
+ <span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
+ <span v-else-if="row.companyType == 1">鍐呴儴鍛樺伐</span>
+ <span v-else>璁垮</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="happenTime" 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="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 != 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="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="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>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ </TableLayout>
</template>
<script>
@@ -107,7 +104,7 @@
name: 'DeviceEvent',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -122,7 +119,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: '闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃',
api: '/business/deviceEvent',
@@ -132,7 +129,7 @@
this.changeRadio('0')
},
methods: {
- changeRadio (e) {
+ changeRadio(e) {
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
@@ -148,13 +145,13 @@
}
this.search()
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.startTime = e[0]
this.searchForm.endTime = e[1]
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.time = []
this.searchForm.radio = '0'
--
Gitblit v1.9.3