From e7de3ae6f46341e2714351793914dcc0b3c3b74e Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期五, 15 十月 2021 17:51:44 +0800
Subject: [PATCH] Merge branch 'bhomebus' of http://192.168.5.5:10010/r/web/vue-smart-ai into bhomebus

---
 src/components/subComponents/CardItem.vue |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/components/subComponents/CardItem.vue b/src/components/subComponents/CardItem.vue
index 4432950..063f9af 100644
--- a/src/components/subComponents/CardItem.vue
+++ b/src/components/subComponents/CardItem.vue
@@ -71,7 +71,7 @@
         />
       </div>
       <div class="s-card-left-box" v-else>
-        <img :src="data.baseInfo[0] | httpImage" class="cursor-pointer" />
+        <img :src="data.baseInfo[0].targetPicUrl | httpImage" class="cursor-pointer" />
       </div>
     </div>
 
@@ -295,7 +295,7 @@
 
     <!-- 娌℃湁搴曞簱锛岄潪姣斿锛屾櫘閫氭ā寮� 涓�瀹氭湁targetInfo锛屽苟涓攖argetInfo涓暟涓�1-->
     <div
-      v-else-if="data.targetInfo !== null && data.targetInfo[0].picSmUrl !== '' && data.targetInfo.length == 1"
+      v-else-if="data.targetInfo !== null && data.targetInfo[0].picSmUrl !== ''"
       class="s-card-right-signal"
     >
       <div
@@ -505,11 +505,11 @@
       type: String,
       default: "search"
     },
-    fromCluster:{
-      type:Boolean,
-      default:false
+    fromCluster: {
+      type: Boolean,
+      default: false
     },
-    searchT:{}
+    searchT: {}
   },
   computed: {
     isId() {
@@ -540,6 +540,9 @@
       }
     },
     httpImage(url) {
+      if (!url.length) {
+        return ""
+      }
       return '/httpImage/' + url + ((url.indexOf("?") >= 0) ? '&' : '?') + 'width=160'
     }
   },
@@ -606,9 +609,9 @@
       }
       let message
       if (this.fromCluster) {
-       message = 'toCluster?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType + '&timestamp=' + new Date().getTime() + '&start=' + this.searchT[0] + '&end=' + this.searchT[1];
+        message = 'toCluster?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType + '&timestamp=' + new Date().getTime() + '&start=' + this.searchT[0] + '&end=' + this.searchT[1];
       } else {
-         message = 'toSearch?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType + '&timestamp=' + new Date().getTime() + '&start=' + this.searchT[0] + '&end=' + this.searchT[1];
+        message = 'toSearch?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType + '&timestamp=' + new Date().getTime() + '&start=' + this.searchT[0] + '&end=' + this.searchT[1];
       }
       window.parent.postMessage({
         msg: message

--
Gitblit v1.8.0