From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/views/intellectInspect/intelligentLine/index.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/intellectInspect/intelligentLine/index.vue b/src/views/intellectInspect/intelligentLine/index.vue
index 8581867..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>
@@ -85,7 +87,7 @@
<script lang="ts">
import screenfull from 'screenfull';
import { lineApi } from '/@/api/intelligentLine';
-import { toRefs, reactive, ref, onMounted, onUnmounted, computed } from 'vue';
+import {toRefs, reactive, ref, onMounted, onUnmounted, computed, nextTick} from 'vue';
import {useRoute} from 'vue-router';
import { storeToRefs } from 'pinia';
import { initBackEndControlRoutes } from '/@/router/backEnd';
@@ -217,9 +219,11 @@
// 页面关闭处理
onUnmounted(() => {
// 销毁监听
- state.socket.onclose = () => {
- console.log('socket已经关闭');
- };
+ nextTick(()=>{
+ state.socket.onclose = () => {
+ console.log('socket已经关闭');
+ };
+ })
});
return {
dataList,
--
Gitblit v1.9.2