From e6ac83c1fe04e95a3b89b1e1a39773465f2ffb9b Mon Sep 17 00:00:00 2001
From: sd <shidong@jhsoft.cc>
Date: 星期五, 25 七月 2025 09:02:23 +0800
Subject: [PATCH] 实时监控-右侧数据不准确修复；详情样式调整：任务名称颜色变更；预警声音提示暂时隐藏。 摄像机配置-隐藏复制粘贴功能；

---
 src/components/subComponents/CardItem.vue |   64 ++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/src/components/subComponents/CardItem.vue b/src/components/subComponents/CardItem.vue
index 1d2c855..fff7e16 100644
--- a/src/components/subComponents/CardItem.vue
+++ b/src/components/subComponents/CardItem.vue
@@ -72,20 +72,20 @@
             data.targetInfo == null ||
             data.targetInfo[0].targetType !== 'FaceDetect'
           "
-          :src="data.picMaxUrl[0] | httpImage"
+          :src="data.picMaxUrl[0] | apiImg"
           class="cursor-pointer"
           @click="detailsClick($event)"
         />
         <img
           v-else
-          :src="data.targetInfo[0].picSmUrl | httpImage"
+          :src="data.targetInfo[0].picSmUrl | apiImg"
           class="cursor-pointer"
           @click="detailsClick($event)"
         />
       </div>
       <div class="s-card-left-box" v-else>
         <img
-          :src="data.baseInfo[0].targetPicUrl | httpImage"
+          :src="data.baseInfo[0].targetPicUrl | apiImg"
           class="cursor-pointer"
         />
       </div>
@@ -330,15 +330,29 @@
         @mouseenter="cardMouseenter($event)"
         @mouseleave="cardMouseleave($event)"
       >
-        <p :title="data.picDate">
+        <p :title="data.detect_time">
           <span class="fontStyle color222">{{
-            data.picDate | formatTime
+            data.detect_time | formatTime
           }}</span>
         </p>
         <p :title="data.cameraAddr" style="margin-bottom: 8px">
           <span class="fontStyle color222">{{ data.cameraAddr }}</span>
         </p>
-        <el-tooltip placement="right" popper-class="atooltip">
+        <p v-for="(item, index) in data.event_levels" :key="index + 'rule'">
+              <span v-if="data.is_warning === 1" style="color: red;">{{ data.task_name }}</span
+              >
+              <span v-else>{{ data.task_name }}</span
+              >&nbsp;&nbsp;
+              <span v-if="data.is_warning === 1" style="color: red;">{{
+                item.dictValue
+              }}</span
+              >
+              <span v-else>{{
+                item.dictValue
+              }}</span
+              >&nbsp;
+            </p>
+        <!-- <el-tooltip placement="right" popper-class="atooltip">
           <div slot="content">
             <p v-for="(item, index) in data.alarmRules" :key="index + 'rule'">
               <span>{{ data.taskName }}</span
@@ -381,7 +395,7 @@
               <span v-if="index < data.alarmRules.length - 1">/&nbsp;</span>
             </span>
           </el-button>
-        </el-tooltip>
+        </el-tooltip> -->
       </div>
       <div class="right-bottom">
         <div v-if="!data.id" class="card-icon-box">
@@ -398,10 +412,14 @@
           v-if="data.targetInfo == null || data.targetInfo[0].picSmUrl == ''"
           class="card-icon-box"
         >
-          <el-tooltip content="璇︽儏" placement="top" popper-class="atooltip">
-            <i class="iconfont iconcaidan" @click="detailsClick($event)"></i>
+          <el-tooltip placement="top" :content="data.zh_desc_class" effect="light" popper-class="my-tooltip">
+          <img src="@/assets/img/article-fill@1x.png" >
+            <!-- <i class="iconfont iconcaidan" @click="detailsClick($event)"></i> -->
           </el-tooltip>
-          <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+          <!-- <el-tooltip content="璇︽儏" placement="top" popper-class="atooltip">
+            <i class="iconfont iconcaidan" @click="detailsClick($event)"></i>
+          </el-tooltip> -->
+          <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
             <i
               v-if="!data.isCollect"
               class="iconfont iconshoucang2"
@@ -410,26 +428,26 @@
             <span v-else @click="collect(false)" class="iconfont icon_collect"
               >&#xe625;</span
             >
-          </el-tooltip>
+          </el-tooltip> -->
           <!-- :class="
               data.isAlarm ? 'iconfont systemmm' : 'iconfont systemxing'
           "-->
           
-          <el-tooltip
+          <!-- <el-tooltip
             content="鍒犻櫎"
             placement="top"
             popper-class="atooltip"
           >
             <i class="iconfont iconshanchu ml40" @click="toDelete(data.id)"></i>
-          </el-tooltip>
+          </el-tooltip> -->
           <!-- 杩欓噷鏄澧炲姞鎸夐挳鐨勫湴鏂� -->
-          <el-tooltip
+          <!-- <el-tooltip
             content="璇姤"
             placement="top"
             popper-class="atooltip"
           >
           <i :style="{color:data.misreport? '#f00':''}" :disabled="data.misreport" class="iconfont el-icon-error ml40" @click="toFalseAlarm(data)"></i>
-          </el-tooltip>
+          </el-tooltip> -->
         </div>
         <div class="card-icon-box" v-else>
           <el-tooltip content="璇︽儏" placement="top" popper-class="atooltip">
@@ -846,6 +864,14 @@
         "/httpImage/" + url + (url.indexOf("?") >= 0 ? "&" : "?") + "width=160"
       );
     },
+    apiImg(url) {
+      if (!url.length) {
+        return "";
+      }
+      return (
+        "/api-img" + url + (url.indexOf("?") >= 0 ? "&" : "?") + "width=160"
+      );
+    },
   },
   data() {
     return {
@@ -968,6 +994,14 @@
   },
 };
 </script>
+<style>
+/* 鍏ㄥ眬鐢熸晥锛屽彲瑕嗙洊 tooltip */
+.my-tooltip {
+  max-width: 540px !important;
+  color: #606266 !important;
+}
+
+</style>
 <style lang="scss">
 .fontStyle {
   font-family: PingFangSC-Medium;

--
Gitblit v1.8.0