From 563ade512cb25690fa79a5843069961e4fcfa942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 29 Oct 2024 17:34:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B94F=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/board/cs2.js    |  9 +++++++++
 src/views/cs/index2.vue | 20 ++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/api/board/cs2.js b/src/api/board/cs2.js
index a1dc289..c59cc56 100644
--- a/src/api/board/cs2.js
+++ b/src/api/board/cs2.js
@@ -8,3 +8,12 @@ export function getHourProductionList(query) {
     params: query
   });
 }
+
+// 查询产量
+export function getAgvData(query) {
+  return request({
+    url: 'http://192.168.202.25:9001/api/scada/agvdata',
+    method: 'get',
+    params: query
+  });
+}
diff --git a/src/views/cs/index2.vue b/src/views/cs/index2.vue
index de8b4a7..9aebd3b 100644
--- a/src/views/cs/index2.vue
+++ b/src/views/cs/index2.vue
@@ -66,12 +66,12 @@
       <div class="box" style="top: 64.3%;left: 85.3%;"></div>
       <div class="box" style="top: 70.6%;left: 85.3%;"></div>
 
-      <div v-for="(i,k) in hfData" :class="hfLocation[k].isProd? 'hf1':'hf'"
+      <div v-for="(i,k) in hfData" :class="(hfLocation[k].isProd || parseFloat(i.quantity))? 'hf1':'hf'"
            :style="`top: ${hfLocation[k].top}%;`">
         <span>
           烘房{{ k + 1 }} （产量：{{ i.quantity }}车）
         </span>
-        <div v-if="hfLocation[k].isProd" class="inProd">
+        <div v-if="hfLocation[k].isProd || parseFloat(i.quantity)" class="inProd">
           <svg t="1723106843182" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
                p-id="1501">
             <path
@@ -83,7 +83,7 @@
         </div>
         <div class="infoModel" :style="`display:${loopIndex === k?'inline-block':''}`">
           <div class="title">{{ i.equName }}</div>
-          <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> 10</div>
+          <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> {{ i.quantity }}</div>
           <div class="equipmentInfo"><span style="color: #fff9">设备信息:</span> 10</div>
         </div>
       </div>
@@ -93,7 +93,7 @@
         <div :class="equipmentLocation[k].isRight?`equipmentName1`:`equipmentName`"
              :style="`display:${loopIndex === 18+k?'inline-block':''}`">
           <div class="title">{{ i.equName }}</div>
-          <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> 10</div>
+          <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> {{ i.quantity }}</div>
           <div class="equipmentInfo"><span style="color: #fff9">设备信息:</span> 10</div>
         </div>
       </div>
@@ -108,7 +108,7 @@
 <script>
 
 import * as TWEEN from '@tweenjs/tween.js'
-import {getHourProductionList} from "../../api/board/cs2";
+import {getAgvData, getHourProductionList} from "../../api/board/cs2";
 
 export default {
   data() {
@@ -308,6 +308,9 @@ export default {
       return ` left: ${xLocation}%;top: ${yLocation}%;`
     },
     getData() {
+      getAgvData().then(e=>{
+        console.log(e)
+      })
       getHourProductionList().then(e => {
         let hfArr = []
         let equipmentArr = []
@@ -319,7 +322,6 @@ export default {
         }
         this.hfData = hfArr
         this.equipmentData = equipmentArr
-        console.log(equipmentArr)
       })
     }
   },
@@ -734,6 +736,7 @@ export default {
     }
   }
 }
+
 .ring, .ring1 {
   position: absolute;
   width: 10px;
@@ -754,11 +757,12 @@ export default {
   }
 }
 
-.ring{
+.ring {
   border: 1px solid #90EE90; /* 设置边框为黑色，宽度为5px */
   box-shadow: 0 0 3px 3px #90EE9099;
 }
-.ring1{
+
+.ring1 {
   border: 1px solid #ff603b; /* 设置边框为黑色，宽度为5px */
   box-shadow: 0 0 3px 3px #ff603b99;
 }