From 3d649b1886a15ac8d2abcf3e195adc5433f95c8f Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 7 Mar 2024 09:27:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/delivery/components/bottom.vue | 4 ++--
 src/view/delivery/components/left.vue   | 2 +-
 src/view/index/components/bottom.vue    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/view/delivery/components/bottom.vue b/src/view/delivery/components/bottom.vue
index 159d0fc..ee18ad1 100644
--- a/src/view/delivery/components/bottom.vue
+++ b/src/view/delivery/components/bottom.vue
@@ -35,7 +35,7 @@ const initData = (data) => {
       [
         `${data[i].code||'-'}`,
         `${data[i].name||'-'}`,
-        `${data[i].create_time||'-'}`,
+        `${data[i].alarm_time || data[i].create_time||'-'}`,
         `${data[i].alarm_value||'-'}`,
         `${data[i].alarm_reason||'-'}`,
         `<span class="btn">查看详情></span>`,
@@ -170,7 +170,7 @@ onMounted(() => {
           </div>
           <div class="info-item">
             <div class="tips">警告时间:</div>
-            <div>{{ showInfo.create_time || '-' }}</div>
+            <div>{{ showInfo.alarm_time || showInfo.create_time || '-' }}</div>
           </div>
         </div>
         <div class="info">
diff --git a/src/view/delivery/components/left.vue b/src/view/delivery/components/left.vue
index b85b0c3..8bbadbf 100644
--- a/src/view/delivery/components/left.vue
+++ b/src/view/delivery/components/left.vue
@@ -285,7 +285,7 @@ onMounted(() => {
         <div class="bg"></div>
       </div>
       <div class="c-box">
-        <videoFlv class="img" :url="farmInfo.video_url" />
+        <videoFlv v-if="farmInfo.video_url" class="img" :url="farmInfo.video_url" />
         <div class="name">{{ farmInfo.farm_name }}</div>
       </div>
     </div>
diff --git a/src/view/index/components/bottom.vue b/src/view/index/components/bottom.vue
index 9fd2f00..952f24b 100644
--- a/src/view/index/components/bottom.vue
+++ b/src/view/index/components/bottom.vue
@@ -34,7 +34,7 @@ const initData = (data) => {
       [
         `${data[i].code||'-'}`,
         `${data[i].name||'-'}`,
-        `${data[i].create_time||'-'}`,
+        `${data[i].alarm_time || data[i].create_time||'-'}`,
         `${data[i].alarm_value||'-'}`,
         `${data[i].alarm_reason||'-'}`,
         `<span class="btn">查看详情></span>`,
@@ -169,7 +169,7 @@ onMounted(() => {
           </div>
           <div class="info-item">
             <div class="tips">警告时间:</div>
-            <div>{{ showInfo.create_time || '-' }}</div>
+            <div>{{ showInfo.alarm_time || showInfo.create_time || '-' }}</div>
           </div>
         </div>
         <div class="info">