From 16fea50bc322351da71108d0a5e9711b04a84dbd Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 6 Nov 2023 16:08:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=B0=E6=96=99=E8=B4=A7=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/workshop.vue | 41 ++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/components/workshop.vue b/src/components/workshop.vue
index e6bdc4d..27ad033 100644
--- a/src/components/workshop.vue
+++ b/src/components/workshop.vue
@@ -350,6 +350,20 @@
     <div class="blue_line blue_line_1"></div>
     <div class="blue_line blue_line_2"></div>
     <div class="machine_block machine_block_4">
+      <div class="yj_1600_block_1 yj_1250_block">
+        <div class="p_device weilan_1600_wrap">
+          <img class="device_img" src="../assets/images/device/630/wl.png" alt="">
+        </div>
+        <div class="p_device yj_1600_wrap_1">
+          <img class="device_img" src="../assets/images/device/630/yj_gray.png" alt="">
+        </div>
+        <div class="p_device robot_1600_wrap">
+          <img class="device_img" src="../assets/images/device/robot_2500_gray.png" alt="">
+        </div>
+        <div class="p_device ktp_1600_wrap" v-for="(e, i) in [1,1]" :key="i" :class="'ktp_1600_wrap_' + (i+1)">
+          <img class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
+        </div>
+      </div>
       <div v-if="press.length >= 3" class="yj_1600_block_1">
         <div class="p_device weilan_1600_wrap">
           <img class="device_img" src="../assets/images/device/630/wl.png" alt="">
@@ -458,20 +472,6 @@
           ></device-pop>
         </div>
       </div>
-      <div class="yj_1600_block_1 yj_1250_block">
-        <div class="p_device weilan_1600_wrap">
-          <img class="device_img" src="../assets/images/device/630/wl.png" alt="">
-        </div>
-        <div class="p_device yj_1600_wrap_1">
-          <img class="device_img" src="../assets/images/device/630/yj_gray.png" alt="">
-        </div>
-        <div class="p_device robot_1600_wrap">
-          <img class="device_img" src="../assets/images/device/robot_2500_gray.png" alt="">
-        </div>
-        <div class="p_device ktp_1600_wrap" v-for="(e, i) in [1,1]" :key="i" :class="'ktp_1600_wrap_' + (i+1)">
-          <img class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
-        </div>
-      </div>
       <div v-if="press.length >= 5" class="yj_1600_block_1 yj_2500_block">
         <div class="p_device weilan_2500_wrap">
           <img class="device_img" src="../assets/images/device/2500/wl.png" alt="">
@@ -515,7 +515,7 @@
           </div>
         </div>
         <div v-if="press[5].loadLocation.length > 10" class="p_device ktp_yyj_wrap_3">
-          <div class="lz_yyj_3">
+          <div class="lz_yyj_2">
             <img v-show="press[5].loadLocation[10].status !== 4 && (press[5].loadLocation[10].pointStatus === '2' || press[5].loadLocation[10].pointStatus === '3')" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(press[5].loadLocation[10])">
             <img v-show="press[5].loadLocation[10].status !== 4 && press[5].loadLocation[10].pointStatus === '1'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(press[5].loadLocation[10])">
             <img v-show="press[5].loadLocation[10].status === 4" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(press[5].loadLocation[10])">
@@ -529,13 +529,13 @@
         </div>
         <div v-if="press[5].loadLocation.length > 11" class="p_device lz_yyj_wrap_2 lz_yyj_wrap_3">
           <div class="lz_yyj_2">
-            <img v-show="press[5].loadLocation[11].status !== 4 && (press[5].loadLocation[11].pointStatus === '2' || press[5].loadLocation[11].pointStatus === '3')" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(press[5].loadLocation[10])">
-            <img v-show="press[5].loadLocation[11].status !== 4 && press[5].loadLocation[11].pointStatus === '1'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(press[5].loadLocation[10])">
-            <img v-show="press[5].loadLocation[11].status === 4" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(press[5].loadLocation[10])">
+            <img v-show="press[5].loadLocation[11].status !== 4 && (press[5].loadLocation[11].pointStatus === '2' || press[5].loadLocation[11].pointStatus === '3')" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(press[5].loadLocation[11])">
+            <img v-show="press[5].loadLocation[11].status !== 4 && press[5].loadLocation[11].pointStatus === '1'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(press[5].loadLocation[11])">
+            <img v-show="press[5].loadLocation[11].status === 4" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(press[5].loadLocation[11])">
             <device-pop
               type="lz"
               :pkId="pkId"
-              :data="press[5].loadLocation[10]"
+              :data="press[5].loadLocation[11]"
               @closePop="closePop"
             ></device-pop>
           </div>
@@ -1189,9 +1189,12 @@ export default {
   top: 86%;
   left: 22%;
 .lz_yyj_1
+  position relative
   width 50%
   img
     _wh(100%, auto)
+.lz_yyj_2
+  position relative
 .jzj_2500_wrap
   _wh(36%, auto)
   left auto