diff --git a/dist.zip b/dist.zip
index 73ac3fe..2a8ecc4 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index 4b1ca37..22d13b7 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -1109,7 +1109,7 @@ export const workshopCondition = () => {
       ],
       'TrappedMaterialShelfList': [
         {
-          'stand_status_color': '',
+          'stand_status_color': '0',
           'stand_status': '',
           'point_name': '困料货位1',
           'point_code': 'KLHW01',
@@ -1118,7 +1118,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位3',
           'point_code': 'KLHW03',
@@ -1136,7 +1136,7 @@ export const workshopCondition = () => {
           'stand_status_name': '困料完成'
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位7',
           'point_code': 'KLHW07',
@@ -1145,7 +1145,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位9',
           'point_code': 'KLHW09',
@@ -1154,7 +1154,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位11',
           'point_code': 'KLHW11',
@@ -1163,7 +1163,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位13',
           'point_code': 'KLHW13',
@@ -1172,7 +1172,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位15',
           'point_code': 'KLHW15',
@@ -1181,7 +1181,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位17',
           'point_code': 'KLHW17',
@@ -1190,7 +1190,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位19',
           'point_code': 'KLHW19',
@@ -1199,7 +1199,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位21',
           'point_code': 'KLHW21',
@@ -1208,7 +1208,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位23',
           'point_code': 'KLHW23',
@@ -1217,7 +1217,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位25',
           'point_code': 'KLHW25',
@@ -1226,7 +1226,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位27',
           'point_code': 'KLHW27',
@@ -1235,7 +1235,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位29',
           'point_code': 'KLHW29',
@@ -1244,7 +1244,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位31',
           'point_code': 'KLHW31',
@@ -1253,7 +1253,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位33',
           'point_code': 'KLHW33',
@@ -1262,7 +1262,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位35',
           'point_code': 'KLHW35',
@@ -1271,7 +1271,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位37',
           'point_code': 'KLHW37',
@@ -1280,7 +1280,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位39',
           'point_code': 'KLHW39',
@@ -1289,7 +1289,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位2',
           'point_code': 'KLHW02',
@@ -1298,7 +1298,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位4',
           'point_code': 'KLHW04',
@@ -1307,7 +1307,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位6',
           'point_code': 'KLHW06',
@@ -1316,7 +1316,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位8',
           'point_code': 'KLHW08',
@@ -1325,7 +1325,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位10',
           'point_code': 'KLHW10',
@@ -1334,7 +1334,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位12',
           'point_code': 'KLHW12',
@@ -1343,7 +1343,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位14',
           'point_code': 'KLHW14',
@@ -1352,7 +1352,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位16',
           'point_code': 'KLHW16',
@@ -1361,7 +1361,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位18',
           'point_code': 'KLHW18',
@@ -1370,7 +1370,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位20',
           'point_code': 'KLHW20',
@@ -1379,7 +1379,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位22',
           'point_code': 'KLHW22',
@@ -1388,7 +1388,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位24',
           'point_code': 'KLHW24',
@@ -1397,7 +1397,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位26',
           'point_code': 'KLHW26',
@@ -1406,7 +1406,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位28',
           'point_code': 'KLHW28',
@@ -1415,7 +1415,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位30',
           'point_code': 'KLHW30',
@@ -1424,7 +1424,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位32',
           'point_code': 'KLHW32',
@@ -1433,7 +1433,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位34',
           'point_code': 'KLHW34',
@@ -1442,7 +1442,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位36',
           'point_code': 'KLHW36',
@@ -1451,7 +1451,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位38',
           'point_code': 'KLHW38',
@@ -1460,7 +1460,7 @@ export const workshopCondition = () => {
           'stand_status_name': ''
         },
         {
-          'stand_status_color': '',
+          'stand_status_color': '1',
           'stand_status': '',
           'point_name': '困料货位40',
           'point_code': 'KLHW40',
@@ -1513,7 +1513,7 @@ export const workshopCondition = () => {
         {
           'point_name': '混料机9下料位',
           'point_code': 'HLJ09XL01',
-          'point_status': '0'
+          'point_status': '1'
         },
         {
           'point_name': '混料机10下料位',
diff --git a/src/images/workshop/cdz.png b/src/images/workshop/cdz.png
new file mode 100644
index 0000000..cdbd40f
Binary files /dev/null and b/src/images/workshop/cdz.png differ
diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue
index f528366..56ee3bc 100644
--- a/src/pages/modules/homepage/one.vue
+++ b/src/pages/modules/homepage/one.vue
@@ -19,10 +19,10 @@
                             </div>
                             <div class="bg_line"></div>
                           </div>
-                          <img v-show="e.device_status === 0" src="../../../images/workshop/hlj_s_gray.png" alt="">
-                          <img v-show="e.device_status === 1" src="../../../images/workshop/hlj_s_yellow.png" alt="">
-                          <img v-show="e.device_status === 2" src="../../../images/workshop/hlj_s_green.png" alt="">
-                          <img v-show="e.device_status === 3" src="../../../images/workshop/hlj_s_red.png" alt="">
+                          <img v-show="String(e.device_status) === '0'" src="../../../images/workshop/hlj_s_gray.png" alt="">
+                          <img v-show="String(e.device_status) === '1'" src="../../../images/workshop/hlj_s_yellow.png" alt="">
+                          <img v-show="String(e.device_status) === '2'" src="../../../images/workshop/hlj_s_green.png" alt="">
+                          <img v-show="String(e.device_status) === '3'" src="../../../images/workshop/hlj_s_red.png" alt="">
                         </div>
                       </div>
                       <div v-if="MixMachineList.length > 0" class="machine_wrap hlj_wrap">
@@ -35,36 +35,36 @@
                             </div>
                             <div class="bg_line"></div>
                           </div>
-                          <img v-show="e.device_status === 0" src="../../../images/workshop/hlj_gray.png" alt="">
-                          <img v-show="e.device_status === 1" src="../../../images/workshop/hlj_yellow.png" alt="">
-                          <img v-show="e.device_status === 2" src="../../../images/workshop/hlj_green.png" alt="">
-                          <img v-show="e.device_status === 3" src="../../../images/workshop/hlj_red.png" alt="">
+                          <img v-show="String(e.device_status) === '0'" src="../../../images/workshop/hlj_gray.png" alt="">
+                          <img v-show="String(e.device_status) === '1'" src="../../../images/workshop/hlj_yellow.png" alt="">
+                          <img v-show="String(e.device_status) === '2'" src="../../../images/workshop/hlj_green.png" alt="">
+                          <img v-show="String(e.device_status) === '3'" src="../../../images/workshop/hlj_red.png" alt="">
                         </div>
                       </div>
                       <div v-if="MixBlankingList.length > 0" class="machine_wrap lz_wrap_1">
                         <div v-for="(e,i) in MixBlankingList.slice(0, 4)" :key="i" class="sh_machine lz">
-                          <img :class="e.point_status === '0' ? 'hidden': ''" src="../../../images/workshop/lz.png" alt="">
+                          <img :class="String(e.point_status) === '0' ? 'hidden': ''" src="../../../images/workshop/lz.png" alt="">
                         </div>
                       </div>
                       <div v-if="MixBlankingList.length > 0" class="machine_wrap lz_wrap_2">
                         <div v-for="(e,i) in MixBlankingList.slice(4)" :key="i" class="sh_machine lz">
-                          <img :class="e.point_status === '0' ? 'hidden': ''" src="../../../images/workshop/lz.png" alt="">
+                          <img :class="String(e.point_status) === '0' ? 'hidden': ''" src="../../../images/workshop/lz.png" alt="">
                         </div>
                       </div>
                       <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 :class="String(TrappedShelfList[0].point_status) === '0' ? 'hidden': ''" src="../../../images/workshop/lz.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': ''">
+                          <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>
                       </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 :class="String(TrappedShelfList[4].point_status) === '0' ? 'hidden': ''" src="../../../images/workshop/lz.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': ''">
+                          <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>
                       </div>
                       <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_3">
@@ -104,23 +104,23 @@
                             <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine yyj">
-                            <img v-show="PressMachineList[0].device_status === 0" src="../../../images/workshop/yj_2500_gray.png" alt="">
-                            <img v-show="PressMachineList[0].device_status === 1" src="../../../images/workshop/yj_2500_yellow.png" alt="">
-                            <img v-show="PressMachineList[0].device_status === 2" src="../../../images/workshop/yj_2500_green.png" alt="">
-                            <img v-show="PressMachineList[0].device_status === 3" src="../../../images/workshop/yj_2500_red.png" alt="">
+                            <img v-show="String(PressMachineList[0].device_status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
+                            <img v-show="String(PressMachineList[0].device_status) === '1'" src="../../../images/workshop/yj_2500_yellow.png" alt="">
+                            <img v-show="String(PressMachineList[0].device_status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
+                            <img v-show="String(PressMachineList[0].device_status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
                           </div>
                           <div class="sh_machine wzm"></div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
-                            <img v-show="StackingPositionList[0].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
-                            <img v-show="StackingPositionList[0].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
-                            <img v-show="StackingPositionList[0].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
-                            <img v-show="StackingPositionList[0].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                            <img v-show="String(StackingPositionList[0].color_status) === '0'" src="../../../images/workshop/ktp_gray.png" alt="">
+                            <img v-show="String(StackingPositionList[0].color_status) === '1'" src="../../../images/workshop/ktp_green.png" alt="">
+                            <img v-show="String(StackingPositionList[0].color_status) === '2'" src="../../../images/workshop/ktp_red.png" alt="">
+                            <img v-show="String(StackingPositionList[0].color_status) === '3'" src="../../../images/workshop/ktp_yellow.png" alt="">
                           </div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_2">
-                            <img v-show="StackingPositionList[1].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
-                            <img v-show="StackingPositionList[1].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
-                            <img v-show="StackingPositionList[1].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
-                            <img v-show="StackingPositionList[1].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                            <img v-show="String(StackingPositionList[1].color_status) === '0'" src="../../../images/workshop/ktp_gray.png" alt="">
+                            <img v-show="String(StackingPositionList[1].color_status) === '1'" src="../../../images/workshop/ktp_green.png" alt="">
+                            <img v-show="String(StackingPositionList[1].color_status) === '2'" src="../../../images/workshop/ktp_red.png" alt="">
+                            <img v-show="String(StackingPositionList[1].color_status) === '3'" src="../../../images/workshop/ktp_yellow.png" alt="">
                           </div>
                           <div class="sh_machine robot">
                             <img src="../../../images/workshop/robot_2500_green.png" alt="">
@@ -147,10 +147,10 @@
                             <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine yyj">
-                            <img v-show="PressMachineList[1].device_status === 0" src="../../../images/workshop/yj_2500_gray.png" alt="">
-                            <img v-show="PressMachineList[1].device_status === 1" src="../../../images/workshop/yj_2500_yellow.png" alt="">
-                            <img v-show="PressMachineList[1].device_status === 2" src="../../../images/workshop/yj_2500_green.png" alt="">
-                            <img v-show="PressMachineList[1].device_status === 3" src="../../../images/workshop/yj_2500_red.png" alt="">
+                            <img v-show="String(PressMachineList[1].device_status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
+                            <img v-show="String(PressMachineList[1].device_status) === '1'" src="../../../images/workshop/yj_2500_yellow.png" alt="">
+                            <img v-show="String(PressMachineList[1].device_status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
+                            <img v-show="String(PressMachineList[1].device_status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
                           </div>
                           <div class="sh_machine wzm"></div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
@@ -195,16 +195,16 @@
                             <img src="../../../images/workshop/blj.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                            <img v-show="PressMachineList[2].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="PressMachineList[2].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="PressMachineList[2].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="PressMachineList[2].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <img v-show="String(PressMachineList[2].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                            <img v-show="String(PressMachineList[2].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                            <img v-show="String(PressMachineList[2].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                            <img v-show="String(PressMachineList[2].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                            <img v-show="PressMachineList[3].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="PressMachineList[3].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="PressMachineList[3].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="PressMachineList[3].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <img v-show="String(PressMachineList[3].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                            <img v-show="String(PressMachineList[3].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                            <img v-show="String(PressMachineList[3].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                            <img v-show="String(PressMachineList[3].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                           </div>
                           <div class="sh_machine weilan">
                             <img src="../../../images/workshop/weilan_3.png" alt="">
@@ -267,16 +267,16 @@
                             <img src="../../../images/workshop/blj.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                            <img v-show="PressMachineList[4].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="PressMachineList[4].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="PressMachineList[4].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="PressMachineList[4].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <img v-show="String(PressMachineList[4].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                            <img v-show="String(PressMachineList[4].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                            <img v-show="String(PressMachineList[4].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                            <img v-show="String(PressMachineList[4].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                            <img v-show="PressMachineList[5].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="PressMachineList[5].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="PressMachineList[5].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="PressMachineList[5].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <img v-show="String(PressMachineList[5].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                            <img v-show="String(PressMachineList[5].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                            <img v-show="String(PressMachineList[5].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                            <img v-show="String(PressMachineList[5].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                           </div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
                             <img v-show="StackingPositionList[8].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -306,9 +306,9 @@
                         <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_7">
                           <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
                             <div class="yj_info">
-                              <p>{{PressMachineList[6].open_time}}</p>
-                              <p>{{PressMachineList[6].material_code}}</p>
-                              <p>{{PressMachineList[6].now_capacity}}</p>
+                              <p><span>时间：</span>{{PressMachineList[6].open_time}}</p>
+                              <p><span>物料：</span>{{PressMachineList[6].material_code}}</p>
+                              <p><span>产能：</span>{{PressMachineList[6].now_capacity}}</p>
                             </div>
                             <div class="bg_line"></div>
                           </div>
@@ -316,10 +316,10 @@
                             <img src="../../../images/workshop/blj.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                            <img v-show="PressMachineList[6].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="PressMachineList[6].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="PressMachineList[6].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="PressMachineList[6].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <img v-show="String(PressMachineList[6].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                            <img v-show="String(PressMachineList[6].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                            <img v-show="String(PressMachineList[6].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                            <img v-show="String(PressMachineList[6].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                           </div>
                           <div class="sh_machine weilan">
                             <img src="../../../images/workshop/weilan_6.png" alt="">
@@ -364,16 +364,16 @@
                             <img src="../../../images/workshop/blj.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                            <img v-show="PressMachineList[7].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="PressMachineList[7].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="PressMachineList[7].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="PressMachineList[7].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <img v-show="String(PressMachineList[7].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                            <img v-show="String(PressMachineList[7].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                            <img v-show="String(PressMachineList[7].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                            <img v-show="String(PressMachineList[7].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                            <img v-show="PressMachineList[8].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="PressMachineList[8].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="PressMachineList[8].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="PressMachineList[8].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <img v-show="String(PressMachineList[8].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                            <img v-show="String(PressMachineList[8].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                            <img v-show="String(PressMachineList[8].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                            <img v-show="String(PressMachineList[8].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                           </div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
                             <img v-show="StackingPositionList[14].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -446,10 +446,10 @@
                             <img src="../../../images/workshop/yj_630_gray.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                            <img v-show="PressMachineList[9].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="PressMachineList[9].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="PressMachineList[9].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="PressMachineList[9].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <img v-show="String(PressMachineList[9].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                            <img v-show="String(PressMachineList[9].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                            <img v-show="String(PressMachineList[9].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                            <img v-show="String(PressMachineList[9].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                           </div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_3">
                             <img v-show="StackingPositionList[19].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -465,14 +465,20 @@
                           </div>
                         </div>
                       </div>
-                      <div class="machine_wrap kl_wrap_1">
-                        <div v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]" :key="i" class="lz" :class="{'mgt5': i === 2 || i === 6 || i === 10 || i === 14 || i === 18}">
-                          <img src="../../../images/workshop/hj.png" alt="">
+                      <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>
                       </div>
-                      <div class="machine_wrap kl_wrap_1 kl_wrap_2">
-                        <div v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]" :key="i" class="lz" :class="{'mgt5': i === 2 || i === 6 || i === 10 || i === 14 || i === 18}">
-                          <img src="../../../images/workshop/hj.png" alt="">
+                      <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>
                       </div>
                       <div class="machine_wrap mtp_wrap_1">
@@ -537,7 +543,8 @@ export default {
       MixMachineList: [], // 混料机数据
       MixBlankingList: [], // 混料机下料位
       TrappedShelfList: [], // 困料位料盅
-      StackingPositionList: [] // 压制码垛数据信息
+      StackingPositionList: [], // 压制码垛数据信息
+      TrappedMaterialShelfList: [] // 困料货架信息
     }
   },
   mounted () {
@@ -564,19 +571,11 @@ export default {
         this.MixBlankingList = [...res.result.MixBlankingList]
         this.TrappedShelfList = [...res.result.TrappedShelfList]
         this.StackingPositionList = [...res.result.StackingPositionList]
+        this.TrappedMaterialShelfList = [...res.result.TrappedMaterialShelfList]
         this.setEchart1()
         this.setEchart2()
         this.setEchart3()
       }
-      // this.dayRows = [...res.result.runningStatus]
-      // this.weekRows = [...res.result.faultyStatus]
-      // this.deviceRows = [...res.result.faultyInfo]
-      // if (this.dayRows.length > 0) {
-      //   this.setEchart1()
-      // }
-      // if (this.weekRows.length > 0) {
-      //   this.setEchart2()
-      // }
     },
     setEchart1 () {
       // let barName = ['碾机1', '碾机2', '碾机3', '碾机4', '碾机5', '碾机6', '碾机7', '碾机8', '碾机9', '碾机10', '碾机11', '碾机12', '碾机13', '碾机14', '碾机15', '碾机16']
@@ -1080,7 +1079,7 @@ export default {
 .hlj_s_wrap
   width 4%
   height 85.5%
-  top 5%
+  top 3%
   left 17%
   .hlj_s
     height 7%
@@ -1110,15 +1109,15 @@ export default {
         _wh(4%, 1px)
         background-color #03fcfd
     &:nth-child(2)
-      top 9%
+      top 8.5%
     &:nth-child(3)
-      top 18%
+      top 17.5%
     &:nth-child(4)
-      top 27%
+      top 26.5%
 .hlj_wrap
   width 4%
   height 66.5%
-  top 39%
+  top 35%
   left 17%
   .hlj
     height 7%
@@ -1158,21 +1157,21 @@ export default {
     &:nth-child(6)
       top 42%
     &:nth-child(7)
-      top 51%
+      top 53%
     &:nth-child(8)
-      top 59%
+      top 61%
     &:nth-child(9)
-      top 68%
+      top 70%
     &:nth-child(10)
-      top 76%
+      top 78%
     &:nth-child(11)
-      top 85%
+      top 87%
     &:nth-child(12)
-      top 93%
+      top 95%
 .lz_wrap_1
   width 2%
   height 84.6%
-  top 6%
+  top 3.5%
   left 22%
   .lz
     &:nth-child(2)
@@ -1184,7 +1183,7 @@ export default {
 .lz_wrap_2
   width 2%
   height 66.3%
-  top 40%
+  top 36%
   left 22%
   .lz
     &:nth-child(2)
@@ -1198,17 +1197,17 @@ export default {
     &:nth-child(6)
       top 42.5%
     &:nth-child(7)
-      top 51%
+      top 53%
     &:nth-child(8)
-      top 59.5%
+      top 61.5%
     &:nth-child(9)
-      top 68%
+      top 70%
     &:nth-child(10)
-      top 76.5%
+      top 78.5%
     &:nth-child(11)
-      top 85%
+      top 87%
     &:nth-child(12)
-      top 92.5%
+      top 94.5%
 .yjlz_wrap_1
   width 2%
   height 16.442%
diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue
index c151342..c6d96d5 100644
--- a/src/pages/modules/homepage/two.vue
+++ b/src/pages/modules/homepage/two.vue
@@ -48,6 +48,16 @@
                           <img src="../../../images/workshop/cpj.png" alt="">
                         </div>
                       </div>
+                      <div class="machine_wrap cdz_wrap_1">
+                        <div class="cdz">
+                          <img src="../../../images/workshop/cdz.png" alt="">
+                        </div>
+                      </div>
+                      <div class="machine_wrap cdz_wrap_1 cdz_wrap_2">
+                        <div class="cdz">
+                          <img src="../../../images/workshop/cdz.png" alt="">
+                        </div>
+                      </div>
                       <div class="machine_wrap yao_wrap">
                         <div class="yaosb">
                           <img src="../../../images/workshop/yao.png" alt="">
@@ -63,9 +73,16 @@
                             <img src="../../../images/workshop/mtp.png" alt="">
                           </div>
                         </div>
-                        <div class="machine_wrap mtp_wrap_3 mtp_wrap_4">
-                          <div v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28]" :key="i" class="mtp">
-                            <img src="../../../images/workshop/mtp.png" alt="">
+                        <div v-if="SemiFinishedProductShelfList.length > 0" class="machine_wrap mtp_wrap_3 mtp_wrap_4">
+                          <div v-for="(e,i) in SemiFinishedProductShelfList.slice(0, 26)" :key="i" class="mtp">
+                            <img v-show="String(e.point_status) === '0'" src="../../../images/workshop/ktp_gray.png" alt="">
+                            <img v-show="String(e.point_status) === '1'" src="../../../images/workshop/mtp.png" alt="">
+                          </div>
+                        </div>
+                        <div class="machine_wrap mtp_wrap_3 mtp_wrap_4 mtp_wrap_5">
+                          <div v-for="(e,i) in SemiFinishedProductShelfList.slice(26)" :key="i" class="mtp">
+                            <img v-show="String(e.point_status) === '0'" src="../../../images/workshop/ktp_gray.png" alt="">
+                            <img v-show="String(e.point_status) === '1'" src="../../../images/workshop/mtp.png" alt="">
                           </div>
                         </div>
                       </div>
@@ -307,7 +324,10 @@
         <div class="style_block" style="left: calc(100% / 3);bottom: 0"></div>
         <div class="style_block" style="background: green;left: calc(200% / 3);top:0;"></div>
         <div class="style_block" style="left: calc(200% / 3);top:calc(100% / 3);"></div>
-        <div class="style_block" style="background: blue;left: calc(200% / 3);bottom: 0"></div> -->
+        <div class="style_block" style="background: blue;left: calc(200% / 3);bottom: 0"></div>
+        <div class="style_block" style="background: green;left: 0;top:0;"></div>
+        <div class="style_block" style="left: 0;top:calc(100% / 3);"></div>
+        <div class="style_block" style="background: green;left: 0;bottom: 0"></div> -->
     </div>
 </template>
 
@@ -324,7 +344,8 @@ export default {
       DeviceConditionList: [],
       LastMonthFailureList: [],
       LastTenFailureList: [],
-      SortAndPalletizingList: []
+      SortAndPalletizingList: [], // 分拣拆码垛对接位
+      SemiFinishedProductShelfList: [] // 半成品货架数据
     }
   },
   computed: {
@@ -361,6 +382,7 @@ export default {
         this.LastMonthFailureList = [...res.result.LastMonthFailureList]
         this.LastTenFailureList = [...res.result.LastTenFailureList]
         this.SortAndPalletizingList = [...res.result.SortAndPalletizingList]
+        this.SemiFinishedProductShelfList = [...res.result.SemiFinishedProductShelfList]
         this.setEchart1()
         this.setEchart2()
       }
@@ -770,11 +792,11 @@ export default {
     img
       _wh(100%, auto)
 .mtp_wrap_2
-  top 35%
+  top 39%
   left 1%
 .gtssj_wrap_1
   width 2.5%
-  top 35%
+  top 39%
   left 7.6%
   .gtssj
     width 100%
@@ -782,15 +804,25 @@ export default {
       _wh(100%, auto)
 .cpj_wrap_1
   width: 4%;
-  top: 38%;
+  top: 42%;
   left: 6.3%;
   .cpj
     width 100%
     img
       _wh(100%, auto)
+.cdz_wrap_1
+  width: 3%;
+  top: 21%;
+  left: 8%;
+  .cdz
+    width 100%
+    img
+      _wh(100%, auto)
+.cdz_wrap_2
+  left: 12%;
 .yao_wrap
   width 69%
-  top 6.5%
+  top 7%
   left auto
   right 7%
   background-color #676767
@@ -814,7 +846,7 @@ export default {
 .mtp_wrap_3
   width: 3.5%;
   height: 10%;
-  top: 84%;
+  top: 85%;
   left: -0.8%;
   transform rotate(-90deg)
   z-index 4
@@ -824,12 +856,15 @@ export default {
     img
       _wh(100%, auto)
 .mtp_wrap_4
-  left 13%
+  left 18.3%
+  top: 87%
+.mtp_wrap_5
+  top 105%
 .cmd_block
   width 40%
   height 50%
   position absolute
-  top: 35%;
+  top: 39%;
   left: 28%;
 .ktp_wrap_1
   width: 6.3%;
diff --git a/src/pages/modules/takeshape/one.vue b/src/pages/modules/takeshape/one.vue
index 8a09d3c..1ec1d51 100644
--- a/src/pages/modules/takeshape/one.vue
+++ b/src/pages/modules/takeshape/one.vue
@@ -64,10 +64,12 @@
                   </div>
                   <div class="yaji_wrap">
                     <div class="machine_wrap yj_wrap_1">
-                      <div class="sh_machine yj_info_wrap">
-                        <p>2023-6-10</p>
-                        <p>成品1</p>
-                        <p>367</p>
+                      <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
+                        <div class="yj_info">
+                          <p><span>时间：</span>{{PressMachineList[0].open_time}}</p>
+                          <p><span>物料：</span>{{PressMachineList[0].material_code}}</p>
+                          <p><span>产能：</span>{{PressMachineList[0].now_capacity}}</p>
+                        </div>
                         <div class="bg_line"></div>
                       </div>
                       <div class="sh_machine weilan">
@@ -77,23 +79,23 @@
                         <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine yyj">
-                        <img v-show="PressMachineList[0].device_status === 0" src="../../../images/workshop/yj_2500_gray.png" alt="">
-                        <img v-show="PressMachineList[0].device_status === 1" src="../../../images/workshop/yj_2500_yellow.png" alt="">
-                        <img v-show="PressMachineList[0].device_status === 2" src="../../../images/workshop/yj_2500_green.png" alt="">
-                        <img v-show="PressMachineList[0].device_status === 3" src="../../../images/workshop/yj_2500_red.png" alt="">
+                        <img v-show="String(PressMachineList[0].device_status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
+                        <img v-show="String(PressMachineList[0].device_status) === '1'" src="../../../images/workshop/yj_2500_yellow.png" alt="">
+                        <img v-show="String(PressMachineList[0].device_status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
+                        <img v-show="String(PressMachineList[0].device_status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
                       </div>
                       <div class="sh_machine wzm"></div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
-                        <img v-show="StackingPositionList[0].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
-                        <img v-show="StackingPositionList[0].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
-                        <img v-show="StackingPositionList[0].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
-                        <img v-show="StackingPositionList[0].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                        <img v-show="String(StackingPositionList[0].color_status) === '0'" src="../../../images/workshop/ktp_gray.png" alt="">
+                        <img v-show="String(StackingPositionList[0].color_status) === '1'" src="../../../images/workshop/ktp_green.png" alt="">
+                        <img v-show="String(StackingPositionList[0].color_status) === '2'" src="../../../images/workshop/ktp_red.png" alt="">
+                        <img v-show="String(StackingPositionList[0].color_status) === '3'" src="../../../images/workshop/ktp_yellow.png" alt="">
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_2">
-                        <img v-show="StackingPositionList[1].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
-                        <img v-show="StackingPositionList[1].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
-                        <img v-show="StackingPositionList[1].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
-                        <img v-show="StackingPositionList[1].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                        <img v-show="String(StackingPositionList[1].color_status) === '0'" src="../../../images/workshop/ktp_gray.png" alt="">
+                        <img v-show="String(StackingPositionList[1].color_status) === '1'" src="../../../images/workshop/ktp_green.png" alt="">
+                        <img v-show="String(StackingPositionList[1].color_status) === '2'" src="../../../images/workshop/ktp_red.png" alt="">
+                        <img v-show="String(StackingPositionList[1].color_status) === '3'" src="../../../images/workshop/ktp_yellow.png" alt="">
                       </div>
                       <div class="sh_machine robot">
                         <img src="../../../images/workshop/robot_2500_green.png" alt="">
@@ -105,10 +107,12 @@
 
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_2">
-                      <div class="sh_machine yj_info_wrap">
-                        <p>2023-6-10</p>
-                        <p>成品1</p>
-                        <p>367</p>
+                      <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
+                        <div class="yj_info">
+                          <p><span>时间：</span>{{PressMachineList[1].open_time}}</p>
+                          <p><span>物料：</span>{{PressMachineList[1].material_code}}</p>
+                          <p><span>产能：</span>{{PressMachineList[1].now_capacity}}</p>
+                        </div>
                         <div class="bg_line"></div>
                       </div>
                       <div class="sh_machine weilan">
@@ -118,10 +122,10 @@
                         <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine yyj">
-                        <img v-show="PressMachineList[1].device_status === 0" src="../../../images/workshop/yj_2500_gray.png" alt="">
-                        <img v-show="PressMachineList[1].device_status === 1" src="../../../images/workshop/yj_2500_yellow.png" alt="">
-                        <img v-show="PressMachineList[1].device_status === 2" src="../../../images/workshop/yj_2500_green.png" alt="">
-                        <img v-show="PressMachineList[1].device_status === 3" src="../../../images/workshop/yj_2500_red.png" alt="">
+                        <img v-show="String(PressMachineList[1].device_status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
+                        <img v-show="String(PressMachineList[1].device_status) === '1'" src="../../../images/workshop/yj_2500_yellow.png" alt="">
+                        <img v-show="String(PressMachineList[1].device_status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
+                        <img v-show="String(PressMachineList[1].device_status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
                       </div>
                       <div class="sh_machine wzm"></div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
@@ -143,16 +147,20 @@
                       </div>
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_3">
-                      <div class="sh_machine yj_info_wrap">
-                        <p>2023-6-10</p>
-                        <p>成品1</p>
-                        <p>367</p>
+                      <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
+                        <div class="yj_info">
+                          <p><span>时间：</span>{{PressMachineList[2].open_time}}</p>
+                          <p><span>物料：</span>{{PressMachineList[2].material_code}}</p>
+                          <p><span>产能：</span>{{PressMachineList[2].now_capacity}}</p>
+                        </div>
                         <div class="bg_line"></div>
                       </div>
-                      <div class="sh_machine yj_info_wrap yj_info_wrap_1">
-                        <p>2023-6-10</p>
-                        <p>成品1</p>
-                        <p>367</p>
+                      <div v-if="PressMachineList.length > 0" class="yj_info_wrap yj_info_wrap_1">
+                        <div class="yj_info">
+                          <p><span>时间：</span>{{PressMachineList[3].open_time}}</p>
+                          <p><span>物料：</span>{{PressMachineList[3].material_code}}</p>
+                          <p><span>产能：</span>{{PressMachineList[3].now_capacity}}</p>
+                        </div>
                         <div class="bg_line"></div>
                       </div>
                       <div class="sh_machine blj_1">
@@ -162,16 +170,16 @@
                         <img src="../../../images/workshop/blj.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                        <img v-show="PressMachineList[2].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="PressMachineList[2].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="PressMachineList[2].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="PressMachineList[2].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <img v-show="String(PressMachineList[2].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                        <img v-show="String(PressMachineList[2].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                        <img v-show="String(PressMachineList[2].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                        <img v-show="String(PressMachineList[2].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                        <img v-show="PressMachineList[3].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="PressMachineList[3].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="PressMachineList[3].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="PressMachineList[3].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <img v-show="String(PressMachineList[3].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                        <img v-show="String(PressMachineList[3].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                        <img v-show="String(PressMachineList[3].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                        <img v-show="String(PressMachineList[3].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                       </div>
                       <div class="sh_machine weilan">
                         <img src="../../../images/workshop/weilan_3.png" alt="">
@@ -214,32 +222,36 @@
                       </div>
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5">
-                      <div class="sh_machine yj_info_wrap">
-                        <p>2023-6-10</p>
-                        <p>成品1</p>
-                        <p>367</p>
+                      <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
+                        <div class="yj_info">
+                          <p><span>时间：</span>{{PressMachineList[4].open_time}}</p>
+                          <p><span>物料：</span>{{PressMachineList[4].material_code}}</p>
+                          <p><span>产能：</span>{{PressMachineList[4].now_capacity}}</p>
+                        </div>
                         <div class="bg_line"></div>
                       </div>
-                      <div class="sh_machine yj_info_wrap yj_info_wrap_1">
-                        <p>2023-6-10</p>
-                        <p>成品1</p>
-                        <p>367</p>
+                      <div v-if="PressMachineList.length > 0" class="yj_info_wrap yj_info_wrap_1">
+                        <div class="yj_info">
+                          <p><span>时间：</span>{{PressMachineList[5].open_time}}</p>
+                          <p><span>物料：</span>{{PressMachineList[5].material_code}}</p>
+                          <p><span>产能：</span>{{PressMachineList[5].now_capacity}}</p>
+                        </div>
                         <div class="bg_line"></div>
                       </div>
                       <div class="sh_machine blj_1">
                         <img src="../../../images/workshop/blj.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                        <img v-show="PressMachineList[4].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="PressMachineList[4].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="PressMachineList[4].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="PressMachineList[4].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <img v-show="String(PressMachineList[4].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                        <img v-show="String(PressMachineList[4].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                        <img v-show="String(PressMachineList[4].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                        <img v-show="String(PressMachineList[4].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                        <img v-show="PressMachineList[5].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="PressMachineList[5].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="PressMachineList[5].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="PressMachineList[5].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <img v-show="String(PressMachineList[5].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                        <img v-show="String(PressMachineList[5].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                        <img v-show="String(PressMachineList[5].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                        <img v-show="String(PressMachineList[5].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
                         <img v-show="StackingPositionList[8].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -267,20 +279,22 @@
                       </div>
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_7">
-                      <div class="sh_machine yj_info_wrap">
-                        <p>2023-6-10</p>
-                        <p>成品1</p>
-                        <p>367</p>
+                      <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
+                        <div class="yj_info">
+                          <p><span>时间：</span>{{PressMachineList[6].open_time}}</p>
+                          <p><span>物料：</span>{{PressMachineList[6].material_code}}</p>
+                          <p><span>产能：</span>{{PressMachineList[6].now_capacity}}</p>
+                        </div>
                         <div class="bg_line"></div>
                       </div>
                       <div class="sh_machine blj_1">
                         <img src="../../../images/workshop/blj.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                        <img v-show="PressMachineList[6].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="PressMachineList[6].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="PressMachineList[6].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="PressMachineList[6].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <img v-show="String(PressMachineList[6].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                        <img v-show="String(PressMachineList[6].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                        <img v-show="String(PressMachineList[6].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                        <img v-show="String(PressMachineList[6].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                       </div>
                       <div class="sh_machine weilan">
                         <img src="../../../images/workshop/weilan_6.png" alt="">
@@ -305,32 +319,36 @@
                       </div>
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8">
-                      <div class="sh_machine yj_info_wrap">
-                        <p>2023-6-10</p>
-                        <p>成品1</p>
-                        <p>367</p>
+                      <div v-if="PressMachineList.length > 0" class="yj_info_wrap">
+                        <div class="yj_info">
+                          <p><span>时间：</span>{{PressMachineList[7].open_time}}</p>
+                          <p><span>物料：</span>{{PressMachineList[7].material_code}}</p>
+                          <p><span>产能：</span>{{PressMachineList[7].now_capacity}}</p>
+                        </div>
                         <div class="bg_line"></div>
                       </div>
-                      <div class="sh_machine yj_info_wrap yj_info_wrap_1">
-                        <p>2023-6-10</p>
-                        <p>成品1</p>
-                        <p>367</p>
+                      <div v-if="PressMachineList.length > 0" class="yj_info_wrap yj_info_wrap_1">
+                        <div class="yj_info">
+                          <p><span>时间：</span>{{PressMachineList[8].open_time}}</p>
+                          <p><span>物料：</span>{{PressMachineList[8].material_code}}</p>
+                          <p><span>产能：</span>{{PressMachineList[8].now_capacity}}</p>
+                        </div>
                         <div class="bg_line"></div>
                       </div>
                       <div class="sh_machine blj_1 blj_2">
                         <img src="../../../images/workshop/blj.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                        <img v-show="PressMachineList[7].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="PressMachineList[7].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="PressMachineList[7].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="PressMachineList[7].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <img v-show="String(PressMachineList[7].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                        <img v-show="String(PressMachineList[7].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                        <img v-show="String(PressMachineList[7].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                        <img v-show="String(PressMachineList[7].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                        <img v-show="PressMachineList[8].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="PressMachineList[8].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="PressMachineList[8].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="PressMachineList[8].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <img v-show="String(PressMachineList[8].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                        <img v-show="String(PressMachineList[8].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                        <img v-show="String(PressMachineList[8].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                        <img v-show="String(PressMachineList[8].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
                         <img v-show="StackingPositionList[14].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -391,20 +409,22 @@
                       </div>
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8 yj_wrap_10">
-                      <div class="sh_machine yj_info_wrap yj_info_wrap_1">
-                        <p>2023-6-10</p>
-                        <p>成品1</p>
-                        <p>367</p>
+                      <div v-if="PressMachineList.length > 0" class="yj_info_wrap yj_info_wrap_1">
                         <div class="bg_line"></div>
+                        <div class="yj_info">
+                          <p><span>时间：</span>{{PressMachineList[9].open_time}}</p>
+                          <p><span>物料：</span>{{PressMachineList[9].material_code}}</p>
+                          <p><span>产能：</span>{{PressMachineList[9].now_capacity}}</p>
+                        </div>
                       </div>
                       <div class="sh_machine cyj_1">
                         <img src="../../../images/workshop/yj_630_gray.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                        <img v-show="PressMachineList[9].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="PressMachineList[9].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="PressMachineList[9].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="PressMachineList[9].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <img v-show="String(PressMachineList[9].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                        <img v-show="String(PressMachineList[9].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                        <img v-show="String(PressMachineList[9].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                        <img v-show="String(PressMachineList[9].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_3">
                         <img v-show="StackingPositionList[19].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -420,20 +440,26 @@
                       </div>
                     </div>
                   </div>
-                  <div class="machine_wrap mtp_wrap_1">
-                    <div class="mtp" v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]" :key="i">
-                      <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                  <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>
                   </div>
-                  <div class="machine_wrap mtp_wrap_1 mtp_wrap_2">
-                    <div class="mtp" v-for="(e,i) in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]" :key="i">
-                      <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                  <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>
                   </div>
                 </div>
             </div>
         </div>
-        <div class="style_block" style="left: calc(100% / 3);top:0;"></div>
+        <!-- <div class="style_block" style="left: calc(100% / 3);top:0;"></div>
         <div class="style_block" style="background: green;left: calc(100% / 3);top:calc(100% / 3);"></div>
         <div class="style_block" style="left: calc(100% / 3);bottom: 0"></div>
         <div class="style_block" style="background: green;left: calc(200% / 3);top:0;"></div>
@@ -441,7 +467,7 @@
         <div class="style_block" style="background: blue;left: calc(200% / 3);bottom: 0"></div>
         <div class="style_block" style="background: green;left: 0;top:0;"></div>
         <div class="style_block" style="left: 0;top:calc(100% / 3);"></div>
-        <div class="style_block" style="background: green;left: 0;bottom: 0"></div>
+        <div class="style_block" style="background: green;left: 0;bottom: 0"></div> -->
     </div>
 </template>
 
@@ -459,7 +485,8 @@ export default {
       MixMachineList: [], // 混料机数据
       MixBlankingList: [], // 混料机下料位
       TrappedShelfList: [], // 困料位料盅
-      StackingPositionList: [] // 压制码垛数据信息
+      StackingPositionList: [], // 压制码垛数据信息
+      TrappedMaterialShelfList: [] // 困料货架信息
     }
   },
   mounted () {
@@ -483,6 +510,7 @@ export default {
         this.MixBlankingList = [...res.result.MixBlankingList]
         this.TrappedShelfList = [...res.result.TrappedShelfList]
         this.StackingPositionList = [...res.result.StackingPositionList]
+        this.TrappedMaterialShelfList = [...res.result.TrappedMaterialShelfList]
       }
     }
   }
@@ -560,19 +588,24 @@ export default {
     left 0
     z-index 4
     _wh(100%, auto)
-.mtp_wrap_1
-  width 1.5%
-  height 7.4%
-  right 27%
-  top 86%
-  transform rotate(90deg)
-  .mtp
+.kl_wrap_1
+  width 2%
+  height: 98%;
+  bottom: -33%;
+  left: auto;
+  right: 57.5%;
+  transform: rotate(90deg);
+  .lz
+    position relative
     width 100%
+    height 4.4%
     img
-      _wh(100%, auto)
-.mtp_wrap_2
-  right 27%
-  top 90%
+      position absolute
+      _wh(100%, 100%)
+  .mgt5
+    margin-top 45%
+.kl_wrap_2
+  bottom -40%
 .yaji_wrap
   position: absolute;
   left: 0;
@@ -604,22 +637,31 @@ export default {
   // left: 90.5%;
   left 87%
   .yj_info_wrap
-    width 60%
-    top: 0
-    left: -64%
-    padding: 5px
-    _bis('../../../images/workshop/txtbg.png')
-    transform rotate(-90deg)
-    p
-      _font(14px, 16px, #fff,,right)
+    position absolute
+    top 1%
+    left -112%
+    z-index 0
+    width 130%
+    _fj(row)
+    .yj_info
+      width 72%
+      height 61px
+      padding 5px
+      background-image linear-gradient(to right, #067272, transparent)
+      border 1px solid #00ffff
+      border-radius 5px
+      overflow hidden
+      transform rotate(270deg) translateY(100%)
+      p
+        _font(13px, 17px, #00ffff,,left)
+        border-bottom 0.5px solid #067272
+        span
+          color #fff
+        &:last-child
+          border none
     .bg_line
-      position absolute
-      _wh(65%, 2px)
+      _wh(28%, 1px)
       background-color #03fcfd
-      right: 18%;
-      bottom: -69%;
-      transform translate(-50%)
-      transform rotate(-90deg)
   .yyj
     width 50%
     img
@@ -682,13 +724,22 @@ export default {
 .yj_wrap_3
   left: 53%
   .yj_info_wrap
-    top -15%
+    top -10%
+    width 148%
+    .yj_info
+      width 63%
+      transform rotate(270deg) translateX(10%) translateY(100%)
     .bg_line
-      width: 100%;
-      left: 2%;
-      bottom: -103%;
+      width 37%
   .yj_info_wrap_1
-    top 77%
+    top 46%
+    left: -143%;
+    width 180%
+    .yj_info
+      width 51.8%
+      transform rotate(270deg) translateY(100%)
+    .bg_line
+      width 48.2%
   .blj_1
     width: 18%;
     top: 14%;
@@ -818,10 +869,10 @@ export default {
       right auto
 .yj_wrap_10
   top 55%
-  .yj_info_wrap_1
-    left 105%
-    .bg_line
-      top -105%
+  .yj_info_wrap
+    left 63%
+    .yj_info
+      transform: rotate(270deg) translateY(-100%)
   .cyj_1
     left auto
     right 0