diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index d8f1687..1d8387b 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -521,39 +521,24 @@ export const workshopCondition = () => post('api/cockpit/workshopCondition', {})
 //       ],
 //       'LastMonthFailureList': [
 //         {
-//           'device_name': '机器1',
-//           'failure': 27,
-//           'shutdown': null,
-//           'standby': null,
-//           'running': null
+//           'device_name': '压机3',
+//           'failure': '2'
 //         },
 //         {
-//           'device_name': '机器2',
-//           'failure': 11,
-//           'shutdown': null,
-//           'standby': null,
-//           'running': null
+//           'device_name': '压机1',
+//           'failure': '2'
 //         },
 //         {
-//           'device_name': '机器3',
-//           'failure': 28,
-//           'shutdown': null,
-//           'standby': null,
-//           'running': null
+//           'device_name': '压机6',
+//           'failure': '1'
 //         },
 //         {
-//           'device_name': '机器4',
-//           'failure': 20,
-//           'shutdown': null,
-//           'standby': null,
-//           'running': null
+//           'device_name': '压机5',
+//           'failure': '1'
 //         },
 //         {
-//           'device_name': '机器5',
-//           'failure': 23,
-//           'shutdown': null,
-//           'standby': null,
-//           'running': null
+//           'device_name': '压机2',
+//           'failure': '1'
 //         }
 //       ],
 //       'CPDayList': [
@@ -590,39 +575,60 @@ export const workshopCondition = () => post('api/cockpit/workshopCondition', {})
 //       ],
 //       'LastTenFailureList': [
 //         {
-//           'failure_time': '05-30 09:50:12',
-//           'device_code': 'hl01',
-//           'device_name': '混料01',
-//           'failure_info': '机器故障',
-//           'device_status_name': '待机'
+//           'failure_info': '未排产报警',
+//           'device_name': '压机5',
+//           'data_id': '1655172926997131432',
+//           'device_code': 'YJ05',
+//           'failure_time': '2023-06-21 16:19:41'
 //         },
 //         {
-//           'failure_time': '05-30 09:50:12',
-//           'device_code': 'hl01',
-//           'device_name': '混料01',
-//           'failure_info': '机器故障',
-//           'device_status_name': '待机'
+//           'failure_info': '未排产报警',
+//           'device_name': '压机3',
+//           'data_id': '1655172926997132452',
+//           'device_code': 'YJ03',
+//           'failure_time': '2023-06-21 16:19:41'
 //         },
 //         {
-//           'failure_time': '05-30 09:50:12',
-//           'device_code': 'hl01',
-//           'device_name': '混料01',
-//           'failure_info': '机器故障',
-//           'device_status_name': '待机'
+//           'failure_info': '未排产报警',
+//           'device_name': '压机2',
+//           'data_id': '1655172926997139426',
+//           'device_code': 'YJ02',
+//           'failure_time': '2023-06-21 16:19:41'
 //         },
 //         {
-//           'failure_time': '05-30 09:50:12',
-//           'device_code': 'hl01',
-//           'device_name': '混料01',
-//           'failure_info': '机器故障',
-//           'device_status_name': '待机'
+//           'failure_info': '未排产报警',
+//           'device_name': '压机9',
+//           'data_id': '1655172926997139432',
+//           'device_code': 'YJ09',
+//           'failure_time': '2023-06-21 16:19:41'
 //         },
 //         {
-//           'failure_time': '05-30 09:50:12',
-//           'device_code': 'hl01',
-//           'device_name': '混料01',
-//           'failure_info': '机器故障',
-//           'device_status_name': '待机'
+//           'failure_info': '未排产报警',
+//           'device_name': '压机3',
+//           'data_id': '1655172926997139452',
+//           'device_code': 'YJ03',
+//           'failure_time': '2023-06-21 16:19:41'
+//         },
+//         {
+//           'failure_info': '未排产报警',
+//           'device_name': '压机1',
+//           'data_id': '1655172926997139456',
+//           'device_code': 'YJ01',
+//           'failure_time': '2023-06-21 16:19:41'
+//         },
+//         {
+//           'failure_info': '未排产报警',
+//           'device_name': '压机1',
+//           'data_id': '1655172926997139433',
+//           'device_code': 'YJ01',
+//           'failure_time': '2023-06-20 16:19:41'
+//         },
+//         {
+//           'failure_info': '未排产报警',
+//           'device_name': '压机6',
+//           'data_id': '1655172926997111432',
+//           'device_code': 'YJ06',
+//           'failure_time': '2023-06-18 16:19:41'
 //         }
 //       ],
 //       'StackingPositionList': [
@@ -913,116 +919,228 @@ export const workshopCondition = () => post('api/cockpit/workshopCondition', {})
 //       ],
 //       'MixMachineList': [
 //         {
-//           'bom': '3038C2',
+//           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ01',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '7500'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 194,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
-//           'bom': '3038C2',
+//           'bom': '3008C1',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ02',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '9000'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 196,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
-//           'bom': '3034C2',
+//           'bom': '3008C1',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ03',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '3000'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 196,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
-//           'bom': '3034C2',
+//           'bom': '3004M1',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ04',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '3000'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 196,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
-//           'bom': '3038C2',
+//           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ05',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '42000'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 1,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
 //           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ06',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '0'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 0,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
 //           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ07',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '0'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 0,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
 //           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ08',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '0'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 1,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
 //           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ09',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '0'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 0,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
 //           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ10',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '0'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 0,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
 //           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ11',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '0'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 0,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
 //           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ12',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '0'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 0,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
 //           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ13',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '0'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 0,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
 //           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ14',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '0'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 0,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
 //           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ15',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '1501'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 0,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
 //           'bom': '-',
 //           'device_status': 1,
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'HLJ16',
-//           'open_time': '06-14 17:02:48',
-//           'now_capacity': '0'
+//           'mix_num': 0,
+//           'open_time': '',
+//           'work_time': 0,
+//           'error': 0,
+//           'now_capacity': '0',
+//           'status': 0
 //         }
 //       ],
 //       'TrappedShelfList': [
@@ -1093,84 +1211,144 @@ export const workshopCondition = () => post('api/cockpit/workshopCondition', {})
 //       ],
 //       'PressMachineList': [
 //         {
-//           'device_status': 1,
 //           'device_name': '压机1',
+//           'error_time': 8,
+//           'stand_time': 15,
+//           'real_qty': 250,
 //           'device_code': 'YJ01',
-//           'open_time': '2023-06-14 17:02:48',
-//           'material_code': 'GBMCZ3039M4',
-//           'now_capacity': '7304'
+//           'open_time': '2023-06-27 07:47:16',
+//           'work_time': 37,
+//           'current_weight': 1172266814,
+//           'error': 0,
+//           'material_code': 'GBMAC3008C1',
+//           'now_capacity': '719',
+//           'status': 0
 //         },
 //         {
-//           'device_status': 1,
 //           'device_name': '压机2',
+//           'error_time': 39,
+//           'stand_time': 361,
+//           'real_qty': 226,
 //           'device_code': 'YJ02',
-//           'open_time': '2023-06-14 17:02:48',
-//           'material_code': '',
-//           'now_capacity': '7250'
+//           'open_time': '2023-06-27 07:46:41',
+//           'work_time': 276,
+//           'current_weight': 1169393295,
+//           'error': 5,
+//           'material_code': 'GBMCZ3004M1',
+//           'now_capacity': '680',
+//           'status': 0
 //         },
 //         {
-//           'device_status': 1,
 //           'device_name': '压机3',
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'YJ03',
-//           'open_time': '2023-06-14 17:02:48',
-//           'material_code': 'GBMAC3003C1',
-//           'now_capacity': '2040'
+//           'open_time': '',
+//           'work_time': 0,
+//           'current_weight': 0,
+//           'error': 0,
+//           'material_code': '',
+//           'now_capacity': '345',
+//           'status': 0
 //         },
 //         {
-//           'device_status': 1,
 //           'device_name': '压机4',
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'YJ04',
-//           'open_time': '2023-06-14 17:02:48',
-//           'material_code': 'GBMCZ3013L3',
-//           'now_capacity': '1586'
+//           'open_time': '',
+//           'work_time': 0,
+//           'current_weight': 0,
+//           'error': 0,
+//           'material_code': '',
+//           'now_capacity': '349',
+//           'status': 0
 //         },
 //         {
-//           'device_status': 1,
 //           'device_name': '压机5',
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'YJ05',
-//           'open_time': '2023-06-14 17:02:48',
+//           'open_time': '2023-06-20 08:03:23',
+//           'work_time': 741,
+//           'current_weight': 0,
+//           'error': 0,
 //           'material_code': '',
-//           'now_capacity': '0'
+//           'now_capacity': '0',
+//           'status': 2
 //         },
 //         {
-//           'device_status': 1,
 //           'device_name': '压机6',
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'YJ06',
-//           'open_time': '2023-06-14 17:02:48',
+//           'open_time': '2023-06-20 08:03:23',
+//           'work_time': 19448,
+//           'current_weight': 0,
+//           'error': 0,
 //           'material_code': '',
-//           'now_capacity': '0'
+//           'now_capacity': '0',
+//           'status': 2
 //         },
 //         {
-//           'device_status': 1,
 //           'device_name': '压机7',
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'YJ07',
-//           'open_time': '2023-06-14 17:02:48',
+//           'open_time': '',
+//           'work_time': 0,
+//           'current_weight': 0,
+//           'error': 0,
 //           'material_code': '',
-//           'now_capacity': '0'
+//           'now_capacity': '0',
+//           'status': 0
 //         },
 //         {
-//           'device_status': 1,
 //           'device_name': '压机8',
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'YJ08',
-//           'open_time': '2023-06-14 17:02:48',
+//           'open_time': '2023-06-20 08:03:23',
+//           'work_time': 19448,
+//           'current_weight': 0,
+//           'error': 0,
 //           'material_code': '',
