From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/deviceEvent.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 13ee242..ae3cf86 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -14,8 +14,8 @@
<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-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>
<el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
@@ -61,7 +61,7 @@
<el-table-column label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{ row }">
<span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
- <span v-if="row.companyType == 1">鍐呴儴鍛樺伐</span>
+ <span v-else-if="row.companyType == 1">鍐呴儴鍛樺伐</span>
<span v-else>璁垮</span>
</template>
</el-table-column>
@@ -77,7 +77,7 @@
</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>
--
Gitblit v1.9.3