From 4e2e52b766d87fc528d02bdebc1757c3dda8c596 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/deviceEvent.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index f6b4a8f..6dd132c 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -14,7 +14,7 @@
<el-option label="鍐呴儴浜哄憳" value="2"></el-option>
</el-select>
</el-form-item> -->
- <el-form-item label="浜哄憳绫诲瀷" prop="memberType">
+ <el-form-item label="浜哄憳绫诲瀷" prop="queryUserType">
<el-select v-model="searchForm.queryUserType" placeholder="璇烽�夋嫨">
<el-option label="璁垮" value="0"></el-option>
<el-option label="鐩稿叧鏂圭粍缁�" value="1"></el-option>
@@ -58,6 +58,10 @@
<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 label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{ row }">
<span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
@@ -77,16 +81,13 @@
</el-table-column>
<el-table-column label="鎶撴媿鐓х墖" min-width="100px">
<template slot-scope="{row}">
- <el-image style="width: 80px; height: 80px" :src="row.extEventPictureURL"
+ <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-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">
@@ -154,8 +155,8 @@
reset() {
this.$refs.searchForm.resetFields()
this.time = []
- this.searchForm.radio = '0'
- this.changeRadio('0')
+ this.searchForm.radio = ''
+ // this.changeRadio('0')
this.search()
}
}
--
Gitblit v1.9.3