-//           'now_capacity': '0'
+//           'now_capacity': '0',
+//           'status': 2
 //         },
 //         {
-//           'device_status': 1,
 //           'device_name': '压机9',
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'YJ09',
-//           'open_time': '2023-06-14 17:02:48',
+//           'open_time': '2023-06-20 08:03:23',
+//           'work_time': 19448,
+//           'current_weight': 0,
+//           'error': 0,
 //           'material_code': '',
-//           'now_capacity': '0'
+//           'now_capacity': '0',
+//           'status': 2
 //         },
 //         {
-//           'device_status': 1,
 //           'device_name': '压机10',
+//           'error_time': 0,
+//           'stand_time': 0,
+//           'real_qty': 0,
 //           'device_code': 'YJ10',
-//           'open_time': '2023-06-14 17:02:48',
+//           'open_time': '2023-06-20 08:03:23',
+//           'work_time': 19448,
+//           'current_weight': 0,
+//           'error': 0,
 //           'material_code': '',
-//           'now_capacity': '0'
+//           'now_capacity': '0',
+//           'status': 2
 //         }
 //       ],
 //       'TrappedMaterialShelfList': [
@@ -2973,7 +3151,241 @@ export const moldingTableDate = () => post('api/cockpit/moldingTableDate', {})
 // 分拣包装左
 export const sortingAndPackagingPopover = () => post('api/cockpit/sortingAndPackagingPopover', {})
 // export const sortingAndPackagingPopover = () => {
-//   let res = {'code': 200, 'desc': '操作成功', 'result': {'SplitOrPalletizingList': [{'bom': '3012C1', 'is_full': '是', 'device_name': '压机1', 'qty': '270', 'mix_num': '20230606000', 'point_name': '分拣拆垛1对接位1', 'vehicle_code': '5070', 'point_code': 'FJCD01DJ01', 'point_status': '1', 'material_code': 'GBMAC3012C1'}, {'bom': '-', 'is_full': '-', 'device_name': '-', 'qty': '-', 'mix_num': '-', 'point_name': '分拣拆垛1对接位2', 'vehicle_code': '', 'point_code': 'FJCD01DJ02', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'is_full': '-', 'device_name': '-', 'qty': '-', 'mix_num': '-', 'point_name': '分拣码垛1对接位1', 'vehicle_code': '0000', 'point_code': 'FJMD01DJ01', 'point_status': '1', 'material_code': '-'}, {'bom': '-', 'is_full': '-', 'device_name': '-', 'qty': '-', 'mix_num': '-', 'point_name': '分拣码垛1对接位2', 'vehicle_code': '0000', 'point_code': 'FJMD01DJ02', 'point_status': '1', 'material_code': '-'}], 'HalfSupportCacheList': [{'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}, {'bom': '-', 'device_name': '-', 'instorage_time': '-', 'qty': '-', 'mix_num': '-', 'point_name': '半托缓存位1', 'point_status_name': '无货', 'vehicle_code': '-', 'point_code': 'BTHC01', 'point_status': '0', 'material_code': '-'}], 'DevicesInfoList': {'DT01': {'device_status': 2, 'device_name': '叠托位', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'DT01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'FJCDJXS01': {'device_status': 2, 'device_name': '分拣拆垛机械手', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'FJCDJXS01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'RGV01': {'device_status': 2, 'device_name': 'RGV搬运车', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'RGV01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'FJMDJXS01': {'device_status': 2, 'device_name': '分拣码垛机械手', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'FJMDJXS01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'CPJ01': {'device_status': 2, 'device_name': '拆盘机', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'CPJ01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'BZJ01': {'device_status': 2, 'device_name': '包装机', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'BZJ01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}, 'FJRGCD01': {'device_status': 2, 'device_name': '分拣人工拆垛', 'device_status_name': '运行中', 'error_time': '0', 'stand_time': '2', 'device_code': 'FJRGCD01', 'open_time': '2023-06-02 11:12:02', 'work_time': '7'}}}}
+//   let res = {
+//     'code': 200,
+//     'desc': '操作成功',
+//     'result': {
+//       'SplitOrPalletizingList': [
+//         {
+//           'bom': '3012C1',
+//           'is_full': '是',
+//           'device_name': '压机1',
+//           'qty': '270',
+//           'mix_num': '20230606000',
+//           'point_name': '分拣拆垛1对接位1',
+//           'vehicle_code': '5070',
+//           'point_code': 'FJCD01DJ01',
+//           'point_status': '1',
+//           'material_code': 'GBMAC3012C1'
+//         },
+//         {
+//           'bom': '-',
+//           'is_full': '-',
+//           'device_name': '-',
+//           'qty': '-',
+//           'mix_num': '-',
+//           'point_name': '分拣拆垛1对接位2',
+//           'vehicle_code': '',
+//           'point_code': 'FJCD01DJ02',
+//           'point_status': '0',
+//           'material_code': '-'
+//         },
+//         {
+//           'bom': '-',
+//           'is_full': '-',
+//           'device_name': '-',
+//           'qty': '-',
+//           'mix_num': '-',
+//           'point_name': '分拣码垛1对接位1',
+//           'vehicle_code': '0000',
+//           'point_code': 'FJMD01DJ01',
+//           'point_status': '1',
+//           'material_code': '-'
+//         },
+//         {
+//           'bom': '-',
+//           'is_full': '-',
+//           'device_name': '-',
+//           'qty': '-',
+//           'mix_num': '-',
+//           'point_name': '分拣码垛1对接位2',
+//           'vehicle_code': '0000',
+//           'point_code': 'FJMD01DJ02',
+//           'point_status': '1',
+//           'material_code': '-'
+//         }
+//       ],
+//       'HalfSupportCacheList': [
+//         {
+//           'bom': '-',
+//           'device_name': '-',
+//           'instorage_time': '-',
+//           'qty': '-',
+//           'mix_num': '-',
+//           'point_name': '半托缓存位1',
+//           'point_status_name': '无货',
+//           'vehicle_code': '-',
+//           'point_code': 'BTHC01',
+//           'point_status': '0',
+//           'material_code': '-'
+//         }
+//       ],
+//       'DevicesInfoList': {
+//         'DT01': {
+//           'device_status': 2,
+//           'device_name': '叠托位',
+//           'device_status_name': '运行中',
+//           'error_time': '0',
+//           'stand_time': '2',
+//           'device_code': 'DT01',
+//           'open_time': '2023-06-02 11:12:02',
+//           'work_time': '7'
+//         },
+//         'FJCDJXS01': {
+//           'device_status': 2,
+//           'device_name': '分拣拆垛机械手',
+//           'device_status_name': '运行中',
+//           'error_time': '0',
+//           'stand_time': '2',
+//           'device_code': 'FJCDJXS01',
+//           'open_time': '2023-06-02 11:12:02',
+//           'work_time': '7'
+//         },
+//         'RGV01': {
+//           'device_status': 2,
+//           'device_name': 'RGV搬运车',
+//           'device_status_name': '运行中',
+//           'error_time': '0',
+//           'stand_time': '2',
+//           'device_code': 'RGV01',
+//           'open_time': '2023-06-02 11:12:02',
+//           'work_time': '7'
+//         },
+//         'FJMDJXS01': {
+//           'device_status': 2,
+//           'device_name': '分拣码垛机械手',
+//           'device_status_name': '运行中',
+//           'error_time': '0',
+//           'stand_time': '2',
+//           'device_code': 'FJMDJXS01',
+//           'open_time': '2023-06-02 11:12:02',
+//           'work_time': '7'
+//         },
+//         'CPJ01': {
+//           'device_status': 2,
+//           'device_name': '拆盘机',
+//           'device_status_name': '运行中',
+//           'error_time': '0',
+//           'stand_time': '2',
+//           'device_code': 'CPJ01',
+//           'open_time': '2023-06-02 11:12:02',
+//           'work_time': '7'
+//         },
+//         'BZJ01': {
+//           'device_status': 2,
+//           'device_name': '包装机',
+//           'device_status_name': '运行中',
+//           'error_time': '0',
+//           'stand_time': '2',
+//           'device_code': 'BZJ01',
+//           'open_time': '2023-06-02 11:12:02',
+//           'work_time': '7'
+//         },
+//         'FJRGCD01': {
+//           'device_status': 2,
+//           'device_name': '分拣人工拆垛',
+//           'device_status_name': '运行中',
+//           'error_time': '0',
+//           'stand_time': '2',
+//           'device_code': 'FJRGCD01',
+//           'open_time': '2023-06-02 11:12:02',
+//           'work_time': '7'
+//         }
+//       },
+//       'PackagingLineList': [
+//         {
+//           'device_code': 'BZX01',
+//           'move': '1',
+//           'vehicle_type': '3',
+//           'vehicle_code': '0001'
+//         },
+//         {
+//           'device_code': 'BZX02',
+//           'move': '1',
+//           'vehicle_type': '2',
+//           'vehicle_code': '0000'
+//         },
+//         {
+//           'device_code': 'BZX03',
+//           'move': '0',
+//           'vehicle_type': '',
+//           'vehicle_code': ''
+//         },
+//         {
+//           'device_code': 'BZX04',
+//           'move': '0',
+//           'vehicle_type': '',
+//           'vehicle_code': ''
+//         },
+//         {
+//           'device_code': 'BZX05',
+//           'move': '0',
+//           'vehicle_type': '',
+//           'vehicle_code': ''
+//         },
+//         {
+//           'device_code': 'BZX06',
+//           'move': '0',
+//           'vehicle_type': '',
+//           'vehicle_code': ''
+//         },
+//         {
+//           'device_code': 'BZX07',
+//           'move': '0',
+//           'vehicle_type': '',
+//           'vehicle_code': ''
+//         },
+//         {
+//           'device_code': 'BZX08',
+//           'move': '1',
+//           'vehicle_type': '2',
+//           'vehicle_code': '1111'
+//         },
+//         {
+//           'device_code': 'BZX09',
+//           'move': '0',
+//           'vehicle_type': '',
+//           'vehicle_code': ''
+//         },
+//         {
+//           'device_code': 'BZX10',
+//           'move': '0',
+//           'vehicle_type': '',
+//           'vehicle_code': ''
+//         },
+//         {
+//           'device_code': 'BZX11',
+//           'move': '0',
+//           'vehicle_type': '',
+//           'vehicle_code': ''
+//         },
+//         {
+//           'device_code': 'BZX12',
+//           'move': '0',
+//           'vehicle_type': '',
+//           'vehicle_code': ''
+//         },
+//         {
+//           'device_code': 'BZX13',
+//           'move': '0',
+//           'vehicle_type': '',
+//           'vehicle_code': ''
+//         },
+//         {
+//           'device_code': 'BZX14',
+//           'move': '1',
+//           'vehicle_type': '2',
+//           'vehicle_code': '0000'
+//         },
+//         {
+//           'device_code': 'BZX15',
+//           'move': '1',
+//           'vehicle_type': '2',
+//           'vehicle_code': '0000'
+//         }
+//       ]
+//     }
+//   }
 //   return res
 // }
 
