From d3c5332b87d052a590ea5a92a43cd8b13532da77 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, 13 Nov 2024 15:08:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cs/index2.vue | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/views/cs/index2.vue b/src/views/cs/index2.vue
index 14d0f05..856c798 100644
--- a/src/views/cs/index2.vue
+++ b/src/views/cs/index2.vue
@@ -66,13 +66,12 @@
       <div class="box" style="top: 82.6%;left: 78.5%;"></div>
       <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 || parseFloat(i.quantity))? 'hf1':'hf'"
+      <div v-for="(i,k) in hfData" :class="(hfLocation[k].isProd || parseFloat(((hfData.find(v=> v&&v.equCode===`H${k+1}`))||{}).quantity))? 'hf1':'hf'"
            :style="`top: ${hfLocation[k].top}%;`">
         <span>
-          烘房{{ k + 1 }} （产量：{{ i.quantity }}车）
+          烘房{{ k + 1 }} （产量：{{ ((hfData.find(v=>v&&v.equCode===`H${k+1}`))||{}).quantity ||0 }}车）
         </span>
-        <div v-if="hfLocation[k].isProd || parseFloat(i.quantity)" class="inProd">
+        <div v-if="hfLocation[k].isProd || parseFloat(((hfData.find(v=>v&&v.equCode===`H${k+1}`))||{}).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,10 +82,10 @@
           生产中
         </div>
         <div class="infoModel" :style="`display:${loopIndex === k?'inline-block':''}`">
-          <div class="title">{{ (i||{}).equName }}</div>
+          <div class="title">{{ ((hfData.find(v=> v&&v.equCode===`H${k+1}`))||{}).equName }}</div>
           <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> {{ (i||{}).quantity }}</div>
           <div class="equipmentInfo"><span style="color: #fff9">设备状态:</span> {{
-              parseFloat((i||{}).quantity) > 0 ? '运行' : '停机'
+              parseFloat(((hfData.find(v=> v&&v.equCode===`H${k+1}`))||{}).quantity) > 0 ? '运行' : '停机'
             }}
           </div>
         </div>
@@ -96,10 +95,10 @@
            :style="`top: ${equipmentLocation[k].top}%;left: ${equipmentLocation[k].left}%;`">
         <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> {{ (i||{}).quantity }}</div>
+          <div class="title">{{ ((equipmentData.find(v=>v&&v.equCode===`C${k+1}`))||{}).equName }}</div>
+          <div class="equipmentOutput"><span style="color: #fff9">设备产量:</span> {{ ((equipmentData.find(v=>v&&v.equCode===`C${k+1}`))||{}).quantity }}</div>
           <div class="equipmentInfo"><span style="color: #fff9">设备状态:</span> {{
-              parseFloat((i||{}).quantity) > 0 ? '运行' : '停机'
+              parseFloat(((equipmentData.find(v=>v&&v.equCode===`C${k+1}`))||{}).quantity) > 0 ? '运行' : '停机'
             }}
           </div>
         </div>
@@ -384,8 +383,7 @@ export default {
         }
         this.hfData = hfArr
         this.equipmentData = equipmentArr
-        console.log(this.hfData)
-        console.log(this.equipmentData)
+        // console.log(this.hfData)
       })
     }
   },