From 33d6185c6c4e72f9aa4cae657baa6d27a89cb84b Mon Sep 17 00:00:00 2001
From: sd <shidong@jhsoft.cc>
Date: 星期五, 29 八月 2025 09:25:40 +0800
Subject: [PATCH] 实时监控-没有触发预警的数据不再显示任务名称和等级（卡片和详情弹框）

---
 src/pages/gb28181/index/App.vue            |    7 +++++--
 src/components/subComponents/CardItem.vue  |   10 +++++-----
 src/pages/gb28181/components/gbZtree.vue   |    6 +++---
 src/components/subComponents/ModelCard.vue |    4 +---
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/components/subComponents/CardItem.vue b/src/components/subComponents/CardItem.vue
index 9bb2319..3ac5d32 100644
--- a/src/components/subComponents/CardItem.vue
+++ b/src/components/subComponents/CardItem.vue
@@ -341,16 +341,16 @@
         <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-else>{{ data.task_name }}</span> -->
+              &nbsp;&nbsp;
               <span v-if="data.is_warning === 1" style="color: red;">{{
                 item.dictValue
               }}</span
               >
-              <span v-else>{{
+              <!-- <span v-else>{{
                 item.dictValue
-              }}</span
-              >&nbsp;
+              }}</span> -->
+              &nbsp;
             </p>
         <!-- <el-tooltip placement="right" popper-class="atooltip">
           <div slot="content">
diff --git a/src/components/subComponents/ModelCard.vue b/src/components/subComponents/ModelCard.vue
index 1dcbcc2..fed9300 100644
--- a/src/components/subComponents/ModelCard.vue
+++ b/src/components/subComponents/ModelCard.vue
@@ -50,11 +50,9 @@
                 <span style="margin-left:35px;">{{ data.cameraName || "鎽勫儚鏈哄悕绉�" }}</span>
               </p>
               <p>
-                <span class="fontStyleForModel">AI浠诲姟</span>
+                <span v-if="data.is_warning === 1" class="fontStyleForModel">AI浠诲姟</span>
                 <span v-if="data.is_warning === 1" style="margin-left:20px;color: red;">{{ data.task_name }}</span>
-                <span v-else style="margin-left:20px;">{{ data.task_name }}</span>
                 <span v-if="data.is_warning === 1" style="margin-left:20px;color: red;">{{ data.event_level_name }}</span>
-                <span v-else style="margin-left:20px;">{{ data.event_level_name }}</span>
               </p>
               <p v-if="data.is_warning === 1">
                 <span class="fontStyleForModel">闅愭偅鎻忚堪</span>
diff --git a/src/pages/gb28181/components/gbZtree.vue b/src/pages/gb28181/components/gbZtree.vue
index 6a5ea5e..751a246 100644
--- a/src/pages/gb28181/components/gbZtree.vue
+++ b/src/pages/gb28181/components/gbZtree.vue
@@ -12,7 +12,7 @@
 
 <script>
 export default {
-  name: 'CameraTree',
+  name: 'TreeMenu',
   props: {
     node: Array,       // 鎺ユ敹鏍戞暟鎹�
     height: [Number, String],
@@ -33,8 +33,8 @@
   mounted() {
     this.checkedKeys(this.node)
     this.$refs.tree.setCheckedKeys(this.checkedKeysList);
-    // console.log("checkedKeysList",this.checkedKeysList)
-    this.handleCheckChange()
+    console.log("checkedKeysList",this.checkedKeysList)
+    // this.handleCheckChange()
   },
   methods: {
     checkedKeys(node) {
diff --git a/src/pages/gb28181/index/App.vue b/src/pages/gb28181/index/App.vue
index 7eb531f..03e42e8 100644
--- a/src/pages/gb28181/index/App.vue
+++ b/src/pages/gb28181/index/App.vue
@@ -92,7 +92,7 @@
             <b>鍥芥爣鎽勫儚鏈洪厤缃�</b>
             <span>(鏈�澶氬嬀閫�500璺憚鍍忔満)</span>
           </div>
-          <tree-menu ref="tree" app="gb28181" treeName="localTree" :node="treeData" :height="treeHeight"
+          <tree-menu v-if="activeName === 'cameras' && treeDataLoaded" ref="tree" app="gb28181" treeName="localTree" :node="treeData" :height="treeHeight"
             @cehckDataUpload="handleParentMethod" :setting="treeSettings" style="width:600px;min-height:500px" />
           <!--                    <div class="base-image" >
                         <span>{{ 0 }}</span>
@@ -137,6 +137,7 @@
   },
   data() {
     return {
+      treeDataLoaded:false,
       totalNode: 0,
       checkData: 0,
       treeData: [{
@@ -338,10 +339,12 @@
       gb28181.getGb28181Pool().then((rsp) => {
         if (rsp && rsp.status == 200) {
           // console.log("treeData:",rsp.data.items)
+          this.treeData = [];
           this.treeData = rsp.data.items;
           this.totalNode = rsp.data.total;
+          this.checkData = this.treeData.filter(node => node.checked).length
+          this.treeDataLoaded = true;
         }
-        // console.log("treeData:",this.treeData)
       })
     },
     saveChecked() {

--
Gitblit v1.8.0