From f339afdea8d0cef5be98f620c487f783afb96a15 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期日, 07 二月 2021 14:31:54 +0800
Subject: [PATCH] 调整card首页展示的规则

---
 src/components/subComponents/CardItem.vue |   51 ++++++++++++++++++++++++++-------------------------
 1 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/components/subComponents/CardItem.vue b/src/components/subComponents/CardItem.vue
index 3938e06..b58f8d1 100644
--- a/src/components/subComponents/CardItem.vue
+++ b/src/components/subComponents/CardItem.vue
@@ -56,8 +56,9 @@
             <img :src="item | httpImage" class="cursor-pointer" @click="detailsClick($event)" />
           </el-carousel-item>
         </el-carousel>
+        <!-- 鏆傛椂璁や负鍙湁浜鸿劯鎶撴媿鐨勬姤璀�, 棣栭〉鏄剧ず灏忓浘, 鍏朵粬鏃堕棿鍧囨樉绀哄ぇ鍥� -->
         <img
-          v-else-if="data.targetInfo == null || data.targetInfo[0].picSmUrl == ''"
+          v-else-if="data.targetInfo == null || data.targetInfo[0].targetType !== 'FaceDetect'"
           :src="data.picMaxUrl[0] | httpImage"
           class="cursor-pointer"
           @click="detailsClick($event)"
@@ -73,6 +74,7 @@
         <img :src="data.baseInfo[0] | httpImage" class="cursor-pointer" />
       </div>
     </div>
+
     <!-- 鍙充晶鏂囧瓧鍖哄煙 -->
     <!-- 澶氬紶搴曞浘鍒囨崲 -->
     <div class="s-card-right-isCompare" v-if="showType == 'compare'">
@@ -490,9 +492,9 @@
 }
 
 export default {
-  mounted () {
+  mounted() {
     //window.addEventListener("resize", this.watchWindow);
-    window.addEventListener("resize",this.getBottom)
+    window.addEventListener("resize", this.getBottom)
   },
   props: {
     data: {
@@ -505,18 +507,18 @@
     }
   },
   computed: {
-    isId () {
+    isId() {
       return this.data.id
     }
   },
   filters: {
-    formatTime (t) {
+    formatTime(t) {
       return new Date(t).Format("yyyy-MM-dd HH:mm:ss")
     },
-    percentage (score) {
+    percentage(score) {
       return score.toFixed(2) + "%"
     },
-    idCard (v) {
+    idCard(v) {
       try {
         let obj = JSON.parse(v)
         return obj.idCard
@@ -524,7 +526,7 @@
         return v.split("/")[1]
       }
     },
-    sex (v) {
+    sex(v) {
       try {
         let obj = JSON.parse(v)
         return obj.sex
@@ -532,11 +534,11 @@
         return v.split("/")[0]
       }
     },
-    httpImage (url) {
+    httpImage(url) {
       return '/httpImage/' + url + ((url.indexOf("?") >= 0) ? '&' : '?') + 'width=160'
     }
   },
-  data () {
+  data() {
     return {
       tempShowType: true,
       initialIndex: 0,
@@ -547,14 +549,14 @@
   },
   watch: {
     data: {
-      handler (val, oldVal) {
+      handler(val, oldVal) {
         this.$forceUpdate()
       },
       deep: true
     }
   },
   methods: {
-    getBottom () {
+    getBottom() {
       this.$nextTick(() => {
         let imgDom = this.$refs.firstImg
         if (imgDom) {
@@ -564,32 +566,32 @@
         return `4px`;
       })
     },
-    getUrl (bwtype) {
+    getUrl(bwtype) {
       if (bwtype == 1) {
         return `url(${require("@/assets/img/red.png")})`
       } else {
         return `url(${require("@/assets/img/green.png")})`
       }
     },
-    changeInitialIndex (index) {
+    changeInitialIndex(index) {
       this.initialIndex = index;
     },
-    cardMouseenter (ev) {
+    cardMouseenter(ev) {
       this.overflowState = false;
     },
-    cardMouseleave (ev) {
+    cardMouseleave(ev) {
       this.overflowState = true;
     },
-    changeCarousel (index) {
+    changeCarousel(index) {
       this.carouselIndex = index;
     },
-    detailsClick (ev) {
+    detailsClick(ev) {
       this.$emit("detailsClick", ev);
     },
-    toAdd (item) {
+    toAdd(item) {
       this.$emit("addToBase", item);
     },
-    tosearch (item) {
+    tosearch(item) {
       let captureId = item.id == "" ? item.baseInfo[0].targetId : item.id
       let imgUrl = item.targetInfo ? item.targetInfo[0].picSmUrl : item.baseInfo[0].targetPicUrl
       let compType = 1 //  鏁版嵁鏉ヨ嚜浜巈s
@@ -622,7 +624,6 @@
   line-height: 1.25rem;
 }
 .box-card {
-
   cursor: default;
   .el-carousel__arrow {
     height: 20px;
@@ -644,8 +645,8 @@
       width: 100%;
       position: relative;
       overflow: hidden;
-          top: 50%;
-    transform: translateY(-50%);
+      top: 50%;
+      transform: translateY(-50%);
       .card-img-box-compear {
         width: 100%;
         display: flex;
@@ -658,10 +659,10 @@
           flex: 1;
           height: 100%;
         }
-        .el-carousel{
+        .el-carousel {
           flex: 1;
           width: auto;
-          height: auto!important;
+          height: auto !important;
         }
         .el-carousel__item {
           display: flex;

--
Gitblit v1.8.0