diff --git a/src/fetch/api.js b/src/fetch/api.js
deleted file mode 100644
index 8e36353..0000000
--- a/src/fetch/api.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import axios from 'axios'
-import qs from 'qs'
-import { toast } from '@js/mUtils.js'
-import store from '../vuex/store'
-
-axios.defaults.timeout = 50000
-// axios.defaults.retry = 4
-// axios.defaults.retryDelay = 5000
-axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
-
-axios.interceptors.request.use(
-  config => {
-    if (config.method === 'post') {
-      if (!config.data.flag) {
-        config.data = qs.stringify(config.data)
-      } else {
-        config.data = config.data.formData
-      }
-    }
-    return config
-  },
-  error => {
-    toast(error.message)
-    return Promise.reject(error)
-    // let config = error.config
-    // if (!config || !config.retry) return Promise.reject(error)
-    // config.__retryCount = config.__retryCount || 0
-    // if (config.__retryCount >= config.retry) {
-    //   return Promise.reject(error)
-    // }
-    // config.__retryCount += 1
-    // let backoff = new Promise(resolve => {
-    //   setTimeout(() => {
-    //     resolve()
-    //   }, config.retryDelay || 1)
-    // })
-    // return backoff.then(() => {
-    //   return axios(config)
-    // })
-  }
-)
-
-axios.interceptors.response.use(
-  response => {
-    return Promise.resolve(response)
-  },
-  error => {
-    toast('网络错误')
-    return Promise.reject(error)
-  }
-)
-
-export const post = (params) => {
-  return new Promise((resolve, reject) => {
-    axios.post(`${store.getters.baseUrl}/wdk?action=wdk.pub&method=call_service&ajaxparam=` + new Date().getTime(), params)
-      .then(response => {
-        // if (response.data.code === '0') {
-        //   toast(response.data.desc)
-        // }
-        resolve(response.data)
-      }, error => {
-        reject(error.message)
-      })
-      .catch((error) => {
-        reject(error)
-      })
-  })
-}
diff --git a/src/main.js b/src/main.js
index 0b4ab64..37e8bfd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,7 +9,6 @@ import '@css/layout.styl'
 import '@js/rem.js'
 import filter from '@js/filter.js'
 import { Dialog, toast } from '@js/mUtils.js'
-import {post} from '@fetch/api.js'
 import * as echarts from 'echarts'
 import VueParticles from 'vue-particles'
 import scroll from 'vue-seamless-scroll'
