From 0db77d65d75f8fefa630b9cbfcde9afe039fff7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Wed, 30 Oct 2024 16:21:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B94F=20agv?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cs/index2.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/cs/index2.vue b/src/views/cs/index2.vue
index 3190b23..c86a42a 100644
--- a/src/views/cs/index2.vue
+++ b/src/views/cs/index2.vue
@@ -84,7 +84,7 @@
         <div class="infoModel" :style="`display:${loopIndex === k?'inline-block':''}`">
           <div class="title">{{ i.equName }}</div>
           <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> {{ i.quantity }}</div>
-          <div class="equipmentInfo"><span style="color: #fff9">设备信息:</span> 10</div>
+          <div class="equipmentInfo"><span style="color: #fff9">设备状态:</span> {{ parseFloat(i.quantity) > 0 ? '启动' : '停机' }}</div>
         </div>
       </div>
 
@@ -94,13 +94,14 @@
              :style="`display:${loopIndex === 18+k?'inline-block':''}`">
           <div class="title">{{ i.equName }}</div>
           <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> {{ i.quantity }}</div>
-          <div class="equipmentInfo"><span style="color: #fff9">设备信息:</span> 10</div>
+          <div class="equipmentInfo"><span style="color: #fff9">设备状态:</span> {{ parseFloat(i.quantity) > 0 ? '启动' : '停机' }}
+          </div>
         </div>
       </div>
-      <div :class="i.isRun ? 'ring':'ring1'" :style="`top:${i.top}%;left:${i.left}%`" v-for="i in ringLocation"></div>
+      <div :class="((equipmentData||[])[k]||{}).quantity>0 ? 'ring':'ring1'" :style="`top:${i.top}%;left:${i.left}%`" v-for="(i,k) in ringLocation"></div>
 
 
-      <div :class="`${i.isGoods? 'agv2':'agv1'}`" v-for="i in agvData"
+      <div :class="`${i.isGoods? 'agv2':'agv1'}`" v-for="i in agvData" v-show="i.show"
            :style="`${getLocation(i.x,i.y)}transform: rotate(${parseFloat(i.rotate )- 180}deg);`"></div>
     </div>
   </div>
@@ -301,6 +302,7 @@ export default {
             y: (72000 - (v.Y - 116000)) / this.siteData.y,
             rotate: v.Angle,
             isGoods: false,
+            show: v.X < 246626 && v.X > 126061 && v.Y < 188055 && v.Y > 116722
           })
         })
         this.agvData = agvArr
@@ -316,6 +318,7 @@ export default {
             new TWEEN.Tween(this.agvData.find(r => r.id === v.AgvId)).to({
               x: (v.X - 126000) / this.siteData.x,
               y: (72000 - (v.Y - 116000)) / this.siteData.y,
+              show: v.X < 246626 && v.X > 126061 && v.Y < 188055 && v.Y > 116722
             }, time - 100).start()
           } else {
             this.agvData.push({
@@ -324,6 +327,7 @@ export default {
               y: (72000 - (v.Y - 116000)) / this.siteData.y,
               rotate: v.Angle,
               isGoods: false,
+              show: v.X < 246626 && v.X > 126061 && v.Y < 188055 && v.Y > 116722
             })
           }
         })
@@ -370,8 +374,8 @@ export default {
   background-size: 100% 100%;
   background-repeat: no-repeat;
   position: absolute;
-  width: 2vw;
-  height: 1.24vw;
+  width: 1vw;
+  height: 0.62vw;
 }
 
 .agv1 {