diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index 56cc4e8..f463322 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -591,36 +591,36 @@ export const workshopCondition = () => {
       'LastTenFailureList': [
         {
           'failure_time': '05-30 09:50:12',
-          'device_code': 'hl',
-          'device_name': '混料',
+          'device_code': 'hl01',
+          'device_name': '混料机01',
           'failure_info': '机器故障',
           'device_status_name': '待机'
         },
         {
           'failure_time': '05-30 09:50:12',
-          'device_code': 'hl',
-          'device_name': '混料',
+          'device_code': 'hl02',
+          'device_name': '混料机02',
           'failure_info': '机器故障',
           'device_status_name': '待机'
         },
         {
           'failure_time': '05-30 09:50:12',
-          'device_code': 'hl',
-          'device_name': '混料',
+          'device_code': 'hl03',
+          'device_name': '混料机03',
           'failure_info': '机器故障',
           'device_status_name': '待机'
         },
         {
           'failure_time': '05-30 09:50:12',
-          'device_code': 'hl',
-          'device_name': '混料',
+          'device_code': 'hl04',
+          'device_name': '混料机04',
           'failure_info': '机器故障',
           'device_status_name': '待机'
         },
         {
           'failure_time': '05-30 09:50:12',
-          'device_code': 'hl',
-          'device_name': '混料',
+          'device_code': 'hl05',
+          'device_name': '混料机05',
           'failure_info': '机器故障',
           'device_status_name': '待机'
         }
@@ -1109,44 +1109,68 @@ export const workshopCondition = () => {
       ],
       'TrappedShelfList': [
         {
+          'stand_status_color': '',
+          'stand_status': '',
           'point_name': '压机1空盅货位',
           'point_code': 'KLHW41',
-          'point_status': '0'
+          'point_status': '0',
+          'stand_status_name': ''
         },
         {
+          'stand_status_color': '',
+          'stand_status': '',
           'point_name': '压机1困料货位1',
           'point_code': 'KLHW42',
-          'point_status': '0'
+          'point_status': '0',
+          'stand_status_name': ''
         },
         {
+          'stand_status_color': '2',
+          'stand_status': '3',
           'point_name': '压机1困料货位2',
           'point_code': 'KLHW43',
-          'point_status': '2'
+          'point_status': '2',
+          'stand_status_name': '困料完成'
         },
         {
+          'stand_status_color': '',
+          'stand_status': '',
           'point_name': '压机1困料货位3',
           'point_code': 'KLHW44',
-          'point_status': '0'
+          'point_status': '0',
+          'stand_status_name': ''
         },
         {
+          'stand_status_color': '',
+          'stand_status': '',
           'point_name': '压机2空盅货位',
           'point_code': 'KLHW45',
-          'point_status': '0'
+          'point_status': '0',
+          'stand_status_name': ''
         },
         {
+          'stand_status_color': '',
+          'stand_status': '',
           'point_name': '压机2困料货位1',
           'point_code': 'KLHW46',
-          'point_status': '0'
+          'point_status': '0',
+          'stand_status_name': ''
         },
         {
+          'stand_status_color': '',
+          'stand_status': '',
           'point_name': '压机2困料货位2',
           'point_code': 'KLHW47',
-          'point_status': '0'
+          'point_status': '0',
+          'stand_status_name': ''
         },
         {
+          'stand_status_color': '',
+          'stand_status': '',
           'point_name': '压机2困料货位3',
           'point_code': 'KLHW48',
-          'point_status': '0'
+          'point_status': '0',
+          'stand_status_name': ''
         }
       ],
       'TrappedMaterialShelfList': [
diff --git a/src/images/workshop/agv_gray.png b/src/images/workshop/agv_gray.png
new file mode 100644
index 0000000..8164508
Binary files /dev/null and b/src/images/workshop/agv_gray.png differ
diff --git a/src/images/workshop/agv_green.png b/src/images/workshop/agv_green.png
new file mode 100644
index 0000000..e7fb76b
Binary files /dev/null and b/src/images/workshop/agv_green.png differ
diff --git a/src/images/workshop/agv_red.png b/src/images/workshop/agv_red.png
new file mode 100644
index 0000000..917880b
Binary files /dev/null and b/src/images/workshop/agv_red.png differ
diff --git a/src/images/workshop/agv_yellow.png b/src/images/workshop/agv_yellow.png
new file mode 100644
index 0000000..df5b810
Binary files /dev/null and b/src/images/workshop/agv_yellow.png differ
diff --git a/src/images/workshop/elect.png b/src/images/workshop/elect.png
new file mode 100644
index 0000000..8304472
Binary files /dev/null and b/src/images/workshop/elect.png differ
diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue
index e8616e7..9737ef7 100644
--- a/src/pages/modules/homepage/one.vue
+++ b/src/pages/modules/homepage/one.vue
@@ -53,38 +53,54 @@
                       </div>
                       <div v-if="TrappedShelfList.length > 0" class="machine_wrap yjlz_wrap_1">
                         <div class="sh_machine lz_1">
-                          <img :class="String(TrappedShelfList[0].point_status) === '0' ? 'hidden': ''" src="../../../images/workshop/lz.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="">
                         </div>
-                        <div class="sh_machine lz_1 lz_2">
-                          <img v-for="(e,i) in TrappedShelfList.slice(1, 4)" :key="i" src="../../../images/workshop/lz.png" alt="" :class="String(e.point_status) === '0' ? 'hidden': ''">
+                        <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="">
                         </div>
                       </div>
                       <div v-if="TrappedShelfList.length > 0" class="machine_wrap yjlz_wrap_1 yjlz_wrap_2">
                         <div class="sh_machine lz_1">
-                          <img :class="String(TrappedShelfList[4].point_status) === '0' ? 'hidden': ''" src="../../../images/workshop/lz.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="">
                         </div>
-                        <div class="sh_machine lz_1 lz_2">
-                          <img v-for="(e,i) in TrappedShelfList.slice(5)" :key="i" src="../../../images/workshop/lz.png" alt="" :class="String(e.point_status) === '0' ? 'hidden': ''">
+                        <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="">
                         </div>
                       </div>
                       <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_3">
                         <div class="sh_machine lz_1">
-                          <img src="../../../images/workshop/lz.png" alt="">
+                          <img src="../../../images/workshop/hj.png" alt="">
                         </div>
                       </div>
                       <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_5">
                         <div class="sh_machine lz_1">
-                          <img src="../../../images/workshop/lz.png" alt="">
+                          <img src="../../../images/workshop/hj.png" alt="">
                         </div>
                       </div>
                       <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_7">
                         <div class="sh_machine lz_1">
-                          <img src="../../../images/workshop/lz.png" alt="">
+                          <img src="../../../images/workshop/hj.png" alt="">
                         </div>
                       </div>
                       <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_8">
                         <div class="sh_machine lz_1">
-                          <img src="../../../images/workshop/lz.png" alt="">
+                          <img src="../../../images/workshop/hj.png" alt="">
                         </div>
                       </div>
                       <div @click="jumpTakeShape">
@@ -138,9 +154,10 @@
                             <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">
                           </div>
 
                         </div>
@@ -194,7 +211,7 @@
                             <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">
                           </div>
                         </div>
                         <div class="machine_wrap yj_wrap_1 yj_wrap_3">
@@ -558,19 +575,21 @@
                         </div>
                       </div>
                       <div v-if="TrappedMaterialShelfList.length > 0" class="machine_wrap kl_wrap_1">
-                        <div v-for="(e,i) in TrappedMaterialShelfList.slice(0, 20)" :key="i" class="lz" :class="{'mgt5': i === 2 || i === 6 || i === 10 || i === 14 || i === 18}">
-                          <img v-show="String(e.stand_status_color) === '0'" src="../../../images/workshop/hj.png" alt="">
-                          <img v-show="String(e.stand_status_color) === '1'" src="../../../images/workshop/lz_hj_green.png" alt="">
-                          <img v-show="String(e.stand_status_color) === '2'" src="../../../images/workshop/lz_hj_red.png" alt="">
-                          <img v-show="String(e.stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                        <div v-for="(e,i) in TrappedMaterialShelfList.slice(0, 20)" :key="i" class="sh_machine lz" :class="{'mgt5': i === 2 || i === 6 || i === 10 || i === 14 || i === 18}">
+                          <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="">
                         </div>
                       </div>
                       <div v-if="TrappedMaterialShelfList.length > 0" class="machine_wrap kl_wrap_1 kl_wrap_2">
-                        <div v-for="(e,i) in TrappedMaterialShelfList.slice(20)" :key="i" class="lz" :class="{'mgt5': i === 2 || i === 6 || i === 10 || i === 14 || i === 18}">
-                          <img v-show="String(e.stand_status_color) === '0'" src="../../../images/workshop/hj.png" alt="">
-                          <img v-show="String(e.stand_status_color) === '1'" src="../../../images/workshop/lz_hj_green.png" alt="">
-                          <img v-show="String(e.stand_status_color) === '2'" src="../../../images/workshop/lz_hj_red.png" alt="">
-                          <img v-show="String(e.stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                        <div v-for="(e,i) in TrappedMaterialShelfList.slice(20)" :key="i" class="sh_machine lz" :class="{'mgt5': i === 2 || i === 6 || i === 10 || i === 14 || i === 18}">
+                          <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="">
                         </div>
                       </div>
                       <div class="machine_wrap mtp_wrap_1">
@@ -1345,12 +1364,14 @@ export default {
   top 2%
   left 42%
   .lz_1
-    width 100%
-    img
-      position relative
+    _wh(100%, 19.011%)
   .lz_2
-    top auto
-    bottom 0
+    &:nth-child(2)
+      top 43%
+    &:nth-child(3)
+      top 62%
+    &:nth-child(4)
+      top 81%
 .yjlz_wrap_2
   top 21%
 .yjlz_wrap_3
@@ -1476,13 +1497,13 @@ 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
+  .elect_2
     left:86%
 .yj_wrap_2
   top 21%
@@ -1509,7 +1530,7 @@ export default {
     top 80%
   .weilan
     top 16%
-  .block_2
+  .elect_2
     top 9%
     left: 89%;
 .yj_wrap_3
@@ -1720,16 +1741,12 @@ export default {
 .kl_wrap_1
   width 2%
   height 63%
-  bottom 4%
+  bottom 10%
   left auto
   right 7%
   .lz
     position relative
-    width 100%
-    height 4.4%
-    img
-      position absolute
-      _wh(100%, 100%)
+    _wh(100%,4.96%)
   .mgt5
     margin-top 45%
 .kl_wrap_2
diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue
index 9d3018c..d1a4924 100644
--- a/src/pages/modules/homepage/two.vue
+++ b/src/pages/modules/homepage/two.vue
@@ -43,15 +43,19 @@
                           <img src="../../../images/workshop/cpj.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap cdz_wrap_1">
-                        <div class="cdz">
+                      <div class="machine_wrap agv_wrap">
+                        <div class="sh_machine cdz_1">
                           <img src="../../../images/workshop/cdz.png" alt="">
                         </div>
-                      </div>
-                      <div class="machine_wrap cdz_wrap_1 cdz_wrap_2">
-                        <div class="cdz">
+                        <div class="sh_machine cdz_1 cdz_2">
                           <img src="../../../images/workshop/cdz.png" alt="">
                         </div>
+                        <div class="sh_machine agv_1">
+                          <img src="../../../images/workshop/agv_yellow.png" alt="">
+                        </div>
+                        <div class="sh_machine agv_1 agv_2">
+                          <img src="../../../images/workshop/agv_yellow.png" alt="">
+                        </div>
                       </div>
                       <div class="machine_wrap yao_wrap">
                         <div class="yaosb">
@@ -99,12 +103,20 @@
                             <img v-show="SortAndPalletizingList[0].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                             <img v-show="SortAndPalletizingList[0].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="SortAndPalletizingList[0].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                            <div class="zhuan_qty">
+                              <p>200</p>
+                              <div class="zhuan_bg_arrow"></div>
+                            </div>
                           </div>
-                          <div v-if="SortAndPalletizingList.length > 0" class="sh_machine kongtuopan_2">
+                          <div v-if="SortAndPalletizingList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_2">
                             <img v-show="SortAndPalletizingList[1].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
                             <img v-show="SortAndPalletizingList[1].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                             <img v-show="SortAndPalletizingList[1].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="SortAndPalletizingList[1].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                            <div class="zhuan_qty">
+                              <p>200</p>
+                              <div class="zhuan_bg_arrow"></div>
+                            </div>
                           </div>
                           <div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot_1" :class="{'rotate_1': String(ManipulatorInfoList[4].color_status) === '1'}">
                             <img v-show="String(ManipulatorInfoList[4].color_status) === '0'" src="../../../images/workshop/robot_cmd_gray.png" alt="">
@@ -120,12 +132,20 @@
                             <img v-show="SortAndPalletizingList[2].color_status === 1" src="../../../images/workshop/cmdssj_green.png" alt="">
                             <img v-show="SortAndPalletizingList[2].color_status === 2" src="../../../images/workshop/cmdssj_red.png" alt="">
                             <img v-show="SortAndPalletizingList[2].color_status === 3" src="../../../images/workshop/cmdssj_yellow.png" alt="">
+                            <div class="zhuan_qty">
+                              <p>200</p>
+                              <div class="zhuan_bg_arrow"></div>
+                            </div>
                           </div>
                           <div v-if="SortAndPalletizingList.length > 0" class="sh_machine cmdssj_1 cmdssj_2">
                             <img v-show="SortAndPalletizingList[3].color_status === 0" src="../../../images/workshop/cmdssj_gray.png" alt="">
                             <img v-show="SortAndPalletizingList[3].color_status === 1" src="../../../images/workshop/cmdssj_green.png" alt="">
                             <img v-show="SortAndPalletizingList[3].color_status === 2" src="../../../images/workshop/cmdssj_red.png" alt="">
                             <img v-show="SortAndPalletizingList[3].color_status === 3" src="../../../images/workshop/cmdssj_yellow.png" alt="">
+                            <div class="zhuan_qty">
+                              <p>200</p>
+                              <div class="zhuan_bg_arrow"></div>
+                            </div>
                           </div>
                           <div class="sh_machine robot_2 rotate_2">
                             <img src="../../../images/workshop/robot_cmd_green.png" alt="">
@@ -841,16 +861,20 @@ export default {
     width 100%
     img
       _wh(100%, auto)
-.cdz_wrap_1
-  width: 3%;
-  top: 9%;
-  left: 3.5%;
-  .cdz
-    width 100%
-    img
-      _wh(100%, auto)
-.cdz_wrap_2
-  top: 16%;
+.agv_wrap
+  _wh(15%, 20%)
+  top 9%
+  left 3.5%
+  .cdz_1
+    width 20%
+  .cdz_2
+    top 35%
+  .agv_1
+    width: 35%;
+    top: 4%;
+    left: 25%;
+  .agv_2
+    top 39%
 .yao_wrap
   width 69%
   top 7%
@@ -921,14 +945,48 @@ export default {
       top: -2000%;
       left: -1000%;
   .kongtuopan_1
-    width 26%
+    _wh(26%, 14%)
     top 3%
     left 3%
+  .zhuan_qty
+    position absolute
+    top -28px
+    right: 0;
+    z-index 8
+    _wh(50px, 20px)
+    background-color: #0ff;
+    border: 1px solid #0ff;
+    border-radius: 5px
+    p
+      display block
+      _fj(row,center)
+      _wh(100%, 100%)
+      _font(13px, 13px, #fff,,center)
+      white-space nowrap
+    .zhuan_bg_arrow
+      position: absolute;
+      bottom -5px
+      right 10%
+      display: block;
+      width: 0;
+      height: 0;
+      border-color: transparent;
+      border-style: solid;
+      border-width: 5px
+      border-bottom-width: 0;
+      border-top-color: #0ff;
+      &:after
+        content: " ";
+        border-width: 5px;
   .kongtuopan_2
-    width 26%
-    top 3%
     left auto
     right 3%
+    .zhuan_qty
+      right auto
+      left 0
+      .zhuan_bg_arrow
+        right auto
+        left 10%
   .fjfztb
     width: 59%;
     top: 9%;
@@ -949,7 +1007,7 @@ export default {
     img
       _wh(100%, 100%)
   .cmdssj_1
-    width: 26%
+    _wh(26%, 23.8%)
     top: 95%;
     left: 4%;
     img
@@ -959,6 +1017,12 @@ export default {
     right 4%
     img
       transform rotate(0deg)
+    .zhuan_qty
+      right auto
+      left 0
+      .zhuan_bg_arrow
+        right auto
+        left 10%
 .robot_2
     top: auto;
     bottom: -8%
@@ -990,12 +1054,13 @@ export default {
   position absolute
   top 0
   left 0
+  z-index -1
   _wh(100%, 9%)
 .rgv_line_1
   position absolute
   top 0
   left 2%
-  z-index 4
+  z-index 0
   width 96%
   height 10%
   background-color #b2b2b2
@@ -1006,7 +1071,7 @@ export default {
   position absolute
   top -100%
   left 0
-  z-index 5
+  z-index 0
   _wh(0.5%, 300%)
   height 300%
   background-color #b2b2b2
diff --git a/src/pages/modules/sortpack/one.vue b/src/pages/modules/sortpack/one.vue
index 4cd1cba..f4f9eec 100644
--- a/src/pages/modules/sortpack/one.vue
+++ b/src/pages/modules/sortpack/one.vue
@@ -598,7 +598,7 @@ export default {
     _wh(100%, auto)
 .diepanji_wrap
     _wh(30%,50%)
-    left 5%
+    left 17%
     top 2%
 .mtp_wrap_1
     width 7%
diff --git a/src/pages/modules/takeshape/one.vue b/src/pages/modules/takeshape/one.vue
index 901bf6b..c336ec6 100644
--- a/src/pages/modules/takeshape/one.vue
+++ b/src/pages/modules/takeshape/one.vue
@@ -28,38 +28,54 @@
                 <div class="center_content">
                   <div v-if="TrappedShelfList.length > 0" class="machine_wrap yjlz_wrap_1">
                     <div class="sh_machine lz_1">
-                      <img :class="TrappedShelfList[0].point_status === '0' ? 'hidden': ''" src="../../../images/workshop/lz.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="">
                     </div>
-                    <div class="sh_machine lz_1 lz_2">
-                      <img v-for="(e,i) in TrappedShelfList.slice(1, 4)" :key="i" src="../../../images/workshop/lz.png" alt="" :class="e.point_status === '0' ? 'hidden': ''">
+                    <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="">
                     </div>
                   </div>
                   <div v-if="TrappedShelfList.length > 0" class="machine_wrap yjlz_wrap_1 yjlz_wrap_2">
                     <div class="sh_machine lz_1">
-                      <img :class="TrappedShelfList[4].point_status === '0' ? 'hidden': ''" src="../../../images/workshop/lz.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="">
                     </div>
-                    <div class="sh_machine lz_1 lz_2">
-                      <img v-for="(e,i) in TrappedShelfList.slice(5)" :key="i" src="../../../images/workshop/lz.png" alt="" :class="e.point_status === '0' ? 'hidden': ''">
+                    <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="">
                     </div>
                   </div>
                   <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_3">
                     <div class="sh_machine lz_1">
-                      <img src="../../../images/workshop/lz.png" alt="">
+                      <img src="../../../images/workshop/hj.png" alt="">
                     </div>
                   </div>
                   <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_5">
                     <div class="sh_machine lz_1">
-                      <img src="../../../images/workshop/lz.png" alt="">
+                      <img src="../../../images/workshop/hj.png" alt="">
                     </div>
                   </div>
                   <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_7">
                     <div class="sh_machine lz_1">
-                      <img src="../../../images/workshop/lz.png" alt="">
+                      <img src="../../../images/workshop/hj.png" alt="">
                     </div>
                   </div>
                   <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_8">
                     <div class="sh_machine lz_1">
-                      <img src="../../../images/workshop/lz.png" alt="">
+                      <img src="../../../images/workshop/hj.png" alt="">
                     </div>
                   </div>
                   <div class="yaji_wrap">
@@ -492,20 +508,106 @@
                       </div>
                     </div>
                   </div>
-                  <div v-if="TrappedMaterialShelfList.length > 0" class="machine_wrap kl_wrap_1">
-                    <div v-for="(e,i) in TrappedMaterialShelfList.slice(0, 20)" :key="i" class="lz" :class="{'mgt5': i === 2 || i === 6 || i === 10 || i === 14 || i === 18}">
-                      <img v-show="String(e.stand_status_color) === '0'" src="../../../images/workshop/hj.png" alt="">
-                      <img v-show="String(e.stand_status_color) === '1'" src="../../../images/workshop/lz_hj_green.png" alt="">
-                      <img v-show="String(e.stand_status_color) === '2'" src="../../../images/workshop/lz_hj_red.png" alt="">
-                      <img v-show="String(e.stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                  <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="">
+                      <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">
+                          <div class="popup_block">
+                            <div class="pop_header">
+                              <div class="pop_name">{{pkObj.point_name}}</div>
+                            </div>
+                            <div class="pop_content">
+                              <div class="pop_item">
+                                <div class="pop_label">状态</div>
+                                <div class="pop_val">{{ pkObj.point_status_name }}</div>
+                              </div>
+                              <div class="pop_item">
+                                <div class="pop_label">载具</div>
+                                <div class="pop_val">{{ pkObj.vehicle_code }}</div>
+                              </div>
+                              <div class="pop_item">
+                                <div class="pop_label">bom号</div>
+                                <div class="pop_val">{{ pkObj.bom }}</div>
+                              </div>
+                              <div class="pop_item">
+                                <div class="pop_label">碾次</div>
+                                <div class="pop_val">{{ pkObj.mix_num }}</div>
+                              </div>
+                              <div class="pop_item">
+                                <div class="pop_label">重量</div>
+                                <div class="pop_val pop_val_s">{{ pkObj.weight }}</div>
+                                <div class="pop_unit">kg</div>
+                              </div>
+                              <div class="pop_item">
+                                <div class="pop_label">入库时间</div>
+                                <div class="pop_val">{{ pkObj.instorage_time }}</div>
+                              </div>
+                              <div class="pop_item">
+                                <div class="pop_label">静置</div>
+                                <div class="pop_val">{{ pkObj.standing_time }}</div>
+                                <div class="pop_unit">h</div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <div class="iconfont icon-guanbi close_btn" @click.stop="closeModal1"></div>
+                      </div>
                     </div>
                   </div>
-                  <div v-if="TrappedMaterialShelfList.length > 0" class="machine_wrap kl_wrap_1 kl_wrap_2">
-                    <div v-for="(e,i) in TrappedMaterialShelfList.slice(20)" :key="i" class="lz" :class="{'mgt5': i === 2 || i === 6 || i === 10 || i === 14 || i === 18}">
-                      <img v-show="String(e.stand_status_color) === '0'" src="../../../images/workshop/hj.png" alt="">
-                      <img v-show="String(e.stand_status_color) === '1'" src="../../../images/workshop/lz_hj_green.png" alt="">
-                      <img v-show="String(e.stand_status_color) === '2'" src="../../../images/workshop/lz_hj_red.png" alt="">
-                      <img v-show="String(e.stand_status_color) === '3'" src="../../../images/workshop/lz_hj_yellow.png" alt="">
+                  <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="">
+                      <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">
+                          <div class="popup_block">
+                            <div class="pop_header">
+                              <div class="pop_name">{{pkObj.point_name}}</div>
+                            </div>
+                            <div class="pop_content">
+                              <div class="pop_item">
+                                <div class="pop_label">状态</div>
+                                <div class="pop_val">{{ pkObj.point_status_name }}</div>
+                              </div>
+                              <div class="pop_item">
+                                <div class="pop_label">载具</div>
+                                <div class="pop_val">{{ pkObj.vehicle_code }}</div>
+                              </div>
+                              <div class="pop_item">
+                                <div class="pop_label">bom号</div>
+                                <div class="pop_val">{{ pkObj.bom }}</div>
+                              </div>
+                              <div class="pop_item">
+                                <div class="pop_label">碾次</div>
+                                <div class="pop_val">{{ pkObj.mix_num }}</div>
+                              </div>
+                              <div class="pop_item">
+                                <div class="pop_label">重量</div>
+                                <div class="pop_val pop_val_s">{{ pkObj.weight }}</div>
+                                <div class="pop_unit">kg</div>
+                              </div>
+                              <div class="pop_item">
+                                <div class="pop_label">入库时间</div>
+                                <div class="pop_val">{{ pkObj.instorage_time }}</div>
+                              </div>
+                              <div class="pop_item">
+                                <div class="pop_label">静置</div>
+                                <div class="pop_val">{{ pkObj.standing_time }}</div>
+                                <div class="pop_unit">h</div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <div class="iconfont icon-guanbi close_btn" @click.stop="closeModal1"></div>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -659,6 +761,7 @@
 
 <script>
 import { workshopCondition, moldingMaterialCondition } from '@js/getData2'
+import { trappedMaterialCondition } from '@js/getData0'
 export default {
   data () {
     return {
@@ -678,17 +781,20 @@ export default {
       PressPopoverList: [], // 压机弹窗数据
       ManipulatorList: [], // 机械手弹窗数据
       TrayStationPopoverList: [], // 码盘工位弹窗数据
+      TrappedShelf40List: [], // 困料货架弹窗
       showModal: false,
       machine: '',
       top: '',
       left: '',
       foldlineStyle: '',
-      pkObj: {}
+      pkObj: {},
+      pkId: ''
     }
   },
   mounted () {
     this._workshopCondition()
     this._moldingMaterialCondition()
+    this._trappedMaterialCondition()
     // this.refresh()
   },
   beforeDestroy () {
@@ -699,6 +805,7 @@ export default {
       this.timer = setInterval(() => {
         this._workshopCondition()
         this._moldingMaterialCondition()
+        this._trappedMaterialCondition()
       }, this.interTime)
     },
     async _workshopCondition () {
@@ -722,6 +829,14 @@ export default {
         this.TrayStationPopoverList = [...res.result.TrayStationPopoverList]
       }
     },
+    // 困料货架弹窗
+    async _trappedMaterialCondition () {
+      let res = await trappedMaterialCondition()
+      if (res.code === 200) {
+        this.TrappedShelf40List = [...res.result.TrappedShelf40List]
+        console.log(this.TrappedShelf40List)
+      }
+    },
     expandTooltip () {
       this.expand = !this.expand
     },
@@ -750,6 +865,7 @@ export default {
       this.showModal = false
       this.machine = ''
       this.pkObj = {}
+      this.pkId = ''
     },
     yjInfo (m, type) {
       this.machine = m
@@ -979,6 +1095,14 @@ export default {
         }
       }
       this.showModal = true
+    },
+    klhjInfo (e) {
+      this.pkId = this.pkId === e.point_code ? '' : e.point_code
+      this.pkObj = this.pkId === e.point_code ? e : {}
+    },
+    closeModal1 () {
+      this.pkId = ''
+      this.pkObj = {}
     }
   }
 }
@@ -1066,11 +1190,7 @@ export default {
   transform: rotate(90deg);
   .lz
     position relative
-    width 100%
-    height 4.4%
-    img
-      position absolute
-      _wh(100%, 100%)
+    _wh(100%,4.96%)
   .mgt5
     margin-top 45%
 .kl_wrap_2
@@ -1469,12 +1589,14 @@ export default {
   right: 8.8%;
   transform rotate(90deg);
   .lz_1
-    width 100%
-    img
-      position relative
+    _wh(100%, 19.011%)
   .lz_2
-    top auto
-    bottom 0
+    &:nth-child(2)
+      top 43%
+    &:nth-child(3)
+      top 62%
+    &:nth-child(4)
+      top 81%
 .yjlz_wrap_2
   right 24.5%
 .yjlz_wrap_3
@@ -1576,4 +1698,13 @@ export default {
         transform: rotateZ(15deg)
     }
 }
+.popup_block_wraper_1
+  position absolute
+  top: -1029%;
+  left: -828%
+  z-index 10
+  transform rotate(-90deg)
+  .foldline_left
+    transform rotate(0deg)
+    top 34%
 </style>