From a694d9d258ff592c0ecd7012523dc565aa6e78df Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Fri, 20 Oct 2023 09:08:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/modules/home/home.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/modules/home/home.vue b/src/pages/modules/home/home.vue
index efac66b..e5061a1 100644
--- a/src/pages/modules/home/home.vue
+++ b/src/pages/modules/home/home.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="main-container main-container_l">
     <div class="con1">
-      <div class="tip">障碍物告警</div>
+      <div class="tip" v-if="dataInfo.error_name">{{dataInfo.error_name}}</div>
     </div>
     <div class="con2">
-      <!-- <button v-if="dataInfo.button_name" @click="clickSave">{{dataInfo.button_name}}继续搬运</button> -->
       <div class="rt">
         <div class="rttxt">设备信息</div>
       </div>
@@ -39,7 +38,7 @@
           <span class="title">AGV故障</span>
           <span class="txt txt2">{{dataInfo.error_name}}</span>
         </div>
-        <button class="btn" @click="clickSave">{{dataInfo.button_name}}继续搬运</button>
+        <button class="btn" v-if="dataInfo.button_name" @click="clickSave">{{dataInfo.button_name}}</button>
       </div>
     </div>
   </div>
@@ -64,7 +63,8 @@ export default {
         task_status: '有任务未执行',
         task_num: '待执行',
         speed: '0.0m/s',
-        error_name: '障碍物告警'
+        error_name: '障碍物告警',
+        button_name: '继续搬运'
       }
     }
   },
@@ -142,14 +142,12 @@ export default {
 .con1
   float left
   position relative
-  width 4.5rem
-  height 4.5rem
+  width 811px
+  height 776px
   // background center / 100% 100% url(../../../images/aio/car2.png) no-repeat
   background center / 100% 100% url(../../../images/new/car-home.png) no-repeat
   // background center / 100% 100% url(../../../images/aio/AGV223.gif) no-repeat
-  margin-left .95rem
-  margin-right .95rem
-  margin-top 1.5rem
+  margin-right 235px
   .tip
     width 542px
     height 120px
@@ -158,10 +156,11 @@ export default {
     font-style italic
     font-size 36px
     text-align center
+    margin-top 153px
+    margin-left 63px
     background center / 100% 100% url(../../../images/new/bg-home-tip.png) no-repeat
 .con2
   float left
-  margin-top 100px
 .btn
   width 335px
   height 91px
@@ -169,6 +168,7 @@ export default {
   margin-left 167px
   position relative
   top -20px
+  color #f6f9fe
 .rt
   width 646px
   height 102px