From b546970e6f1ac59db09a3e84620e22c7d728717d Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 1 Sep 2023 10:14:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=B7=A5=E8=89=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/mork2.js      |   4 ++
 src/components/workshop.vue | 100 ++++++++++++++++++------------------
 2 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/src/assets/js/mork2.js b/src/assets/js/mork2.js
index 8ad52cb..b36c775 100644
--- a/src/assets/js/mork2.js
+++ b/src/assets/js/mork2.js
@@ -453,6 +453,10 @@ export const homepageEquipment = () => {
         {
           'equipment': '冷却道3',
           'status': '4'
+        },
+        {
+          'equipment': '冷却道4',
+          'status': '3'
         }
       ]
     },
diff --git a/src/components/workshop.vue b/src/components/workshop.vue
index 15d6f6f..813f42d 100644
--- a/src/components/workshop.vue
+++ b/src/components/workshop.vue
@@ -27,28 +27,16 @@
         <div class="yao_line_1 yao_line_2">
           <div v-for="(e, i) in [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]" :key="i" class="yao_line_dot"></div>
         </div>
-        <div class="yao_wrap yao_1">
-          <div class="yao_layer1"></div>
-          <div class="yao_layer2"></div>
-          <div class="yao_layer3"></div>
-        </div>
-        <div class="yao_wrap" v-for="(e, i) in kiln" :key="e.equipment" :class="'yao_' + (i + 2)">
+        <div class="yao_bg_1"></div>
+        <div class="yao_bg_1 yao_bg_2"></div>
+        <div class="yao_wrap" v-for="(e, i) in kiln" :key="e.equipment" :class="'yao_' + (i + 1)">
           <div class="yao_layer1"></div>
           <div class="yao_layer2"></div>
           <div class="yao_layer3" :style="{background: ['#11ff0d', '#fdfd0f', '#bfbfbf', '#ff1016'][Number(e.status) - 1]}"></div>
+          <div class="yao_layer4"></div>
+          <div class="yao_layer4 yao_layer5"></div>
         </div>
-        <!-- <div class="yao_wrap yao_5">
-          <div class="yao_layer1"></div>
-          <div class="yao_layer2"></div>
-          <div class="yao_layer3" :style="{background: ['#11ff0d', '#fdfd0f', '#bfbfbf', '#ff1016'][Number(emptyVehicleConveyorLine.status) - 1]}"></div>
-          <div class="p_device yytsj_wrap">
-            <img class="device_img" src="../assets/images/device/yytsj_green.png" alt="">
-          </div>
-          <div class="p_device yygcj_wrap">
-            <img class="device_img" src="../assets/images/device/yygcj_green.png" alt="">
-          </div>
-        </div> -->
-        <div class="yao_wrap yao_6" v-for="(e, i) in coolingConveyorLine" :key="e.equipment" :class="'yao_' + (i + 6)">
+        <div class="yao_wrap" v-for="(e, i) in coolingConveyorLine" :key="e.equipment" :class="'yao_' + (i + 4)">
           <div class="yao_layer1"></div>
           <div class="yao_layer2"></div>
           <div class="yao_layer3" :style="{background: ['#11ff0d', '#fdfd0f', '#bfbfbf', '#ff1016'][Number(e.status) - 1]}"></div>
@@ -163,7 +151,7 @@
     <div class="machine_block machine_block_3">
       <div class="machine_combine">
         <div class="yj_630_blocks">
-          <div class="yj_630_block" v-for="(e, i) in [1,1,1]" :key="i">
+          <div class="yj_630_block" v-for="(e, i) in [1,1,1]" :key="i" style="opacity: 0.2">
             <div class="p_device yj_630_wrap_1">
               <img class="device_img" src="../assets/images/device/630/yj_gray.png" alt="">
             </div>
@@ -369,19 +357,19 @@
           <img v-show="press[4].pressMachine1 === '3'" class="device_img" src="../assets/images/device/1600/yj_gray.png" alt="">
           <img v-show="press[4].pressMachine1 === '4'" class="device_img" src="../assets/images/device/1600/yj_red.png" alt="">
         </div>
