From 71c4683695f8635aff8200b19fede50dbf2956d9 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 5 Jun 2023 14:54:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../photographicDevice/index.vue                   |  2 +-
 src/views/realTimeSearch/index.vue                 | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 7d9aacb..5187b93 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -41,7 +41,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="displayName"
+            prop="equipName"
             label="设备名称"
             show-overflow-tooltip
             min-width="150"
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index 912ddac..112588c 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -86,7 +86,12 @@
 
               <div class="caption">
                 <p class="infoTop">
-                  {{ item.linename }} / {{ item.displayname }}
+                  {{ item.linename }} /
+                  {{
+                    item.displayname !== null && item.displayname !== ""
+                      ? item.displayname
+                      : item.cmdid
+                  }}
                 </p>
                 <p class="infoBottom">
                   拍照时间：{{
@@ -109,7 +114,12 @@
               ></video>
               <div class="caption">
                 <p class="infoTop">
-                  {{ item.linename }} / {{ item.displayname }}
+                  {{ item.linename }} /
+                  {{
+                    item.displayname !== null && item.displayname !== ""
+                      ? item.displayname
+                      : item.cmdid
+                  }}
                 </p>
                 <p class="infoBottom">
                   拍照时间：{{