From e13acbd03f1a6d7b331f6ae19f272f0f3e5d5aa9 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 26 Jun 2023 15:46:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=99=E7=9B=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/modules/homepage/one.vue  | 36 +++++++++++++++-----
 src/pages/modules/takeshape/one.vue | 51 ++++++++++++++---------------
 2 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue
index 7fad877..5fb73c8 100644
--- a/src/pages/modules/homepage/one.vue
+++ b/src/pages/modules/homepage/one.vue
@@ -53,34 +53,54 @@
                       </div>
                       <div v-if="TrappedShelfList.length > 0" class="machine_wrap yjlz_wrap_1">
                         <div class="sh_machine lz_1">
-                          <img v-show="String(TrappedShelfList[0].point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
+                          <!-- <img v-show="String(TrappedShelfList[0].point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
                           <img v-show="String(TrappedShelfList[0].point_status) !== '0' && String(TrappedShelfList[0].stand_status_color) === '0'" src="../../../images/workshop/lz_hj_gray.png" alt="">
                           <img v-show="String(TrappedShelfList[0].point_status) !== '0' && String(TrappedShelfList[0].stand_status_color) === '1'" src="../../../images/workshop/lz_hj_green.png" alt="">
                           <img v-show="String(TrappedShelfList[0].point_status) !== '0' && String(TrappedShelfList[0].stand_status_color) === '2'" src="../../../images/workshop/lz_hj_red.png" alt="">
