diff --git a/src/assets/css/layout.styl b/src/assets/css/layout.styl
index 85cc8f5..328e336 100644
--- a/src/assets/css/layout.styl
+++ b/src/assets/css/layout.styl
@@ -2,6 +2,7 @@
 
 // 样式测试
 .style_block
+  display none
   position absolute
   _wh(calc(100% / 3), calc(100% / 3))
   background red
diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index 098ea17..e9157c3 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -2065,3 +2065,977 @@ export const moldingMaterialCondition = () => {
   }
   return res
 }
+
+// 成型右
+// export const moldingTableDate = () => post('api/cockpit/moldingTableDate', {})
+export const moldingTableDate = () => {
+  let res = {
+    'code': 200,
+    'desc': '操作成功',
+    'result': {
+      'MoldingIOStoringList': [
+        {
+          'bom': '3003C1',
+          'create_time': '2023-06-05 09:39:15',
+          'qty': '305',
+          'mix_num': '20230605000',
+          'io_type': '入库',
+          'vehicle_code': '5011',
+          'point_code': 'BCPHW40',
+          'material_code': 'GBMAC3003C1'
+        },
+        {
+          'bom': '3003C1',
+          'create_time': '2023-06-05 09:39:15',
+          'qty': '230',
+          'mix_num': '20230605000',
+          'io_type': '入库',
+          'vehicle_code': '5082',
+          'point_code': 'BCPHW29',
+          'material_code': 'GBMAC3003C1'
+        },
+        {
+          'bom': '3015C2',
+          'create_time': '2023-06-05 09:39:15',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'io_type': '入库',
+          'vehicle_code': '5269',
+          'point_code': 'BCPHW16',
+          'material_code': 'GBMAC3015C2'
+        },
+        {
+          'bom': '3012C1',
+          'create_time': '2023-06-05 10:06:16',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'io_type': '出库',
+          'vehicle_code': '5116',
+          'point_code': 'BCPHW21',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'bom': '1001C1',
+          'create_time': '2023-06-05 13:33:22',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'io_type': '出库',
+          'vehicle_code': '5038',
+          'point_code': 'BCPHW22',
+          'material_code': 'ZLMCZ1001C1'
+        },
+        {
+          'bom': '3004M1',
+          'create_time': '2023-06-05 13:33:22',
+          'qty': '-',
+          'mix_num': '-',
+          'io_type': '出库',
+          'vehicle_code': '5002',
+          'point_code': 'BCPHW14',
+          'material_code': 'GBMCZ3004M1'
+        },
+        {
+          'bom': '3004M1',
+          'create_time': '2023-06-05 13:33:22',
+          'qty': '-',
+          'mix_num': '-',
+          'io_type': '出库',
+          'vehicle_code': '5098',
+          'point_code': 'BCPHW10',
+          'material_code': 'GBMCZ3004M1'
+        },
+        {
+          'bom': '3004M1',
+          'create_time': '2023-06-05 13:33:22',
+          'qty': '-',
+          'mix_num': '-',
+          'io_type': '出库',
+          'vehicle_code': '5068',
+          'point_code': 'BCPHW09',
+          'material_code': 'GBMCZ3004M1'
+        },
+        {
+          'bom': '3034C2',
+          'create_time': '2023-06-05 12:36:22',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'io_type': '出库',
+          'vehicle_code': '5253',
+          'point_code': 'BCPHW11',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'bom': '3004M1',
+          'create_time': '2023-06-05 13:33:22',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'io_type': '出库',
+          'vehicle_code': '5008',
+          'point_code': 'BCPHW01',
+          'material_code': 'GBMCZ3004M1'
+        },
+        {
+          'bom': '3004M1',
+          'create_time': '2023-06-05 13:33:22',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'io_type': '出库',
+          'vehicle_code': '5091',
+          'point_code': 'BCPHW08',
+          'material_code': 'GBMCZ3004M1'
+        },
+        {
+          'bom': '3012C1',
+          'create_time': '2023-06-05 14:01:49',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'io_type': '出库',
+          'vehicle_code': '5007',
+          'point_code': 'BCPHW16',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'bom': '3034C2',
+          'create_time': '2023-06-05 14:11:40',
+          'qty': '18',
+          'mix_num': '20230605000',
+          'io_type': '出库',
+          'vehicle_code': '5245',
+          'point_code': 'BCPHW17',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'bom': '3012C1',
+          'create_time': '2023-06-05 14:35:16',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'io_type': '出库',
+          'vehicle_code': '5254',
+          'point_code': 'BCPHW19',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'bom': '3034C2',
+          'create_time': '2023-06-05 14:44:04',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'io_type': '出库',
+          'vehicle_code': '5016',
+          'point_code': 'BCPHW20',
+          'material_code': 'GBMAC3034C2'
+        }
+      ],
+      'SemiFinishedProductShelList': [
+        {
+          'create_time': '2023-05-25 14:41:19',
+          'qty': '0',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位1',
+          'vehicle_code': '5036',
+          'point_code': 'BCPHW01',
+          'point_status': '1',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'create_time': '2023-05-26 10:09:57',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位2',
+          'vehicle_code': '5122',
+          'point_code': 'BCPHW02',
+          'point_status': '1',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'create_time': '2023-05-26 10:40:47',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位3',
+          'vehicle_code': '5024',
+          'point_code': 'BCPHW03',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-22 08:48:57',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位4',
+          'vehicle_code': '5063',
+          'point_code': 'BCPHW04',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-19 16:47:43',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位5',
+          'vehicle_code': '5058',
+          'point_code': 'BCPHW05',
+          'point_status': '1',
+          'material_code': 'GBMCZ3009L3'
+        },
+        {
+          'create_time': '2023-05-22 15:35:42',
+          'qty': '0',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位6',
+          'vehicle_code': '5073',
+          'point_code': 'BCPHW06',
+          'point_status': '1',
+          'material_code': 'GBMCZ3004M1'
+        },
+        {
+          'create_time': '2023-05-25 15:04:34',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位7',
+          'vehicle_code': '5053',
+          'point_code': 'BCPHW07',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-25 15:26:48',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位8',
+          'vehicle_code': '5248',
+          'point_code': 'BCPHW08',
+          'point_status': '1',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'create_time': '2023-05-22 12:07:59',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位9',
+          'vehicle_code': '5050',
+          'point_code': 'BCPHW09',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-26 11:18:40',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位10',
+          'vehicle_code': '5004',
+          'point_code': 'BCPHW10',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-26 12:40:49',
+          'qty': '0',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位11',
+          'vehicle_code': '5272',
+          'point_code': 'BCPHW11',
+          'point_status': '1',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'create_time': '2023-05-26 11:57:29',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位12',
+          'vehicle_code': '5077',
+          'point_code': 'BCPHW12',
+          'point_status': '1',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'create_time': '2023-05-26 09:14:11',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位13',
+          'vehicle_code': '5133',
+          'point_code': 'BCPHW13',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-22 10:35:26',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位14',
+          'vehicle_code': '5039',
+          'point_code': 'BCPHW14',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-26 12:18:54',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位15',
+          'vehicle_code': '5033',
+          'point_code': 'BCPHW15',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-29 08:54:25',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位16',
+          'vehicle_code': '5269',
+          'point_code': 'BCPHW16',
+          'point_status': '1',
+          'material_code': 'GBMAC3015C2'
+        },
+        {
+          'create_time': '',
+          'qty': '',
+          'mix_num': '-',
+          'point_name': '半成品货位17',
+          'vehicle_code': '-',
+          'point_code': 'BCPHW17',
+          'point_status': '0',
+          'material_code': '-'
+        },
+        {
+          'create_time': '2023-05-18 14:56:43',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位18',
+          'vehicle_code': '5143',
+          'point_code': 'BCPHW18',
+          'point_status': '1',
+          'material_code': 'GBMCZ3009L3'
+        },
+        {
+          'create_time': '2023-05-26 14:41:39',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位19',
+          'vehicle_code': '5080',
+          'point_code': 'BCPHW19',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-26 15:00:32',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位20',
+          'vehicle_code': '5091',
+          'point_code': 'BCPHW20',
+          'point_status': '1',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'create_time': '2023-05-18 13:47:45',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位21',
+          'vehicle_code': '5081',
+          'point_code': 'BCPHW21',
+          'point_status': '1',
+          'material_code': 'GBMCZ3009L3'
+        },
+        {
+          'create_time': '2023-05-22 15:43:40',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位22',
+          'vehicle_code': '5034',
+          'point_code': 'BCPHW22',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-26 07:53:36',
+          'qty': '324',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位23',
+          'vehicle_code': '5048',
+          'point_code': 'BCPHW23',
+          'point_status': '1',
+          'material_code': 'GBMAC3003C1'
+        },
+        {
+          'create_time': '2023-05-23 09:19:36',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位24',
+          'vehicle_code': '5070',
+          'point_code': 'BCPHW24',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-26 09:17:28',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位25',
+          'vehicle_code': '5076',
+          'point_code': 'BCPHW25',
+          'point_status': '1',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'create_time': '2023-05-26 10:53:00',
+          'qty': '0',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位26',
+          'vehicle_code': '5066',
+          'point_code': 'BCPHW26',
+          'point_status': '1',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'create_time': '2023-05-26 10:53:19',
+          'qty': '324',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位27',
+          'vehicle_code': '5120',
+          'point_code': 'BCPHW27',
+          'point_status': '1',
+          'material_code': 'GBMAC3003C1'
+        },
+        {
+          'create_time': '2023-05-23 09:33:58',
+          'qty': '0',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位28',
+          'vehicle_code': '5069',
+          'point_code': 'BCPHW28',
+          'point_status': '1',
+          'material_code': 'GBMCZ3004M1'
+        },
+        {
+          'create_time': '2023-05-29 08:10:28',
+          'qty': '230',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位29',
+          'vehicle_code': '5082',
+          'point_code': 'BCPHW29',
+          'point_status': '1',
+          'material_code': 'GBMAC3003C1'
+        },
+        {
+          'create_time': '',
+          'qty': '',
+          'mix_num': '-',
+          'point_name': '半成品货位30',
+          'vehicle_code': '-',
+          'point_code': 'BCPHW30',
+          'point_status': '0',
+          'material_code': '-'
+        },
+        {
+          'create_time': '2023-05-26 13:08:07',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位31',
+          'vehicle_code': '5054',
+          'point_code': 'BCPHW31',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-22 13:47:38',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位32',
+          'vehicle_code': '5029',
+          'point_code': 'BCPHW32',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-19 15:44:44',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位33',
+          'vehicle_code': '5144',
+          'point_code': 'BCPHW33',
+          'point_status': '1',
+          'material_code': 'GBMCZ3009L3'
+        },
+        {
+          'create_time': '2023-05-22 13:01:53',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位34',
+          'vehicle_code': '5085',
+          'point_code': 'BCPHW34',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-26 13:30:59',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位35',
+          'vehicle_code': '5049',
+          'point_code': 'BCPHW35',
+          'point_status': '1',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'create_time': '2023-05-26 13:44:51',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位36',
+          'vehicle_code': '5249',
+          'point_code': 'BCPHW36',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-26 14:37:39',
+          'qty': '120',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位37',
+          'vehicle_code': '5256',
+          'point_code': 'BCPHW37',
+          'point_status': '1',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'create_time': '2023-05-22 14:45:16',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位38',
+          'vehicle_code': '5020',
+          'point_code': 'BCPHW38',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-26 15:07:17',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位39',
+          'vehicle_code': '5008',
+          'point_code': 'BCPHW39',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-26 15:19:14',
+          'qty': '305',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位40',
+          'vehicle_code': '5011',
+          'point_code': 'BCPHW40',
+          'point_status': '1',
+          'material_code': 'GBMAC3003C1'
+        },
+        {
+          'create_time': '2023-05-22 16:21:06',
+          'qty': '288',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位41',
+          'vehicle_code': '5146',
+          'point_code': 'BCPHW41',
+          'point_status': '1',
+          'material_code': 'GBMCZ3004M1'
+        },
+        {
+          'create_time': '2023-05-22 16:21:52',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位42',
+          'vehicle_code': '5131',
+          'point_code': 'BCPHW42',
+          'point_status': '1',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'create_time': '2023-05-23 10:24:13',
+          'qty': '270',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位43',
+          'vehicle_code': '5061',
+          'point_code': 'BCPHW43',
+          'point_status': '1',
+          'material_code': 'GBMCZ3004M1'
+        },
+        {
+          'create_time': '2023-05-23 12:07:16',
+          'qty': '0',
+          'mix_num': '20230605000',
+          'point_name': '半成品货位44',
+          'vehicle_code': '5112',
+          'point_code': 'BCPHW44',
+          'point_status': '1',
+          'material_code': 'GBMCZ3004M1'
+        },
+        {
+          'create_time': '',
+          'qty': '',
+          'mix_num': '-',
+          'point_name': '半成品货位45',
+          'vehicle_code': '-',
+          'point_code': 'BCPHW45',
+          'point_status': '0',
+          'material_code': '-'
+        },
+        {
+          'create_time': '',
+          'qty': '',
+          'mix_num': '-',
+          'point_name': '半成品货位46',
+          'vehicle_code': '-',
+          'point_code': 'BCPHW46',
+          'point_status': '0',
+          'material_code': '-'
+        },
+        {
+          'create_time': '',
+          'qty': '',
+          'mix_num': '-',
+          'point_name': '半成品货位47',
+          'vehicle_code': '-',
+          'point_code': 'BCPHW47',
+          'point_status': '0',
+          'material_code': '-'
+        },
+        {
+          'create_time': '',
+          'qty': '',
+          'mix_num': '-',
+          'point_name': '半成品货位48',
+          'vehicle_code': '-',
+          'point_code': 'BCPHW48',
+          'point_status': '0',
+          'material_code': '-'
+        },
+        {
+          'create_time': '',
+          'qty': '',
+          'mix_num': '-',
+          'point_name': '半成品货位49',
+          'vehicle_code': '-',
+          'point_code': 'BCPHW49',
+          'point_status': '0',
+          'material_code': '-'
+        },
+        {
+          'create_time': '',
+          'qty': '',
+          'mix_num': '-',
+          'point_name': '半成品货位50',
+          'vehicle_code': '-',
+          'point_code': 'BCPHW50',
+          'point_status': '0',
+          'material_code': '-'
+        },
+        {
+          'create_time': '',
+          'qty': '',
+          'mix_num': '-',
+          'point_name': '半成品货位51',
+          'vehicle_code': '-',
+          'point_code': 'BCPHW51',
+          'point_status': '0',
+          'material_code': '-'
+        },
+        {
+          'create_time': '',
+          'qty': '',
+          'mix_num': '-',
+          'point_name': '半成品货位52',
+          'vehicle_code': '-',
+          'point_code': 'BCPHW52',
+          'point_status': '0',
+          'material_code': '-'
+        }
+      ],
+      'MoldingDayList': [
+        {
+          'bom': '3012C1',
+          'workorder_id': '1660922283415453696',
+          'plan_qty': '7000',
+          'workorder_code': '230523040',
+          'realproducestart_date': '2023-05-24 07:56:48',
+          'order_status': '5',
+          'device_name': '压机1',
+          'order_status_name': '完成',
+          'real_qty': '2298',
+          'device_code': 'YJ01',
+          'realproduceend_date': '2023-05-24 16:19:25',
+          'total_mix_frequency': '8',
+          'region_code': 'YZ',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'bom': '3012C1',
+          'workorder_id': '1661283274846281728',
+          'plan_qty': '5000',
+          'workorder_code': '230524031',
+          'realproducestart_date': '2023-05-25 08:07:39',
+          'order_status': '5',
+          'device_name': '压机1',
+          'order_status_name': '完成',
+          'real_qty': '2415',
+          'device_code': 'YJ01',
+          'realproduceend_date': '2023-05-25 15:40:43',
+          'total_mix_frequency': '10',
+          'region_code': 'YZ',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'bom': '3034C2',
+          'workorder_id': '1661283420745146368',
+          'plan_qty': '3000',
+          'workorder_code': '230524034',
+          'realproducestart_date': '2023-05-25 08:08:02',
+          'order_status': '5',
+          'device_name': '压机2',
+          'order_status_name': '完成',
+          'real_qty': '2552',
+          'device_code': 'YJ02',
+          'realproduceend_date': '2023-05-25 15:45:51',
+          'total_mix_frequency': '11',
+          'region_code': 'YZ',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'bom': '3003C1',
+          'workorder_id': '1661283572813832192',
+          'plan_qty': '7000',
+          'workorder_code': '230524037',
+          'realproducestart_date': '2023-05-26 07:54:01',
+          'order_status': '5',
+          'device_name': '压机3',
+          'order_status_name': '完成',
+          'real_qty': '898',
+          'device_code': 'YJ03',
+          'realproduceend_date': '2023-05-26 15:51:28',
+          'total_mix_frequency': '2',
+          'region_code': 'YZ',
+          'material_code': 'GBMAC3003C1'
+        },
+        {
+          'bom': '3003C1',
+          'workorder_id': '1661283680963960832',
+          'plan_qty': '900',
+          'workorder_code': '230524040',
+          'realproducestart_date': '2023-05-26 07:53:34',
+          'order_status': '5',
+          'device_name': '压机4',
+          'order_status_name': '完成',
+          'real_qty': '902',
+          'device_code': 'YJ04',
+          'realproduceend_date': '2023-05-26 13:54:22',
+          'total_mix_frequency': '1',
+          'region_code': 'YZ',
+          'material_code': 'GBMAC3003C1'
+        },
+        {
+          'bom': '3012C1',
+          'workorder_id': '1661644006297387008',
+          'plan_qty': '12500',
+          'workorder_code': '230525013',
+          'realproducestart_date': '2023-05-26 07:49:42',
+          'order_status': '5',
+          'device_name': '压机1',
+          'order_status_name': '完成',
+          'real_qty': '12310',
+          'device_code': 'YJ01',
+          'realproduceend_date': '2023-05-26 15:38:37',
+          'total_mix_frequency': '9',
+          'region_code': 'YZ',
+          'material_code': 'GBMAC3012C1'
+        },
+        {
+          'bom': '3034C2',
+          'workorder_id': '1661644086618308608',
+          'plan_qty': '12500',
+          'workorder_code': '230525016',
+          'realproducestart_date': '2023-05-26 07:49:29',
+          'order_status': '5',
+          'device_name': '压机2',
+          'order_status_name': '完成',
+          'real_qty': '12508',
+          'device_code': 'YJ02',
+          'realproduceend_date': '2023-05-26 15:33:27',
+          'total_mix_frequency': '9',
+          'region_code': 'YZ',
+          'material_code': 'GBMAC3034C2'
+        },
+        {
+          'bom': '3038C2',
+          'workorder_id': '1662005782209839104',
+          'plan_qty': '1296',
+          'workorder_code': '230526025',
+          'realproducestart_date': '2023-05-29 08:09:21',
+          'order_status': '3',
+          'device_name': '压机1',
+          'order_status_name': '生产中',
+          'real_qty': '1200',
+          'device_code': 'YJ01',
+          'realproduceend_date': '-',
+          'total_mix_frequency': '1',
+          'region_code': 'YZ',
+          'material_code': 'GBMAC3038C2'
+        },
+        {
+          'bom': '3038C2',
+          'workorder_id': '1662006089157394432',
+          'plan_qty': '3888',
+          'workorder_code': '230526031',
+          'realproducestart_date': '-',
+          'order_status': '1',
+          'device_name': '压机1',
+          'order_status_name': '未生产',
+          'real_qty': '3856',
+          'device_code': 'YJ01',
+          'realproduceend_date': '-',
+          'total_mix_frequency': '0',
+          'region_code': 'YZ',
+          'material_code': 'GBMAC3038C2'
+        },
+        {
+          'bom': '3003C1',
+          'workorder_id': '1662006554016301056',
+          'plan_qty': '5500',
+          'workorder_code': '230526040',
+          'realproducestart_date': '2023-05-29 08:31:33',
+          'order_status': '3',
+          'device_name': '压机3',
+          'order_status_name': '生产中',
+          'real_qty': '5000',
+          'device_code': 'YJ03',
+          'realproduceend_date': '-',
+          'total_mix_frequency': '0',
+          'region_code': 'YZ',
+          'material_code': 'GBMAC3003C1'
+        },
+        {
+          'bom': '3003C1',
+          'workorder_id': '1662006688682819584',
+          'plan_qty': '1440',
+          'workorder_code': '230526043',
+          'realproducestart_date': '2023-05-29 08:10:16',
+          'order_status': '3',
+          'device_name': '压机4',
+          'order_status_name': '生产中',
+          'real_qty': '1000',
+          'device_code': 'YJ04',
+          'realproduceend_date': '-',
+          'total_mix_frequency': '1',
+          'region_code': 'YZ',
+          'material_code': 'GBMAC3003C1'
+        },
+        {
+          'bom': '2031M2',
+          'workorder_id': '1662282237812621312',
+          'plan_qty': '10888',
+          'workorder_code': '230527001',
+          'realproducestart_date': '2023-05-27 10:20:35',
+          'order_status': '5',
+          'device_name': '压机1',
+          'order_status_name': '完成',
+          'real_qty': '10888',
+          'device_code': 'YJ01',
+          'realproduceend_date': '2023-05-27 13:57:43',
+          'total_mix_frequency': '0',
+          'region_code': 'YZ',
+          'material_code': 'DLMCZ2031M2'
+        }
+      ]
+    }
+  }
+  return res
+}
+
+// 分拣包装右
+// export const sortingAndPackaging = () => post('api/cockpit/sortingAndPackaging', {})
+export const sortingAndPackaging = () => {
+  let res = {
+    'code': 200,
+    'desc': '操作成功',
+    'result': {
+      'SortingDayList': [
+        {
+          'total_palletizing_qty': '0',
+          'total_stripping_qty': '288',
+          'material_id': '1658742670023069696',
+          'material_code': 'GBMCZ3004M1'
+        },
+        {
+          'total_palletizing_qty': '0',
+          'total_stripping_qty': '270',
+          'material_id': '1655138063413809152',
+          'material_code': 'ZLMCZ1001C1'
+        },
+        {
+          'total_palletizing_qty': '0',
+          'total_stripping_qty': '576',
+          'material_id': '1659114773914193920',
+          'material_code': 'GBMCZ3004M1'
+        }
+      ],
+      'PackingAreaTaskList': [
+        {
+          'device_name': '-',
+          'instorage_time': '-',
+          'qty': '-',
+          'device_code': '-',
+          'mix_num': '-',
+          'point_name': '包装线1',
+          'point_status_name': '无货',
+          'vehicle_code': '-',
+          'point_code': 'BZX01',
+          'point_status': '0',
+          'material_code': '-'
+        }
+      ],
+      'HalfSupportCacheList': [
+        {
+          'device_name': '-',
+          'instorage_time': '-',
+          'qty': '-',
+          'device_code': '-',
+          'mix_num': '-',
+          'point_name': '半托缓存位1',
+          'point_status_name': '无货',
+          'vehicle_code': '-',
+          'point_code': 'BTHC01',
+          'point_status': '0',
+          'material_code': '-'
+        }
+      ],
+      'CPDayList': [
+        {
+          'qualified_in_qty': 1259,
+          'unqualified_in_qty': 208,
+          'inventory_qty': 1096,
+          'material_code': '成品1'
+        },
+        {
+          'qualified_in_qty': 1654,
+          'unqualified_in_qty': 1522,
+          'inventory_qty': 1934,
+          'material_code': '成品2'
+        },
+        {
+          'qualified_in_qty': 1153,
+          'unqualified_in_qty': 659,
+          'inventory_qty': 637,
+          'material_code': '成品3'
+        },
+        {
+          'qualified_in_qty': 743,
+          'unqualified_in_qty': 1525,
+          'inventory_qty': 1248,
+          'material_code': '成品4'
+        },
+        {
+          'qualified_in_qty': 1697,
+          'unqualified_in_qty': 434,
+          'inventory_qty': 511,
+          'material_code': '成品5'
+        }
+      ]
+    }
+  }
+  return res
+}
diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue
index 4604e77..d4f19cf 100644
--- a/src/pages/modules/homepage/two.vue
+++ b/src/pages/modules/homepage/two.vue
@@ -757,7 +757,7 @@ export default {
     border 1px solid rgba(8,205,248,0.3)
 .scroll_tab_1
   _wh(100%, 40px)
-  border-bottom 1 solid rgba(8,205,248,0.3)
+  border-bottom 1px solid rgba(8,205,248,0.3)
   li
     float left
     width 20%
@@ -775,7 +775,7 @@ export default {
 .scroll-ul_1
   li
     _wh(100%, 44px)
-    border-bottom 1 solid rgba(8,205,248,0.3)
+    border-bottom 1px solid rgba(8,205,248,0.3)
     &:nth-child(even)
       background rgba(1,24,52,0.60)
       box-shadow inset 0px 1px 0px 0px rgba(13,89,115,0.3)
diff --git a/src/pages/modules/sortpack/two.vue b/src/pages/modules/sortpack/two.vue
index f1b5226..9a30c45 100644
--- a/src/pages/modules/sortpack/two.vue
+++ b/src/pages/modules/sortpack/two.vue
@@ -9,74 +9,47 @@
             <div class="n_body_container_wraper">
                 <div class="n_content">
                     <div class="item_wrap">
-                        <div class="item_tip item_tip_bg_s">
-                            <div class="item_tip_left">当日压制任务</div>
+                        <div class="item_tip">
+                            <div class="item_tip_left">当日拆码垛</div>
+                        </div>
+                        <div class="item_content">
+                            <div id="sortpack_echart_1" style="width: 100%; height: 100%;"></div>
+                        </div>
+                    </div>
+                    <div class="item_wrap">
+                        <div class="item_tip">
+                            <div class="item_tip_left">当日成品</div>
+                        </div>
+                        <div class="item_content">
+                            <div id="sortpack_echart_2" style="width: 100%; height: 100%;"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="n_content">
+                    <div class="item_wrap">
+                        <div class="item_tip">
+                            <div class="item_tip_left">半托缓存</div>
                         </div>
                         <div class="item_content">
                             <div class="scroll_wrap">
                                 <ul class="scroll_tab_1">
-                                    <li>任务号</li>
-                                    <li>设备</li>
-                                    <li>BOM号</li>
-                                    <li>生产物料</li>
-                                    <li>厂家</li>
-                                    <li>计划量(块)</li>
-                                    <li>已生产(块)</li>
-                                    <li>碾次</li>
-                                    <li>生产状态</li>
-                                    <li>开始时间</li>
-                                    <li>结束时间</li>
-                                </ul>
-                                <div class="scroll_container_1">
-                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
-                                        <ul class="scroll-ul_1">
-                                            <li v-for="(e, i) in array1" :key="i">
-                                                <div class="scroll-ul_1_div">{{e.time}}</div>
-                                                <div class="scroll-ul_1_div">{{e.code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.name}}</div>
-                                                <div class="scroll-ul_1_div">{{e.info}}</div>
-                                                <div class="scroll-ul_1_div">{{e.status}}</div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
-                                            </li>
-                                        </ul>
-                                    </vue-seamless-scroll>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="n_content n_bottom_content">
-                    <div class="item_wrap">
-                        <div class="item_tip item_tip_bg_s">
-                            <div class="item_tip_left">成型库存</div>
-                        </div>
-                        <div class="item_content">
-                            <div class="scroll_wrap">
-                                <ul class="scroll_tab_1 scroll_tab_2">
                                     <li>货位</li>
                                     <li>物料编码</li>
-                                    <li>物料名称</li>
                                     <li>数量</li>
-                                    <li>载具号</li>
+                                    <li>压机号</li>
                                     <li>碾次</li>
                                     <li>入库时间</li>
                                 </ul>
                                 <div class="scroll_container_1 scroll_container_2">
-                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
-                                        <ul class="scroll-ul_1 scroll-ul_2">
-                                            <li v-for="(e, i) in array1" :key="i">
-                                                <div class="scroll-ul_1_div">{{e.time}}</div>
-                                                <div class="scroll-ul_1_div">{{e.code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.name}}</div>
-                                                <div class="scroll-ul_1_div">{{e.info}}</div>
-                                                <div class="scroll-ul_1_div">{{e.status}}</div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
+                                    <vue-seamless-scroll :data="HalfSupportCacheList" :class-option="defaultOption1">
+                                        <ul class="scroll-ul_1">
+                                            <li v-for="(e, i) in HalfSupportCacheList" :key="i">
+                                                <div class="scroll-ul_1_div">{{e.point_name}}</div>
+                                                <div class="scroll-ul_1_div">{{e.material_code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.qty}}</div>
+                                                <div class="scroll-ul_1_div">{{e.device_code}}</div>
+                                                <div class="scroll-ul_1_div">{{ e.mix_num }}</div>
+                                                <div class="scroll-ul_1_div">{{ e.instorage_time }}</div>
                                             </li>
                                         </ul>
                                     </vue-seamless-scroll>
@@ -85,33 +58,29 @@
                         </div>
                     </div>
                     <div class="item_wrap">
-                        <div class="item_tip item_tip_bg_s">
-                            <div class="item_tip_left">成型出入库</div>
+                        <div class="item_tip">
+                            <div class="item_tip_left">包装区物料</div>
                         </div>
                         <div class="item_content">
                             <div class="scroll_wrap">
                                 <ul class="scroll_tab_1 scroll_tab_3">
-                                    <li>类别</li>
+                                    <li>点位</li>
                                     <li>物料编码</li>
-                                    <li>物料名称</li>
                                     <li>数量</li>
-                                    <li>载具号</li>
+                                    <li>压机号</li>
                                     <li>碾次</li>
-                                    <li>货位</li>
                                     <li>出入时间</li>
                                 </ul>
-                                <div class="scroll_container_1 scroll_container_3">
-                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
-                                        <ul class="scroll-ul_1 scroll-ul_3">
-                                            <li v-for="(e, i) in array1" :key="i">
-                                                <div class="scroll-ul_1_div">{{e.time}}</div>
-                                                <div class="scroll-ul_1_div">{{e.code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.name}}</div>
-                                                <div class="scroll-ul_1_div">{{e.info}}</div>
-                                                <div class="scroll-ul_1_div">{{e.status}}</div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
+                                <div class="scroll_container_1">
+                                    <vue-seamless-scroll :data="PackingAreaTaskList" :class-option="defaultOption2">
+                                        <ul class="scroll-ul_1">
+                                            <li v-for="(e, i) in PackingAreaTaskList" :key="i">
+                                                <div class="scroll-ul_1_div">{{e.point_name}}</div>
+                                                <div class="scroll-ul_1_div">{{e.material_code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.qty}}</div>
+                                                <div class="scroll-ul_1_div">{{e.device_code}}</div>
+                                                <div class="scroll-ul_1_div">{{ e.mix_num }}</div>
+                                                <div class="scroll-ul_1_div">{{ e.instorage_time }}</div>
                                             </li>
                                         </ul>
                                     </vue-seamless-scroll>
@@ -122,21 +91,72 @@
                 </div>
             </div>
         </div>
+        <div class="tooltip_wrap right_tooltip_wrap" :style="expand ? 'opacity: 1' : 'opacity: 0.1'">
+          <div class="tooltip_pages" :style="expand ? 'width: 240px' : 'width: 0'">
+            <div class="tooltip_page pointer" @click="toJumpPage(1)">1</div>
+            <div class="tooltip_page pointer" @click="toJumpPage(2)">2</div>
+            <div class="tooltip_page current_page pointer" @click="toJumpPage(3)">3</div>
+            <div class="tooltip_page pointer" @click="toJumpPage(4)">4</div>
+            <div class="tooltip_page pointer" @click="toJumpPage(5)">5</div>
+            <div class="tooltip_page pointer" @click="toJumpPage(6)">6</div>
+          </div>
+          <div class="tooltip_arrow pointer" @click="expandTooltip" v-text="expand ? '&lt;&lt;' : '&gt;&gt;'"></div>
+        </div>
+        <div class="style_block" style="left: calc(100% / 3);top:0;"></div>
+        <div class="style_block" style="background: green;left: calc(100% / 3);top:calc(100% / 3);"></div>
+        <div class="style_block" style="left: calc(100% / 3);bottom: 0"></div>
+        <div class="style_block" style="background: green;left: calc(200% / 3);top:0;"></div>
+        <div class="style_block" style="left: calc(200% / 3);top:calc(100% / 3);"></div>
+        <div class="style_block" style="background: blue;left: calc(200% / 3);bottom: 0"></div>
+        <div class="style_block" style="background: green;left: 0;top:0;"></div>
+        <div class="style_block" style="left: 0;top:calc(100% / 3);"></div>
+        <div class="style_block" style="background: green;left: 0;bottom: 0"></div>
     </div>
 </template>
 
 <script>
+import { sortingAndPackaging } from '@js/getData2'
 export default {
   data () {
     return {
-      array1: [{time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}]
+      interTime: this.$store.getters.setTime,
+      timer: null,
+      expand: false,
+      SortingDayList: [],
+      PackingAreaTaskList: [],
+      HalfSupportCacheList: [],
+      CPDayList: []
     }
   },
   computed: {
     defaultOption1 () {
       return {
         step: 0.4, // 数值越大速度滚动越快
-        limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
+        limitMoveNum: 9, // 开始无缝滚动的数据量 this.dataList.length
+        hoverStop: true, // 是否开启鼠标悬停stop
+        direction: 1, // 0向下 1向上 2向左 3向右
+        openWatch: true, // 开启数据实时监控刷新dom
+        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+      }
+    },
+    defaultOption2 () {
+      return {
+        step: 0.4, // 数值越大速度滚动越快
+        limitMoveNum: 8, // 开始无缝滚动的数据量 this.dataList.length
+        hoverStop: true, // 是否开启鼠标悬停stop
+        direction: 1, // 0向下 1向上 2向左 3向右
+        openWatch: true, // 开启数据实时监控刷新dom
+        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+      }
+    },
+    defaultOption3 () {
+      return {
+        step: 0.4, // 数值越大速度滚动越快
+        limitMoveNum: 8, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
         openWatch: true, // 开启数据实时监控刷新dom
@@ -146,8 +166,52 @@ export default {
       }
     }
   },
+  mounted () {
+    this._sortingAndPackaging()
+    // this.refresh()
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
+  },
   methods: {
-
+    refresh () {
+      this.timer = setInterval(() => {
+        this._sortingAndPackaging()
+      }, this.interTime)
+    },
+    async _sortingAndPackaging () {
+      let res = await sortingAndPackaging()
+      if (res.code === 200) {
+        this.SortingDayList = [...res.result.SortingDayList]
+        this.PackingAreaTaskList = [...res.result.PackingAreaTaskList]
+        this.HalfSupportCacheList = [...res.result.HalfSupportCacheList]
+        this.CPDayList = [...res.result.CPDayList]
+      }
+    },
+    expandTooltip () {
+      this.expand = !this.expand
+    },
+    toJumpPage (type) {
+      switch (type) {
+        case 1:
+          this.$router.push('/homepagetwo')
+          break
+        case 2:
+          this.$router.push('/hnlktwo')
+          break
+        case 3:
+          break
+        case 4:
+          this.$router.push('/firedrytwo')
+          break
+        case 5:
+          this.$router.push('/sortpacktwo')
+          break
+        case 6:
+          this.$router.push('/pdtwo')
+          break
+      }
+    }
   }
 }
 </script>
@@ -155,9 +219,12 @@ export default {
 <style lang="stylus" scoped>
 @import '~@css/mixin'
 .n_container
+    position relative
     _wh(100%, 100%)
     overflow hidden
 .n_header
+    position relative
+    z-index 0
     _wh(100%, 8%)
     _bis('../../../images/bg_header.jpg')
 .n_header_h1
@@ -171,31 +238,27 @@ export default {
         font-family "阿里妈妈数黑体" !important
         padding-left 3px
 .n_body_container
+    position relative
+    z-index 8
     _wh(100%, 92%)
-    padding 40px 50px 20px 0
+    padding 10px 50px 20px 40px
     _bis('../../../images/bg_content_r.jpg')
 .n_body_container_wraper
     _wh(100%, 100%)
 .n_content
     _wh(100%, 49.75%)
+    _fj(row)
     &:nth-child(2)
         margin-top .5%
-.n_bottom_content
-    _fj(row)
-    .item_wrap
-        width calc(50% - 8px)
-        &:nth-child(2)
-            margin-left 16px
-    .item_tip_bg_s
-        _bis('../../../images/bg_title_s.png')
 .item_wrap
-    _wh(100%, 100%)
+    _wh(calc(50% - 8px), 100%)
+    &:nth-child(2)
+        margin-left 16px
 .item_tip
     _wh(100%, 32px)
     line-height 32px
     padding 0 10px
-.item_tip_bg_s
-    _bis('../../../images/bg_title_j.png')
+    _bis('../../../images/bg_title_s.png')
 .item_tip_left
     _wh(60%, 100%)
     font-family "SourceHanSansCN"
@@ -213,10 +276,10 @@ export default {
     border 1px solid rgba(8,205,248,0.3)
 .scroll_tab_1
   _wh(100%, 40px)
-  border-bottom 1 solid rgba(8,205,248,0.3)
+  border-bottom 1px solid rgba(8,205,248,0.3)
   li
     float left
-    width 9%
+    width 16%
     _font(14px,40px,#78B1DE,,center)
     word-wrap break-word
     word-break break-all
@@ -224,14 +287,8 @@ export default {
     padding 0 5px
     overflow hidden
     box-sizing border-box
-    &:nth-child(8)
-        width 10%
-.scroll_tab_2 li
-    width 14%
-    &:nth-child(7)
-        width 16%
-.scroll_tab_3 li
-    width 12.5%
+    &:nth-child(6)
+        width 20%
 .scroll_container_1
   width 100%
   height calc(100% - 40px)
@@ -239,13 +296,13 @@ export default {
 .scroll-ul_1
   li
     _wh(100%, 44px)
-    border-bottom 1 solid rgba(8,205,248,0.3)
+    border-bottom 1px solid rgba(8,205,248,0.3)
     &:nth-child(even)
       background rgba(1,24,52,0.60)
       box-shadow inset 0px 1px 0px 0px rgba(13,89,115,0.3)
     .scroll-ul_1_div
       float left
-      _wh(9%, 44px)
+      _wh(16%, 44px)
       _fj(row, center)
       _font(14px, 16px, #fff,,center)
       word-wrap break-word
@@ -253,12 +310,6 @@ export default {
       // white-space nowrap
       padding 0 5px
       overflow hidden
-      &:nth-child(8)
-        width 10%
-.scroll-ul_2 li .scroll-ul_1_div
-    width 14%
-    &:nth-child(7)
-        width 16%
-.scroll-ul_3 li .scroll-ul_1_div
-    width 12.5%
+      &:nth-child(6)
+        width 20%
 </style>
diff --git a/src/pages/modules/takeshape/one.vue b/src/pages/modules/takeshape/one.vue
index 16b59b0..a9e7773 100644
--- a/src/pages/modules/takeshape/one.vue
+++ b/src/pages/modules/takeshape/one.vue
@@ -645,7 +645,7 @@
             <div class="tooltip_page pointer" @click.stop="toJumpPage(6)">6</div>
           </div>
         </div>
-        <!-- <div class="style_block" style="left: calc(100% / 3);top:0;"></div>
+        <div class="style_block" style="left: calc(100% / 3);top:0;"></div>
         <div class="style_block" style="background: green;left: calc(100% / 3);top:calc(100% / 3);"></div>
         <div class="style_block" style="left: calc(100% / 3);bottom: 0"></div>
         <div class="style_block" style="background: green;left: calc(200% / 3);top:0;"></div>
@@ -653,7 +653,7 @@
         <div class="style_block" style="background: blue;left: calc(200% / 3);bottom: 0"></div>
         <div class="style_block" style="background: green;left: 0;top:0;"></div>
         <div class="style_block" style="left: 0;top:calc(100% / 3);"></div>
-        <div class="style_block" style="background: green;left: 0;bottom: 0"></div> -->
+        <div class="style_block" style="background: green;left: 0;bottom: 0"></div>
     </div>
 </template>
 
@@ -856,70 +856,118 @@ export default {
             this.foldlineStyle = 'foldline_right'
             break
           case 2:
-            this.pkObj = this.PressPopoverList[1]
+            this.pkObj = this.TrayStationPopoverList[1]
             this.top = this.$refs.mpgw02.getBoundingClientRect().top - 21
             this.left = this.$refs.mpgw02.getBoundingClientRect().left - 657
             this.foldlineStyle = 'foldline_right'
             break
           case 3:
-            this.pkObj = this.PressPopoverList[2]
+            this.pkObj = this.TrayStationPopoverList[2]
             this.top = this.$refs.mpgw03.getBoundingClientRect().top - 40
             this.left = this.$refs.mpgw03.getBoundingClientRect().left - 635
             this.foldlineStyle = 'foldline_right'
             break
           case 4:
-            this.pkObj = this.PressPopoverList[3]
+            this.pkObj = this.TrayStationPopoverList[3]
             this.top = this.$refs.mpgw04.getBoundingClientRect().top - 40
             this.left = this.$refs.mpgw04.getBoundingClientRect().left - 635
             this.foldlineStyle = 'foldline_right'
             break
           case 5:
-            this.pkObj = this.PressPopoverList[4]
+            this.pkObj = this.TrayStationPopoverList[4]
             this.top = this.$refs.mpgw05.getBoundingClientRect().top - 21
             this.left = this.$refs.mpgw05.getBoundingClientRect().left - 657
             this.foldlineStyle = 'foldline_right'
             break
           case 6:
-            this.pkObj = this.PressPopoverList[5]
+            this.pkObj = this.TrayStationPopoverList[5]
             this.top = this.$refs.mpgw06.getBoundingClientRect().top - 21
             this.left = this.$refs.mpgw06.getBoundingClientRect().left - 657
             this.foldlineStyle = 'foldline_right'
             break
           case 7:
-            this.pkObj = this.PressPopoverList[6]
+            this.pkObj = this.TrayStationPopoverList[6]
             this.top = this.$refs.mpgw07.getBoundingClientRect().top - 21
             this.left = this.$refs.mpgw07.getBoundingClientRect().left - 657
             this.foldlineStyle = 'foldline_right'
             break
           case 8:
-            this.pkObj = this.PressPopoverList[7]
+            this.pkObj = this.TrayStationPopoverList[7]
             this.top = this.$refs.mpgw08.getBoundingClientRect().top - 21
             this.left = this.$refs.mpgw08.getBoundingClientRect().left - 657
             this.foldlineStyle = 'foldline_right'
             break
           case 9:
-            this.pkObj = this.PressPopoverList[8]
+            this.pkObj = this.TrayStationPopoverList[8]
             this.top = this.$refs.mpgw09.getBoundingClientRect().top - 40
             this.left = this.$refs.mpgw09.getBoundingClientRect().left - 635
             this.foldlineStyle = 'foldline_right'
             break
           case 10:
-            this.pkObj = this.PressPopoverList[9]
+            this.pkObj = this.TrayStationPopoverList[9]
             this.top = this.$refs.mpgw10.getBoundingClientRect().top - 40
             this.left = this.$refs.mpgw10.getBoundingClientRect().left - 635
             this.foldlineStyle = 'foldline_right'
             break
           case 11:
-            this.pkObj = this.PressPopoverList[10]
+            this.pkObj = this.TrayStationPopoverList[10]
             this.top = this.$refs.mpgw11.getBoundingClientRect().top - 40
-            this.left = this.$refs.mpgw11.getBoundingClientRect().left - 635
-            this.foldlineStyle = 'foldline_right'
+            this.left = this.$refs.mpgw11.getBoundingClientRect().left + 112
+            this.foldlineStyle = 'foldline_left'
             break
           case 12:
-            this.pkObj = this.PressPopoverList[11]
+            this.pkObj = this.TrayStationPopoverList[11]
             this.top = this.$refs.mpgw12.getBoundingClientRect().top - 40
-            this.left = this.$refs.mpgw12.getBoundingClientRect().left - 635
-            this.foldlineStyle = 'foldline_right'
+            this.left = this.$refs.mpgw12.getBoundingClientRect().left + 112
+            this.foldlineStyle = 'foldline_left'
+            break
+          case 13:
+            this.pkObj = this.TrayStationPopoverList[12]
+            this.top = this.$refs.mpgw13.getBoundingClientRect().top - 40
+            this.left = this.$refs.mpgw13.getBoundingClientRect().left + 112
+            this.foldlineStyle = 'foldline_left'
+            break
+          case 14:
+            this.pkObj = this.TrayStationPopoverList[13]
+            this.top = this.$refs.mpgw14.getBoundingClientRect().top - 40
+            this.left = this.$refs.mpgw14.getBoundingClientRect().left + 112
+            this.foldlineStyle = 'foldline_left'
+            break
+          case 15:
+            this.pkObj = this.TrayStationPopoverList[14]
+            this.top = this.$refs.mpgw15.getBoundingClientRect().top - 40
+            this.left = this.$refs.mpgw15.getBoundingClientRect().left + 112
+            this.foldlineStyle = 'foldline_left'
+            break
+          case 16:
+            this.pkObj = this.TrayStationPopoverList[15]
+            this.top = this.$refs.mpgw16.getBoundingClientRect().top - 40
+            this.left = this.$refs.mpgw16.getBoundingClientRect().left + 112
+            this.foldlineStyle = 'foldline_left'
+            break
+          case 17:
+            this.pkObj = this.TrayStationPopoverList[16]
+            this.top = this.$refs.mpgw17.getBoundingClientRect().top - 40
+            this.left = this.$refs.mpgw17.getBoundingClientRect().left + 112
+            this.foldlineStyle = 'foldline_left'
+            break
+          case 18:
+            this.pkObj = this.TrayStationPopoverList[17]
+            this.top = this.$refs.mpgw18.getBoundingClientRect().top - 40
+            this.left = this.$refs.mpgw18.getBoundingClientRect().left + 112
+            this.foldlineStyle = 'foldline_left'
+            break
+          case 19:
+            this.pkObj = this.TrayStationPopoverList[18]
+            this.top = this.$refs.mpgw19.getBoundingClientRect().top - 24
+            this.left = this.$refs.mpgw19.getBoundingClientRect().left + 112
+            this.foldlineStyle = 'foldline_left'
+            break
+          case 20:
+            this.pkObj = this.TrayStationPopoverList[19]
+            this.top = this.$refs.mpgw20.getBoundingClientRect().top - 24
+            this.left = this.$refs.mpgw20.getBoundingClientRect().left + 112
+            this.foldlineStyle = 'foldline_left'
             break
         }
       }
@@ -936,6 +984,8 @@ export default {
     _wh(100%, 100%)
     overflow hidden
 .n_header
+    position relative
+    z-index 0
     _wh(100%, 8%)
     _bis('../../../images/bg_header.jpg')
 .n_header_h1
diff --git a/src/pages/modules/takeshape/two.vue b/src/pages/modules/takeshape/two.vue
index 289aeb0..f34a266 100644
--- a/src/pages/modules/takeshape/two.vue
+++ b/src/pages/modules/takeshape/two.vue
@@ -19,7 +19,6 @@
                                     <li>设备</li>
                                     <li>BOM号</li>
                                     <li>生产物料</li>
-                                    <li>厂家</li>
                                     <li>计划量(块)</li>
                                     <li>已生产(块)</li>
                                     <li>碾次</li>
@@ -28,20 +27,19 @@
                                     <li>结束时间</li>
                                 </ul>
                                 <div class="scroll_container_1">
-                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
+                                    <vue-seamless-scroll :data="MoldingDayList" :class-option="defaultOption1">
                                         <ul class="scroll-ul_1">
-                                            <li v-for="(e, i) in array1" :key="i">
-                                                <div class="scroll-ul_1_div">{{e.time}}</div>
-                                                <div class="scroll-ul_1_div">{{e.code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.name}}</div>
-                                                <div class="scroll-ul_1_div">{{e.info}}</div>
-                                                <div class="scroll-ul_1_div">{{e.status}}</div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
+                                            <li v-for="(e, i) in MoldingDayList" :key="i">
+                                                <div class="scroll-ul_1_div">{{e.workorder_code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.device_name}}</div>
+                                                <div class="scroll-ul_1_div">{{e.bom}}</div>
+                                                <div class="scroll-ul_1_div">{{e.material_code}}</div>
+                                                <div class="scroll-ul_1_div">{{ e.plan_qty }}</div>
+                                                <div class="scroll-ul_1_div">{{ e.real_qty }}</div>
+                                                <div class="scroll-ul_1_div">{{ e.total_mix_frequency }}</div>
+                                                <div class="scroll-ul_1_div">{{ e.order_status_name }}</div>
+                                                <div class="scroll-ul_1_div">{{ e.realproducestart_date }}</div>
+                                                <div class="scroll-ul_1_div">{{ e.realproduceend_date }}</div>
                                             </li>
                                         </ul>
                                     </vue-seamless-scroll>
@@ -60,23 +58,21 @@
                                 <ul class="scroll_tab_1 scroll_tab_2">
                                     <li>货位</li>
                                     <li>物料编码</li>
-                                    <li>物料名称</li>
                                     <li>数量</li>
                                     <li>载具号</li>
                                     <li>碾次</li>
                                     <li>入库时间</li>
                                 </ul>
                                 <div class="scroll_container_1 scroll_container_2">
-                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
+                                    <vue-seamless-scroll :data="SemiFinishedProductShelList" :class-option="defaultOption2">
                                         <ul class="scroll-ul_1 scroll-ul_2">
-                                            <li v-for="(e, i) in array1" :key="i">
-                                                <div class="scroll-ul_1_div">{{e.time}}</div>
-                                                <div class="scroll-ul_1_div">{{e.code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.name}}</div>
-                                                <div class="scroll-ul_1_div">{{e.info}}</div>
-                                                <div class="scroll-ul_1_div">{{e.status}}</div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
+                                            <li v-for="(e, i) in SemiFinishedProductShelList" :key="i">
+                                                <div class="scroll-ul_1_div">{{e.point_name}}</div>
+                                                <div class="scroll-ul_1_div">{{e.material_code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.qty}}</div>
+                                                <div class="scroll-ul_1_div">{{e.vehicle_code}}</div>
+                                                <div class="scroll-ul_1_div">{{ e.mix_num }}</div>
+                                                <div class="scroll-ul_1_div">{{ e.create_time }}</div>
                                             </li>
                                         </ul>
                                     </vue-seamless-scroll>
@@ -93,7 +89,6 @@
                                 <ul class="scroll_tab_1 scroll_tab_3">
                                     <li>类别</li>
                                     <li>物料编码</li>
-                                    <li>物料名称</li>
                                     <li>数量</li>
                                     <li>载具号</li>
                                     <li>碾次</li>
@@ -101,17 +96,16 @@
                                     <li>出入时间</li>
                                 </ul>
                                 <div class="scroll_container_1 scroll_container_3">
-                                    <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
+                                    <vue-seamless-scroll :data="MoldingIOStoringList" :class-option="defaultOption3">
                                         <ul class="scroll-ul_1 scroll-ul_3">
-                                            <li v-for="(e, i) in array1" :key="i">
-                                                <div class="scroll-ul_1_div">{{e.time}}</div>
-                                                <div class="scroll-ul_1_div">{{e.code}}</div>
-                                                <div class="scroll-ul_1_div">{{e.name}}</div>
-                                                <div class="scroll-ul_1_div">{{e.info}}</div>
-                                                <div class="scroll-ul_1_div">{{e.status}}</div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
-                                                <div class="scroll-ul_1_div"></div>
+                                            <li v-for="(e, i) in MoldingIOStoringList" :key="i">
+                                                <div class="scroll-ul_1_div">{{e.io_type}}</div>
+                                                <div class="scroll-ul_1_div">{{e.material_code}}</div>
+                                                <div class="scroll-ul_1_div">{{e.qty}}</div>
+                                                <div class="scroll-ul_1_div">{{e.vehicle_code}}</div>
+                                                <div class="scroll-ul_1_div">{{ e.mix_num }}</div>
+                                                <div class="scroll-ul_1_div">{{ e.point_code }}</div>
+                                                <div class="scroll-ul_1_div">{{ e.create_time }}</div>
                                             </li>
                                         </ul>
                                     </vue-seamless-scroll>
@@ -122,21 +116,71 @@
                 </div>
             </div>
         </div>
+        <div class="tooltip_wrap right_tooltip_wrap" :style="expand ? 'opacity: 1' : 'opacity: 0.1'">
+          <div class="tooltip_pages" :style="expand ? 'width: 240px' : 'width: 0'">
+            <div class="tooltip_page pointer" @click="toJumpPage(1)">1</div>
+            <div class="tooltip_page pointer" @click="toJumpPage(2)">2</div>
+            <div class="tooltip_page current_page pointer" @click="toJumpPage(3)">3</div>
+            <div class="tooltip_page pointer" @click="toJumpPage(4)">4</div>
+            <div class="tooltip_page pointer" @click="toJumpPage(5)">5</div>
+            <div class="tooltip_page pointer" @click="toJumpPage(6)">6</div>
+          </div>
+          <div class="tooltip_arrow pointer" @click="expandTooltip" v-text="expand ? '&lt;&lt;' : '&gt;&gt;'"></div>
+        </div>
+        <div class="style_block" style="left: calc(100% / 3);top:0;"></div>
+        <div class="style_block" style="background: green;left: calc(100% / 3);top:calc(100% / 3);"></div>
+        <div class="style_block" style="left: calc(100% / 3);bottom: 0"></div>
+        <div class="style_block" style="background: green;left: calc(200% / 3);top:0;"></div>
+        <div class="style_block" style="left: calc(200% / 3);top:calc(100% / 3);"></div>
+        <div class="style_block" style="background: blue;left: calc(200% / 3);bottom: 0"></div>
+        <div class="style_block" style="background: green;left: 0;top:0;"></div>
+        <div class="style_block" style="left: 0;top:calc(100% / 3);"></div>
+        <div class="style_block" style="background: green;left: 0;bottom: 0"></div>
     </div>
 </template>
 
 <script>
+import { moldingTableDate } from '@js/getData2'
 export default {
   data () {
     return {
-      array1: [{time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}, {time: '12-01 09:09:09', code: 'hn01', name: '混碾01', info: '机械故障 ', status: '故障'}]
+      interTime: this.$store.getters.setTime,
+      timer: null,
+      expand: false,
+      MoldingIOStoringList: [],
+      SemiFinishedProductShelList: [],
+      MoldingDayList: []
     }
   },
   computed: {
     defaultOption1 () {
       return {
         step: 0.4, // 数值越大速度滚动越快
-        limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
+        limitMoveNum: 9, // 开始无缝滚动的数据量 this.dataList.length
+        hoverStop: true, // 是否开启鼠标悬停stop
+        direction: 1, // 0向下 1向上 2向左 3向右
+        openWatch: true, // 开启数据实时监控刷新dom
+        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+      }
+    },
+    defaultOption2 () {
+      return {
+        step: 0.4, // 数值越大速度滚动越快
+        limitMoveNum: 8, // 开始无缝滚动的数据量 this.dataList.length
+        hoverStop: true, // 是否开启鼠标悬停stop
+        direction: 1, // 0向下 1向上 2向左 3向右
+        openWatch: true, // 开启数据实时监控刷新dom
+        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+      }
+    },
+    defaultOption3 () {
+      return {
+        step: 0.4, // 数值越大速度滚动越快
+        limitMoveNum: 8, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
         openWatch: true, // 开启数据实时监控刷新dom
@@ -146,8 +190,51 @@ export default {
       }
     }
   },
+  mounted () {
+    this._moldingTableDate()
+    // this.refresh()
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
+  },
   methods: {
-
+    refresh () {
+      this.timer = setInterval(() => {
+        this._moldingTableDate()
+      }, this.interTime)
+    },
+    async _moldingTableDate () {
+      let res = await moldingTableDate()
+      if (res.code === 200) {
+        this.MoldingIOStoringList = [...res.result.MoldingIOStoringList]
+        this.SemiFinishedProductShelList = [...res.result.SemiFinishedProductShelList]
+        this.MoldingDayList = [...res.result.MoldingDayList]
+      }
+    },
+    expandTooltip () {
+      this.expand = !this.expand
+    },
+    toJumpPage (type) {
+      switch (type) {
+        case 1:
+          this.$router.push('/homepagetwo')
+          break
+        case 2:
+          this.$router.push('/hnlktwo')
+          break
+        case 3:
+          break
+        case 4:
+          this.$router.push('/firedrytwo')
+          break
+        case 5:
+          this.$router.push('/sortpacktwo')
+          break
+        case 6:
+          this.$router.push('/pdtwo')
+          break
+      }
+    }
   }
 }
 </script>
@@ -155,9 +242,12 @@ export default {
 <style lang="stylus" scoped>
 @import '~@css/mixin'
 .n_container
+    position relative
     _wh(100%, 100%)
     overflow hidden
 .n_header
+    position relative
+    z-index 0
     _wh(100%, 8%)
     _bis('../../../images/bg_header.jpg')
 .n_header_h1
@@ -171,8 +261,10 @@ export default {
         font-family "阿里妈妈数黑体" !important
         padding-left 3px
 .n_body_container
+    position relative
+    z-index 8
     _wh(100%, 92%)
-    padding 15px 50px 20px 0
+    padding 10px 50px 20px 40px
     _bis('../../../images/bg_content_r.jpg')
 .n_body_container_wraper
     _wh(100%, 100%)
@@ -213,10 +305,10 @@ export default {
     border 1px solid rgba(8,205,248,0.3)
 .scroll_tab_1
   _wh(100%, 40px)
-  border-bottom 1 solid rgba(8,205,248,0.3)
+  border-bottom 1px solid rgba(8,205,248,0.3)
   li
     float left
-    width 9%
+    width 10%
     _font(14px,40px,#78B1DE,,center)
     word-wrap break-word
     word-break break-all
@@ -224,14 +316,20 @@ export default {
     padding 0 5px
     overflow hidden
     box-sizing border-box
-    &:nth-child(8)
-        width 10%
-.scroll_tab_2 li
-    width 14%
     &:nth-child(7)
-        width 16%
+        width 6%
+    &:nth-child(9),&:nth-child(10)
+        width 12%
+.scroll_tab_2 li
+    width 16%
+    &:nth-child(6)
+        width 20%
 .scroll_tab_3 li
-    width 12.5%
+    width 14%
+    &:nth-child(3)
+        width 11%
+    &:nth-child(7)
+        width 19%
 .scroll_container_1
   width 100%
   height calc(100% - 40px)
@@ -239,13 +337,13 @@ export default {
 .scroll-ul_1
   li
     _wh(100%, 44px)
-    border-bottom 1 solid rgba(8,205,248,0.3)
+    border-bottom 1px solid rgba(8,205,248,0.3)
     &:nth-child(even)
       background rgba(1,24,52,0.60)
       box-shadow inset 0px 1px 0px 0px rgba(13,89,115,0.3)
     .scroll-ul_1_div
       float left
-      _wh(9%, 44px)
+      _wh(10%, 44px)
       _fj(row, center)
       _font(14px, 16px, #fff,,center)
       word-wrap break-word
@@ -253,12 +351,18 @@ export default {
       // white-space nowrap
       padding 0 5px
       overflow hidden
-      &:nth-child(8)
-        width 10%
+      &:nth-child(7)
+        width 6%
+      &:nth-child(9),&:nth-child(10)
+        width 12%
 .scroll-ul_2 li .scroll-ul_1_div
-    width 14%
-    &:nth-child(7)
-        width 16%
+    width 16%
+    &:nth-child(6)
+        width 20%
 .scroll-ul_3 li .scroll-ul_1_div
-    width 12.5%
+    width 14%
+    &:nth-child(3)
+        width 11%
+    &:nth-child(7)
+        width 19%
 </style>