From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Wed, 17 Aug 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/views/intellectInspect/intelligentLine/index.vue | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue
index da39b51..0c02976 100644
--- a/src/views/intellectInspect/intelligentLine/index.vue
+++ b/src/views/intellectInspect/intelligentLine/index.vue
@@ -23,7 +23,9 @@
<div class="line-map" v-if="dataList && dataList.length > 0">
<div class="line-item" v-for="(item, index) in dataList" :key="index">
<div class="picbox">
- <img src="../../../assets/loginPage/equipment.jpg"/>
+ <div class="imgbox">
+ <img :src="item.rfidImage==null?defaultImg:item.rfidImage"/>
+ </div>
<p>
RFID: <span>{{ item.rfid }}</span>
</p>
--
Gitblit v1.9.2