-                          <img v-show="String(TrappedShelfList[0].point_status) !== '0' && String(TrappedShelfList[0].stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                          <img v-show="String(TrappedShelfList[0].point_status) !== '0' && String(TrappedShelfList[0].stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt=""> -->
+                          <img v-show="String(TrappedShelfList[0].point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
+                          <img v-show="String(TrappedShelfList[0].point_status) === '1'" src="../../../images/workshop/lz_hj_gray.png" alt="">
+                          <img v-show="String(TrappedShelfList[0].point_status) === '2' && String(TrappedShelfList[0].stand_status) === '2'" src="../../../images/workshop/lz_hj_green.png" alt="">
+                          <img v-show="String(TrappedShelfList[0].point_status) === '2' && String(TrappedShelfList[0].stand_status) === '3' || String(TrappedShelfList[0].stand_status) === '4'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                          <img v-show="String(TrappedShelfList[0].point_status) === '2' && String(TrappedShelfList[0].stand_status) === '5'" src="../../../images/workshop/lz_hj_red.png" alt="">
                         </div>
                         <div class="sh_machine lz_1 lz_2" v-for="(e,i) in TrappedShelfList.slice(1, 4)" :key="i">
-                          <img v-show="String(e.point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
+                          <!-- <img v-show="String(e.point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
                           <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '0'" src="../../../images/workshop/lz_hj_gray.png" alt="">
                           <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '1'" src="../../../images/workshop/lz_hj_green.png" alt="">
                           <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '2'" src="../../../images/workshop/lz_hj_red.png" alt="">
-                          <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                          <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt=""> -->
+                          <img v-show="String(e.point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
+                          <img v-show="String(e.point_status) === '1'" src="../../../images/workshop/lz_hj_gray.png" alt="">
+                          <img v-show="String(e.point_status) === '1' && String(e.stand_status) === '2'" src="../../../images/workshop/lz_hj_green.png" alt="">
+                          <img v-show="String(e.point_status) === '1' && String(e.stand_status) === '3' || String(e.stand_status) === '4'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                          <img v-show="String(e.point_status) === '1' && String(e.stand_status) === '5'" src="../../../images/workshop/lz_hj_red.png" alt="">
                         </div>
                       </div>
                       <div v-if="TrappedShelfList.length > 0" class="machine_wrap yjlz_wrap_1 yjlz_wrap_2">
                         <div class="sh_machine lz_1">
-                          <img v-show="String(TrappedShelfList[4].point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
+                          <!-- <img v-show="String(TrappedShelfList[4].point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
                           <img v-show="String(TrappedShelfList[4].point_status) !== '0' && String(TrappedShelfList[4].stand_status_color) === '0'" src="../../../images/workshop/lz_hj_gray.png" alt="">
                           <img v-show="String(TrappedShelfList[4].point_status) !== '0' && String(TrappedShelfList[4].stand_status_color) === '1'" src="../../../images/workshop/lz_hj_green.png" alt="">
                           <img v-show="String(TrappedShelfList[4].point_status) !== '0' && String(TrappedShelfList[4].stand_status_color) === '2'" src="../../../images/workshop/lz_hj_red.png" alt="">
-                          <img v-show="String(TrappedShelfList[4].point_status) !== '0' && String(TrappedShelfList[4].stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                          <img v-show="String(TrappedShelfList[4].point_status) !== '0' && String(TrappedShelfList[4].stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt=""> -->
+                          <img v-show="String(TrappedShelfList[4].point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
+                          <img v-show="String(TrappedShelfList[4].point_status) === '1'" src="../../../images/workshop/lz_hj_gray.png" alt="">
+                          <img v-show="String(TrappedShelfList[4].point_status) === '2' && String(TrappedShelfList[4].stand_status) === '2'" src="../../../images/workshop/lz_hj_green.png" alt="">
+                          <img v-show="String(TrappedShelfList[4].point_status) === '2' && String(TrappedShelfList[4].stand_status) === '3' || String(TrappedShelfList[4].stand_status) === '4'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                          <img v-show="String(TrappedShelfList[4].point_status) === '2' && String(TrappedShelfList[4].stand_status) === '5'" src="../../../images/workshop/lz_hj_red.png" alt="">
                         </div>
                         <div class="sh_machine lz_1 lz_2" v-for="(e,i) in TrappedShelfList.slice(5)" :key="i">
-                          <img v-show="String(e.point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
+                          <!-- <img v-show="String(e.point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
                           <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '0'" src="../../../images/workshop/lz_hj_gray.png" alt="">
                           <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '1'" src="../../../images/workshop/lz_hj_green.png" alt="">
                           <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '2'" src="../../../images/workshop/lz_hj_red.png" alt="">
-                          <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                          <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt=""> -->
+                          <img v-show="String(e.point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
+                          <img v-show="String(e.point_status) === '1'" src="../../../images/workshop/lz_hj_gray.png" alt="">
+                          <img v-show="String(e.point_status) === '2' && String(e.stand_status) === '2'" src="../../../images/workshop/lz_hj_green.png" alt="">
+                          <img v-show="String(e.point_status) === '2' && String(e.stand_status) === '3' || String(e.stand_status) === '4'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                          <img v-show="String(e.point_status) === '2' && String(e.stand_status) === '5'" src="../../../images/workshop/lz_hj_red.png" alt="">
                         </div>
                       </div>
                       <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_3">
diff --git a/src/pages/modules/takeshape/one.vue b/src/pages/modules/takeshape/one.vue
index f8d180e..fa9d1a1 100644
--- a/src/pages/modules/takeshape/one.vue
+++ b/src/pages/modules/takeshape/one.vue
@@ -29,33 +29,33 @@
                   <div v-if="TrappedShelfList.length > 0" class="machine_wrap yjlz_wrap_1">
                     <div class="sh_machine lz_1">
                       <img v-show="String(TrappedShelfList[0].point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
-                      <img v-show="String(TrappedShelfList[0].point_status) !== '0' && String(TrappedShelfList[0].stand_status_color) === '0'" src="../../../images/workshop/lz_hj_gray.png" alt="">
-                      <img v-show="String(TrappedShelfList[0].point_status) !== '0' && String(TrappedShelfList[0].stand_status_color) === '1'" src="../../../images/workshop/lz_hj_green.png" alt="">
-                      <img v-show="String(TrappedShelfList[0].point_status) !== '0' && String(TrappedShelfList[0].stand_status_color) === '2'" src="../../../images/workshop/lz_hj_red.png" alt="">
-                      <img v-show="String(TrappedShelfList[0].point_status) !== '0' && String(TrappedShelfList[0].stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                      <img v-show="String(TrappedShelfList[0].point_status) === '1'" src="../../../images/workshop/lz_hj_gray.png" alt="">
+                      <img v-show="String(TrappedShelfList[0].point_status) === '2' && String(TrappedShelfList[0].stand_status) === '2'" src="../../../images/workshop/lz_hj_green.png" alt="">
+                      <img v-show="String(TrappedShelfList[0].point_status) === '2' && String(TrappedShelfList[0].stand_status) === '3' || String(TrappedShelfList[0].stand_status) === '4'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                      <img v-show="String(TrappedShelfList[0].point_status) === '2' && String(TrappedShelfList[0].stand_status) === '5'" src="../../../images/workshop/lz_hj_red.png" alt="">
                     </div>
                     <div class="sh_machine lz_1 lz_2" v-for="(e,i) in TrappedShelfList.slice(1, 4)" :key="i">
                       <img v-show="String(e.point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '0'" src="../../../images/workshop/lz_hj_gray.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '1'" src="../../../images/workshop/lz_hj_green.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '2'" src="../../../images/workshop/lz_hj_red.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                      <img v-show="String(e.point_status) === '1'" src="../../../images/workshop/lz_hj_gray.png" alt="">
+                      <img v-show="String(e.point_status) === '1' && String(e.stand_status) === '2'" src="../../../images/workshop/lz_hj_green.png" alt="">
+                      <img v-show="String(e.point_status) === '1' && String(e.stand_status) === '3' || String(e.stand_status) === '4'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                      <img v-show="String(e.point_status) === '1' && String(e.stand_status) === '5'" src="../../../images/workshop/lz_hj_red.png" alt="">
                     </div>
                   </div>
                   <div v-if="TrappedShelfList.length > 0" class="machine_wrap yjlz_wrap_1 yjlz_wrap_2">
                     <div class="sh_machine lz_1">
                       <img v-show="String(TrappedShelfList[4].point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
-                      <img v-show="String(TrappedShelfList[4].point_status) !== '0' && String(TrappedShelfList[4].stand_status_color) === '0'" src="../../../images/workshop/lz_hj_gray.png" alt="">
-                      <img v-show="String(TrappedShelfList[4].point_status) !== '0' && String(TrappedShelfList[4].stand_status_color) === '1'" src="../../../images/workshop/lz_hj_green.png" alt="">
-                      <img v-show="String(TrappedShelfList[4].point_status) !== '0' && String(TrappedShelfList[4].stand_status_color) === '2'" src="../../../images/workshop/lz_hj_red.png" alt="">
-                      <img v-show="String(TrappedShelfList[4].point_status) !== '0' && String(TrappedShelfList[4].stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                      <img v-show="String(TrappedShelfList[4].point_status) === '1'" src="../../../images/workshop/lz_hj_gray.png" alt="">
+                      <img v-show="String(TrappedShelfList[4].point_status) === '2' && String(TrappedShelfList[4].stand_status) === '2'" src="../../../images/workshop/lz_hj_green.png" alt="">
+                      <img v-show="String(TrappedShelfList[4].point_status) === '2' && String(TrappedShelfList[4].stand_status) === '3' || String(TrappedShelfList[4].stand_status) === '4'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                      <img v-show="String(TrappedShelfList[4].point_status) === '2' && String(TrappedShelfList[4].stand_status) === '5'" src="../../../images/workshop/lz_hj_red.png" alt="">
                     </div>
                     <div class="sh_machine lz_1 lz_2" v-for="(e,i) in TrappedShelfList.slice(5)" :key="i">
                       <img v-show="String(e.point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '0'" src="../../../images/workshop/lz_hj_gray.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '1'" src="../../../images/workshop/lz_hj_green.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '2'" src="../../../images/workshop/lz_hj_red.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && String(e.stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                      <img v-show="String(e.point_status) === '1'" src="../../../images/workshop/lz_hj_gray.png" alt="">
+                      <img v-show="String(e.point_status) === '2' && String(e.stand_status) === '2'" src="../../../images/workshop/lz_hj_green.png" alt="">
+                      <img v-show="String(e.point_status) === '2' && String(e.stand_status) === '3' || String(e.stand_status) === '4'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                      <img v-show="String(e.point_status) === '2' && String(e.stand_status) === '5'" src="../../../images/workshop/lz_hj_red.png" alt="">
                     </div>
                   </div>
                   <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_3">
@@ -522,9 +522,10 @@
                   <div v-if="TrappedShelf40List.length > 0" class="machine_wrap kl_wrap_1">
                     <div v-for="(e,i) in TrappedShelf40List.slice(0, 20)" :key="i" class="sh_machine lz" :class="{'mgt5': i === 2 || i === 6 || i === 10 || i === 14 || i === 18}" @click.stop="klhjInfo(e)">
                       <img v-show="String(e.point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && String(e.stand_status) === '2'" src="../../../images/workshop/lz_hj_green.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && (String(e.stand_status) === '3' || String(e.stand_status) === '4')" src="../../../images/workshop/lz_hj_yellow.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && String(e.stand_status) === '5'" src="../../../images/workshop/lz_hj_red.png" alt="">
+                      <img v-show="String(e.point_status) === '1'" src="../../../images/workshop/lz_hj_gray.png" alt="">
+                      <img v-show="String(e.point_status) === '2' && String(e.stand_status) === '2'" src="../../../images/workshop/lz_hj_green.png" alt="">
+                      <img v-show="String(e.point_status) === '2' && (String(e.stand_status) === '3' || String(e.stand_status) === '4')" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                      <img v-show="String(e.point_status) === '2' && String(e.stand_status) === '5'" src="../../../images/workshop/lz_hj_red.png" alt="">
                       <div v-if="e.point_code === pkId" class="popup_block_wraper popup_block_wraper_1">
                         <div class="foldline foldline_left"></div>
                         <div class="popup_bg">
@@ -573,9 +574,10 @@
                   <div v-if="TrappedShelf40List.length > 0" class="machine_wrap kl_wrap_1 kl_wrap_2">
                     <div v-for="(e,i) in TrappedShelf40List.slice(20)" :key="i" class="sh_machine lz" :class="{'mgt5': i === 2 || i === 6 || i === 10 || i === 14 || i === 18}" @click.stop="klhjInfo(e)">
                       <img v-show="String(e.point_status) === '0'" src="../../../images/workshop/hj.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && String(e.stand_status) === '2'" src="../../../images/workshop/lz_hj_green.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && (String(e.stand_status) === '3' || String(e.stand_status) === '4')" src="../../../images/workshop/lz_hj_yellow.png" alt="">
-                      <img v-show="String(e.point_status) !== '0' && String(e.stand_status) === '5'" src="../../../images/workshop/lz_hj_red.png" alt="">
+                      <img v-show="String(e.point_status) === '1'" src="../../../images/workshop/lz_hj_gray.png" alt="">
+                      <img v-show="String(e.point_status) === '2' && String(e.stand_status) === '2'" src="../../../images/workshop/lz_hj_green.png" alt="">
+                      <img v-show="String(e.point_status) === '2' && (String(e.stand_status) === '3' || String(e.stand_status) === '4')" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                      <img v-show="String(e.point_status) === '2' && String(e.stand_status) === '5'" src="../../../images/workshop/lz_hj_red.png" alt="">
                       <div v-if="e.point_code === pkId" class="popup_block_wraper popup_block_wraper_1">
                         <div class="foldline foldline_left"></div>
                         <div class="popup_bg">
@@ -784,8 +786,6 @@ export default {
       myCharts2: '',
       myCharts3: '',
       PressMachineList: [], // 压机数据
-      MixMachineList: [], // 混料机数据
-      MixBlankingList: [], // 混料机下料位
       TrappedShelfList: [], // 困料位料盅
       StackingPositionList: [], // 压制码垛数据信息
       TrappedMaterialShelfList: [], // 困料货架信息
@@ -824,8 +824,6 @@ export default {
       let res = await workshopCondition()
       if (res.code === 200) {
         this.PressMachineList = [...res.result.PressMachineList]
-        this.MixMachineList = [...res.result.MixMachineList]
-        this.MixBlankingList = [...res.result.MixBlankingList]
         this.TrappedShelfList = [...res.result.TrappedShelfList]
         this.StackingPositionList = [...res.result.StackingPositionList]
         this.TrappedMaterialShelfList = [...res.result.TrappedMaterialShelfList]
@@ -846,7 +844,6 @@ export default {
       let res = await trappedMaterialCondition()
       if (res.code === 200) {
         this.TrappedShelf40List = [...res.result.TrappedShelf40List]
-        console.log(this.TrappedShelf40List)
       }
     },
     expandTooltip () {