From 1fb497a5eb569570ebe15d2cff63ba97dabaf4bf Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 21 Jun 2023 10:09:41 +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/assets/js/getData0.js           | 32 ++++++++---------
 src/pages/modules/homepage/one.vue  | 19 +++++++++-
 src/pages/modules/homepage/two.vue  | 55 ++++++++++++++++++++++++++++-
 src/pages/modules/takeshape/one.vue | 46 +++++++++++++-----------
 4 files changed, 113 insertions(+), 39 deletions(-)

diff --git a/src/assets/js/getData0.js b/src/assets/js/getData0.js
index d187c4e..d490398 100644
--- a/src/assets/js/getData0.js
+++ b/src/assets/js/getData0.js
@@ -2446,7 +2446,7 @@ export const trappedMaterialCondition = () => {
       'TrappedShelf40List': [
         {
           'bom': '-',
-          'stand_status': '2',
+          'stand_status': '',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位1',
@@ -2461,7 +2461,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '3',
+          'stand_status': '2',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位3',
@@ -2491,7 +2491,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '4',
+          'stand_status': '',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位7',
@@ -2506,7 +2506,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '',
+          'stand_status': '2',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位9',
@@ -2536,7 +2536,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '5',
+          'stand_status': '',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位13',
@@ -2566,7 +2566,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '4',
+          'stand_status': '',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位17',
@@ -2611,7 +2611,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '3',
+          'stand_status': '',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位23',
@@ -2656,7 +2656,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '5',
+          'stand_status': '',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位29',
@@ -2701,7 +2701,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '2',
+          'stand_status': '',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位35',
@@ -2746,7 +2746,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '',
+          'stand_status': '2',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位2',
@@ -2761,7 +2761,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '',
+          'stand_status': '2',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位4',
@@ -2776,7 +2776,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '',
+          'stand_status': '2',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位6',
@@ -2791,7 +2791,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '',
+          'stand_status': '2',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位8',
@@ -2866,7 +2866,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '3',
+          'stand_status': '',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位18',
@@ -2911,7 +2911,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '5',
+          'stand_status': '',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位24',
@@ -2971,7 +2971,7 @@ export const trappedMaterialCondition = () => {
         },
         {
           'bom': '-',
-          'stand_status': '2',
+          'stand_status': '',
           'standing_time': '-',
           'weight': '-',
           'point_name': '困料货位32',
diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue
index 9737ef7..df8e84f 100644
--- a/src/pages/modules/homepage/one.vue
+++ b/src/pages/modules/homepage/one.vue
@@ -158,8 +158,8 @@
                             <img src="../../../images/workshop/elect.png" alt="">
                           </div>
                           <div class="sh_machine elect_1 elect_2">
+                            <img src="../../../images/workshop/elect.png" alt="">
                           </div>
-
                         </div>
                         <div class="machine_wrap yj_wrap_1 yj_wrap_2">
                           <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
@@ -212,6 +212,7 @@
                             <img v-show="String(ManipulatorInfoList[1].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                           </div>
                           <div class="sh_machine elect_1 elect_2">
+                            <img src="../../../images/workshop/elect.png" alt="">
                           </div>
                         </div>
                         <div class="machine_wrap yj_wrap_1 yj_wrap_3">
@@ -313,6 +314,9 @@
                             <img v-show="String(ManipulatorInfoList[2].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
                             <img v-show="String(ManipulatorInfoList[2].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                           </div>
+                          <div class="sh_machine elect_1 elect_2">
+                            <img src="../../../images/workshop/elect.png" alt="">
+                          </div>
                         </div>
                         <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5">
                           <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
@@ -572,6 +576,9 @@
                             <img v-show="StackingPositionList[18].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="StackingPositionList[18].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
                           </div>
+                          <div class="sh_machine elect_1 elect_2">
+                            <img src="../../../images/workshop/elect.png" alt="">
+                          </div>
                         </div>
                       </div>
                       <div v-if="TrappedMaterialShelfList.length > 0" class="machine_wrap kl_wrap_1">
@@ -1503,6 +1510,10 @@ export default {
     left: 74%;
     top: 27%;
     background-color #fff
+    _fj(row,center)
+    img
+      position static
+      _wh(50%, 100%)
   .elect_2
     left:86%
 .yj_wrap_2
@@ -1633,6 +1644,9 @@ export default {
         bottom auto
         right auto
         left 10%
+  .elect_2
+    top: 101%;
+    left: 38%;
 .yj_wrap_5
   top 61%
   .kongtuopan_1
@@ -1738,6 +1752,9 @@ export default {
     right 64%
     img
       transform rotate(-90deg)
+  .elect_2
+    top: 46%;
+    left: 52%;
 .kl_wrap_1
   width 2%
   height 63%
diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue
index d1a4924..9a5cf37 100644
--- a/src/pages/modules/homepage/two.vue
+++ b/src/pages/modules/homepage/two.vue
@@ -84,6 +84,9 @@
                             <img v-show="String(e.point_status) === '1'" src="../../../images/workshop/mtp.png" alt="">
                           </div>
                         </div>
+                        <div class="sh_machine elect_1 elect_5">
+                          <img src="../../../images/workshop/elect.png" alt="">
+                        </div>
                       </div>
                       <div class="cmd_block">
                         <div class="machine_wrap ktp_wrap_1">
@@ -161,7 +164,7 @@
                           <div class="sh_machine kongtuopan_1">
                             <img src="../../../images/workshop/mtp.png" alt="">
                           </div>
-                          <div class="sh_machine kongtuopan_2">
+                          <div class="sh_machine kongtuopan_1 kongtuopan_2">
                             <img src="../../../images/workshop/mtp.png" alt="">
                           </div>
                           <div class="sh_machine robot_1">
@@ -282,6 +285,18 @@
                             </div>
                           </div>
                         </div>
+                        <div class="sh_machine elect_1">
+                          <img src="../../../images/workshop/elect.png" alt="">
+                        </div>
+                        <div class="sh_machine elect_1 elect_2">
+                          <img src="../../../images/workshop/elect.png" alt="">
+                        </div>
+                        <div class="sh_machine elect_1 elect_3">
+                          <img src="../../../images/workshop/elect.png" alt="">
+                        </div>
+                        <div class="sh_machine elect_1 elect_4">
+                          <img src="../../../images/workshop/elect.png" alt="">
+                        </div>
                       </div>
                     </div>
                 </div>
@@ -1155,6 +1170,44 @@ export default {
   left: 76%;
   top: 58%;
   transform: rotate(-90deg);
+.elect_1
+  width: 4%;
+  height: 2.96%;
+  left: 55%;
+  top: 1%;
+  background-color #fff
+  _fj(row,center)
+  img
+    position static
+    _wh(50%, 100%)
+.elect_2
+  width: 2.7%;
+  height: 4.4%;
+  left: 55%;
+  top: 38%;
+  img
+    _wh(80%, 80%)
+.elect_3
+  width: 3.5%;
+  height: 4.4%;
+  left: 12%;
+  top: 50%;
+  img
+    _wh(60%, 100%)
+.elect_4
+  width: 7%;
+  height: 4.4%;
+  left: 36%;
+  top: 115%;
+  img
+    _wh(40%, 100%)
+.elect_5
+  width: 2%;
+  height: 28%;
+  left: 100.2%
+  top: 56%;
+  img
+    _wh(80%, 50%)
 .rotate_1
   animation rotate_1 1.5s linear 1.5s infinite alternate-reverse
 @keyframes rotate_1 {
diff --git a/src/pages/modules/takeshape/one.vue b/src/pages/modules/takeshape/one.vue
index c336ec6..f06ca4b 100644
--- a/src/pages/modules/takeshape/one.vue
+++ b/src/pages/modules/takeshape/one.vue
@@ -121,11 +121,12 @@
                         <img v-show="String(ManipulatorInfoList[0].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
                         <img v-show="String(ManipulatorInfoList[0].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                       </div>
-                      <div class="sh_machine block_1">
+                      <div class="sh_machine elect_1">
+                        <img src="../../../images/workshop/elect.png" alt="">
                       </div>
-                      <div class="sh_machine block_1 block_2">
+                      <div class="sh_machine elect_1 elect_2">
+                        <img src="../../../images/workshop/elect.png" alt="">
                       </div>
-
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_2">
                       <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
@@ -169,7 +170,8 @@
                         <img v-show="String(ManipulatorInfoList[1].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
                         <img v-show="String(ManipulatorInfoList[1].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                       </div>
-                      <div class="sh_machine block_1 block_2">
+                      <div class="sh_machine elect_1 elect_2">
+                        <img src="../../../images/workshop/elect.png" alt="">
                       </div>
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_3">
@@ -255,6 +257,9 @@
                         <img v-show="String(ManipulatorInfoList[2].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
                         <img v-show="String(ManipulatorInfoList[2].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                       </div>
+                      <div class="sh_machine elect_1 elect_2">
+                        <img src="../../../images/workshop/elect.png" alt="">
+                      </div>
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5">
                       <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
@@ -506,6 +511,9 @@
                         <img v-show="StackingPositionList[18].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                         <img v-show="StackingPositionList[18].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
                       </div>
+                      <div class="sh_machine elect_1 elect_2">
+                        <img src="../../../images/workshop/elect.png" alt="">
+                      </div>
                     </div>
                   </div>
                   <div v-if="TrappedShelf40List.length > 0" class="machine_wrap kl_wrap_1">
@@ -1202,20 +1210,6 @@ export default {
   width: 98%;
   height: 55%;
 // 压机
-.yyj_wrap_1
-  width 10.801%
-  height 29.895%
-  transform rotate(90deg)
-  top: 4.4%;
-  left: 90.5%;
-.yyj_wrap_2
-  left: 80%;
-.cyj_wrap_1
-  left 70%
-.cyj_wrap_2
-  left 60%
-.cyj_wrap_3
-  left 50%
 .yj_wrap_1
   width 10.801%
   height 29.895%
@@ -1327,13 +1321,17 @@ export default {
       .zhuan_bg_arrow
         right auto
         left 10%
-  .block_1
+  .elect_1
     width: 10%;
     height: 9%;
     left: 74%;
     top: 27%;
     background-color #fff
-  .block_2
+    _fj(row,center)
+    img
+      position static
+      _wh(50%, 100%)
+  .elect_2
     left:86%
 .yj_wrap_2
   left: 71%
@@ -1360,7 +1358,7 @@ export default {
     top 80%
   .weilan
     top 16%
-  .block_2
+  .elect_2
     top 9%
     left: 89%;
 .yj_wrap_3
@@ -1475,6 +1473,9 @@ export default {
         bottom auto
         right auto
         left 10%
+  .elect_2
+    top: 101%;
+    left: 38%;
 .yj_wrap_5
   left: 36%
   .kongtuopan_1
@@ -1582,6 +1583,9 @@ export default {
     right 64%
     img
       transform rotate(-90deg)
+  .elect_2
+    top: 45%;
+    left: 52%;
 .yjlz_wrap_1
   width: 1.365%;
   height: 17%;