From 1243b878b65752ab46709e80786e6b441c70e061 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 22 Sep 2023 17:19:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/workshop.vue | 51 +++++++++++++++----------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/src/components/workshop.vue b/src/components/workshop.vue
index 7f9e712..554bd16 100644
--- a/src/components/workshop.vue
+++ b/src/components/workshop.vue
@@ -156,15 +156,14 @@
             type="hangj"
             :pkId="pkId"
             :data="e"
-            :direction="i === 1 ? 'down' : ''"
+            :direction="i === 0 ? 'down' : ''"
             @closePop="closePop"
           ></device-pop>
         </div>
         <div class="p_device ktp_yao_back_wrap_1">
           <div class="ktp_yao_back" v-for="e in backWarehouse" :key="e.equipment">
-            <img v-show="e.status === 1" class="device_img" src="../assets/images/device/ktpv_green.png" alt="" @click="getInfo(e)">
-            <img v-show="e.status === 2" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="" @click="getInfo(e)">
-            <img v-show="e.status === 3" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status !== 4 && (e.pointStatus === '2' || e.pointStatus === '3')" class="device_img" src="../assets/images/device/ktpv_green.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status !== 4 && e.pointStatus === '1'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="" @click="getInfo(e)">
             <img v-show="e.status === 4" class="device_img" src="../assets/images/device/ktpv_red.png" alt="" @click="getInfo(e)">
             <device-pop
             type="tp"
@@ -206,9 +205,8 @@
     </div>
     <div class="p_device ktp_yao_front_wrap">
       <div class="ktp_yao_front" v-for="e in  frontWarehouse" :key="e.equipment">
-        <img v-show="e.status === 1" class="device_img" src="../assets/images/device/ktp_green.png" alt="" @click="getInfo(e)">
-        <img v-show="e.status === 2" class="device_img" src="../assets/images/device/ktp_yellow.png" alt="" @click="getInfo(e)">
-        <img v-show="e.status === 3" class="device_img" src="../assets/images/device/ktp_gray.png" alt="" @click="getInfo(e)">
+        <img v-show="e.status !== 4 && (e.pointStatus === '2' || e.pointStatus === '3')" class="device_img" src="../assets/images/device/ktp_green.png" alt="" @click="getInfo(e)">
+        <img v-show="e.status !== 4 && e.pointStatus === '1'" class="device_img" src="../assets/images/device/ktp_gray.png" alt="" @click="getInfo(e)">
         <img v-show="e.status === 4" class="device_img" src="../assets/images/device/ktp_red.png" alt="" @click="getInfo(e)">
         <device-pop
           type="tp"
@@ -283,9 +281,8 @@
           </div>
           <div class="yj_630_block yj_630_block_reverse" v-for="e in press.slice(0,3)" :key="e.pkid">
             <div class="p_device slw_630_wrap_1" v-for="(el, j) in e.loadLocation" :key="el.equipment" :class="{'slw_630_wrap_2': j === 1}">
-              <img v-show="el.status === 1" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(el)">
-              <img v-show="el.status === 2" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(el)">
-              <img v-show="el.status === 3" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(el)">
+              <img v-show="el.status !== 4 && (el.pointStatus === '2' || el.pointStatus === '3')" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(el)">
+              <img v-show="el.status !== 4 && (el.pointStatus === '1')" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(el)">
               <img v-show="el.status === 4" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(el)">
               <device-pop
                 type="lz"
@@ -361,9 +358,8 @@
           <img class="device_img" src="../assets/images/device/630/wl.png" alt="">
         </div>
         <div class="p_device slw_1600_wrap" v-for="(e, i) in press[3].loadLocation" :key="e.equipment" :class="'slw_1600_wrap_' + (i + 1)">
-          <img v-show="e.status === 1" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
-          <img v-show="e.status === 2" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(e)">
-          <img v-show="e.status === 3" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status !== 4 && (e.pointStatus === '2' || e.pointStatus === '3')" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status !== 4 && e.pointStatus === '1'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
           <img v-show="e.status === 4" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(e)">
           <device-pop
             type="lz"
@@ -416,9 +412,8 @@
           <img class="device_img" src="../assets/images/device/630/wl.png" alt="">
         </div>
         <div class="p_device slw_1600_wrap slw_1600_wrap_2" v-for="(e, i) in press[4].loadLocation" :key="e.equipment" :class="'slw_1600_wrap_' + (2 * i + 2)">
-          <img v-show="e.status === 1" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
-          <img v-show="e.status === 2" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(e)">
-          <img v-show="e.status === 3" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status !== 4 && (e.pointStatus === '2' || e.pointStatus === '3')" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status !== 4 && e.pointStatus === '1'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
           <img v-show="e.status === 4" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(e)">
           <device-pop
             type="lz"
@@ -504,9 +499,8 @@
         </div>
         <div class="p_device lz_yyj_wrap_1">
           <div class="lz_yyj_1" v-for="e in press[5].loadLocation.slice(0, 8)" :key="e.equipment">
-            <img v-show="e.status === 1" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
-            <img v-show="e.status === 2" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(e)">
-            <img v-show="e.status === 3" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status !== 4 && (e.pointStatus === '2' || e.pointStatus === '3')" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status !== 4 && e.pointStatus === '1'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
             <img v-show="e.status === 4" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(e)">
             <device-pop
               type="lz"
@@ -518,9 +512,8 @@
         </div>
         <div class="p_device lz_yyj_wrap_2">
           <div class="lz_yyj_2" v-for="(e, i) in press[5].loadLocation.slice(8, 10)" :key="i">
-            <img v-show="e.status === 1" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
-            <img v-show="e.status === 2" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(e)">
-            <img v-show="e.status === 3" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status !== 4 && (e.pointStatus === '2' || e.pointStatus === '3')" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status !== 4 && e.pointStatus === '1'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
             <img v-show="e.status === 4" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(e)">
             <device-pop
               type="lz"
@@ -532,9 +525,8 @@
         </div>
         <div v-if="press[5].loadLocation.length > 10" class="p_device ktp_yyj_wrap_3">
           <div class="lz_yyj_3">
-            <img v-show="press[5].loadLocation[10].status === 1" 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 === 2" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(press[5].loadLocation[10])">
-            <img v-show="press[5].loadLocation[10].status === 3" 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 && (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])">
             <device-pop
               type="lz"
@@ -546,9 +538,8 @@
         </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 === 1" 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 === 2" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(press[5].loadLocation[10])">
-            <img v-show="press[5].loadLocation[11].status === 3" 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 && (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])">
             <device-pop
               type="lz"
@@ -842,10 +833,10 @@ export default {
   _wh(100%, 100%)
 .yjbyx_1
   _wh(100%, 10%)
-  top auto
-  bottom 0
 .yjbyx_2
   _wh(100%, 10%)
+  top auto
+  bottom 0
 .yao_line_1
   position absolute
   _wh(100%, 6px)