From 78ce920fa8a3f06cf40ee936b7b33c457206ecb6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 10:51:57 +0800
Subject: [PATCH] 整理
---
admin/src/views/business/deviceEvent.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 6230072..b21c70d 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -10,8 +10,7 @@
</el-form-item>
<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="1"></el-option>
<el-option label="鍐呴儴浜哄憳" value="2"></el-option>
</el-select>
</el-form-item>
@@ -55,23 +54,20 @@
>
<el-table-column prop="userType" label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.userType === 0">鍔冲姟璁垮</span>
- <span v-if="row.userType === 1">鏅�氳瀹�</span>
- <span v-if="row.userType === 2">鍐呴儴浜哄憳</span>
+ <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="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="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 === 0">鍑�</span>
- <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">
@@ -83,7 +79,12 @@
</el-image>
</template>
</el-table-column>
- <el-table-column prop="happenTime" 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"
--
Gitblit v1.9.3