From 014df6e1d2f99f5328513a5ad51aa41fba2e8e7a 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, 5 Nov 2024 11:10:45 +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 | 24 +++++++++++++++---------
 src/views/cs/index3.vue |  6 +++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/views/cs/index2.vue b/src/views/cs/index2.vue
index 9505a53..cd41368 100644
--- a/src/views/cs/index2.vue
+++ b/src/views/cs/index2.vue
@@ -7,8 +7,8 @@
       <div class="subTitle" style="left: 48.9%;">烘房区</div>
       <div class="subTitle" style="left: 70.8%;">收坯区</div>
       <div class="floorNum floorNum1">1F</div>
-<!--      <div class="floorNum floorNum2" @click="$router.push('/cs')">2F</div>-->
-      <div class="floorNum floorNum2" >2F</div>
+      <!--      <div class="floorNum floorNum2" @click="$router.push('/cs')">2F</div>-->
+      <div class="floorNum floorNum2">2F</div>
       <div class="floorNum floorNum3">3F</div>
       <div class="floorNum floorNum4">4F</div>
       <div class="floorNum floorNum5">5F</div>
@@ -85,7 +85,10 @@
         <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> {{ parseFloat(i.quantity) > 0 ? '运行' : '停机' }}</div>
+          <div class="equipmentInfo"><span style="color: #fff9">设备状态:</span> {{
+              parseFloat(i.quantity) > 0 ? '运行' : '停机'
+            }}
+          </div>
         </div>
       </div>
 
@@ -95,11 +98,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> {{ parseFloat(i.quantity) > 0 ? '运行' : '停机' }}
+          <div class="equipmentInfo"><span style="color: #fff9">设备状态:</span> {{
+              parseFloat(i.quantity) > 0 ? '运行' : '停机'
+            }}
           </div>
         </div>
       </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="((equipmentData||[])[k]||{}).quantity>0 ? 'ring':'ring1'" :style="`top:${i.top}%;left:${i.left}%`"
+           v-for="(i,k) in ringLocation"></div>
 
 
       <div :class="`${i.IsLoad? 'agv2':'agv1'}`" v-for="i in agvData" v-show="i.show"
@@ -316,7 +322,7 @@ export default {
           if (this.agvData.filter(r => r.id === v.AgvId).length >= 1) {
             let f1 = new TWEEN.Tween(this.agvData.find(r => r.id === v.AgvId)).to({
               rotate: v.Angle,
-            }, 100).start().onComplete(()=>{
+            }, 100).start().onComplete(() => {
               f1 = null
             })
             let f2 = new TWEEN.Tween(this.agvData.find(r => r.id === v.AgvId)).to({
@@ -325,7 +331,7 @@ export default {
               show: v.X < 245000 && v.X > 126000 && v.Y < 187000 && v.Y > 116000,
               IsLoad: v.IsLoad,
               // show: true
-            }, time - 100).start().onComplete(()=>{
+            }, time - 100).start().onComplete(() => {
               f2 = null
             })
           } else {
@@ -363,8 +369,8 @@ export default {
         createTimeEnd = `${parseTime(new Date(), '{y}-{m}-{d}')} 19:30:00`
       }
       getHourProductionList({
-        productDateStart:createTimeStart,
-        productDateEnd:createTimeEnd
+        productDateStart: createTimeStart,
+        productDateEnd: createTimeEnd
       }).then(e => {
         let hfArr = []
         let equipmentArr = []
diff --git a/src/views/cs/index3.vue b/src/views/cs/index3.vue
index dbafe4a..7de9d7b 100644
--- a/src/views/cs/index3.vue
+++ b/src/views/cs/index3.vue
@@ -6,10 +6,10 @@
     <div class="modelTitle" style="top:15.2%;left:71%">烘房白坯质量统计</div>
     <div class="modelTitle" style="top:65%;left:32%">近7天产量</div>
     <div class="modelTitle" style="top:65%;left:71%">计划达成率</div>
-    <div class="title1" style="top:24%;left:34%">成型机数量：</div>
-    <div class="title1" style="top:24%;left:52.5%">烘房数量：</div>
+    <div class="title1" style="top:24%;left:34%">成型机产量：</div>
+    <div class="title1" style="top:24%;left:52.5%">烘房产量：</div>
     <div class="title1" style="top:45%;left:34%">烘房耗电量：</div>
-    <div class="title1" style="top:45%;left:52.5%">AGV数量：</div>
+    <div class="title1" style="top:45%;left:52.5%">AGV开动数量：</div>
     <div class="unit1" style="top: 31.3%;left: 45.5%;">车</div>
     <div class="unit1" style="top: 31.3%;left: 63.5%">车</div>
     <div class="unit1" style="top: 51.3%;left: 45.5%;">KWh</div>