@@ -20,7 +19,6 @@ for (let k in filter) {
 Vue.prototype.$echarts = echarts
 Vue.prototype.Dialog = Dialog
 Vue.prototype.toast = toast
-Vue.prototype.$post = post
 Vue.use(VueParticles)
 Vue.use(scroll)
 Vue.config.productionTip = false
diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue
index 26af210..2c24591 100644
--- a/src/pages/modules/homepage/one.vue
+++ b/src/pages/modules/homepage/one.vue
@@ -140,10 +140,10 @@
                             <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine yyj">
-                            <img v-show="String(PressMachineList[0].device_status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
-                            <img v-show="String(PressMachineList[0].device_status) === '1'" src="../../../images/workshop/yj_2500_yellow.png" alt="">
-                            <img v-show="String(PressMachineList[0].device_status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
-                            <img v-show="String(PressMachineList[0].device_status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
+                            <img v-show="String(PressMachineList[0].status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
+                            <img v-show="String(PressMachineList[0].status) === '1'" src="../../../images/workshop/yj_2500_yellow.png" alt="">
+                            <img v-show="String(PressMachineList[0].status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
+                            <img v-show="String(PressMachineList[0].status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
                           </div>
                           <div class="sh_machine wzm">
                             <p v-if="PressMachineList.length > 0">{{ PressMachineList[0].device_name }}</p>
@@ -153,8 +153,8 @@
                             <img v-show="String(StackingPositionList[0].color_status) === '1'" src="../../../images/workshop/ktp_green.png" alt="">
                             <img v-show="String(StackingPositionList[0].color_status) === '2'" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="String(StackingPositionList[0].color_status) === '3'" src="../../../images/workshop/ktp_yellow.png" alt="">
-                            <div class="zhuan_qty">
-                              <p>200</p>
+                            <div v-show="String(StackingPositionList[0].color_status) === '1'" class="zhuan_qty">
+                              <p>{{ StackingPositionList[0].encoder_qty }}</p>
                               <div class="zhuan_bg_arrow"></div>
                             </div>
                           </div>
@@ -163,8 +163,8 @@
                             <img v-show="String(StackingPositionList[1].color_status) === '1'" src="../../../images/workshop/ktp_green.png" alt="">
                             <img v-show="String(StackingPositionList[1].color_status) === '2'" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="String(StackingPositionList[1].color_status) === '3'" src="../../../images/workshop/ktp_yellow.png" alt="">
-                            <div class="zhuan_qty">
-                              <p>200</p>
+                            <div v-show="String(StackingPositionList[1].color_status) === '1'" class="zhuan_qty">
+                              <p>{{ StackingPositionList[1].encoder_qty }}</p>
                               <div class="zhuan_bg_arrow"></div>
                             </div>
                           </div>
@@ -197,10 +197,10 @@
                             <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                           </div>
                           <div v-if="PressMachineList.length > 0" class="sh_machine yyj">
-                            <img v-show="String(PressMachineList[1].device_status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
-                            <img v-show="String(PressMachineList[1].device_status) === '1'" src="../../../images/workshop/yj_2500_yellow.png" alt="">
-                            <img v-show="String(PressMachineList[1].device_status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
-                            <img v-show="String(PressMachineList[1].device_status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
+                            <img v-show="String(PressMachineList[1].status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
+                            <img v-show="String(PressMachineList[1].status) === '1'" src="../../../images/workshop/yj_2500_yellow.png" alt="">
+                            <img v-show="String(PressMachineList[1].status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
+                            <img v-show="String(PressMachineList[1].status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
                           </div>
                           <div class="sh_machine wzm">
                             <p v-if="PressMachineList.length > 0">{{ PressMachineList[1].device_name }}</p>
@@ -210,8 +210,8 @@
                             <img v-show="StackingPositionList[2].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                             <img v-show="StackingPositionList[2].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="StackingPositionList[2].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
-                            <div class="zhuan_qty">
-                              <p>200</p>
+                            <div v-show="StackingPositionList[2].color_status === 1" class="zhuan_qty">
+                              <p>{{ StackingPositionList[2].encoder_qty }}</p>
                               <div class="zhuan_bg_arrow"></div>
                             </div>
                           </div>
@@ -220,8 +220,8 @@
                             <img v-show="StackingPositionList[3].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                             <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 class="zhuan_qty">
-                              <p>200</p>
+                            <div v-show="StackingPositionList[3].color_status === 1" class="zhuan_qty">
+                              <p>{{ StackingPositionList[3].encoder_qty }}</p>
                               <div class="zhuan_bg_arrow"></div>
                             </div>
                           </div>
@@ -261,19 +261,19 @@
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
                             <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="">
+                              <img v-show="String(PressMachineList[2].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[2].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[2].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[2].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">
                             <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="">
+                              <img v-show="String(PressMachineList[3].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[3].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[3].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[3].status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                             </div>
                           </div>
                           <div class="sh_machine weilan">
@@ -293,8 +293,8 @@
                             <img v-show="StackingPositionList[4].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                             <img v-show="StackingPositionList[4].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="StackingPositionList[4].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
-                            <div class="zhuan_qty">
-                              <p>200</p>
+                            <div v-show="StackingPositionList[4].color_status === 1" class="zhuan_qty">
+                              <p>{{StackingPositionList[4].encoder_qty}}</p>
                               <div class="zhuan_bg_arrow"></div>
                             </div>
                           </div>
@@ -303,8 +303,8 @@
                             <img v-show="StackingPositionList[5].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                             <img v-show="StackingPositionList[5].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="StackingPositionList[5].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
-                            <div class="zhuan_qty">
-                              <p>200</p>
+                            <div v-show="StackingPositionList[5].color_status === 1" class="zhuan_qty">
+                              <p>{{StackingPositionList[5].encoder_qty}}</p>
                               <div class="zhuan_bg_arrow"></div>
                             </div>
                           </div>
@@ -313,8 +313,8 @@
                             <img v-show="StackingPositionList[6].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                             <img v-show="StackingPositionList[6].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="StackingPositionList[6].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
-                            <div class="zhuan_qty">
-                              <p>200</p>
+                            <div v-show="StackingPositionList[6].color_status === 1" class="zhuan_qty">
+                              <p>{{ StackingPositionList[6].encoder_qty }}</p>
                               <div class="zhuan_bg_arrow"></div>
                             </div>
                           </div>
@@ -323,8 +323,8 @@
                             <img v-show="StackingPositionList[7].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                             <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 class="zhuan_qty">
-                              <p>200</p>
+                            <div v-show="StackingPositionList[7].color_status === 1" class="zhuan_qty">
+                              <p>{{ StackingPositionList[7].encoder_qty }}</p>
                               <div class="zhuan_bg_arrow"></div>
                             </div>
                           </div>
@@ -361,19 +361,19 @@
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
                             <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="">
+                              <img v-show="String(PressMachineList[4].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[4].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[4].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[4].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">
                             <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="">
+                              <img v-show="String(PressMachineList[5].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[5].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[5].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[5].status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                             </div>
                           </div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
@@ -416,10 +416,10 @@
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
                             <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="">
+                              <img v-show="String(PressMachineList[6].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[6].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[6].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[6].status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                             </div>
                           </div>
                           <div class="sh_machine weilan">
@@ -430,8 +430,8 @@
                             <img v-show="StackingPositionList[12].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                             <img v-show="StackingPositionList[12].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="StackingPositionList[12].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
-                            <div class="zhuan_qty">
-                              <p>200</p>
+                            <div v-show="StackingPositionList[12].color_status === 1" class="zhuan_qty">
+                              <p>{{StackingPositionList[12].encoder_qty}}</p>
                               <div class="zhuan_bg_arrow"></div>
                             </div>
                           </div>
@@ -440,8 +440,8 @@
                             <img v-show="StackingPositionList[13].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                             <img v-show="StackingPositionList[13].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                             <img v-show="StackingPositionList[13].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
-                            <div class="zhuan_qty">
-                              <p>200</p>
+                            <div v-show="StackingPositionList[13].color_status === 1" class="zhuan_qty">
+                              <p>{{ StackingPositionList[13].encoder_qty }}</p>
                               <div class="zhuan_bg_arrow"></div>
                             </div>
                           </div>
@@ -481,19 +481,19 @@
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
                             <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="">
+                              <img v-show="String(PressMachineList[7].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[7].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[7].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[7].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">
                             <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="">
+                              <img v-show="String(PressMachineList[8].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[8].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[8].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[8].status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                             </div>
                           </div>
                           <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1">
@@ -581,10 +581,10 @@
                           <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
                             <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="">
+                              <img v-show="String(PressMachineList[9].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                              <img v-show="String(PressMachineList[9].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                              <img v-show="String(PressMachineList[9].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                              <img v-show="String(PressMachineList[9].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">
@@ -1580,6 +1580,7 @@ export default {
       left auto
       right 0
       _fj(row, center)
+      padding 0 3px
       p
         position relative
         z-index 7
diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue
index 1fed172..d7453a9 100644
--- a/src/pages/modules/homepage/two.vue
+++ b/src/pages/modules/homepage/two.vue
@@ -237,23 +237,6 @@
                               <img src="../../../images/workshop/ggtssj_y.png" alt="">
                             </div>
                           </div>
-                          <div class="machine_wrap ggtj_wrap_1 ggtj_wrap_6">
-                            <div class="sh_machine rgpt">
-                              <img src="../../../images/workshop/rgpt.png" alt="">
-                            </div>
-                            <div class="machine_wrap ggtj">
-                              <img src="../../../images/workshop/ggtssj.png" alt="" v-for="(e,i) in [1,2,3,4,5,6,7,8,9]" :key="i">
-                            </div>
-                            <div class="sh_machine ltssj">
-                              <img src="../../../images/workshop/ltssj_g.png" alt="">
-                            </div>
-                            <div class="sh_machine fmj_bzd">
-                              <img src="../../../images/workshop/fmj_bzd.png" alt="">
-                            </div>
-                            <div class="sh_machine crj">
-                              <img src="../../../images/workshop/crj.png" alt="">
-                            </div>
-                          </div>
                           <div class="machine_wrap ggtj_wrap_1 ggtj_wrap_7">
                             <div class="machine_wrap ggtj">
                               <img src="../../../images/workshop/ggtssj_y.png" alt="">
@@ -279,9 +262,33 @@
                               <img src="../../../images/workshop/ggtssj_y.png" alt="">
                             </div>
                           </div>
-                          <div class="machine_wrap ggtj_wrap_1 ggtj_wrap_12">
-                            <div class="machine_wrap ggtj">
-                              <img src="../../../images/workshop/ggtssj.png" alt="" v-for="(e,i) in [1,2,3,4,5,6,7,8,9]" :key="i">
+                          <div class="machine_wrap ggtj_wrap_1 ggtj_wrap_6">
+                            <div v-if="PackagingLineList.length > 0" class="machine_wrap ggtj">
+                              <div v-for="(e,i) in PackagingLineList.slice(0,8)" :key="i" class="ggtj_list_wrap" @click.stop="bzxInfo(e)">
+                                <div v-show="i === 5" class="sh_machine rgpt">
+                                  <img src="../../../images/workshop/rgpt.png" alt="">
+                                </div>
+                                <img class="sh_machine" src="../../../images/workshop/ggtssj.png" alt="">
+                                <img v-show="String(e.move) === '1'" class="mtp" src="../../../images/workshop/mtp.png" alt="">
+                                <div v-show="i === 5" class="sh_machine ltssj">
+                                  <img src="../../../images/workshop/ltssj_g.png" alt="">
+                                </div>
+                                <div v-show="i === 6" class="sh_machine fmj_bzd">
+                                  <img src="../../../images/workshop/fmj_bzd.png" alt="">
+                                </div>
+                              </div>
+                            </div>
+                            <div v-if="PackagingLineList.length > 0" class="sh_machine crj" @click.stop="bzxInfo(PackagingLineList[8])">
+                              <img src="../../../images/workshop/crj.png" alt="">
+                              <img v-show="String(PackagingLineList[8].move) === '1'" class="mtp" src="../../../images/workshop/mtp.png" alt="">
+                            </div>
+                          </div>
+                          <div class="machine_wrap ggtj_wrap_1 ggtj_wrap_6 ggtj_wrap_12">
+                            <div v-if="PackagingLineList.length > 0" class="machine_wrap ggtj">
+                              <div v-for="(e,i) in PackagingLineList.slice(9)" :key="i" class="ggtj_list_wrap" @click.stop="bzxInfo(e)">
+                                <img class="sh_machine" src="../../../images/workshop/ggtssj.png">
+                                <img v-show="String(e.move) === '1'" class="mtp" src="../../../images/workshop/mtp.png" alt="">
+                              </div>
                             </div>
                           </div>
                         </div>
@@ -372,7 +379,7 @@
 </template>
 
 <script>
-import { workshopCondition } from '@js/getData2'
+import { workshopCondition, sortingAndPackagingPopover } from '@js/getData2'
 export default {
   name: 'two',
   data () {
@@ -387,7 +394,8 @@ export default {
       LastTenFailureList: [],
       SortAndPalletizingList: [], // 分拣拆码垛对接位
       SemiFinishedProductShelfList: [], // 半成品货架数据
-      ManipulatorInfoList: [] // 机械手数据
+      ManipulatorInfoList: [], // 机械手数据
+      PackagingLineList: [] // 包装线数据
     }
   },
   computed: {
@@ -406,6 +414,7 @@ export default {
   },
   mounted () {
     this._workshopCondition()
+    this._sortingAndPackagingPopover()
     this.refresh()
   },
   beforeDestroy () {
@@ -415,6 +424,7 @@ export default {
     refresh () {
       this.timer = setInterval(() => {
         this._workshopCondition()
+        this._sortingAndPackagingPopover()
       }, this.interTime)
     },
     async _workshopCondition () {
@@ -430,6 +440,12 @@ export default {
         this.setEchart2()
       }
     },
+    async _sortingAndPackagingPopover () {
+      let res = await sortingAndPackagingPopover()
+      if (res.code === 200) {
+        this.PackagingLineList = [...res.result.PackagingLineList]
+      }
+    },
     setEchart1 () {
       let colors = ['#30EBC9', '#E2BB0E', '#516282', '#F96700']
       let status = ['运行', '待机', '关机', '故障']
@@ -1096,7 +1112,7 @@ export default {
   top: 0.6%;
   left: 75%;
 .ggtj_wrap_1
-  _wh(5%, 90%)
+  width 5%
   top: 9%;
   left: 7%;
   .ggtj
@@ -1116,24 +1132,41 @@ export default {
 .ggtj_wrap_5
   left 40%
 .ggtj_wrap_6
+  height 90%
   left 48%
+  z-index 4
   .rgpt
-    top 57%
+    top 9%
     width: 200%;
-    left: -50%;
-    z-index 1
+    left: -50%
   .ltssj
-    top 55%
-    width: 120%;
-    left: -10%;
+    _wh(120%, 100%)
+    left: -10%
+    z-index 4
+    img
+      height 100%
   .fmj_bzd
-    top 80%
+    top 39%
     width: 120%;
     left: -10%;
+    z-index 4
   .crj
-    top: 98%;
-    width: 180%;
+    top: 88%;
+    _wh(180%, 12.01%)
     left: -74%;
+    .mtp
+      width 55.56%
+      left 43%
+      top 21%
+  .ggtj
+    _wh(100%, 87.69%)
+  .ggtj_list_wrap
+    position relative
+    _wh(100%, 12.5%)
+    _fj(row,center)
+    .mtp
+      position relative
+      z-index 4
 .ggtj_wrap_7
   left 56%
 .ggtj_wrap_8
@@ -1146,14 +1179,23 @@ export default {
   left 80%
 .ggtj_wrap_12
   left: 76%;
-  top: 58%;
+  top: 49%;
   transform: rotate(-90deg);
+  z-index 5
+  .ggtj_list_wrap
+    position relative
+    _wh(100%, 12.5%)
+    _fj(row,center)
+    .mtp
+      position relative
+      z-index 4
 .elect_1
   width: 4%;
   height: 2.96%;
   left: 55%;
   top: 1%;
   background-color #fff
+  z-index 1
   _fj(row,center)
   img
     position static
@@ -1176,7 +1218,7 @@ export default {
   width: 7%;
   height: 4.4%;
   left: 36%;
-  top: 115%;
+  top: 108%;
   img
     _wh(40%, 100%)
 .elect_5
diff --git a/src/pages/modules/sortpack/one.vue b/src/pages/modules/sortpack/one.vue
index a788165..811dc6b 100644
--- a/src/pages/modules/sortpack/one.vue
+++ b/src/pages/modules/sortpack/one.vue
@@ -57,12 +57,20 @@
                           <img v-show="SortAndPalletizingList[0].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                           <img v-show="SortAndPalletizingList[0].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                           <img v-show="SortAndPalletizingList[0].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                          <div v-show="SortAndPalletizingList[0].color_status === 1" class="zhuan_qty">
+                            <p>{{ SortAndPalletizingList[0].encoder_qty }}</p>
+                            <div class="zhuan_bg_arrow"></div>
+                          </div>
                         </div>
-                        <div v-if="SortAndPalletizingList.length > 0" class="sh_machine kongtuopan_2" ref="cmgw02" @click.stop="yjInfo('cmgw', 2)">
+                        <div v-if="SortAndPalletizingList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_2" ref="cmgw02" @click.stop="yjInfo('cmgw', 2)">
                           <img v-show="SortAndPalletizingList[1].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
                           <img v-show="SortAndPalletizingList[1].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                           <img v-show="SortAndPalletizingList[1].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                           <img v-show="SortAndPalletizingList[1].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                          <div v-show="SortAndPalletizingList[1].color_status === 1" class="zhuan_qty">
+                            <p>{{ SortAndPalletizingList[1].encoder_qty }}</p>
+                            <div class="zhuan_bg_arrow"></div>
+                          </div>
                         </div>
                         <div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot_1" :class="{'rotate_1': String(ManipulatorInfoList[4].color_status) === '1'}" ref="FJCDJXS01" @click.stop="yjInfo('device', 'FJCDJXS01')">
                           <img v-show="String(ManipulatorInfoList[4].color_status) === '0'" src="../../../images/workshop/robot_cmd_gray.png" alt="">
@@ -78,12 +86,20 @@
                           <img v-show="SortAndPalletizingList[2].color_status === 1" src="../../../images/workshop/cmdssj_green.png" alt="">
                           <img v-show="SortAndPalletizingList[2].color_status === 2" src="../../../images/workshop/cmdssj_red.png" alt="">
                           <img v-show="SortAndPalletizingList[2].color_status === 3" src="../../../images/workshop/cmdssj_yellow.png" alt="">
+                          <div v-show="SortAndPalletizingList[2].color_status === 1" class="zhuan_qty">
+                            <p>{{ SortAndPalletizingList[2].encoder_qty }}</p>
+                            <div class="zhuan_bg_arrow"></div>
+                          </div>
                         </div>
                         <div v-if="SortAndPalletizingList.length > 0" class="sh_machine cmdssj_1 cmdssj_2" ref="cmgw04" @click.stop="yjInfo('cmgw', 4)">
                           <img v-show="SortAndPalletizingList[3].color_status === 0" src="../../../images/workshop/cmdssj_gray.png" alt="">
                           <img v-show="SortAndPalletizingList[3].color_status === 1" src="../../../images/workshop/cmdssj_green.png" alt="">
                           <img v-show="SortAndPalletizingList[3].color_status === 2" src="../../../images/workshop/cmdssj_red.png" alt="">
                           <img v-show="SortAndPalletizingList[3].color_status === 3" src="../../../images/workshop/cmdssj_yellow.png" alt="">
+                          <div v-show="SortAndPalletizingList[3].color_status === 1" class="zhuan_qty">
+                            <p>{{ SortAndPalletizingList[3].encoder_qty }}</p>
+                            <div class="zhuan_bg_arrow"></div>
+                          </div>
                         </div>
                         <div class="sh_machine robot_2 rotate_2" ref="FJMDJXS01" @click.stop="yjInfo('device', 'FJMDJXS01')">
                           <img src="../../../images/workshop/robot_cmd_green.png" alt="">
@@ -99,7 +115,7 @@
                         <div class="sh_machine kongtuopan_1">
                           <img src="../../../images/workshop/mtp.png" alt="">
                         </div>
-                        <div class="sh_machine kongtuopan_2">
+                        <div class="sh_machine kongtuopan_1 kongtuopan_2">
                           <img src="../../../images/workshop/mtp.png" alt="">
                         </div>
                         <div class="sh_machine robot_1">
@@ -172,23 +188,6 @@
                             <img src="../../../images/workshop/ggtssj_y.png" alt="">
                           </div>
                         </div>
-                        <div class="machine_wrap ggtj_wrap_1 ggtj_wrap_6">
-                          <div class="sh_machine rgpt">
-                            <img src="../../../images/workshop/rgpt.png" alt="">
-                          </div>
-                          <div class="machine_wrap ggtj">
-                            <img src="../../../images/workshop/ggtssj.png" alt="" v-for="(e,i) in [1,2,3,4,5,6,7,8,9]" :key="i">
-                          </div>
-                          <div class="sh_machine ltssj">
-                            <img src="../../../images/workshop/ltssj_g.png" alt="">
-                          </div>
-                          <div class="sh_machine fmj_bzd">
-                            <img src="../../../images/workshop/fmj_bzd.png" alt="">
-                          </div>
-                          <div class="sh_machine crj">
-                            <img src="../../../images/workshop/crj.png" alt="">
-                          </div>
-                        </div>
                         <div class="machine_wrap ggtj_wrap_1 ggtj_wrap_7">
                           <div class="machine_wrap ggtj pointer" ref="bthc04" @click.stop="yjInfo('bthc', 4)">
                             <img src="../../../images/workshop/ggtssj_y.png" alt="">
@@ -214,11 +213,122 @@
                             <img src="../../../images/workshop/ggtssj_y.png" alt="">
                           </div>
                         </div>
-                        <div class="machine_wrap ggtj_wrap_1 ggtj_wrap_12">
-                          <div class="machine_wrap ggtj">
-                            <img src="../../../images/workshop/ggtssj.png" alt="" v-for="(e,i) in [1,2,3,4,5,6,7,8,9]" :key="i">
+                        <div class="machine_wrap ggtj_wrap_1 ggtj_wrap_6">
+                          <div v-if="PackagingLineList.length > 0" class="machine_wrap ggtj">
+                            <div v-for="(e,i) in PackagingLineList.slice(0,8)" :key="i" class="ggtj_list_wrap" @click.stop="bzxInfo(e)">
+                              <div v-show="i === 5" class="sh_machine rgpt">
+                                <img src="../../../images/workshop/rgpt.png" alt="">
+                              </div>
+                              <img class="sh_machine" src="../../../images/workshop/ggtssj.png" alt="">
+                              <img v-show="String(e.move) === '1'" class="mtp" src="../../../images/workshop/mtp.png" alt="">
+                              <div v-show="i === 5" class="sh_machine ltssj">
+                                <img src="../../../images/workshop/ltssj_g.png" alt="">
+                              </div>
+                              <div v-show="i === 6" class="sh_machine fmj_bzd">
+                                <img src="../../../images/workshop/fmj_bzd.png" alt="">
+                              </div>
+                              <div v-if="e.device_code === pkId" class="popup_block_wraper popup_block_wraper_1">
+                                <div class="foldline foldline_right"></div>
+                                <div class="popup_bg">
+                                  <div class="popup_block">
+                                    <div class="pop_header">
+                                      <div class="pop_name">{{pkObj.device_code}}</div>
+                                    </div>
+                                    <div class="pop_content">
+                                      <div class="pop_item">
+                                        <div class="pop_label">状态</div>
+                                        <div class="pop_val">{{ ['无货', '有货'][Number(pkObj.move)] }}</div>
+                                      </div>
+                                      <div class="pop_item">
+                                        <div class="pop_label">载具类型</div>
+                                        <div class="pop_val">{{ pkObj.vehicle_type }}</div>
+                                      </div>
+                                      <div class="pop_item">
+                                        <div class="pop_label">载具编码</div>
+                                        <div class="pop_val">{{ pkObj.vehicle_code }}</div>
+                                      </div>
+                                    </div>
+                                  </div>
+                                </div>
+                                <div class="iconfont icon-guanbi close_btn" @click.stop="closeModal1"></div>
+                              </div>
+                            </div>
+                          </div>
+                          <div v-if="PackagingLineList.length > 0" class="sh_machine crj" @click.stop="bzxInfo(PackagingLineList[8])">
+                            <img src="../../../images/workshop/crj.png" alt="">
+                            <img v-show="String(PackagingLineList[8].move) === '1'" class="mtp" src="../../../images/workshop/mtp.png" alt="">
+                            <div v-if="PackagingLineList[8].device_code === pkId" class="popup_block_wraper popup_block_wraper_2">
+                              <div class="foldline foldline_right"></div>
+                              <div class="popup_bg">
+                                <div class="popup_block">
+                                  <div class="pop_header">
+                                    <div class="pop_name">{{pkObj.device_code}}</div>
+                                  </div>
+                                  <div class="pop_content">
+                                    <div class="pop_item">
+                                      <div class="pop_label">状态</div>
+                                      <div class="pop_val">{{ ['无货', '有货'][Number(pkObj.move)] }}</div>
+                                    </div>
+                                    <div class="pop_item">
+                                      <div class="pop_label">载具类型</div>
+                                      <div class="pop_val">{{ pkObj.vehicle_type }}</div>
+                                    </div>
+                                    <div class="pop_item">
+                                      <div class="pop_label">载具编码</div>
+                                      <div class="pop_val">{{ pkObj.vehicle_code }}</div>
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                              <div class="iconfont icon-guanbi close_btn" @click.stop="closeModal1"></div>
+                            </div>
                           </div>
                         </div>
+                        <div class="machine_wrap ggtj_wrap_1 ggtj_wrap_6 ggtj_wrap_12">
+                          <div v-if="PackagingLineList.length > 0" class="machine_wrap ggtj">
+                            <div v-for="(e,i) in PackagingLineList.slice(9)" :key="i" class="ggtj_list_wrap" @click.stop="bzxInfo(e)">
+                              <img class="sh_machine" src="../../../images/workshop/ggtssj.png">
+                              <img v-show="String(e.move) === '1'" class="mtp" src="../../../images/workshop/mtp.png" alt="">
+                              <div v-if="e.device_code === pkId" class="popup_block_wraper popup_block_wraper_3">
+                                <div class="foldline foldline_right"></div>
+                                <div class="popup_bg">
+                                  <div class="popup_block">
+                                    <div class="pop_header">
+                                      <div class="pop_name">{{pkObj.device_code}}</div>
+                                    </div>
+                                    <div class="pop_content">
+                                      <div class="pop_item">
+                                        <div class="pop_label">状态</div>
+                                        <div class="pop_val">{{ ['无货', '有货'][Number(pkObj.move)] }}</div>
+                                      </div>
+                                      <div class="pop_item">
+                                        <div class="pop_label">载具类型</div>
+                                        <div class="pop_val">{{ pkObj.vehicle_type }}</div>
+                                      </div>
+                                      <div class="pop_item">
+                                        <div class="pop_label">载具编码</div>
+                                        <div class="pop_val">{{ pkObj.vehicle_code }}</div>
+                                      </div>
+                                    </div>
+                                  </div>
+                                </div>
+                                <div class="iconfont icon-guanbi close_btn" @click.stop="closeModal1"></div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div class="sh_machine elect_1">
+                        <img src="../../../images/workshop/elect.png" alt="">
+                      </div>
+                      <div class="sh_machine elect_1 elect_2">
+                        <img src="../../../images/workshop/elect.png" alt="">
+                      </div>
+                      <div class="sh_machine elect_1 elect_3">
+                        <img src="../../../images/workshop/elect.png" alt="">
+                      </div>
+                      <div class="sh_machine elect_1 elect_4">
+                        <img src="../../../images/workshop/elect.png" alt="">
                       </div>
                     </div>
                 </div>
@@ -328,12 +438,14 @@ export default {
       DevicesInfoList: {}, // 设备弹窗
       SortAndPalletizingList: [], // 分拣拆码垛对接位
       ManipulatorInfoList: [], // 机械手数据
+      PackagingLineList: [], // 包装线数据
       showModal: false,
       machine: '',
       top: '',
       left: '',
       foldlineStyle: '',
-      pkObj: {}
+      pkObj: {},
+      pkId: ''
     }
   },
   mounted () {
@@ -364,6 +476,7 @@ export default {
         this.SplitOrPalletizingList = [...res.result.SplitOrPalletizingList]
         this.HalfSupportCacheList = [...res.result.HalfSupportCacheList]
         this.DevicesInfoList = res.result.DevicesInfoList
+        this.PackagingLineList = [...res.result.PackagingLineList]
       }
     },
     expandTooltip () {
@@ -373,6 +486,7 @@ export default {
       this.showModal = false
       this.machine = ''
       this.pkObj = {}
+      this.pkId = ''
     },
     yjInfo (m, type) {
       this.machine = m
@@ -406,6 +520,7 @@ export default {
             this.foldlineStyle = 'foldline_right'
             break
         }
+        this.showModal = true
       }
       if (m === 'bthc') {
         if (!this.HalfSupportCacheList.length) {
@@ -417,48 +532,70 @@ export default {
             this.top = this.$refs.bthc01.getBoundingClientRect().top - 13
             this.left = this.$refs.bthc01.getBoundingClientRect().left - 627
             this.foldlineStyle = 'foldline_right'
+            this.showModal = true
             break
           case 2:
-            this.pkObj = this.HalfSupportCacheList[1]
-            this.top = this.$refs.bthc02.getBoundingClientRect().top - 13
-            this.left = this.$refs.bthc02.getBoundingClientRect().left - 627
-            this.foldlineStyle = 'foldline_right'
+            if (this.HalfSupportCacheList.length >= 2) {
+              this.pkObj = this.HalfSupportCacheList[1]
+              this.top = this.$refs.bthc02.getBoundingClientRect().top - 13
+              this.left = this.$refs.bthc02.getBoundingClientRect().left - 627
+              this.foldlineStyle = 'foldline_right'
+              this.showModal = true
+            }
             break
           case 3:
-            this.pkObj = this.HalfSupportCacheList[2]
-            this.top = this.$refs.bthc03.getBoundingClientRect().top - 13
-            this.left = this.$refs.bthc03.getBoundingClientRect().left - 627
-            this.foldlineStyle = 'foldline_right'
+            if (this.HalfSupportCacheList.length >= 3) {
+              this.pkObj = this.HalfSupportCacheList[2]
+              this.top = this.$refs.bthc03.getBoundingClientRect().top - 13
+              this.left = this.$refs.bthc03.getBoundingClientRect().left - 627
+              this.foldlineStyle = 'foldline_right'
+              this.showModal = true
+            }
             break
           case 4:
-            this.pkObj = this.HalfSupportCacheList[3]
-            this.top = this.$refs.bthc04.getBoundingClientRect().top - 13
-            this.left = this.$refs.bthc04.getBoundingClientRect().left - 627
-            this.foldlineStyle = 'foldline_right'
+            if (this.HalfSupportCacheList.length >= 4) {
+              this.pkObj = this.HalfSupportCacheList[3]
+              this.top = this.$refs.bthc04.getBoundingClientRect().top - 13
+              this.left = this.$refs.bthc04.getBoundingClientRect().left - 627
+              this.foldlineStyle = 'foldline_right'
+              this.showModal = true
+            }
             break
           case 5:
-            this.pkObj = this.HalfSupportCacheList[4]
-            this.top = this.$refs.bthc05.getBoundingClientRect().top - 13
-            this.left = this.$refs.bthc05.getBoundingClientRect().left - 627
-            this.foldlineStyle = 'foldline_right'
+            if (this.HalfSupportCacheList.length >= 5) {
+              this.pkObj = this.HalfSupportCacheList[4]
+              this.top = this.$refs.bthc05.getBoundingClientRect().top - 13
+              this.left = this.$refs.bthc05.getBoundingClientRect().left - 627
+              this.foldlineStyle = 'foldline_right'
+              this.showModal = true
+            }
             break
           case 6:
-            this.pkObj = this.HalfSupportCacheList[5]
-            this.top = this.$refs.bthc06.getBoundingClientRect().top - 13
-            this.left = this.$refs.bthc06.getBoundingClientRect().left - 627
-            this.foldlineStyle = 'foldline_right'
+            if (this.HalfSupportCacheList.length >= 6) {
+              this.pkObj = this.HalfSupportCacheList[5]
+              this.top = this.$refs.bthc06.getBoundingClientRect().top - 13
+              this.left = this.$refs.bthc06.getBoundingClientRect().left - 627
+              this.foldlineStyle = 'foldline_right'
+              this.showModal = true
+            }
             break
           case 7:
-            this.pkObj = this.HalfSupportCacheList[6]
-            this.top = this.$refs.bthc07.getBoundingClientRect().top - 13
-            this.left = this.$refs.bthc07.getBoundingClientRect().left - 627
-            this.foldlineStyle = 'foldline_right'
+            if (this.HalfSupportCacheList.length >= 7) {
+              this.pkObj = this.HalfSupportCacheList[6]
+              this.top = this.$refs.bthc07.getBoundingClientRect().top - 13
+              this.left = this.$refs.bthc07.getBoundingClientRect().left - 627
+              this.foldlineStyle = 'foldline_right'
+              this.showModal = true
+            }
             break
           case 8:
-            this.pkObj = this.HalfSupportCacheList[7]
-            this.top = this.$refs.bthc08.getBoundingClientRect().top - 13
-            this.left = this.$refs.bthc08.getBoundingClientRect().left - 627
-            this.foldlineStyle = 'foldline_right'
+            if (this.HalfSupportCacheList.length >= 8) {
+              this.pkObj = this.HalfSupportCacheList[7]
+              this.top = this.$refs.bthc08.getBoundingClientRect().top - 13
+              this.left = this.$refs.bthc08.getBoundingClientRect().left - 627
+              this.foldlineStyle = 'foldline_right'
+              this.showModal = true
+            }
             break
         }
       }
@@ -498,8 +635,16 @@ export default {
             this.foldlineStyle = 'foldline_left'
             break
         }
+        this.showModal = true
       }
-      this.showModal = true
+    },
+    bzxInfo (e) {
+      this.pkId = this.pkId === e.device_code ? '' : e.device_code
+      this.pkObj = this.pkId === e.device_code ? e : {}
+    },
+    closeModal1 () {
+      this.pkId = ''
+      this.pkObj = {}
     }
   }
 }
@@ -630,11 +775,45 @@ export default {
     top 3%
     left 3%
     cursor pointer
+  .zhuan_qty
+    position absolute
+    top -28px
+    right: 0;
+    z-index 8
+    _wh(50px, 20px)
+    background-color: #0ff;
+    border: 1px solid #0ff;
+    border-radius: 5px
+    p
+      display block
+      _fj(row,center)
+      _wh(100%, 100%)
+      _font(13px, 13px, #fff,,center)
+      white-space nowrap
+    .zhuan_bg_arrow
+      position: absolute;
+      bottom -5px
+      right 10%
+      display: block;
+      width: 0;
+      height: 0;
+      border-color: transparent;
+      border-style: solid;
+      border-width: 5px
+      border-bottom-width: 0;
+      border-top-color: #0ff;
+      &:after
+        content: " ";
+        border-width: 5px;
   .kongtuopan_2
-    width 26%
-    top 3%
     left auto
     right 3%
+    .zhuan_qty
+      right auto
+      left 0
+      .zhuan_bg_arrow
+        right auto
+        left 10%
   .fjfztb
     width: 59%;
     top: 9%;
@@ -665,6 +844,12 @@ export default {
     right 4%
     img
       transform rotate(0deg)
+    .zhuan_qty
+      right auto
+      left 0
+      .zhuan_bg_arrow
+        right auto
+        left 10%
 .robot_2
     top: auto;
     bottom: -8%
@@ -744,7 +929,7 @@ export default {
   top: 0.6%;
   left: 75%;
 .ggtj_wrap_1
-  _wh(5%, 90%)
+  width 5%
   top: 9%;
   left: 7%;
   .ggtj
@@ -764,24 +949,41 @@ export default {
 .ggtj_wrap_5
   left 40%
 .ggtj_wrap_6
+  height 90%
   left 48%
+  z-index 4
   .rgpt
-    top 57%
+    top 9%
     width: 200%;
-    left: -50%;
-    z-index 1
+    left: -50%
   .ltssj
-    top 55%
-    width: 120%;
-    left: -10%;
+    _wh(120%, 100%)
+    left: -10%
+    z-index 4
+    img
+      height 100%
   .fmj_bzd
-    top 80%
+    top 39%
     width: 120%;
     left: -10%;
+    z-index 4
   .crj
-    top: 98%;
-    width: 180%;
+    top: 88%;
+    _wh(180%, 12.01%)
     left: -74%;
+    .mtp
+      width 55.56%
+      left 43%
+      top 21%
+  .ggtj
+    _wh(100%, 87.69%)
+  .ggtj_list_wrap
+    position relative
+    _wh(100%, 12.5%)
+    _fj(row,center)
+    .mtp
+      position relative
+      z-index 4
 .ggtj_wrap_7
   left 56%
 .ggtj_wrap_8
@@ -794,8 +996,55 @@ export default {
   left 80%
 .ggtj_wrap_12
   left: 76%;
-  top: 58%;
+  top: 49%;
   transform: rotate(-90deg);
+  z-index 5
+  .ggtj_list_wrap
+    position relative
+    _wh(100%, 12.5%)
+    _fj(row,center)
+    .mtp
+      position relative
+      z-index 4
+.elect_1
+  width: 4%;
+  height: 2.96%;
+  left: 55%;
+  top: 1%;
+  background-color #fff
+  z-index 1
+  _fj(row,center)
+  img
+    position static
+    _wh(50%, 100%)
+.elect_2
+  width: 2.7%;
+  height: 4.4%;
+  left: 55%;
+  top: 38%;
+  img
+    _wh(80%, 80%)
+.elect_3
+  width: 3.5%;
+  height: 4.4%;
+  left: 12%;
+  top: 50%;
+  img
+    _wh(60%, 100%)
+.elect_4
+  width: 7%;
+  height: 4.4%;
+  left: 36%;
+  top: 108%;
+  img
+    _wh(40%, 100%)
+.elect_5
+  width: 2%;
+  height: 28%;
+  left: 100.2%
+  top: 56%;
+  img
+    _wh(80%, 50%)
 .rotate_1
   animation rotate_1 1.5s linear 1.5s infinite alternate-reverse
 @keyframes rotate_1 {
@@ -828,4 +1077,27 @@ export default {
         transform: rotateZ(-90deg)
     }
 }
+.popup_block_wraper_1
+  position absolute
+  top: -4%;
+  left: auto;
+  right: 249%;
+  z-index 10
+.popup_block_wraper_2
+  position absolute
+  top: -137%
+  left: auto;
+  right: 140%;
+  z-index 10
+  .foldline_right
+    transform: rotateY(180deg)
+.popup_block_wraper_3
+  position absolute
+  top: -773%;
+  left: auto;
+  right: -550%;
+  z-index: 10;
+  transform: rotate(90deg);
+  .foldline_right
+    transform: rotateY(180deg)
 </style>
diff --git a/src/pages/modules/takeshape/one.vue b/src/pages/modules/takeshape/one.vue
index e8c9313..4ddb267 100644
--- a/src/pages/modules/takeshape/one.vue
+++ b/src/pages/modules/takeshape/one.vue
@@ -95,10 +95,10 @@
                         <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine yyj" ref="yj01" @click.stop="yjInfo('yj', 1)">
-                        <img v-show="String(PressMachineList[0].device_status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
-                        <img v-show="String(PressMachineList[0].device_status) === '1'" src="../../../images/workshop/yj_2500_yellow.png" alt="">
-                        <img v-show="String(PressMachineList[0].device_status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
-                        <img v-show="String(PressMachineList[0].device_status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
+                        <img v-show="String(PressMachineList[0].status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
+                        <img v-show="String(PressMachineList[0].status) === '1'" src="../../../images/workshop/yj_2500_yellow.png" alt="">
+                        <img v-show="String(PressMachineList[0].status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
+                        <img v-show="String(PressMachineList[0].status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
                       </div>
                       <div class="sh_machine wzm">
                         <p v-if="PressMachineList.length > 0">{{ PressMachineList[0].device_name }}</p>
@@ -108,12 +108,20 @@
                         <img v-show="String(StackingPositionList[0].color_status) === '1'" src="../../../images/workshop/ktp_green.png" alt="">
                         <img v-show="String(StackingPositionList[0].color_status) === '2'" src="../../../images/workshop/ktp_red.png" alt="">
                         <img v-show="String(StackingPositionList[0].color_status) === '3'" src="../../../images/workshop/ktp_yellow.png" alt="">
+                        <div v-show="String(StackingPositionList[0].color_status) === '1'" class="zhuan_qty">
+                          <p>{{ StackingPositionList[0].encoder_qty }}</p>
+                          <div class="zhuan_bg_arrow"></div>
+                        </div>
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_2" ref="mpgw02" @click.stop="yjInfo('mpgw', 2)">
                         <img v-show="String(StackingPositionList[1].color_status) === '0'" src="../../../images/workshop/ktp_gray.png" alt="">
                         <img v-show="String(StackingPositionList[1].color_status) === '1'" src="../../../images/workshop/ktp_green.png" alt="">
                         <img v-show="String(StackingPositionList[1].color_status) === '2'" src="../../../images/workshop/ktp_red.png" alt="">
                         <img v-show="String(StackingPositionList[1].color_status) === '3'" src="../../../images/workshop/ktp_yellow.png" alt="">
+                        <div v-show="String(StackingPositionList[1].color_status) === '1'" class="zhuan_qty">
+                          <p>{{ StackingPositionList[1].encoder_qty }}</p>
+                          <div class="zhuan_bg_arrow"></div>
+                        </div>
                       </div>
                       <div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot pointer" :class="{'rotate_2500_1': String(ManipulatorInfoList[0].color_status) === '1'}" ref="jxs01" @click.stop="yjInfo('jxs', 1)">
                         <img v-show="String(ManipulatorInfoList[0].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
@@ -144,10 +152,10 @@
                         <img src="../../../images/workshop/jzjcss_yellow.png" alt="">
                       </div>
                       <div v-if="PressMachineList.length > 0" class="sh_machine yyj" ref="yj02" @click.stop="yjInfo('yj', 2)">
-                        <img v-show="String(PressMachineList[1].device_status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
-                        <img v-show="String(PressMachineList[1].device_status) === '1'" src="../../../images/workshop/yj_2500_yellow.png" alt="">
-                        <img v-show="String(PressMachineList[1].device_status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
-                        <img v-show="String(PressMachineList[1].device_status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
+                        <img v-show="String(PressMachineList[1].status) === '0'" src="../../../images/workshop/yj_2500_gray.png" alt="">
+                        <img v-show="String(PressMachineList[1].status) === '1'" src="../../../images/workshop/yj_2500_yellow.png" alt="">
+                        <img v-show="String(PressMachineList[1].status) === '2'" src="../../../images/workshop/yj_2500_green.png" alt="">
+                        <img v-show="String(PressMachineList[1].status) === '3'" src="../../../images/workshop/yj_2500_red.png" alt="">
                       </div>
                       <div class="sh_machine wzm">
                         <p v-if="PressMachineList.length > 0">{{ PressMachineList[1].device_name }}</p>
@@ -157,12 +165,20 @@
                         <img v-show="StackingPositionList[2].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                         <img v-show="StackingPositionList[2].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                         <img v-show="StackingPositionList[2].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                        <div v-show="StackingPositionList[2].color_status === 1" class="zhuan_qty">
+                          <p>{{ StackingPositionList[2].encoder_qty }}</p>
+                          <div class="zhuan_bg_arrow"></div>
+                        </div>
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_2" ref="mpgw04" @click.stop="yjInfo('mpgw', 4)">
                         <img v-show="StackingPositionList[3].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
                         <img v-show="StackingPositionList[3].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                         <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 v-show="StackingPositionList[3].color_status === 1" class="zhuan_qty">
+                          <p>{{ StackingPositionList[3].encoder_qty }}</p>
+                          <div class="zhuan_bg_arrow"></div>
+                        </div>
                       </div>
                       <div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot pointer" :class="{'rotate_2500_2': String(ManipulatorInfoList[1].color_status) === '1'}" ref="jxs02" @click.stop="yjInfo('jxs', 2)">
                         <img v-show="String(ManipulatorInfoList[1].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
@@ -200,19 +216,19 @@
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
                         <div class="cyj_img_wrap" ref="yj03" @click.stop="yjInfo('yj', 3)">
                           <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="">
+                          <img v-show="String(PressMachineList[2].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[2].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[2].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[2].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">
                         <div class="cyj_img_wrap" ref="yj04" @click.stop="yjInfo('yj', 4)">
                           <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="">
+                          <img v-show="String(PressMachineList[3].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[3].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[3].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[3].status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                         </div>
                       </div>
                       <div class="sh_machine weilan">
@@ -232,24 +248,40 @@
                         <img v-show="StackingPositionList[4].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                         <img v-show="StackingPositionList[4].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                         <img v-show="StackingPositionList[4].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                        <div v-show="StackingPositionList[4].color_status === 1" class="zhuan_qty">
+                          <p>{{StackingPositionList[4].encoder_qty}}</p>
+                          <div class="zhuan_bg_arrow"></div>
+                        </div>
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_2" ref="mpgw06" @click.stop="yjInfo('mpgw', 6)">
                         <img v-show="StackingPositionList[5].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
                         <img v-show="StackingPositionList[5].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                         <img v-show="StackingPositionList[5].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                         <img v-show="StackingPositionList[5].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                        <div v-show="StackingPositionList[5].color_status === 1" class="zhuan_qty">
+                          <p>{{StackingPositionList[5].encoder_qty}}</p>
+                          <div class="zhuan_bg_arrow"></div>
+                        </div>
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_3" ref="mpgw07" @click.stop="yjInfo('mpgw', 7)">
                         <img v-show="StackingPositionList[6].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
                         <img v-show="StackingPositionList[6].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                         <img v-show="StackingPositionList[6].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                         <img v-show="StackingPositionList[6].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                        <div v-show="StackingPositionList[6].color_status === 1" class="zhuan_qty">
+                            <p>{{ StackingPositionList[6].encoder_qty }}</p>
+                            <div class="zhuan_bg_arrow"></div>
+                          </div>
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_4" ref="mpgw08" @click.stop="yjInfo('mpgw', 8)">
                         <img v-show="StackingPositionList[7].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
                         <img v-show="StackingPositionList[7].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                         <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 v-show="StackingPositionList[7].color_status === 1" class="zhuan_qty">
+                          <p>{{ StackingPositionList[7].encoder_qty }}</p>
+                          <div class="zhuan_bg_arrow"></div>
+                        </div>
                       </div>
                       <div v-if="ManipulatorInfoList.length > 0" class="sh_machine robot pointer" :class="{'rotate_630_1': String(ManipulatorInfoList[2].color_status) === '1'}" ref="jxs03" @click.stop="yjInfo('jxs', 3)">
                         <img v-show="String(ManipulatorInfoList[2].color_status) === '0'" src="../../../images/workshop/robot_2500_gray.png" alt="">
@@ -284,19 +316,19 @@
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
                         <div class="cyj_img_wrap" ref="yj05" @click.stop="yjInfo('yj', 5)">
                           <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="">
+                          <img v-show="String(PressMachineList[4].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[4].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[4].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[4].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">
                         <div class="cyj_img_wrap" ref="yj06" @click.stop="yjInfo('yj', 6)">
                           <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="">
+                          <img v-show="String(PressMachineList[5].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[5].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[5].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[5].status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                         </div>
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1" ref="mpgw09" @click.stop="yjInfo('mpgw', 9)">
@@ -339,10 +371,10 @@
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
                         <div class="cyj_img_wrap" ref="yj07" @click.stop="yjInfo('yj', 7)">
                           <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="">
+                          <img v-show="String(PressMachineList[6].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[6].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[6].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[6].status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                         </div>
                       </div>
                       <div class="sh_machine weilan">
@@ -353,12 +385,20 @@
                         <img v-show="StackingPositionList[12].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                         <img v-show="StackingPositionList[12].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                         <img v-show="StackingPositionList[12].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                        <div v-show="StackingPositionList[12].color_status === 1" class="zhuan_qty">
+                          <p>{{StackingPositionList[12].encoder_qty}}</p>
+                          <div class="zhuan_bg_arrow"></div>
+                        </div>
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1 kongtuopan_2" ref="mpgw14" @click.stop="yjInfo('mpgw', 14)">
                         <img v-show="StackingPositionList[13].color_status === 0" src="../../../images/workshop/ktp_gray.png" alt="">
                         <img v-show="StackingPositionList[13].color_status === 1" src="../../../images/workshop/ktp_green.png" alt="">
                         <img v-show="StackingPositionList[13].color_status === 2" src="../../../images/workshop/ktp_red.png" alt="">
                         <img v-show="StackingPositionList[13].color_status === 3" src="../../../images/workshop/ktp_yellow.png" alt="">
+                        <div v-show="StackingPositionList[13].color_status === 1" class="zhuan_qty">
+                          <p>{{ StackingPositionList[13].encoder_qty }}</p>
+                          <div class="zhuan_bg_arrow"></div>
+                        </div>
                       </div>
                       <div class="sh_machine jcpmj">
                         <img src="../../../images/workshop/jcpmj.png" alt="">
@@ -396,19 +436,19 @@
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1">
                         <div class="cyj_img_wrap" ref="yj08" @click.stop="yjInfo('yj', 8)">
                           <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="">
+                          <img v-show="String(PressMachineList[7].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[7].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[7].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[7].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">
                         <div class="cyj_img_wrap" ref="yj09" @click.stop="yjInfo('yj', 9)">
                           <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="">
+                          <img v-show="String(PressMachineList[8].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[8].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[8].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[8].status) === '3'" src="../../../images/workshop/yj_630_red.png" alt="">
                         </div>
                       </div>
                       <div v-if="StackingPositionList.length > 0" class="sh_machine kongtuopan_1" ref="mpgw15" @click.stop="yjInfo('mpgw', 15)">
@@ -496,10 +536,10 @@
                       <div v-if="PressMachineList.length > 0" class="sh_machine cyj_1 cyj_2">
                         <div class="cyj_img_wrap" ref="yj10" @click.stop="yjInfo('yj', 10)">
                           <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="">
+                          <img v-show="String(PressMachineList[9].status) === '0'" src="../../../images/workshop/yj_630_gray.png" alt="">
+                          <img v-show="String(PressMachineList[9].status) === '1'" src="../../../images/workshop/yj_630_yellow.png" alt="">
+                          <img v-show="String(PressMachineList[9].status) === '2'" src="../../../images/workshop/yj_630_green.png" alt="">
+                          <img v-show="String(PressMachineList[9].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" ref="mpgw20" @click.stop="yjInfo('mpgw', 20)">
@@ -1265,13 +1305,14 @@ export default {
     left: 61%;
     .zhuan_qty
       position absolute
-      bottom -30px
-      right: 0;
+      bottom: -47px;
+      right: -49%;
       z-index 8
       _wh(50px, 20px)
       background-color: #0ff;
       border: 1px solid #0ff;
       border-radius: 5px
+      transform: rotate(-90deg);
       p
         display block
         _fj(row,center)
@@ -1280,27 +1321,21 @@ export default {
         white-space nowrap
       .zhuan_bg_arrow
         position: absolute;
-        top -5px
-        right 10%
+        top: 3px;
+        right: -5px;
         display: block;
         width: 0;
         height: 0;
         border-color: transparent;
         border-style: solid;
         border-width: 5px
-        border-top-width: 0;
-        border-bottom-color: #0ff;
+        border-right-width: 0;
+        border-left-color: #0ff;
         &:after
           content: " ";
           border-width: 5px;
   .kongtuopan_2
     left: 74%;
-    .zhuan_qty
-      right auto
-      left 0
-      .zhuan_bg_arrow
-        right auto
-        left 10%
   .elect_1
     width: 10%;
     height: 9%;
@@ -1326,14 +1361,15 @@ export default {
       bottom auto
       top 0
       right auto
-      left 32px
+      left 20px
       .zhuan_bg_arrow
         border-color: transparent;
         border-width: 5px;
-        border-left-width: 0;
-        border-right-color: #0ff;
-        top: 20%;
-        left: -5px;
+        border-top-width: 0;
+        border-bottom-color: #0ff;
+        top -5px
+        right 50%
+        transform: translateX(50%)
   .kongtuopan_2
     top 80%
   .weilan
@@ -1418,10 +1454,10 @@ export default {
       .zhuan_bg_arrow
         border-color: transparent;
         border-width: 5px;
-        border-bottom-width: 0;
-        border-top-color: #0ff;
-        top auto
-        bottom -5px
+        border-left-width: 0;
+        border-right-color: #0ff;
+        left: -5px;
+        right: auto;
   .kongtuopan_2
     left: 80%;
   .kongtuopan_3
@@ -1432,27 +1468,23 @@ export default {
       .zhuan_bg_arrow
         border-color: transparent;
         border-width: 5px;
-        border-top-width: 0;
-        border-bottom-color: #0ff;
-        top -5px
-        bottom auto
+        border-right-width: 0;
+        border-left-color: #0ff;
+        left: auto;
+        right: -5px;
   .kongtuopan_4
     top: 64%
     left: 80%;
     .zhuan_qty
       bottom -47px
       top auto
-      right auto
-      left 0
       .zhuan_bg_arrow
         border-color: transparent;
         border-width: 5px;
-        border-top-width: 0;
-        border-bottom-color: #0ff;
-        top -5px
-        bottom auto
-        right auto
-        left 10%
+        border-right-width: 0;
+        border-left-color: #0ff;
+        left: auto;
+        right: -5px;
   .elect_2
     top: 101%;
     left: 38%;
@@ -1492,18 +1524,25 @@ export default {
       transform rotate(90deg)
     .zhuan_qty
       bottom auto
-      top 0
+      top -13px
       right auto
-      left 32px
+      left 20px
       .zhuan_bg_arrow
         border-color: transparent;
         border-width: 5px;
-        border-left-width: 0;
-        border-right-color: #0ff;
-        top: 20%;
-        left: -5px;
+        border-top-width: 0;
+        border-bottom-color: #0ff;
+        top -5px
+        right 60%
+        left auto
   .kongtuopan_2
     top: 59%
+    .zhuan_qty
+      bottom -13px
+      top auto
+      .zhuan_bg_arrow
+        left 60%
+        right auto
   .jcpmj
     width: 18%;
     top: 12%;