首页图片

src/assets/js/getData2.js

@@ -461,7 +461,7 @@ export const workshopCondition = () => {
           'point_name': '压机1空盅货位',
           'point_status_name': '无货',
           'point_code': 'KLHW41',
-          'point_status': '0'
+          'point_status': '1'
         },
         {
           'point_name': '压机1困料货位1',
@@ -485,7 +485,7 @@ export const workshopCondition = () => {
           'point_name': '压机2空盅货位',
           'point_status_name': '无货',
           'point_code': 'KLHW45',
-          'point_status': '0'
+          'point_status': '1'
         },
         {
           'point_name': '压机2困料货位1',
@@ -497,40 +497,40 @@ export const workshopCondition = () => {
           'point_name': '压机2困料货位2',
           'point_status_name': '无货',
           'point_code': 'KLHW47',
-          'point_status': '0'
+          'point_status': '1'
         },
         {
           'point_name': '压机2困料货位3',
           'point_status_name': '无货',
           'point_code': 'KLHW48',
-          'point_status': '0'
+          'point_status': '1'
         }
       ],
       'MixBlankingList': [
         {
           'point_name': '混料机1下料位',
           'point_code': 'HLJ01XL01',
-          'point_status': '0'
+          'point_status': '1'
         },
         {
           'point_name': '混料机2下料位',
           'point_code': 'HLJ02XL01',
-          'point_status': '0'
+          'point_status': '1'
         },
         {
           'point_name': '混料机3下料位',
           'point_code': 'HLJ03XL01',
-          'point_status': '0'
+          'point_status': '1'
         },
         {
           'point_name': '混料机4下料位',
           'point_code': 'HLJ04XL01',
-          'point_status': '0'
+          'point_status': '1'
         },
         {
           'point_name': '混料机5下料位',
           'point_code': 'HLJ05XL01',
-          'point_status': '0'
+          'point_status': '1'
         },
         {
           'point_name': '混料机6下料位',
@@ -550,7 +550,7 @@ export const workshopCondition = () => {
         {
           'point_name': '混料机9下料位',
           'point_code': 'HLJ09XL01',
-          'point_status': '0'
+          'point_status': '1'
         },
         {
           'point_name': '混料机10下料位',

src/pages/modules/homepage/one.vue

@@ -37,6 +37,12 @@
                     <div class="right_wrap">
                       <div v-if="MixMachineList.length > 0" class="machine_wrap hlj_s_wrap">
                         <div v-for="(e,i) in MixMachineList.slice(0, 4)" :key="i" class="sh_machine hlj_s">
+                          <div class="sh_machine yj_info_wrap">
+                            <p>2023-6-10</p>
+                            <p>成品1</p>
+                            <p>367</p>
+                            <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="">
@@ -45,6 +51,11 @@
                       </div>
                       <div v-if="MixMachineList.length > 0" class="machine_wrap hlj_wrap">
                         <div v-for="(e,i) in MixMachineList.slice(4)" :key="i"  class="sh_machine hlj">
+                          <div class="sh_machine yj_info_wrap">
+                            <p>2023-6-10</p>
+                            <p>成品1&nbsp;&nbsp;367</p>
+                            <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="">
@@ -53,12 +64,12 @@
                       </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 v-show="e.point_status === '1'" src="../../../images/workshop/lz.png" alt="">
+                          <img :class="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 v-show="e.point_status === '1'" src="../../../images/workshop/lz.png" alt="">
+                          <img :class="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">
@@ -74,7 +85,7 @@
                           <img :class="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(4)" :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="e.point_status === '0' ? 'hidden': ''">
                         </div>
                       </div>
                       <div class="machine_wrap yjlz_wrap_1 yjlz_wrap_3">
@@ -97,233 +108,302 @@
                           <img src="../../../images/workshop/lz.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yj_wrap_1">
+                      <div @click="jumpTakeShape">
-                        <div class="sh_machine weilan">
+                        <div class="machine_wrap yj_wrap_1">
-                          <img src="../../../images/workshop/weilan_2.png" alt="">
+                          <div class="sh_machine yj_info_wrap">
+                            <p>2023-6-10</p>
+                            <p>成品1</p>
+                            <p>367</p>
+                            <div class="bg_line"></div>
+                          </div>
+                          <div class="sh_machine weilan">
+                            <img src="../../../images/workshop/weilan_2.png" alt="">
+                          </div>
+                          <div class="sh_machine jzjcss">
+                            <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="">
+                          </div>
+                          <div class="sh_machine wzm"></div>
+                          <div class="sh_machine kongtuopan_1">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_2">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine robot">
+                            <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                          </div>
+                          <div class="sh_machine block_1">
+                          </div>
+                          <div class="sh_machine block_1 block_2">
+                          </div>
+
                         </div>
-                        <div class="sh_machine jzjcss">
+                        <div class="machine_wrap yj_wrap_1 yj_wrap_2">
-                          <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
+                          <div class="sh_machine yj_info_wrap">
+                            <p>2023-6-10</p>
+                            <p>成品1</p>
+                            <p>367</p>
+                            <div class="bg_line"></div>
+                          </div>
+                          <div class="sh_machine weilan">
+                            <img src="../../../images/workshop/weilan_1.png" alt="">
+                          </div>
+                          <div class="sh_machine jzjcss">
+                            <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="">
+                          </div>
+                          <div class="sh_machine wzm"></div>
+                          <div class="sh_machine kongtuopan_1">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_2">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine robot">
+                            <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                          </div>
+                          <div class="sh_machine block_1 block_2">
+                          </div>
                         </div>
-                        <div v-if="PressMachineList.length > 0" class="sh_machine yyj">
+                        <div class="machine_wrap yj_wrap_1 yj_wrap_3">
-                          <img v-show="PressMachineList[0].device_status === 0" src="../../../images/workshop/yj_2500_gray.png" alt="">
+                          <div class="sh_machine yj_info_wrap">
-                          <img v-show="PressMachineList[0].device_status === 1" src="../../../images/workshop/yj_2500_yellow.png" alt="">
+                            <p>2023-6-10</p>
-                          <img v-show="PressMachineList[0].device_status === 2" src="../../../images/workshop/yj_2500_green.png" alt="">
+                            <p>成品1</p>
-                          <img v-show="PressMachineList[0].device_status === 3" src="../../../images/workshop/yj_2500_red.png" alt="">
+                            <p>367</p>
+                            <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 class="bg_line"></div>
+                          </div>
+                          <div class="sh_machine blj_1">
+                            <img src="../../../images/workshop/blj.png" alt="">
+                          </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[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="">
+                          </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="">
+                          </div>
+                          <div class="sh_machine weilan">
+                            <img src="../../../images/workshop/weilan_3.png" alt="">
+                          </div>
+                          <div class="sh_machine jzjcj_1">
+                            <img src="../../../images/workshop/jzjcj_630.png" alt="">
+                          </div>
+                          <div class="sh_machine jzjcj_1 jzjcj_2">
+                            <img src="../../../images/workshop/jzjcj_630.png" alt="">
+                          </div>
+                          <div class="sh_machine lmyzj">
+                            <img src="../../../images/workshop/lmyzj_630.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_2">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_3">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_4">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine robot">
+                            <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                          </div>
                         </div>
-                        <div class="sh_machine wzm"></div>
+                        <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5">
-                        <div class="sh_machine kongtuopan_1">
+                          <div class="sh_machine yj_info_wrap">
-                          <img src="../../../images/workshop/ktp.png" alt="">
+                            <p>2023-6-10</p>
+                            <p>成品1</p>
+                            <p>367</p>
+                            <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 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="">
+                          </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="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_2">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_3">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_4">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
                         </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
+                        <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_7">
-                          <img src="../../../images/workshop/ktp.png" alt="">
+                          <div class="sh_machine yj_info_wrap">
+                            <p>2023-6-10</p>
+                            <p>成品1</p>
+                            <p>367</p>
+                            <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="">
+                          </div>
+                          <div class="sh_machine weilan">
+                            <img src="../../../images/workshop/weilan_6.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_2">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine jcpmj">
+                            <img src="../../../images/workshop/jcpmj.png" alt="">
+                          </div>
+                          <div class="sh_machine robot">
+                            <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                          </div>
                         </div>
-                        <div class="sh_machine robot">
+                        <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8">
-                          <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                          <div class="sh_machine yj_info_wrap">
+                            <p>2023-6-10</p>
+                            <p>成品1</p>
+                            <p>367</p>
+                            <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 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="">
+                          </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="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_2">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_3">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_4">
+                            <img src="../../../images/workshop/ktp.png" alt="">
+                          </div>
                         </div>
-                        <div class="sh_machine block_1">
+                        <div class="machine_wrap yj_wrap_1 yj_wrap_17">
+                          <div class="sh_machine yyj">
+                            <img src="../../../images/workshop/yj_2500_gray.png" alt="">
+                          </div>
+                          <div class="sh_machine wzm"></div>
                         </div>
-                        <div class="sh_machine block_1 block_2">
+                        <div class="machine_wrap yj_wrap_1 yj_wrap_2 yj_wrap_17">
+                          <div class="sh_machine yyj">
+                            <img src="../../../images/workshop/yj_2500_gray.png" alt="">
+                          </div>
+                          <div class="sh_machine wzm"></div>
                         </div>
-                      </div>
+                        <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_15">
-                      <div class="machine_wrap yj_wrap_1 yj_wrap_2">
+                          <div class="sh_machine cyj_1">
-                        <div class="sh_machine weilan">
+                            <img src="../../../images/workshop/yj_630_gray.png" alt="">
-                          <img src="../../../images/workshop/weilan_1.png" alt="">
+                          </div>
+                          <div class="sh_machine cyj_1 cyj_2">
+                            <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                          </div>
                         </div>
-                        <div class="sh_machine jzjcss">
+                        <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_13">
-                          <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
+                          <div class="sh_machine cyj_1">
+                            <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                          </div>
+                          <div class="sh_machine cyj_1 cyj_2">
+                            <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                          </div>
                         </div>
-                        <div v-if="PressMachineList.length > 0" class="sh_machine yyj">
+                        <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_7 yj_wrap_12">
-                          <img v-show="PressMachineList[1].device_status === 0" src="../../../images/workshop/yj_2500_gray.png" alt="">
+                          <div class="sh_machine cyj_1">
-                          <img v-show="PressMachineList[1].device_status === 1" src="../../../images/workshop/yj_2500_yellow.png" alt="">
+                            <img src="../../../images/workshop/yj_630_gray.png" alt="">
-                          <img v-show="PressMachineList[1].device_status === 2" src="../../../images/workshop/yj_2500_green.png" alt="">
+                          </div>
-                          <img v-show="PressMachineList[1].device_status === 3" src="../../../images/workshop/yj_2500_red.png" alt="">
                         </div>
-                        <div class="sh_machine wzm"></div>
+                        <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8 yj_wrap_10">
-                        <div class="sh_machine kongtuopan_1">
+                          <div class="sh_machine yj_info_wrap yj_info_wrap_1">
-                          <img src="../../../images/workshop/ktp.png" alt="">
+                            <div class="bg_line"></div>
-                        </div>
+                            <p>2023-6-10</p>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
+                            <p>成品1</p>
-                          <img src="../../../images/workshop/ktp.png" alt="">
+                            <p>367</p>
-                        </div>
+                          </div>
-                        <div class="sh_machine robot">
+                          <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                            <img src="../../../images/workshop/yj_630_gray.png" alt="">
-                        </div>
+                          </div>
-                        <div class="sh_machine block_1 block_2">
+                          <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                        </div>
+                            <img v-show="PressMachineList[9].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
-                      </div>
+                            <img v-show="PressMachineList[9].device_status === 1" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                      <div class="machine_wrap yj_wrap_1 yj_wrap_3">
+                            <img v-show="PressMachineList[9].device_status === 2" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <div class="sh_machine blj_1">
+                            <img v-show="PressMachineList[9].device_status === 3" src="../../../images/workshop/yj_630_red.png" alt="">
-                          <img src="../../../images/workshop/blj.png" alt="">
+                          </div>
-                        </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_3">
-                        <div class="sh_machine blj_1 blj_2">
+                            <img src="../../../images/workshop/ktp.png" alt="">
-                          <img src="../../../images/workshop/blj.png" alt="">
+                          </div>
-                        </div>
+                          <div class="sh_machine kongtuopan_1 kongtuopan_4">
-                        <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
+                            <img src="../../../images/workshop/ktp.png" alt="">
-                          <img v-show="PressMachineList[2].device_status === 0" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          </div>
-                          <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="">
-                        </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="">
-                        </div>
-                        <div class="sh_machine weilan">
-                          <img src="../../../images/workshop/weilan_3.png" alt="">
-                        </div>
-                        <div class="sh_machine jzjcj_1">
-                          <img src="../../../images/workshop/jzjcj_630.png" alt="">
-                        </div>
-                        <div class="sh_machine jzjcj_1 jzjcj_2">
-                          <img src="../../../images/workshop/jzjcj_630.png" alt="">
-                        </div>
-                        <div class="sh_machine lmyzj">
-                          <img src="../../../images/workshop/lmyzj_630.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_3">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_4">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_2500_green.png" alt="">
-                        </div>
-                      </div>
-                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5">
-                        <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="">
-                        </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="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_3">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_4">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                      </div>
-                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_7">
-                        <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="">
-                        </div>
-                        <div class="sh_machine weilan">
-                          <img src="../../../images/workshop/weilan_6.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine jcpmj">
-                          <img src="../../../images/workshop/jcpmj.png" alt="">
-                        </div>
-                        <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_2500_green.png" alt="">
-                        </div>
-                      </div>
-                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8">
-                        <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="">
-                        </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="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_3">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_4">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                      </div>
-                      <div class="machine_wrap yj_wrap_1 yj_wrap_2 yj_wrap_17">
-                        <div class="sh_machine yyj">
-                          <img src="../../../images/workshop/yj_2500_gray.png" alt="">
-                        </div>
-                        <div class="sh_machine wzm"></div>
-                      </div>
-                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_15">
-                        <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
-                        </div>
-                        <div class="sh_machine cyj_1 cyj_2">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
-                        </div>
-                      </div>
-                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_13">
-                        <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
-                        </div>
-                        <div class="sh_machine cyj_1 cyj_2">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
-                        </div>
-                      </div>
-                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_7 yj_wrap_12">
-                        <div class="sh_machine cyj_1">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
-                        </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 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="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_3">
-                          <img src="../../../images/workshop/ktp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_1 kongtuopan_4">
-                          <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                       </div>
                       <div class="machine_wrap lz_wrap_4">
@@ -816,6 +896,9 @@ export default {
           this.myCharts3.resize()
         })
       }
+    },
+    jumpTakeShape () {
+      this.$router.push('/takeshapeone')
     }
   }
 }
@@ -896,88 +979,120 @@ export default {
 .hlj_s_wrap
   width 4%
   height 85.5%
-  top 14.5%
+  top 12%
-  left 7%
+  left 11%
   .hlj_s
+    height 7%
+    .yj_info_wrap
+      width: 210%;
+      top: -17%
+      left: -270%;
+      padding: 5px
+      _bis('../../../images/workshop/txtbg.png')
+      p
+        _font(14px, 16px, #fff,,right)
+      .bg_line
+        position absolute
+        _wh(67%, 2px)
+        background-color #03fcfd
+        right -100%
+        top 50%
+        transform translate(-50%)
     &:nth-child(2)
-      top 5.5%
+      top 9%
     &:nth-child(3)
-      top 11%
+      top 18%
     &:nth-child(4)
-      top 16.5%
+      top 27%
 .hlj_wrap
   width 4%
   height 66.5%
-  top 33%
+  top 44%
   left 14%
   .hlj
+    height 7%
+    .yj_info_wrap
+      width: 210%;
+      top: -2%
+      left: -270%;
+      padding: 5px
+      _bis('../../../images/workshop/txtbg.png')
+      p
+        _font(14px, 16px, #fff,,right)
+      .bg_line
+        position absolute
+        _wh(67%, 2px)
+        background-color #03fcfd
+        right -100%
+        top 50%
+        transform translate(-50%)
     &:nth-child(2)
-      top 6%
+      top 7%
     &:nth-child(3)
-      top 12.7%
+      top 15%
     &:nth-child(4)
-      top 18.6%
+      top 22%
     &:nth-child(5)
-      top 25.5%
+      top 30%
     &:nth-child(6)
-      top 31.5%
+      top 37%
     &:nth-child(7)
-      top 38.1%
+      top 45%
     &:nth-child(8)
-      top 44%
+      top 52%
     &:nth-child(9)
-      top 51%
+      top 60%
     &:nth-child(10)
-      top 57%
+      top 67%
     &:nth-child(11)
-      top 63.5%
+      top 75%
     &:nth-child(12)
-      top 69.5%
+      top 82%
 .lz_wrap_1
   width 2%
   height 84.6%
-  top 15.4%
+  top 13%
-  left 22%
+  left 24%
   .lz
     &:nth-child(2)
-      top 5.4%
+      top 9%
     &:nth-child(3)
-      top 11%
+      top 18%
     &:nth-child(4)
-      top 16.2%
+      top 27%
 .lz_wrap_2
   width 2%
   height 66.3%
-  top 33.7%
+  top 45%
   left 19%
   .lz
     &:nth-child(2)
-      top 6.1%
+      top 6.5%
     &:nth-child(3)
-      top 12.8%
+      top 15%
     &:nth-child(4)
-      top 18.5%
+      top 21.5%
     &:nth-child(5)
-      top 26%
+      top 30%
     &:nth-child(6)
-      top 31.5%
+      top 36.5%
     &:nth-child(7)
-      top 38.2%
+      top 45%
     &:nth-child(8)
-      top 43.9%
+      top 51.5%
     &:nth-child(9)
-      top 51%
+      top 60%
     &:nth-child(10)
-      top 56.8%
+      top 66.5%
     &:nth-child(11)
-      top 64%
+      top 75%
     &:nth-child(12)
-      top 69.5%
+      top 81.5%
 .yjlz_wrap_1
   width 2%
   height 16.442%
   top 3%
-  left 38%
+  left 41%
   .lz_1
     width 100%
     img
@@ -1011,7 +1126,22 @@ export default {
   width 16%
   height 16.442%
   top 3%
-  left 43%
+  left 44%
+  .yj_info_wrap
+    width 60%
+    top: 0
+    left: -81%
+    padding: 5px
+    _bis('../../../images/workshop/txtbg.png')
+    p
+      _font(14px, 16px, #fff,,right)
+    .bg_line
+      position absolute
+      _wh(67%, 2px)
+      background-color #03fcfd
+      right -100%
+      top 50%
+      transform translate(-50%)
   .yyj
     width 50%
     img
@@ -1072,6 +1202,13 @@ export default {
     left: 89%;
 .yj_wrap_3
   top 41%
+  .yj_info_wrap
+    top -10%
+    .bg_line
+      width: 100%;
+      right: -150%;
+  .yj_info_wrap_1
+    top 46%
   .blj_1
     width: 18%;
     top: 14%;
@@ -1134,6 +1271,8 @@ export default {
     top 86%
 .yj_wrap_7
   top 75%
+  .yj_info_wrap
+    top 19%
   .blj_1
     top 42%
   .cyj_1
@@ -1160,28 +1299,61 @@ export default {
 .yj_wrap_8
   top 89%
 .yj_wrap_17
-  left auto
+  left 60%
-  right 13%
   .yyj
+    left auto
+    right 0
     img
-      left -23%
+      left auto
+      right 37%
       transform rotate(180deg)
+  .wzm
+    left auto
+    right 0
 .yj_wrap_15
-  left auto
+  left 60%
-  right 17%
+  .cyj_1
+    left auto
+    right 0
+    img
+      left 0
+      right auto
 .yj_wrap_13
-  left auto
+  left 60%
-  right 17%
+  .cyj_1
+    left auto
+    right 0
+    img
+      left 0
+      right auto
 .yj_wrap_12
-  left auto
+  left 60%
-  right 17%
+  .cyj_1
+    left auto
+    right 0
+    img
+      left 0
+      right auto
 .yj_wrap_10
-  left auto
+  left 60%
-  right 17%
+  .yj_info_wrap_1
-  .kongtuopan_3
+    left auto
-    left 18%
+    right -81%
-  .kongtuopan_4
+    _bis('../../../images/workshop/txtbg1.png')
-    left 18%
+    p
+      text-align left
+    .bg_line
+      left -50%
+  .cyj_1
+    left auto
+    right 0
+    img
+      left 0
+      right auto
+  .kongtuopan_1
+    left auto
+    right 64%
+    transform rotate(-90deg)
 .lz_wrap_4
   width 2%
   height 63%

src/pages/modules/homepage/two.vue

@@ -79,6 +79,9 @@
                           <div class="sh_machine weilan1">
                             <img src="../../../images/workshop/weilan_5.png" alt="">
                           </div>
+                          <div class="sh_machine fjfztb">
+                            <img src="../../../images/workshop/fjfztb.png" alt="">
+                          </div>
                           <div class="sh_machine kongtuopan_1">
                             <img src="../../../images/workshop/mtp.png" alt="">
                           </div>
@@ -91,9 +94,6 @@
                           <div class="sh_machine weilan2">
                             <img src="../../../images/workshop/weilan_5.png" alt="">
                           </div>
-                          <div class="sh_machine fjfztb">
-                            <img src="../../../images/workshop/fjfztb.png" alt="">
-                          </div>
                           <div class="sh_machine cmdssj_1">
                             <img src="../../../images/workshop/cmdssj.png" alt="">
                           </div>
@@ -108,6 +108,9 @@
                           <div class="sh_machine weilan1">
                             <img src="../../../images/workshop/weilan_5.png" alt="">
                           </div>
+                          <div class="sh_machine fjfztb">
+                            <img src="../../../images/workshop/fjfztb.png" alt="">
+                          </div>
                           <div class="sh_machine kongtuopan_1">
                             <img src="../../../images/workshop/mtp.png" alt="">
                           </div>
@@ -115,28 +118,31 @@
                             <img src="../../../images/workshop/mtp.png" alt="">
                           </div>
                           <div class="sh_machine robot_1">
-                            <img src="../../../images/workshop/robot_4_gray.png" alt="">
+                            <img src="../../../images/workshop/robot_cmd_gray.png" alt="">
                           </div>
                           <div class="sh_machine weilan2">
                             <img src="../../../images/workshop/weilan_5.png" alt="">
                           </div>
-                          <div class="sh_machine fjfztb">
+                          <!-- <div class="sh_machine cmdssj_1">
-                            <img src="../../../images/workshop/fjfztb.png" alt="">
-                          </div>
-                          <div class="sh_machine cmdssj_1">
                             <img src="../../../images/workshop/cmdssj.png" alt="">
                           </div>
                           <div class="sh_machine cmdssj_1 cmdssj_2">
                             <img src="../../../images/workshop/cmdssj.png" alt="">
-                          </div>
+                          </div> -->
                           <div class="sh_machine robot_2">
-                            <img src="../../../images/workshop/robot_4_gray.png" alt="">
+                            <img src="../../../images/workshop/robot_cmd_gray.png" alt="">
                           </div>
                         </div>
                         <div class="machine_wrap liu_wrap">
                           <!-- <div class="sh_machine liu">
                             <img src="../../../images/workshop/liu.png" alt="">
                           </div> -->
+                          <div class="sh_machine cmdssj_1">
+                            <img src="../../../images/workshop/cmdssj.png" alt="">
+                          </div>
+                          <div class="sh_machine cmdssj_1 cmdssj_2">
+                            <img src="../../../images/workshop/cmdssj.png" alt="">
+                          </div>
                           <div class="rgv_line_wrap">
                             <div class="rgv_line_1">
                               <div class="rgv_line_begine"></div>
@@ -826,7 +832,7 @@ export default {
   left: 0
   .robot_1
     left: 48%;
-    top: 10%;
+    top: 12%;
     width 1%
     height 1%
     transform: rotate(-90deg)
@@ -844,9 +850,9 @@ export default {
     left auto
     right 3%
   .fjfztb
-    width: 44%
+    width: 59%;
-    top: 33%;
+    top: 9%;
-    left: 26%
+    left: 17%;
   .weilan1
     width: 100%;
     height: 53%;
@@ -875,7 +881,7 @@ export default {
       transform rotate(0deg)
 .robot_2
     top: auto;
-    bottom: -13%
+    bottom: -8%
     left: 48%;
     width 1%
     height 1%
@@ -890,6 +896,16 @@ export default {
   _wh(130%, 78%)
   top 43%
   left -15%
+  .cmdssj_1
+    width: 4.8%;
+    top: -11%;
+    left: 74%;
+    img
+      transform rotateY(180deg)
+  .cmdssj_2
+    left: 84%;
+    img
+      transform rotate(0deg)
 .rgv_line_wrap
   position absolute
   top 0

src/pages/modules/homepage/two_back.vue

@@ -1,727 +0,0 @@
-<template>
-    <div class="n_container">
-        <div class="n_header">
-            <div class="n_header_h1">
-                <h1>据控制中心</h1>
-            </div>
-        </div>
-        <div class="n_body_container">
-            <div class="n_body_container_wraper">
-                <div class="n_left_content">
-                    <div class="status_wrap">
-                        <div class="status_item">
-                            <div class="status_tip green"></div>
-                            <div class="status_name">运行中/困料中</div>
-                        </div>
-                        <div class="status_item">
-                            <div class="status_tip yellow"></div>
-                            <div class="status_name">待机/困料完成</div>
-                        </div>
-                        <div class="status_item">
-                            <div class="status_tip gray"></div>
-                            <div class="status_name">关机</div>
-                        </div>
-                        <div class="status_item">
-                            <div class="status_tip red"></div>
-                            <div class="status_name">故障/困料超时</div>
-                        </div>
-                    </div>
-                    <div class="right_wrap">
-                      <div class="machine_wrap mtp_wrap_1">
-                        <div v-for="(e,i) in [1,2,3,4,5,6]" :key="i" class="mtp">
-                          <img src="../../../images/workshop/mtp.png" alt="">
-                        </div>
-                      </div>
-                      <div class="machine_wrap mtp_wrap_1 mtp_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="mtp">
-                          <img src="../../../images/workshop/mtp.png" alt="">
-                        </div>
-                      </div>
-                      <div class="machine_wrap gtssj_wrap_1">
-                        <div v-for="(e,i) in [1,2,3,4,5]" :key="i" class="gtssj">
-                          <img src="../../../images/workshop/gtssj.png" alt="">
-                        </div>
-                      </div>
-                      <div class="machine_wrap cpj_wrap_1">
-                        <div class="cpj">
-                          <img src="../../../images/workshop/cpj.png" alt="">
-                        </div>
-                      </div>
-                      <div class="machine_wrap yao_wrap">
-                        <div class="yaosb">
-                          <img src="../../../images/workshop/yao.png" alt="">
-                        </div>
-                        <div class="sh_machine yjbyx_1">
-                          <img src="../../../images/workshop/yjbyx.png" alt="">
-                        </div>
-                        <div class="sh_machine yjbyx_2">
-                          <img src="../../../images/workshop/yjbyx.png" alt="">
-                        </div>
-                        <div class="machine_wrap mtp_wrap_3">
-                          <div v-for="(e,i) in [1,2,3,4]" :key="i" class="mtp">
-                            <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>
-                        </div>
-                      </div>
-                      <div class="machine_wrap cmd_wrap_1">
-                        <div class="sh_machine kongtuopan_1">
-                          <img src="../../../images/workshop/mtp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_2">
-                          <img src="../../../images/workshop/mtp.png" alt="">
-                        </div>
-                        <div class="sh_machine robot_1">
-                          <img src="../../../images/workshop/robot_4.png" alt="">
-                        </div>
-                        <div class="sh_machine weilan">
-                          <img src="../../../images/workshop/weilan_5.png" alt="">
-                        </div>
-                        <div class="sh_machine fjfztb">
-                          <img src="../../../images/workshop/fjfztb.png" alt="">
-                        </div>
-                        <div class="sh_machine guntssj_1">
-                          <img src="../../../images/workshop/ggtssj.png" alt="">
-                        </div>
-                        <div class="sh_machine guntssj_2">
-                          <img src="../../../images/workshop/ggtssj.png" alt="">
-                        </div>
-                        <div class="sh_machine robot_2">
-                          <img src="../../../images/workshop/robot_4.png" alt="">
-                        </div>
-                      </div>
-                      <div class="machine_wrap cmd_wrap_1 cmd_wrap_2">
-                        <div class="sh_machine kongtuopan_1">
-                          <img src="../../../images/workshop/mtp.png" alt="">
-                        </div>
-                        <div class="sh_machine kongtuopan_2">
-                          <img src="../../../images/workshop/mtp.png" alt="">
-                        </div>
-                        <div class="sh_machine robot_1">
-                          <img src="../../../images/workshop/robot_4.png" alt="">
-                        </div>
-                        <div class="sh_machine weilan">
-                          <img src="../../../images/workshop/weilan_5.png" alt="">
-                        </div>
-                        <div class="sh_machine fjfztb">
-                          <img src="../../../images/workshop/fjfztb.png" alt="">
-                        </div>
-                        <div class="sh_machine guntssj_1">
-                          <img src="../../../images/workshop/ggtssj.png" alt="">
-                        </div>
-                        <div class="sh_machine guntssj_2">
-                          <img src="../../../images/workshop/ggtssj.png" alt="">
-                        </div>
-                        <div class="sh_machine robot_2">
-                          <img src="../../../images/workshop/robot_4.png" alt="">
-                        </div>
-                      </div>
-                      <div class="machine_wrap liu_wrap">
-                        <div class="sh_machine liu">
-                          <img src="../../../images/workshop/liu.png" alt="">
-                        </div>
-                      </div>
-                    </div>
-                </div>
-                <div class="n_right_content">
-                    <div class="item_wrap">
-                        <div class="item_tip item_tip_bg_s">
-                            <div class="item_tip_left">设备运行情况</div>
-                        </div>
-                        <div class="item_content">
-                            <div id="home_echart_4" style="width: 100%; height: 100%;"></div>
-                        </div>
-                    </div>
-                    <div class="item_wrap">
-                        <div class="item_tip item_tip_bg_s">
-                            <div class="item_tip_left">近一月故障次数前5设备</div>
-                        </div>
-                        <div class="item_content">
-                            <div id="home_echart_5" style="width: 100%; height: 100%;"></div>
-                        </div>
-                    </div>
-                    <div class="item_wrap">
-                        <div class="item_tip item_tip_bg_s">
-                            <div class="item_tip_left">最近10次设备故障</div>
-                        </div>
-                        <div class="item_content">
-                            <div class="scroll_wrap">
-                                <ul class="scroll_tab_1">
-                                    <li>故障时间</li>
-                                    <li>设备编码</li>
-                                    <li>设备名称</li>
-                                    <li>故障信息</li>
-                                    <li>当前状态</li>
-                                </ul>
-                                <div class="scroll_container_1">
-                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
-                                        <ul class="scroll-ul_1">
-                                            <li v-for="(e, i) in array1" :key="i">
-                                                <div class="scroll-ul_1_div">{{e.time}}</div>
-                                                <div class="scroll-ul_1_div">{{e.code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.name}}</div>
-                                                <div class="scroll-ul_1_div">{{e.info}}</div>
-                                                <div class="scroll-ul_1_div">{{e.status}}</div>
-                                            </li>
-                                        </ul>
-                                    </vue-seamless-scroll>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-  name: 'two',
-  data () {
-    return {
-      myCharts1: '',
-      myCharts2: '',
-      array1: [{time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}]
-    }
-  },
-  computed: {
-    defaultOption1 () {
-      return {
-        step: 0.4, // 数值越大速度滚动越快
-        limitMoveNum: 15, // 开始无缝滚动的数据量 this.dataList.length
-        hoverStop: true, // 是否开启鼠标悬停stop
-        direction: 1, // 0向下 1向上 2向左 3向右
-        openWatch: true, // 开启数据实时监控刷新dom
-        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
-        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
-        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
-      }
-    }
-  },
-  mounted () {
-    this.setEchart1()
-    this.setEchart2()
-  },
-  methods: {
-    setEchart1 () {
-      let colors = ['#30EBC9', '#E2BB0E', '#516282', '#F96700']
-      let status = ['运行', '待机', '关机', '故障']
-      let barName = ['混料', '压制', '干燥', '包装']
-      let data = [[16, 14, 6, 9], [2, 1, 2, 3], [0, 0, 2, 2], [2, 1, 2, 3]]
-      let option = {
-        grid: {
-          top: 50,
-          left: 0,
-          right: 0,
-          bottom: 0,
-          containLabel: true
-        },
-        legend: {
-          textStyle: {
-            color: '#fff',
-            fontSize: 14,
-            lineHeight: 14
-          },
-          itemGap: 30.86,
-          itemWidth: 14.16,
-          itemHeight: 7.38,
-          data: status
-        },
-        color: colors,
-        xAxis: {
-          type: 'category',
-          axisTick: {
-            show: false
-          },
-          axisLine: {
-            show: true,
-            lineStyle: {
-              width: 2,
-              color: '#8FABBF'
-            }
-          },
-          axisLabel: {
-            interval: 0,
-            textStyle: {
-              color: '#8FABBF',
-              fontSize: 16
-            }
-          },
-          data: barName
-        },
-        yAxis: {
-          type: 'value',
-          axisLine: {
-            show: false
-          },
-          // splitNumber: 2,
-          axisTick: {
-            show: false
-          },
-          axisLabel: {
-            textStyle: {
-              color: '#8FABBF',
-              fontSize: 14
-            }
-          },
-          splitLine: {
-            show: true,
-            lineStyle: {
-              type: [8, 4],
-              dashOffset: 4,
-              color: '#8FABBF'
-            }
-          }
-        },
-        series: []
-      }
-      for (let j = 0; j < status.length; j++) {
-        option.series.push({
-          name: status[j],
-          type: 'bar',
-          stack: '总数',
-          barWidth: '20',
-          label: {
-            show: false,
-            position: 'insideRight'
-          },
-          data: data[j]
-          // itemStyle: {
-          //   normal: {
-          //     label: {
-          //       show: true, // 开启显示
-          //       position: 'top', // 在上方显示
-          //       textStyle: {
-          //         // 数值样式
-          //         color: '#fff',
-          //         fontSize: 14,
-          //         fontWeight: 600
-          //       }
-          //     }
-          //   }
-          // }
-        })
-      }
-      let echart = document.getElementById('home_echart_4')
-      if (this.myCharts1 !== '') {
-        this.myCharts1.dispose()
-      }
-      if (echart !== null) {
-        this.myCharts1 = this.$echarts.init(echart)
-        this.myCharts1.setOption(option)
-        window.addEventListener('resize', () => {
-          this.myCharts1.resize()
-        })
-      }
-    },
-    setEchart2 () {
-      let barName = ['机器5', '混碾5', '机器1', '混碾2', '压机1']
-      let barData = [6, 7, 8, 9, 10]
-      let maxNum = 0
-      for (let i = 0; i < barData.length; i++) {
-        if (barData[i] > maxNum) {
-          maxNum = barData[i]
-        }
-      }
-
-      var option = {
-        grid: {
-          top: 5,
-          left: 0,
-          right: 70,
-          bottom: 0,
-          containLabel: true
-        },
-        xAxis: {
-          show: false,
-          type: 'value'
-        },
-        yAxis: [{
-          type: 'category',
-          axisLabel: {
-            show: true,
-            textStyle: {
-              color: '#8FABBF', // y轴字体颜色
-              fontSize: '12'
-            }
-          },
-          splitLine: {
-            show: false
-          },
-          axisTick: {
-            show: false
-          },
-          axisLine: {
-            lineStyle: {
-              type: [8, 4],
-              dashOffset: 4,
-              color: '#3D5266', // y轴线颜色
-              opacity: 0.4
-            }
-          },
-          data: barName
-        }, {
-          type: 'category',
-          inverse: true,
-          axisTick: 'none',
-          axisLine: 'none',
-          show: false,
-          axisLabel: {
-            textStyle: {
-              color: '#ffffff',
-              fontSize: 12
-            },
-            formatter: function (value) {
-              return value + ' %'
-            }
-          },
-          data: barData
-        }],
-        series: [
-          {
-            name: '故障次数',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-              normal: {
-                color: new this.$echarts.graphic.LinearGradient(1, 0, 0, 0, [
-                  {
-                    offset: 0,
-                    color: '#B68845',
-                    opacity: 1
-                  },
-                  {
-                    offset: 1,
-                    color: 'rgba(134,98,45,0.25)',
-                    opacity: 0.25
-                  }
-                ]),
-                barBorderRadius: 0
-              }
-            },
-            barWidth: 10,
-            data: barData
-          },
-          {
-            type: 'bar',
-            barWidth: 10,
-            barGap: '-100%',
-            data: barData.map(function (item) {
-              return {
-                realValue: item,
-                value: maxNum
-              }
-            }),
-            label: {
-              show: true,
-              position: 'right',
-              distance: 70,
-              align: 'right',
-              formatter: function (params) {
-                return params.data.realValue + ' 台'
-              },
-              color: '#fff',
-              fontSize: 15
-            },
-            itemStyle: {
-              normal: {
-                color: 'rgba(255, 255, 255, 0)'
-              }
-            }
-          }
-        ]
-      }
-      let echart = document.getElementById('home_echart_5')
-      if (this.myCharts2 !== '') {
-        this.myCharts2.dispose()
-      }
-      if (echart !== null) {
-        this.myCharts2 = this.$echarts.init(echart)
-        this.myCharts2.setOption(option)
-        window.addEventListener('resize', () => {
-          this.myCharts2.resize()
-        })
-      }
-    }
-  }
-}
-</script>
-
-<style lang="stylus" scoped>
-@import '~@css/mixin'
-.n_container
-    _wh(100%, 100%)
-.n_header
-    _wh(100%, 8%)
-    _bis('../../../images/bg_header.jpg')
-.n_header_h1
-    _wh(100%, 100%)
-    _fj(row, flex-start)
-    _bis('../../../images/top_right.png',auto,,left)
-    h1
-        _font(32px, 1, #fff,,right)
-        padding-bottom 2%
-        letter-spacing 6px
-        font-family "阿里妈妈数黑体" !important
-        padding-left 3px
-.n_body_container
-    _wh(100%, 92%)
-    padding 40px 20px 20px 0
-    _bis('../../../images/bg_content.jpg')
-.n_body_container_wraper
-    _wh(100%, 100%)
-    _fj(row)
-.n_left_content
-    position relative
-    _wh(calc(67% - 16px), 100%)
-.n_right_content
-    _wh(33%, 100%)
-    background-color #070b1c
-.item_wrap
-    _wh(100%, 33%)
-    +.item_wrap
-        margin-top .5%
-.item_tip
-    _wh(100%, 32px)
-    line-height 32px
-    padding 0 10px
-.item_tip_bg_s
-    _bis('../../../images/bg_title_s.png')
-.item_tip_left
-    _wh(60%, 100%)
-    font-family "SourceHanSansCN"
-    _font(18px, inherit, #fff, 700, left)
-    letter-spacing 2px
-    text-shadow 0 0 9px #159AFF
-    padding-left 34px
-    _bis('../../../images/bg_title_tip.png', 22px, 22px, left)
-.item_content
-    _wh(100%, calc(100% - 32px))
-    padding 10px 5px
-.right_wrap
-    position relative
-    z-index 1
-    _wh(100%, 100%)
-    _bis('../../../images/workshop/workshop_r.png')
-.scroll_wrap
-    _wh(100%, 100%)
-    border 1px solid rgba(8,205,248,0.3)
-.scroll_tab_1
-  _wh(100%, 40px)
-  border-bottom 1 solid rgba(8,205,248,0.3)
-  li
-    float left
-    width 20%
-    _font(14px,40px,#78B1DE,,center)
-    word-wrap break-word
-    word-break break-all
-    white-space nowrap
-    padding 0 5px
-    overflow hidden
-    box-sizing border-box
-.scroll_container_1
-  width 100%
-  height calc(100% - 40px)
-  overflow hidden
-.scroll-ul_1
-  li
-    _wh(100%, 44px)
-    border-bottom 1 solid rgba(8,205,248,0.3)
-    &:nth-child(even)
-      background rgba(1,24,52,0.60)
-      box-shadow inset 0px 1px 0px 0px rgba(13,89,115,0.3)
-    .scroll-ul_1_div
-      float left
-      _wh(20%, 44px)
-      _fj(row, center)
-      _font(14px, 16px, #fff,,center)
-      word-wrap break-word
-      word-break break-all
-      // white-space nowrap
-      padding 0 5px
-      overflow hidden
-.status_wrap
-    position absolute
-    top -26px
-    right 40px
-    z-index 1
-    _fj(row)
-.status_item
-    _fj(row)
-    +.status_item
-        margin-left 20px
-.status_tip
-    _wh(15px, 15px)
-    border-radius 50%
-    margin-right 10px
-    box-shadow 0px 0px 4px 0px rgba(33,121,195,0.88)
-.status_name
-    _font(16px, 1, #fff)
-.green
-  background-color $green2
-.yellow
-  background-color $yellow
-.gray
-  background-color $gray1
-.red
-  background-color $orange
-.machine_wrap
-  position absolute
-  z-index 2
-.sh_machine
-  position absolute
-  top 0
-  left 0
-  z-index 3
-  width 100%
-  img
-    position absolute
-    top 0
-    left 0
-    z-index 4
-    _wh(100%, auto)
-.mtp_wrap_1
-  width 2.5%
-  top 9%
-  left 0
-  .mtp
-    width 100%
-    img
-      _wh(100%, auto)
-.mtp_wrap_2
-  top 30%
-.gtssj_wrap_1
-  width 2.5%
-  top 30%
-  left 4%
-  .gtssj
-    width 100%
-    img
-      _wh(100%, auto)
-.cpj_wrap_1
-  width 4.5%
-  top 33%
-  left 2.5%
-  .cpj
-    width 100%
-    img
-      _wh(100%, auto)
-.yao_wrap
-  width 69%
-  top 6.5%
-  left 8%
-  background-color #676767
-  .yaosb
-    width 100%
-    img
-      _wh(100%, auto)
-  .yjbyx_1
-    width: 4%;
-    top: -2%;
-    left: 2%;
-    img
-      _wh(100%, auto)
-  .yjbyx_2
-    width: 4%;
-    top: -2%;
-    left: auto;
-    right: 2%;
-    img
-      _wh(100%, auto)
-.mtp_wrap_3
-  width: 3.5%;
-  height: 10%;
-  top: 84%;
-  left: -0.8%;
-  transform rotate(-90deg)
-  z-index 4
-  .mtp
-    width 100%
-    margin-bottom 10%
-    img
-      _wh(100%, auto)
-.mtp_wrap_4
-  left 13%
-.cmd_wrap_1
-  width: 8%;
-  height: 15%;
-  top: 30%;
-  left: 10%;
-  // background: #f00;
-  .robot_1
-    width: 20%;
-    left: 38%;
-    top: -2%;
-  .kongtuopan_1
-    width 15%
-    height 13%
-    top 3%
-    left 3%
-    img
-      _wh(100%, 100%)
-  .kongtuopan_2
-    width 15%
-    height 13%
-    top 3%
-    left auto
-    right 3%
-    transform rotate(180deg)
-    img
-      _wh(100%, 100%)
-  .fjfztb
-    width: 44%;
-    height: 60%;
-    top: 27%;
-    left: 26%;
-    img
-      _wh(100%, 100%)
-  .weilan
-    width: 100%;
-    height: 53%;
-    top: auto;
-    bottom: -19%;
-    left: 0;
-    img
-      _wh(100%, 100%)
-  .guntssj_1
-    width: 26%;
-    height: 27%;
-    top: auto
-    left: 0;
-    bottom: -16%
-    img
-      _wh(100%, 100%)
-  .guntssj_2
-    width: 26%;
-    height: 27%;
-    top: auto;
-    left: auto;
-    right: 0;
-    bottom: -16%
-    img
-      _wh(100%, 100%)
-.robot_2
-    width: 20%;
-    left: 38%;
-    top: auto;
-    bottom: 9%
-.cmd_wrap_2
-  left 27%
-.liu_wrap
-  width: 48%;
-  top: 48%;
-  left: 8%;
-  height: 31%;
-  .liu
-    width: 100%;
-    top: 0;
-    left: 0;
-    height: 100%;
-    img
-      _wh(100%, 100%)
-</style>

src/pages/modules/processproduction/three.vue

@@ -8,12 +8,12 @@
 <script>
 // import one from './one.vue'
 // import two from './two.vue'
-// import one from '../homepage/one.vue'
+import one from '../homepage/one.vue'
-// import two from '../homepage/two.vue'
+import two from '../homepage/two.vue'
 // import one from '../takeshape/one.vue'
 // import two from '../takeshape/two.vue'
-import one from '../hunniankunliao/one.vue'
+// import one from '../hunniankunliao/one.vue'
-import two from '../hunniankunliao/two.vue'
+// import two from '../hunniankunliao/two.vue'
 // import one from '../firedry/one.vue'
 // import two from '../firedry/two.vue'
 export default {

src/pages/modules/sortpack/one.vue

@@ -56,7 +56,7 @@
                             <img src="../../../images/workshop/mtp.png" alt="">
                           </div>
                           <div class="sh_machine robot_1">
-                            <img src="../../../images/workshop/robot_4.png" alt="">
+                            <img src="../../../images/workshop/robot_cmd_red.png" alt="">
                           </div>
                           <div class="sh_machine weilan2">
                             <img src="../../../images/workshop/weilan_5.png" alt="">
@@ -71,7 +71,7 @@
                             <img src="../../../images/workshop/ggtssj.png" alt="">
                           </div>
                           <div class="sh_machine robot_2">
-                            <img src="../../../images/workshop/robot_4.png" alt="">
+                            <img src="../../../images/workshop/robot_cmd_red.png" alt="">
                           </div>
                         </div>
                         <div class="machine_wrap cmd_wrap_1 cmd_wrap_2">
@@ -85,7 +85,7 @@
                             <img src="../../../images/workshop/mtp.png" alt="">
                           </div>
                           <div class="sh_machine robot_1">
-                            <img src="../../../images/workshop/robot_4_gray.png" alt="">
+                            <img src="../../../images/workshop/robot_cmd_gray.png" alt="">
                           </div>
                           <div class="sh_machine weilan2">
                             <img src="../../../images/workshop/weilan_5.png" alt="">
@@ -100,7 +100,7 @@
                             <img src="../../../images/workshop/ggtssj.png" alt="">
                           </div>
                           <div class="sh_machine robot_2">
-                            <img src="../../../images/workshop/robot_4_gray.png" alt="">
+                            <img src="../../../images/workshop/robot_cmd_gray.png" alt="">
                           </div>
                         </div>
                         <div class="machine_wrap rgv_line_wrap">

src/pages/modules/takeshape/one.vue

@@ -74,18 +74,24 @@
                       </div>
                     </div>
                     <div class="yaji_wrap">
-                      <div class="machine_wrap yyj_wrap_1">
+                      <div class="machine_wrap yj_wrap_1">
-                        <!-- <div class="sh_machine yj_gif">
+                        <div class="sh_machine yj_info_wrap">
-                          <img src="../../../images/workshop/yj_2500.gif" alt="">
+                          <p>2023-6-10</p>
-                        </div> -->
+                          <p>成品1</p>
+                          <p>367</p>
+                          <div class="bg_line"></div>
+                        </div>
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_2.png" alt="">
                         </div>
                         <div class="sh_machine jzjcss">
                           <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                         </div>
-                        <div class="sh_machine yyj">
+                        <div v-if="PressMachineList.length > 0" class="sh_machine yyj">
-                          <img src="../../../images/workshop/yj_2500_gray.png" alt="">
+                          <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="">
                         </div>
                         <div class="sh_machine wzm"></div>
                         <div class="sh_machine kongtuopan_1">
@@ -95,22 +101,32 @@
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                         <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_2500_yellow.png" alt="">
+                          <img src="../../../images/workshop/robot_2500_green.png" alt="">
                         </div>
                         <div class="sh_machine block_1">
                         </div>
                         <div class="sh_machine block_1 block_2">
                         </div>
+
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 yyj_wrap_2">
+                      <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 class="bg_line"></div>
+                        </div>
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_1.png" alt="">
                         </div>
                         <div class="sh_machine jzjcss">
                           <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                         </div>
-                        <div class="sh_machine yyj">
+                        <div v-if="PressMachineList.length > 0" class="sh_machine yyj">
-                          <img src="../../../images/workshop/yj_2500_gray.png" alt="">
+                          <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="">
                         </div>
                         <div class="sh_machine wzm"></div>
                         <div class="sh_machine kongtuopan_1">
@@ -120,15 +136,41 @@
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                         <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_2500_yellow.png" alt="">
+                          <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                        </div>
+                        <div class="sh_machine block_1 block_2">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3">
-                        <div class="sh_machine cyj_1">
+                        <div class="sh_machine yj_info_wrap">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <p>2023-6-10</p>
+                          <p>成品1</p>
+                          <p>367</p>
+                          <div class="bg_line"></div>
                         </div>
-                        <div class="sh_machine cyj_1 cyj_2">
+                        <div class="sh_machine yj_info_wrap yj_info_wrap_1">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <p>2023-6-10</p>
+                          <p>成品1</p>
+                          <p>367</p>
+                          <div class="bg_line"></div>
+                        </div>
+                        <div class="sh_machine blj_1">
+                          <img src="../../../images/workshop/blj.png" alt="">
+                        </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[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="">
+                        </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="">
                         </div>
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_3.png" alt="">
@@ -155,15 +197,36 @@
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                         <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_2500_yellow.png" alt="">
+                          <img src="../../../images/workshop/robot_2500_green.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_2">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5">
-                        <div class="sh_machine cyj_1">
+                        <div class="sh_machine yj_info_wrap">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <p>2023-6-10</p>
+                          <p>成品1</p>
+                          <p>367</p>
+                          <div class="bg_line"></div>
                         </div>
-                        <div class="sh_machine cyj_1 cyj_2">
+                        <div class="sh_machine yj_info_wrap yj_info_wrap_1">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <p>2023-6-10</p>
+                          <p>成品1</p>
+                          <p>367</p>
+                          <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="">
+                        </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="">
                         </div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
@@ -178,9 +241,21 @@
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_3">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_7">
-                        <div class="sh_machine cyj_1">
+                        <div class="sh_machine yj_info_wrap">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <p>2023-6-10</p>
+                          <p>成品1</p>
+                          <p>367</p>
+                          <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="">
                         </div>
                         <div class="sh_machine weilan">
                           <img src="../../../images/workshop/weilan_6.png" alt="">
@@ -195,15 +270,36 @@
                           <img src="../../../images/workshop/jcpmj.png" alt="">
                         </div>
                         <div class="sh_machine robot">
-                          <img src="../../../images/workshop/robot_2500_yellow.png" alt="">
+                          <img src="../../../images/workshop/robot_2500_green.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_2 cyj_wrap_4">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8">
-                        <div class="sh_machine cyj_1">
+                        <div class="sh_machine yj_info_wrap">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <p>2023-6-10</p>
+                          <p>成品1</p>
+                          <p>367</p>
+                          <div class="bg_line"></div>
                         </div>
-                        <div class="sh_machine cyj_1 cyj_2">
+                        <div class="sh_machine yj_info_wrap yj_info_wrap_1">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <p>2023-6-10</p>
+                          <p>成品1</p>
+                          <p>367</p>
+                          <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="">
+                        </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="">
                         </div>
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/ktp.png" alt="">
@@ -218,13 +314,13 @@
                           <img src="../../../images/workshop/ktp.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 yyj_wrap_2 yyj_wrap_3">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_2 yj_wrap_17">
                         <div class="sh_machine yyj">
                           <img src="../../../images/workshop/yj_2500_gray.png" alt="">
                         </div>
                         <div class="sh_machine wzm"></div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_5">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_15">
                         <div class="sh_machine cyj_1">
                           <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
@@ -232,7 +328,7 @@
                           <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_2 cyj_wrap_6">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_13">
                         <div class="sh_machine cyj_1">
                           <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
@@ -240,17 +336,26 @@
                           <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_3 cyj_wrap_7">
+                      <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_7 yj_wrap_12">
                         <div class="sh_machine cyj_1">
                           <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
                       </div>
-                      <div class="machine_wrap yyj_wrap_1 cyj_wrap_1 cyj_wrap_2 cyj_wrap_4 cyj_wrap_8">
+                      <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 class="bg_line"></div>
+                        </div>
                         <div class="sh_machine cyj_1">
                           <img src="../../../images/workshop/yj_630_gray.png" alt="">
                         </div>
-                        <div class="sh_machine cyj_1 cyj_2">
+                        <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <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="">
                         </div>
                         <div class="sh_machine kongtuopan_1 kongtuopan_3">
                           <img src="../../../images/workshop/ktp.png" alt="">
@@ -296,6 +401,48 @@
     </div>
 </template>
 
+<script>
+import { workshopCondition } from '@js/getData2'
+export default {
+  data () {
+    return {
+      interTime: this.$store.getters.setTime,
+      timer: null,
+      myCharts1: '',
+      myCharts2: '',
+      myCharts3: '',
+      PressMachineList: [], // 压机数据
+      MixMachineList: [], // 混料机数据
+      MixBlankingList: [], // 混料机下料位
+      TrappedShelfList: [] // 困料位料盅
+    }
+  },
+  mounted () {
+    this._workshopCondition()
+    // this.refresh()
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
+  },
+  methods: {
+    refresh () {
+      this.timer = setInterval(() => {
+        this._workshopCondition()
+      }, this.interTime)
+    },
+    async _workshopCondition () {
+      let res = await workshopCondition()
+      if (res.code === 200) {
+        this.PressMachineList = [...res.result.PressMachineList]
+        this.MixMachineList = [...res.result.MixMachineList]
+        this.MixBlankingList = [...res.result.MixBlankingList]
+        this.TrappedShelfList = [...res.result.TrappedShelfList]
+      }
+    }
+  }
+}
+</script>
+
 <style lang="stylus" scoped>
 @import '~@css/mixin'
 .n_container
@@ -439,6 +586,39 @@
   transform rotate(90deg)
   top: 4.4%;
   left: 90.5%;
+.yyj_wrap_2
+  left: 80%;
+.cyj_wrap_1
+  left 70%
+.cyj_wrap_2
+  left 60%
+.cyj_wrap_3
+  left 50%
+.yj_wrap_1
+  // width 10.801%
+  // height 29.895%
+  width: 15%;
+  height: 41.5%;
+  transform rotate(90deg)
+  top: 4.4%;
+  // left: 90.5%;
+  left 87%
+  .yj_info_wrap
+    display none
+    width 60%
+    top: 0
+    left: -77%
+    padding: 5px
+    _bis('../../../images/workshop/txtbg.png')
+    p
+      _font(14px, 16px, #fff,,right)
+    .bg_line
+      position absolute
+      _wh(67%, 2px)
+      background-color #03fcfd
+      right -100%
+      top 50%
+      transform translate(-50%)
   .yyj
     width 50%
     img
@@ -482,8 +662,8 @@
     background-color #fff
   .block_2
     left:86%
-.yyj_wrap_2
+.yj_wrap_2
-  left: 80%;
+  left: 71%
   .robot
     animation rotate_630_1 1.5s linear 1.5s infinite alternate-reverse
   .kongtuopan_1
@@ -494,8 +674,24 @@
     top 76%
   .weilan
     top 16%
-.cyj_wrap_1
+  .block_2
-  left 70%
+    top 9%
+    left: 89%;
+.yj_wrap_3
+  left: 54%
+  .yj_info_wrap
+    top -10%
+    .bg_line
+      width: 100%;
+      right: -150%;
+  .yj_info_wrap_1
+    top 46%
+  .blj_1
+    width: 18%;
+    top: 14%;
+    left: 16%;
+  .blj_2
+    top 70%
   .cyj_1
     width 50%
     height 50%
@@ -538,8 +734,8 @@
   .kongtuopan_4
     top: 64%
     left: 80%;
-.cyj_wrap_2
+.yj_wrap_5
-  left 60%
+  left: 37%
   .kongtuopan_1
     top: 14%;
     left: 64%;
@@ -550,8 +746,12 @@
     top 70%
   .kongtuopan_4
     top 86%
-.cyj_wrap_3
+.yj_wrap_7
-  left 50%
+  left 22%
+  .yj_info_wrap
+    top 19%
+  .blj_1
+    top 42%
   .cyj_1
     top 25%
     img
@@ -562,7 +762,7 @@
   .robot
     left: 75%
     transform: rotate(15deg);
-    animation rotate_630_2 3s linear 1.5s infinite reverse
+    animation rotate_630_2 3s linear 1.5s infinite alternate-reverse
   .kongtuopan_1
     top 43%
     left 90%
@@ -573,83 +773,79 @@
     width: 18%;
     top: 12%;
     left: 57%;
-.cyj_wrap_4
+.yj_wrap_8
-  top 89%
+  left 8%
-.yyj_wrap_3
+.yj_wrap_17
-  left auto
+  top 70%
-  right 13%
   .yyj
     img
-      left -23%
+      left auto
+      right 37%
       transform rotate(180deg)
-.cyj_wrap_5
+.yj_wrap_15
-  left auto
+  top 70%
-  right 17%
+  .cyj_1
-.cyj_wrap_6
+    img
-  left auto
+      left 0
-  right 17%
+      right auto
-.cyj_wrap_7
+.yj_wrap_13
-  left auto
+  top 70%
-  right 17%
+.yj_wrap_12
-.cyj_wrap_8
+  top 70%
-  left auto
+.yj_wrap_10
-  right 17%
+  top 70%
-  .kongtuopan_3
-    left 18%
-  .kongtuopan_4
-    left 18%
 @keyframes rotate_2500_1 {
     0% {
-      transform: rotate(-46deg)
+      transform: rotateZ(-46deg)
     }
     10% {
-        transform: rotate(-46deg)
+        transform: rotateZ(-46deg)
     }
     20% {
-        transform: rotate(-46deg)
+        transform: rotateZ(-46deg)
     }
     90% {
-        transform: rotate(-120deg)
+        transform: rotateZ(-120deg) rotateY(-30deg)
     }
     100% {
-        transform: rotate(-120deg)
+        transform: rotateZ(-120deg) rotateY(0deg)
     }
 }
 @keyframes rotate_630_1 {
     0% {
-      transform: rotate(-46deg)
+      transform: rotateZ(-46deg)
     }
     10% {
-        transform: rotate(-46deg)
+        transform: rotateZ(-46deg)
     }
     20% {
-        transform: rotate(-46deg)
+        transform: rotateZ(-46deg)
     }
     90% {
-        transform: rotate(-90deg)
+        transform: rotateZ(-90deg)
     }
     100% {
-        transform: rotate(-90deg)
+        transform: rotateZ(-90deg)
     }
 }
 @keyframes rotate_630_2 {
     0% {
-      transform: rotate(150deg)
+      transform: rotateZ(150deg) rotateY(-30deg)
     }
     10% {
-        transform: rotate(150deg)
+        transform: rotateZ(150deg) rotateY(0deg)
     }
     50% {
-        transform: rotate(70deg)
+        transform: rotateZ(70deg) rotateY(-30deg)
     }
     60% {
-        transform: rotate(70deg)
+        transform: rotateZ(70deg) rotateY(0deg)
     }
     90% {
-        transform: rotate(15deg)
+        transform: rotateZ(15deg)
     }
     100% {
-        transform: rotate(15deg)
+        transform: rotateZ(15deg)
     }
 }
 </style>