diff --git a/dist.zip b/dist.zip
index 2a8ecc4..2ea4508 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index 0e96d29..c8cbdb6 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -591,36 +591,36 @@ export const workshopCondition = () => {
       'LastTenFailureList': [
         {
           'failure_time': '05-30 09:50:12',
-          'device_code': 'hn01',
-          'device_name': '混撵01',
+          'device_code': 'hl',
+          'device_name': '混料',
           'failure_info': '机器故障',
           'device_status_name': '待机'
         },
         {
           'failure_time': '05-30 09:50:12',
-          'device_code': 'hn01',
-          'device_name': '混撵01',
+          'device_code': 'hl',
+          'device_name': '混料',
           'failure_info': '机器故障',
           'device_status_name': '待机'
         },
         {
           'failure_time': '05-30 09:50:12',
-          'device_code': 'hn01',
-          'device_name': '混撵01',
+          'device_code': 'hl',
+          'device_name': '混料',
           'failure_info': '机器故障',
           'device_status_name': '待机'
         },
         {
           'failure_time': '05-30 09:50:12',
-          'device_code': 'hn01',
-          'device_name': '混撵01',
+          'device_code': 'hl',
+          'device_name': '混料',
           'failure_info': '机器故障',
           'device_status_name': '待机'
         },
         {
           'failure_time': '05-30 09:50:12',
-          'device_code': 'hn01',
-          'device_name': '混撵01',
+          'device_code': 'hl',
+          'device_name': '混料',
           'failure_info': '机器故障',
           'device_status_name': '待机'
         }
@@ -997,6 +997,7 @@ export const workshopCondition = () => {
         {
           'device_status': 1,
           'device_code': 'YJ01',
+          'device_name': '压机01',
           'open_time': '2023-06-13 14:08:57',
           'material_code': 'GBMCZ3039M4',
           'now_capacity': '7304'
@@ -1004,6 +1005,7 @@ export const workshopCondition = () => {
         {
           'device_status': 1,
           'device_code': 'YJ02',
+          'device_name': '压机02',
           'open_time': '2023-06-13 14:08:57',
           'material_code': '',
           'now_capacity': '7250'
@@ -1011,6 +1013,7 @@ export const workshopCondition = () => {
         {
           'device_status': 1,
           'device_code': 'YJ03',
+          'device_name': '压机03',
           'open_time': '2023-06-13 14:08:57',
           'material_code': 'GBMAC3003C1',
           'now_capacity': '2040'
@@ -1018,6 +1021,7 @@ export const workshopCondition = () => {
         {
           'device_status': 1,
           'device_code': 'YJ04',
+          'device_name': '压机04',
           'open_time': '2023-06-13 14:08:57',
           'material_code': 'GBMCZ3013L3',
           'now_capacity': '1586'
@@ -1025,6 +1029,7 @@ export const workshopCondition = () => {
         {
           'device_status': 1,
           'device_code': 'YJ05',
+          'device_name': '压机05',
           'open_time': '2023-06-13 14:08:57',
           'material_code': '',
           'now_capacity': '0'
@@ -1032,6 +1037,7 @@ export const workshopCondition = () => {
         {
           'device_status': 1,
           'device_code': 'YJ06',
+          'device_name': '压机06',
           'open_time': '2023-06-13 14:08:57',
           'material_code': '',
           'now_capacity': '0'
@@ -1039,6 +1045,7 @@ export const workshopCondition = () => {
         {
           'device_status': 1,
           'device_code': 'YJ07',
+          'device_name': '压机07',
           'open_time': '2023-06-13 14:08:57',
           'material_code': '',
           'now_capacity': '0'
@@ -1046,6 +1053,7 @@ export const workshopCondition = () => {
         {
           'device_status': 1,
           'device_code': 'YJ08',
+          'device_name': '压机08',
           'open_time': '2023-06-13 14:08:57',
           'material_code': '',
           'now_capacity': '0'
@@ -1053,6 +1061,7 @@ export const workshopCondition = () => {
         {
           'device_status': 1,
           'device_code': 'YJ09',
+          'device_name': '压机09',
           'open_time': '2023-06-13 14:08:57',
           'material_code': '',
           'now_capacity': '0'
@@ -1060,11 +1069,44 @@ export const workshopCondition = () => {
         {
           'device_status': 1,
           'device_code': 'YJ10',
+          'device_name': '压机10',
           'open_time': '2023-06-13 14:08:57',
           'material_code': '',
           'now_capacity': '0'
         }
       ],
+      'ManipulatorInfoList': [
+        {
+          'device_name': '码垛机械手1',
+          'color_status': 1,
+          'device_code': 'MDJXS01',
+          'region_code': 'YZ'
+        },
+        {
+          'device_name': '码垛机械手2',
+          'color_status': 1,
+          'device_code': 'MDJXS02',
+          'region_code': 'YZ'
+        },
+        {
+          'device_name': '码垛机械手3',
+          'color_status': 1,
+          'device_code': 'MDJXS03',
+          'region_code': 'YZ'
+        },
+        {
+          'device_name': '码垛机械手4',
+          'color_status': 1,
+          'device_code': 'MDJXS04',
+          'region_code': 'YZ'
+        },
+        {
+          'device_name': '分拣拆垛机械手',
+          'color_status': 1,
+          'device_code': 'FJCDJXS01',
+          'region_code': 'FJ'
+        }
+      ],
       'TrappedShelfList': [
         {
           'point_name': '压机1空盅货位',
diff --git a/src/images/workshop/robot_2500_gray.png b/src/images/workshop/robot_2500_gray.png
new file mode 100644
index 0000000..53bf98f
Binary files /dev/null and b/src/images/workshop/robot_2500_gray.png differ
diff --git a/src/images/workshop/robot_2500_red.png b/src/images/workshop/robot_2500_red.png
new file mode 100644
index 0000000..2c1050b
Binary files /dev/null and b/src/images/workshop/robot_2500_red.png differ
diff --git a/src/images/workshop/robot_cmd_yellow.png b/src/images/workshop/robot_cmd_yellow.png
new file mode 100644
index 0000000..37265bb
Binary files /dev/null and b/src/images/workshop/robot_cmd_yellow.png differ
diff --git a/src/images/workshop/txtbg.png b/src/images/workshop/txtbg.png
deleted file mode 100644
index 1555ab4..0000000
Binary files a/src/images/workshop/txtbg.png and /dev/null differ
diff --git a/src/images/workshop/txtbg1.png b/src/images/workshop/txtbg1.png
deleted file mode 100644
index 75129db..0000000
Binary files a/src/images/workshop/txtbg1.png and /dev/null differ
diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue
index 440d5bc..2189bec 100644
--- a/src/pages/modules/homepage/one.vue
+++ b/src/pages/modules/homepage/one.vue
@@ -109,7 +109,9 @@
                             <img v-show="String(PressMachineList[0].device_status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
                             <img v-show="String(PressMachineList[0].device_status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
                           </div>
-                          <div class="sh_machine wzm"></div>
+                          <div class="sh_machine wzm">
+                            <p v-if="PressMachineList.length > 0">{{ PressMachineList[0].device_name }}</p>
+                          </div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
                             <img v-show="String(StackingPositionList[0].color_status) === '0'" src="../../../images/workshop/ktp_gray.png" alt="">
                             <img v-show="String(StackingPositionList[0].color_status) === '1'" src="../../../images/workshop/ktp_green.png" alt="">
@@ -122,8 +124,11 @@
                             <img v-show="String(StackingPositionList[1].color_status) === '2'" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="String(StackingPositionList[1].color_status) === '3'" src="../../../images/workshop/ktp_yellow.png" alt="">
                           </div>
-                          <div class="sh_machine robot">
-                            <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                          <div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot" :class="{'rotate_2500_1': String(ManipulatorInfoList[0].color_status) === '1'}">
+                            <img v-show="String(ManipulatorInfoList[0].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[0].color_status) === '1'" src="../../../images/workshop/robot_2500_green.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[0].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[0].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                           </div>
                           <div class="sh_machine block_1">
                           </div>
@@ -152,7 +157,9 @@
                             <img v-show="String(PressMachineList[1].device_status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
                             <img v-show="String(PressMachineList[1].device_status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
                           </div>
-                          <div class="sh_machine wzm"></div>
+                          <div class="sh_machine wzm">
+                            <p v-if="PressMachineList.length > 0">{{ PressMachineList[1].device_name }}</p>
+                          </div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
                             <img v-show="StackingPositionList[2].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
                             <img v-show="StackingPositionList[2].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
@@ -165,8 +172,11 @@
                             <img v-show="StackingPositionList[3].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="StackingPositionList[3].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
                           </div>
-                          <div class="sh_machine robot">
-                            <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                          <div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot" :class="{'rotate_2500_2': String(ManipulatorInfoList[1].color_status) === '1'}">
+                            <img v-show="String(ManipulatorInfoList[1].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[1].color_status) === '1'" src="../../../images/workshop/robot_2500_green.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[1].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[1].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                           </div>
                           <div class="sh_machine block_1 block_2">
                           </div>
@@ -195,16 +205,22 @@
                             <img src="../../../images/workshop/blj.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                            <img v-show="String(PressMachineList[2].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="String(PressMachineList[2].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="String(PressMachineList[2].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="String(PressMachineList[2].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <div class="cyj_img_wrap">
+                              <p>{{ PressMachineList[2].device_name }}</p>
+                              <img v-show="String(PressMachineList[2].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[2].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[2].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[2].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            </div>
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                            <img v-show="String(PressMachineList[3].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="String(PressMachineList[3].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="String(PressMachineList[3].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="String(PressMachineList[3].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <div class="cyj_img_wrap">
+                              <p>{{ PressMachineList[3].device_name }}</p>
+                              <img v-show="String(PressMachineList[3].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[3].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[3].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[3].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            </div>
                           </div>
                           <div class="sh_machine weilan">
                             <img src="../../../images/workshop/weilan_3.png" alt="">
@@ -242,8 +258,11 @@
                             <img v-show="StackingPositionList[7].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="StackingPositionList[7].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
                           </div>
-                          <div class="sh_machine robot">
-                            <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                          <div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot" :class="{'rotate_630_1': String(ManipulatorInfoList[2].color_status) === '1'}">
+                            <img v-show="String(ManipulatorInfoList[2].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[2].color_status) === '1'" src="../../../images/workshop/robot_2500_green.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[2].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[2].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                           </div>
                         </div>
                         <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5">
@@ -267,16 +286,22 @@
                             <img src="../../../images/workshop/blj.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                            <img v-show="String(PressMachineList[4].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="String(PressMachineList[4].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="String(PressMachineList[4].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="String(PressMachineList[4].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <div class="cyj_img_wrap">
+                              <p>{{ PressMachineList[4].device_name }}</p>
+                              <img v-show="String(PressMachineList[4].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[4].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[4].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[4].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            </div>
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                            <img v-show="String(PressMachineList[5].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="String(PressMachineList[5].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="String(PressMachineList[5].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="String(PressMachineList[5].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <div class="cyj_img_wrap">
+                              <p>{{ PressMachineList[5].device_name }}</p>
+                              <img v-show="String(PressMachineList[5].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[5].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[5].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[5].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            </div>
                           </div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
                             <img v-show="StackingPositionList[8].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -316,10 +341,13 @@
                             <img src="../../../images/workshop/blj.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                            <img v-show="String(PressMachineList[6].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="String(PressMachineList[6].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="String(PressMachineList[6].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="String(PressMachineList[6].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <div class="cyj_img_wrap">
+                              <p>{{ PressMachineList[6].device_name }}</p>
+                              <img v-show="String(PressMachineList[6].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[6].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[6].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[6].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            </div>
                           </div>
                           <div class="sh_machine weilan">
                             <img src="../../../images/workshop/weilan_6.png" alt="">
@@ -339,8 +367,11 @@
                           <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 v-if="ManipulatorInfoList.length > 0" class="sh_machine robot" :class="{'rotate_630_2': String(ManipulatorInfoList[3].color_status) === '1'}">
+                            <img v-show="String(ManipulatorInfoList[3].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[3].color_status) === '1'" src="../../../images/workshop/robot_2500_green.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[3].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[3].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                           </div>
                         </div>
                         <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8">
@@ -364,16 +395,22 @@
                             <img src="../../../images/workshop/blj.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                            <img v-show="String(PressMachineList[7].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="String(PressMachineList[7].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="String(PressMachineList[7].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="String(PressMachineList[7].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <div class="cyj_img_wrap">
+                              <p>{{ PressMachineList[7].device_name }}</p>
+                              <img v-show="String(PressMachineList[7].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[7].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[7].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[7].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            </div>
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                            <img v-show="String(PressMachineList[8].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="String(PressMachineList[8].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="String(PressMachineList[8].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="String(PressMachineList[8].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <div class="cyj_img_wrap">
+                              <p>{{ PressMachineList[8].device_name }}</p>
+                              <img v-show="String(PressMachineList[8].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[8].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[8].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[8].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            </div>
                           </div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
                             <img v-show="StackingPositionList[14].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -414,23 +451,33 @@
                         </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 class="cyj_img_wrap">
+                              <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                            </div>
                           </div>
                           <div class="sh_machine cyj_1 cyj_2">
-                            <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                            <div class="cyj_img_wrap">
+                              <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                            </div>
                           </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 class="cyj_img_wrap">
+                              <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                            </div>
                           </div>
                           <div class="sh_machine cyj_1 cyj_2">
-                            <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                            <div class="cyj_img_wrap">
+                              <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                            </div>
                           </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 class="cyj_img_wrap">
+                              <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                            </div>
                           </div>
                         </div>
                         <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8 yj_wrap_10">
@@ -443,13 +490,18 @@
                             </div>
                           </div>
                           <div class="sh_machine cyj_1">
-                            <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                            <div class="cyj_img_wrap">
+                              <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                            </div>
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                            <img v-show="String(PressMachineList[9].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                            <img v-show="String(PressMachineList[9].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                            <img v-show="String(PressMachineList[9].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                            <img v-show="String(PressMachineList[9].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            <div class="cyj_img_wrap">
+                              <p>{{ PressMachineList[9].device_name }}</p>
+                              <img v-show="String(PressMachineList[9].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[9].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[9].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[9].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                            </div>
                           </div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_3">
                             <img v-show="StackingPositionList[19].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -516,6 +568,17 @@
               </div>
           </div>
         </div>
+        <div class="tooltip_wrap">
+          <div class="tooltip_arrow" @click="expandTooltip" v-text="expand ? '&gt;&gt;' : '&lt;&lt;'"></div>
+          <div class="tooltip_pages" :style="expand ? 'width: 240px' : 'width: 0'">
+            <div class="tooltip_page">1</div>
+            <div class="tooltip_page">2</div>
+            <div class="tooltip_page">3</div>
+            <div class="tooltip_page">4</div>
+            <div class="tooltip_page">5</div>
+            <div class="tooltip_page">6</div>
+          </div>
+        </div>
         <!-- <div class="style_block" style="left: calc(100% / 3);top:0;"></div>
         <div class="style_block" style="background: green;left: calc(100% / 3);top:calc(100% / 3);"></div>
         <div class="style_block" style="left: calc(100% / 3);bottom: 0"></div>
@@ -533,6 +596,7 @@ export default {
     return {
       interTime: this.$store.getters.setTime,
       timer: null,
+      expand: false,
       myCharts1: '',
       myCharts2: '',
       myCharts3: '',
@@ -544,7 +608,8 @@ export default {
       MixBlankingList: [], // 混料机下料位
       TrappedShelfList: [], // 困料位料盅
       StackingPositionList: [], // 压制码垛数据信息
-      TrappedMaterialShelfList: [] // 困料货架信息
+      TrappedMaterialShelfList: [], // 困料货架信息
+      ManipulatorInfoList: [] // 机械手数据
     }
   },
   mounted () {
@@ -572,6 +637,7 @@ export default {
         this.TrappedShelfList = [...res.result.TrappedShelfList]
         this.StackingPositionList = [...res.result.StackingPositionList]
         this.TrappedMaterialShelfList = [...res.result.TrappedMaterialShelfList]
+        this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
         this.setEchart1()
         this.setEchart2()
         this.setEchart3()
@@ -996,6 +1062,9 @@ export default {
     },
     jumpTakeShape () {
       this.$router.push('/takeshapeone')
+    },
+    expandTooltip () {
+      this.expand = !this.expand
     }
   }
 }
@@ -1283,6 +1352,9 @@ export default {
     background-color #d9d9d9
     top auto
     bottom 0
+    _fj(row,center)
+    p
+      _font(15px,17px,#333,,)
   .jzjcss
     width: 24%;
     left: 51%;
@@ -1297,7 +1369,6 @@ export default {
     left: 75%;
     top: 55%;
     transform: rotate(-46deg)
-    animation rotate_2500_1 1.5s linear 1.5s infinite alternate-reverse
     img
       width 2400%
       top: -800%;
@@ -1320,7 +1391,6 @@ export default {
   top 21%
   .robot
     transform: rotate(-46deg)
-    animation rotate_2500_2 1.5s linear 1.5s infinite alternate-reverse
   .kongtuopan_1
     top 37%
     left 85%
@@ -1352,13 +1422,19 @@ export default {
   .cyj_1
     width 50%
     height 50%
-    img
-      width 28%
+    .cyj_img_wrap
+      position absolute
+      _wh(28%, 91.49%)
       left auto
       right 0
+      _fj(row, center)
+      p
+        position relative
+        z-index 7
+        _font(15px,17px,#333,,)
   .cyj_2
     top 50%
-    img
+    .cyj_img_wrap
       top auto
       bottom 0
   .jzjcj_1
@@ -1382,7 +1458,6 @@ export default {
     left: 79%;
     top: 49%;
     transform: rotate(-4deg)
-    animation rotate_630_1 1.5s linear 1.5s infinite alternate-reverse
   .kongtuopan_1
     top: 21%
     left: 64%;
@@ -1421,7 +1496,6 @@ export default {
   .robot
     left: 75%
     transform: rotate(15deg);
-    animation rotate_630_2 3s linear 1.5s infinite alternate-reverse
   .kongtuopan_1
     top 43%
     left 90%
@@ -1451,7 +1525,7 @@ export default {
   .cyj_1
     left auto
     right 0
-    img
+    .cyj_img_wrap
       left 0
       right auto
 .yj_wrap_13
@@ -1459,7 +1533,7 @@ export default {
   .cyj_1
     left auto
     right 0
-    img
+    .cyj_img_wrap
       left 0
       right auto
 .yj_wrap_12
@@ -1467,7 +1541,7 @@ export default {
   .cyj_1
     left auto
     right 0
-    img
+    .cyj_img_wrap
       left 0
       right auto
 .yj_wrap_10
@@ -1477,7 +1551,7 @@ export default {
   .cyj_1
     left auto
     right 0
-    img
+    .cyj_img_wrap
       left 0
       right auto
   .kongtuopan_1
@@ -1509,6 +1583,14 @@ export default {
     width 100%
     img
       _wh(100%, auto)
+.rotate_2500_1
+  animation rotate_2500_1 1.5s linear 1.5s infinite alternate-reverse
+.rotate_2500_2
+  animation rotate_2500_2 1.5s linear 1.5s infinite alternate-reverse
+.rotate_630_1
+  animation rotate_630_1 1.5s linear 1.5s infinite alternate-reverse
+.rotate_630_2
+  animation rotate_630_2 3s linear 1.5s infinite alternate-reverse
 @keyframes rotate_2500_1 {
     0% {
       transform: rotateZ(-46deg)
@@ -1584,4 +1666,29 @@ export default {
   position absolute
   _wh(calc(100% / 3), calc(100% / 3))
   background red
+.tooltip_wrap
+  position fixed
+  bottom 10%
+  right 0
+  z-index 10
+  _wh(auto, 40px)
+  padding 5px 5px
+  background-color rgba(228,233,237,1)
+  // opacity .6
+  border-top-left-radius 12px
+  border-bottom-left-radius 12px
+  _fj(row)
+.tooltip_arrow
+  _wh(40px, 100%)
+  _font(14px, 30px, #999,,)
+.tooltip_pages
+  height 100%
+  _fj(row)
+  transition width .3s ease
+.tooltip_page
+  _wh(30px, 100%)
+  margin 0 5px
+  _font(14px, 30px, #999,,)
+  border 1px solid #999
+  border-radius 50%
 </style>
diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue
index 65a7e70..1e1cf76 100644
--- a/src/pages/modules/homepage/two.vue
+++ b/src/pages/modules/homepage/two.vue
@@ -106,8 +106,11 @@
                             <img v-show="SortAndPalletizingList[1].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="SortAndPalletizingList[1].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
                           </div>
-                          <div class="sh_machine robot_1 rotate_1">
-                            <img src="../../../images/workshop/robot_cmd_green.png" alt="">
+                          <div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot_1" :class="{'rotate_1': String(ManipulatorInfoList[4].color_status) === '1'}">
+                            <img v-show="String(ManipulatorInfoList[4].color_status) === '0'" src="../../../images/workshop/robot_cmd_gray.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[4].color_status) === '1'" src="../../../images/workshop/robot_cmd_green.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[4].color_status) === '2'" src="../../../images/workshop/robot_cmd_red.png" alt="">
+                            <img v-show="String(ManipulatorInfoList[4].color_status) === '3'" src="../../../images/workshop/robot_cmd_yellow.png" alt="">
                           </div>
                           <div class="sh_machine weilan2">
                             <img src="../../../images/workshop/weilan_5.png" alt="">
@@ -340,7 +343,8 @@ export default {
       LastMonthFailureList: [],
       LastTenFailureList: [],
       SortAndPalletizingList: [], // 分拣拆码垛对接位
-      SemiFinishedProductShelfList: [] // 半成品货架数据
+      SemiFinishedProductShelfList: [], // 半成品货架数据
+      ManipulatorInfoList: [] // 机械手数据
     }
   },
   computed: {
@@ -378,6 +382,7 @@ export default {
         this.LastTenFailureList = [...res.result.LastTenFailureList]
         this.SortAndPalletizingList = [...res.result.SortAndPalletizingList]
         this.SemiFinishedProductShelfList = [...res.result.SemiFinishedProductShelfList]
+        this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
         this.setEchart1()
         this.setEchart2()
       }
diff --git a/src/pages/modules/processproduction/three.vue b/src/pages/modules/processproduction/three.vue
index fdd5e80..aa4a89e 100644
--- a/src/pages/modules/processproduction/three.vue
+++ b/src/pages/modules/processproduction/three.vue
@@ -8,10 +8,10 @@
 <script>
 // import one from './one.vue'
 // import two from './two.vue'
-import one from '../homepage/one.vue'
-import two from '../homepage/two.vue'
-// import one from '../takeshape/one.vue'
-// import two from '../takeshape/two.vue'
+// import one from '../homepage/one.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 two from '../hunniankunliao/two.vue'
 // import one from '../firedry/one.vue'
diff --git a/src/pages/modules/takeshape/one.vue b/src/pages/modules/takeshape/one.vue
index 1ec1d51..912b6d6 100644
--- a/src/pages/modules/takeshape/one.vue
+++ b/src/pages/modules/takeshape/one.vue
@@ -84,7 +84,9 @@
                         <img v-show="String(PressMachineList[0].device_status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
                         <img v-show="String(PressMachineList[0].device_status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
                       </div>
-                      <div class="sh_machine wzm"></div>
+                      <div class="sh_machine wzm">
+                        <p v-if="PressMachineList.length > 0">{{ PressMachineList[0].device_name }}</p>
+                      </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
                         <img v-show="String(StackingPositionList[0].color_status) === '0'" src="../../../images/workshop/ktp_gray.png" alt="">
                         <img v-show="String(StackingPositionList[0].color_status) === '1'" src="../../../images/workshop/ktp_green.png" alt="">
@@ -97,8 +99,11 @@
                         <img v-show="String(StackingPositionList[1].color_status) === '2'" src="../../../images/workshop/ktp_red.png" alt="">
                         <img v-show="String(StackingPositionList[1].color_status) === '3'" src="../../../images/workshop/ktp_yellow.png" alt="">
                       </div>
-                      <div class="sh_machine robot">
-                        <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                      <div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot" :class="{'rotate_2500_1': String(ManipulatorInfoList[0].color_status) === '1'}">
+                        <img v-show="String(ManipulatorInfoList[0].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
+                        <img v-show="String(ManipulatorInfoList[0].color_status) === '1'" src="../../../images/workshop/robot_2500_green.png" alt="">
+                        <img v-show="String(ManipulatorInfoList[0].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
+                        <img v-show="String(ManipulatorInfoList[0].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                       </div>
                       <div class="sh_machine block_1">
                       </div>
@@ -127,7 +132,9 @@
                         <img v-show="String(PressMachineList[1].device_status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
                         <img v-show="String(PressMachineList[1].device_status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
                       </div>
-                      <div class="sh_machine wzm"></div>
+                      <div class="sh_machine wzm">
+                        <p v-if="PressMachineList.length > 0">{{ PressMachineList[1].device_name }}</p>
+                      </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
                         <img v-show="StackingPositionList[2].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
                         <img v-show="StackingPositionList[2].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
@@ -140,8 +147,11 @@
                         <img v-show="StackingPositionList[3].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                         <img v-show="StackingPositionList[3].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
                       </div>
-                      <div class="sh_machine robot">
-                        <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                      <div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot" :class="{'rotate_2500_2': String(ManipulatorInfoList[1].color_status) === '1'}">
+                        <img v-show="String(ManipulatorInfoList[1].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
+                        <img v-show="String(ManipulatorInfoList[1].color_status) === '1'" src="../../../images/workshop/robot_2500_green.png" alt="">
+                        <img v-show="String(ManipulatorInfoList[1].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
+                        <img v-show="String(ManipulatorInfoList[1].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                       </div>
                       <div class="sh_machine block_1 block_2">
                       </div>
@@ -170,16 +180,22 @@
                         <img src="../../../images/workshop/blj.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                        <img v-show="String(PressMachineList[2].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="String(PressMachineList[2].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="String(PressMachineList[2].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="String(PressMachineList[2].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <div class="cyj_img_wrap">
+                          <p>{{ PressMachineList[2].device_name }}</p>
+                          <img v-show="String(PressMachineList[2].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[2].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[2].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[2].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        </div>
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                        <img v-show="String(PressMachineList[3].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="String(PressMachineList[3].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="String(PressMachineList[3].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="String(PressMachineList[3].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <div class="cyj_img_wrap">
+                          <p>{{ PressMachineList[3].device_name }}</p>
+                          <img v-show="String(PressMachineList[3].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[3].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[3].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[3].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        </div>
                       </div>
                       <div class="sh_machine weilan">
                         <img src="../../../images/workshop/weilan_3.png" alt="">
@@ -217,8 +233,11 @@
                         <img v-show="StackingPositionList[7].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                         <img v-show="StackingPositionList[7].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
                       </div>
-                      <div class="sh_machine robot">
-                        <img src="../../../images/workshop/robot_2500_green.png" alt="">
+                      <div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot" :class="{'rotate_630_1': String(ManipulatorInfoList[2].color_status) === '1'}">
+                        <img v-show="String(ManipulatorInfoList[2].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
+                        <img v-show="String(ManipulatorInfoList[2].color_status) === '1'" src="../../../images/workshop/robot_2500_green.png" alt="">
+                        <img v-show="String(ManipulatorInfoList[2].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
+                        <img v-show="String(ManipulatorInfoList[2].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                       </div>
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5">
@@ -242,16 +261,22 @@
                         <img src="../../../images/workshop/blj.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                        <img v-show="String(PressMachineList[4].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="String(PressMachineList[4].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="String(PressMachineList[4].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="String(PressMachineList[4].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <div class="cyj_img_wrap">
+                          <p>{{ PressMachineList[4].device_name }}</p>
+                          <img v-show="String(PressMachineList[4].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[4].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[4].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[4].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        </div>
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                        <img v-show="String(PressMachineList[5].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="String(PressMachineList[5].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="String(PressMachineList[5].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="String(PressMachineList[5].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <div class="cyj_img_wrap">
+                          <p>{{ PressMachineList[5].device_name }}</p>
+                          <img v-show="String(PressMachineList[5].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[5].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[5].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[5].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        </div>
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
                         <img v-show="StackingPositionList[8].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -291,10 +316,13 @@
                         <img src="../../../images/workshop/blj.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                        <img v-show="String(PressMachineList[6].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="String(PressMachineList[6].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="String(PressMachineList[6].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="String(PressMachineList[6].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <div class="cyj_img_wrap">
+                          <p>{{ PressMachineList[6].device_name }}</p>
+                          <img v-show="String(PressMachineList[6].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[6].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[6].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[6].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        </div>
                       </div>
                       <div class="sh_machine weilan">
                         <img src="../../../images/workshop/weilan_6.png" alt="">
@@ -314,8 +342,11 @@
                       <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 v-if="ManipulatorInfoList.length > 0" class="sh_machine robot" :class="{'rotate_630_2': String(ManipulatorInfoList[3].color_status) === '1'}">
+                        <img v-show="String(ManipulatorInfoList[3].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
+                        <img v-show="String(ManipulatorInfoList[3].color_status) === '1'" src="../../../images/workshop/robot_2500_green.png" alt="">
+                        <img v-show="String(ManipulatorInfoList[3].color_status) === '2'" src="../../../images/workshop/robot_2500_red.png" alt="">
+                        <img v-show="String(ManipulatorInfoList[3].color_status) === '3'" src="../../../images/workshop/robot_2500_yellow.png" alt="">
                       </div>
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8">
@@ -339,16 +370,22 @@
                         <img src="../../../images/workshop/blj.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
-                        <img v-show="String(PressMachineList[7].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="String(PressMachineList[7].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="String(PressMachineList[7].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="String(PressMachineList[7].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <div class="cyj_img_wrap">
+                          <p>{{ PressMachineList[7].device_name }}</p>
+                          <img v-show="String(PressMachineList[7].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[7].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[7].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[7].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        </div>
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                        <img v-show="String(PressMachineList[8].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="String(PressMachineList[8].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="String(PressMachineList[8].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="String(PressMachineList[8].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <div class="cyj_img_wrap">
+                          <p>{{ PressMachineList[8].device_name }}</p>
+                          <img v-show="String(PressMachineList[8].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[8].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[8].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[8].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        </div>
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
                         <img v-show="StackingPositionList[14].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -389,23 +426,33 @@
                     </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 class="cyj_img_wrap">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                        </div>
                       </div>
                       <div class="sh_machine cyj_1 cyj_2">
-                        <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                        <div class="cyj_img_wrap">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                        </div>
                       </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 class="cyj_img_wrap">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                        </div>
                       </div>
                       <div class="sh_machine cyj_1 cyj_2">
-                        <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                        <div class="cyj_img_wrap">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                        </div>
                       </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 class="cyj_img_wrap">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                        </div>
                       </div>
                     </div>
                     <div class="machine_wrap yj_wrap_1 yj_wrap_3 yj_wrap_5 yj_wrap_8 yj_wrap_10">
@@ -418,13 +465,18 @@
                         </div>
                       </div>
                       <div class="sh_machine cyj_1">
-                        <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                        <div class="cyj_img_wrap">
+                          <img src="../../../images/workshop/yj_630_gray.png" alt="">
+                        </div>
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
-                        <img v-show="String(PressMachineList[9].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
-                        <img v-show="String(PressMachineList[9].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
-                        <img v-show="String(PressMachineList[9].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
-                        <img v-show="String(PressMachineList[9].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        <div class="cyj_img_wrap">
+                          <p>{{ PressMachineList[9].device_name }}</p>
+                          <img v-show="String(PressMachineList[9].device_status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[9].device_status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[9].device_status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[9].device_status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
+                        </div>
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_3">
                         <img v-show="StackingPositionList[19].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
@@ -486,7 +538,8 @@ export default {
       MixBlankingList: [], // 混料机下料位
       TrappedShelfList: [], // 困料位料盅
       StackingPositionList: [], // 压制码垛数据信息
-      TrappedMaterialShelfList: [] // 困料货架信息
+      TrappedMaterialShelfList: [], // 困料货架信息
+      ManipulatorInfoList: [] // 机械手数据
     }
   },
   mounted () {
@@ -511,6 +564,7 @@ export default {
         this.TrappedShelfList = [...res.result.TrappedShelfList]
         this.StackingPositionList = [...res.result.StackingPositionList]
         this.TrappedMaterialShelfList = [...res.result.TrappedMaterialShelfList]
+        this.ManipulatorInfoList = [...res.result.ManipulatorInfoList]
       }
     }
   }
@@ -672,6 +726,10 @@ export default {
     background-color #d9d9d9
     top auto
     bottom 0
+    _fj(row,center)
+    p
+      _font(15px,17px,#333,,)
+      transform rotate(-90deg)
   .jzjcss
     width: 24%;
     left: 51%;
@@ -749,13 +807,19 @@ export default {
   .cyj_1
     width 50%
     height 50%
-    img
-      width 28%
+    .cyj_img_wrap
+      position absolute
+      _wh(28%, 91.49%)
       left auto
       right 0
+      _fj(row, center)
+      p
+        position relative
+        z-index 7
+        _font(15px,17px,#333,,)
   .cyj_2
     top 50%
-    img
+    .cyj_img_wrap
       top auto
       bottom 0
   .jzjcj_1
@@ -848,7 +912,7 @@ export default {
   .cyj_1
     left auto
     right 0
-    img
+    .cyj_img_wrap
       left 0
       right auto
 .yj_wrap_13
@@ -856,7 +920,7 @@ export default {
   .cyj_1
     left auto
     right 0
-    img
+    .cyj_img_wrap
       left 0
       right auto
 .yj_wrap_12
@@ -864,7 +928,7 @@ export default {
   .cyj_1
     left auto
     right 0
-    img
+    .cyj_img_wrap
       left 0
       right auto
 .yj_wrap_10
@@ -876,7 +940,7 @@ export default {
   .cyj_1
     left auto
     right 0
-    img
+    .cyj_img_wrap
       left 0
       right auto
   .kongtuopan_1