-        <div class="p_device ktp_yyj_wrap_1">
-          <div class="ktp_yyj_1" v-for="(e, i) in [1,1,1,1,1,1,1,1]" :key="i">
-            <img class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
+        <div class="p_device lz_yyj_wrap_1">
+          <div class="lz_yyj_1" v-for="(e, i) in [1,1,1,1,1,1,1,1]" :key="i">
+            <img class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
           </div>
         </div>
-        <div class="p_device ktp_yyj_wrap_2">
-          <div class="ktp_yyj_2" v-for="(e, i) in [1,1,1]" :key="i">
-            <img class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
+        <div class="p_device lz_yyj_wrap_2">
+          <div class="lz_yyj_2" v-for="(e, i) in [1,1,1]" :key="i">
+            <img class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
           </div>
         </div>
         <div class="p_device ktp_yyj_wrap_3">
-          <div class="ktp_yyj_3">
-            <img class="device_img" src="../assets/images/device/ktp_green.png" alt="">
+          <div class="lz_yyj_3">
+            <img class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
           </div>
         </div>
         <div class="p_device ktp_2500_wrap" v-for="(e, i) in press[4].unloadLocation" :key="i" :class="'ktp_2500_wrap_' + (i+1)">
@@ -477,7 +465,6 @@ export default {
       conveyorLine: [],
       gantryRobot: [],
       kiln: [],
-      // emptyVehicleConveyorLine: {},
       coolingConveyorLine: [],
       trayStacker: {},
       vconveyorLine: [],
@@ -524,7 +511,6 @@ export default {
       this.conveyorLine = [...res.dry.conveyorLine]
       this.gantryRobot = [...res.dry.gantryRobot]
       this.kiln = [...res.dry.kiln]
-      // this.emptyVehicleConveyorLine = [...res.dry.emptyVehicleConveyorLine][0]
       this.coolingConveyorLine = [...res.dry.coolingConveyorLine]
       // 托盘输送线
       this.trayStacker = [...res.vehicleConveyorLine.trayStacker][0]
@@ -633,6 +619,14 @@ export default {
   position absolute
   _wh(2%, 100%)
   background-color #ded8e6
+.yao_bg_1
+  position absolute
+  top: 9%;
+  left: 6%;
+  _wh(9%, 82%)
+  background-color #d3d3d3
+.yao_bg_2
+  left 19%
 .yao_layer1
   position absolute
   left -5px
@@ -651,25 +645,29 @@ export default {
   left -5px
   top 5%
   _wh(calc(100% + 10px), 90%)
+.yao_layer4
+  position absolute
+  _wh(calc(100% + 10px), 2px)
+  top 7%
+  left -5px
+  background-color #6d9d6a
+.yao_layer5
+  top auto
+  bottom 7%
 .yao_1
   left 3%
-  opacity 0.2
-  .yao_layer3
-    background-color #bfbfbf
 .yao_2
-  left 14%
+  left 16%
 .yao_3
-  left 25%
+  left 29%
 .yao_4
-  left 36%
+  left 42%
 .yao_5
-  left 48%
+  left 55%
 .yao_6
-  left 60%
+  left 68%
 .yao_7
-  left 72%
-.yao_8
-  left 83%
+  left 81%
 .yytsj_wrap
   _wh(50%, auto)
   left 25%
@@ -873,7 +871,7 @@ export default {
   _wh(34%, 52%)
   left auto
   top auto
-  right 9%
+  right 8%
   bottom 6%
 .weilan_2500_wrap
   _wh(80%, 66%)
@@ -889,21 +887,21 @@ export default {
   top: 38%;
   left: auto;
   right: 4%;
-.ktp_yyj_wrap_1
-  _wh(19%, auto)
+.lz_yyj_wrap_1
+  _wh(31%, auto)
   _fj(flex-start)
   flex-wrap wrap
   top: 33%;
-  left: -1%;
-.ktp_yyj_wrap_2
-  width: 9.5%;
+  left: -9%;
+.lz_yyj_wrap_2
+  width: 15.5%;
   top: 76%;
-  left: 8%;
+  left: 6%;
 .ktp_yyj_wrap_3
-  width: 13%;
-  top: 88%;
-  left: 18%;
-.ktp_yyj_1
+  width: 15.5%;
+  top: 86%;
+  left: 22%;
+.lz_yyj_1
   width 50%
   img
     _wh(100%, auto)