diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css
index e2020d9..2ac2125 100644
--- a/src/assets/css/reset.css
+++ b/src/assets/css/reset.css
@@ -89,7 +89,7 @@ html, body {
  
 body {
      -webkit-text-size-adjust: none;
-     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+     -webkit-tap-highlight-color: rgba(11, 7, 7, 0);
      -moz-user-select:none;/*火狐*/
      -webkit-user-select:none;/*webkit浏览器*/
      -ms-user-select:none;/*IE10*/
diff --git a/src/assets/images/devmon/FJCDJXS.jpg b/src/assets/images/devmon/FJCDJXS.jpg
new file mode 100644
index 0000000..3bd0560
Binary files /dev/null and b/src/assets/images/devmon/FJCDJXS.jpg differ
diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index c212554..a11bf30 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -7,428 +7,723 @@ export const deviceMonitor = () => post('api/cockpit/deviceMonitor', {
 //   let res = {
 //     'code': 200,
 //     'desc': '操作成功',
-//     'result': [
-//       {
-//         'device_code': 'HLJ05',
-//         'device_name': '混料机5',
-//         'device_model': '1',
-//         'device_status': '1',
-//         'device_status_name': null,
-//         'material_name': 'ZLMCZ1001C111122GM001BD20-8',
-//         'work_time': '0',
-//         'real_qty': '10',
-//         'realproducestart_date': '',
-//         'vehicle_qty': '10',
-//         'vehicle_type': '100',
-//         'vehicle_max_qty': '100',
-//         'device_url': 'HLJ'
-//       },
-//       {
-//         'device_code': 'HLJ06',
-//         'device_name': '混料机6',
-//         'device_model': '1',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ'
-//       },
-//       {
-//         'device_code': 'HLJ07',
-//         'device_name': '混料机7',
-//         'device_model': '1',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ'
-//       },
-//       {
-//         'device_code': 'HLJ08',
-//         'device_name': '混料机8',
-//         'device_model': '1',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ'
-//       },
-//       {
-//         'device_code': 'HLJ09',
-//         'device_name': '混料机9',
-//         'device_model': '1',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ'
-//       },
-//       {
-//         'device_code': 'HLJ10',
-//         'device_name': '混料机10',
-//         'device_model': '1',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ'
-//       },
-//       {
-//         'device_code': 'HLJ11',
-//         'device_name': '混料机11',
-//         'device_model': '1',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ'
-//       },
-//       {
-//         'device_code': 'HLJ12',
-//         'device_name': '混料机12',
-//         'device_model': '1',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ'
-//       },
-//       {
-//         'device_code': 'HLJ13',
-//         'device_name': '混料机13',
-//         'device_model': '1',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ'
-//       },
-//       {
-//         'device_code': 'HLJ14',
-//         'device_name': '混料机14',
-//         'device_model': '1',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ'
-//       },
-//       {
-//         'device_code': 'HLJ15',
-//         'device_name': '混料机15',
-//         'device_model': '1',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ'
-//       },
-//       {
-//         'device_code': 'HLJ16',
-//         'device_name': '混料机16',
-//         'device_model': '1',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ'
-//       },
-//       {
-//         'device_code': 'HLJ01',
-//         'device_name': '混料机1',
-//         'device_model': '2',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ_S'
-//       },
-//       {
-//         'device_code': 'HLJ02',
-//         'device_name': '混料机2',
-//         'device_model': '2',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ_S'
-//       },
-//       {
-//         'device_code': 'HLJ03',
-//         'device_name': '混料机3',
-//         'device_model': '2',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ_S'
-//       },
-//       {
-//         'device_code': 'HLJ04',
-//         'device_name': '混料机4',
-//         'device_model': '2',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'HLJ_S'
-//       },
-//       {
-//         'device_code': 'YJ03',
-//         'device_name': '压机3',
-//         'device_model': '3',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '52',
-//         'real_qty': 0,
-//         'realproducestart_date': '2023-04-21 10:10:40',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'YZJ'
-//       },
-//       {
-//         'device_code': 'YJ04',
-//         'device_name': '压机4',
-//         'device_model': '3',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '75',
-//         'real_qty': 0,
-//         'realproducestart_date': '2023-04-20 10:43:55',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'YZJ'
-//       },
-//       {
-//         'device_code': 'YJ05',
-//         'device_name': '压机5',
-//         'device_model': '3',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'YZJ'
-//       },
-//       {
-//         'device_code': 'YJ06',
-//         'device_name': '压机6',
-//         'device_model': '3',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'YZJ'
-//       },
-//       {
-//         'device_code': 'YJ07',
-//         'device_name': '压机7',
-//         'device_model': '3',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '26',
-//         'real_qty': 0,
-//         'realproducestart_date': '2023-04-22 11:29:10',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'YZJ'
-//       },
-//       {
-//         'device_code': 'YJ08',
-//         'device_name': '压机8',
-//         'device_model': '3',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'YZJ'
-//       },
-//       {
-//         'device_code': 'YJ09',
-//         'device_name': '压机9',
-//         'device_model': '3',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'YZJ'
-//       },
-//       {
-//         'device_code': 'YJ10',
-//         'device_name': '压机10',
-//         'device_model': '3',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'YZJ'
-//       },
-//       {
-//         'device_code': 'YJ01',
-//         'device_name': '压机1',
-//         'device_model': '4',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '144',
-//         'real_qty': 0,
-//         'realproducestart_date': '2023-04-17 14:18:58',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'YZJ_S'
-//       },
-//       {
-//         'device_code': 'YJ02',
-//         'device_name': '压机2',
-//         'device_model': '4',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': 0,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'YZJ_S'
-//       },
-//       {
-//         'device_code': 'YJ02',
-//         'device_name': '压机2',
-//         'device_model': '4',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '120',
-//         'real_qty': 0,
-//         'realproducestart_date': '2023-04-18 13:34:36',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'YZJ_S'
-//       },
-//       {
-//         'device_code': 'FJCDJXS01',
-//         'device_name': '分拣拆垛机械手',
-//         'device_model': '5',
-//         'device_status': null,
-//         'device_status_name': null,
-//         'material_name': '-',
-//         'work_time': '0',
-//         'real_qty': null,
-//         'realproducestart_date': '',
-//         'vehicle_qty': null,
-//         'vehicle_type': null,
-//         'vehicle_max_qty': null,
-//         'device_url': 'FJJXS'
-//       }
-//     ]
+//     'result': {
+//       'HLJ': [
+//         {
+//           'device_code': 'HLJ01',
+//           'device_name': '混料机1',
+//           'device_model': '1',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': 'ZLMCZ1001C111122GM001BD20-8',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ_S'
+//         },
+//         {
+//           'device_code': 'HLJ02',
+//           'device_name': '混料机2',
+//           'device_model': '1',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ_S'
+//         },
+//         {
+//           'device_code': 'HLJ03',
+//           'device_name': '混料机3',
+//           'device_model': '1',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ_S'
+//         },
+//         {
+//           'device_code': 'HLJ04',
+//           'device_name': '混料机4',
+//           'device_model': '1',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ_S'
+//         },
+//         {
+//           'device_code': 'HLJ05',
+//           'device_name': '混料机5',
+//           'device_model': '2',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ'
+//         },
+//         {
+//           'device_code': 'HLJ06',
+//           'device_name': '混料机6',
+//           'device_model': '2',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ'
+//         },
+//         {
+//           'device_code': 'HLJ07',
+//           'device_name': '混料机7',
+//           'device_model': '2',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ'
+//         },
+//         {
+//           'device_code': 'HLJ08',
+//           'device_name': '混料机8',
+//           'device_model': '2',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ'
+//         },
+//         {
+//           'device_code': 'HLJ09',
+//           'device_name': '混料机9',
+//           'device_model': '2',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ'
+//         },
+//         {
+//           'device_code': 'HLJ10',
+//           'device_name': '混料机10',
+//           'device_model': '2',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ'
+//         },
+//         {
+//           'device_code': 'HLJ11',
+//           'device_name': '混料机11',
+//           'device_model': '2',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ'
+//         },
+//         {
+//           'device_code': 'HLJ12',
+//           'device_name': '混料机12',
+//           'device_model': '2',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ'
+//         },
+//         {
+//           'device_code': 'HLJ13',
+//           'device_name': '混料机13',
+//           'device_model': '2',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ'
+//         },
+//         {
+//           'device_code': 'HLJ14',
+//           'device_name': '混料机14',
+//           'device_model': '2',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ'
+//         },
+//         {
+//           'device_code': 'HLJ15',
+//           'device_name': '混料机15',
+//           'device_model': '2',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ'
+//         },
+//         {
+//           'device_code': 'HLJ16',
+//           'device_name': '混料机16',
+//           'device_model': '2',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'HLJ'
+//         }
+//       ],
+//       'YZJ': [
+//         {
+//           'device_code': 'YJ01',
+//           'device_name': '压机1',
+//           'device_model': '3',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '0',
+//           'realproducestart_date': '2023-04-17 14:18:58',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'YZJ_S'
+//         },
+//         {
+//           'device_code': 'YJ02',
+//           'device_name': '压机2',
+//           'device_model': '3',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '0',
+//           'realproducestart_date': '2023-04-18 13:34:36',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'YZJ_S'
+//         },
+//         {
+//           'device_code': 'YJ03',
+//           'device_name': '压机3',
+//           'device_model': '4',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '0',
+//           'realproducestart_date': '2023-04-29 16:30:23',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'YZJ'
+//         },
+//         {
+//           'device_code': 'YJ04',
+//           'device_name': '压机4',
+//           'device_model': '4',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '0',
+//           'realproducestart_date': '2023-04-20 10:43:55',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'YZJ'
+//         },
+//         {
+//           'device_code': 'YJ05',
+//           'device_name': '压机5',
+//           'device_model': '4',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '0',
+//           'realproducestart_date': '2023-04-25 15:51:44',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'YZJ'
+//         },
+//         {
+//           'device_code': 'YJ06',
+//           'device_name': '压机6',
+//           'device_model': '4',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '0',
+//           'realproducestart_date': '2023-04-27 09:28:22',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'YZJ'
+//         },
+//         {
+//           'device_code': 'YJ07',
+//           'device_name': '压机7',
+//           'device_model': '4',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '0',
+//           'realproducestart_date': '2023-04-22 11:29:10',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'YZJ'
+//         },
+//         {
+//           'device_code': 'YJ08',
+//           'device_name': '压机8',
+//           'device_model': '4',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '0',
+//           'realproducestart_date': '2023-04-27 09:28:27',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'YZJ'
+//         },
+//         {
+//           'device_code': 'YJ09',
+//           'device_name': '压机9',
+//           'device_model': '4',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '0',
+//           'realproducestart_date': '2023-04-27 09:28:31',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'YZJ'
+//         },
+//         {
+//           'device_code': 'YJ10',
+//           'device_name': '压机10',
+//           'device_model': '4',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'YZJ'
+//         }
+//       ],
+//       'MDJXS': [
+//         {
+//           'device_code': 'FJCDJXS0121',
+//           'device_name': '分拣拆垛机械手',
+//           'device_model': '9',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'FJCDJXS'
+//         },
+//         {
+//           'device_code': 'FJCDJXS0122',
+//           'device_name': '分拣拆垛机械手',
+//           'device_model': '9',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'FJCDJXS'
+//         },
+//         {
+//           'device_code': 'FJCDJXS0123',
+//           'device_name': '分拣拆垛机械手',
+//           'device_model': '9',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'FJCDJXS'
+//         }
+//       ],
+//       'YAO': [
+//         {
+//           'device_code': 'FJCDJXS0124',
+//           'device_name': '分拣拆垛机械手',
+//           'device_model': '9',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'FJCDJXS'
+//         },
+//         {
+//           'device_code': 'FJCDJXS0125',
+//           'device_name': '分拣拆垛机械手',
+//           'device_model': '9',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'FJCDJXS'
+//         },
+//         {
+//           'device_code': 'FJCDJXS0126',
+//           'device_name': '分拣拆垛机械手',
+//           'device_model': '9',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'FJCDJXS'
+//         }
+//       ],
+//       'FJJXS': [
+//         {
+//           'device_code': 'FJCDJXS0127',
+//           'device_name': '分拣拆垛机械手',
+//           'device_model': '9',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'FJCDJXS'
+//         },
+//         {
+//           'device_code': 'FJCDJXS0128',
+//           'device_name': '分拣拆垛机械手',
+//           'device_model': '9',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'FJCDJXS'
+//         }
+//       ],
+//       'BZX': [
+//         {
+//           'device_code': 'FJCDJXS0130',
+//           'device_name': '分拣拆垛机械手',
+//           'device_model': '9',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'FJCDJXS'
+//         },
+//         {
+//           'device_code': 'FJCDJXS0131',
+//           'device_name': '分拣拆垛机械手',
+//           'device_model': '9',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'FJCDJXS'
+//         },
+//         {
+//           'device_code': 'FJCDJXS0132',
+//           'device_name': '分拣拆垛机械手',
+//           'device_model': '9',
+//           'device_status': null,
+//           'device_status_name': null,
+//           'material_name': '-',
+//           'work_time': '0',
+//           'real_qty': '',
+//           'realproducestart_date': '',
+//           'vehicle_qty': null,
+//           'vehicle_type': null,
+//           'vehicle_max_qty': null,
+//           'error': 0,
+//           'open_time': null,
+//           'stand_time': 0,
+//           'error_time': 0,
+//           'device_url': 'FJCDJXS'
+//         }
+//       ]
+//     }
 //   }
 //   return res
 // }
diff --git a/src/pages/DeviceMonitor.vue b/src/pages/DeviceMonitor.vue
index 66d2888..20b0ec1 100644
--- a/src/pages/DeviceMonitor.vue
+++ b/src/pages/DeviceMonitor.vue
@@ -3,65 +3,391 @@
     <t-header index='3'></t-header>
     <div class="content">
       <div class="item_tr clearfix">
-        <div class="item_block fl" v-for="(e, i) in deviceDatas" :key="i">
-          <div class="item_inner" @click.stop="getInfo(e)">
-            <div class="item_img">
-              <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
+        <div class="item_wrapper_h2">
+          <div class="item_block fl" v-for="(e, i) in HLJ" :key="i">
+            <div class="item_inner" @click.stop="getInfo(e)">
+              <div class="item_img">
+                <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
+              </div>
+              <div class="device_name clearfix">
+                <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
+                <div class="fl device_name_text">{{e.device_name}}</div>
+              </div>
+              <div class="info_block">
+                <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table_block">
+                  <div class="info_table">当前生产</div>
+                  <div class="info_data">{{e.material_name}}</div>
+                </div>
+                <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_table_block">
+                  <div class="info_table">已工作</div>
+                  <div class="info_data">{{e.work_time}}小时</div>
+                </div>
+                <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
+                  <div class="info_table">已生产</div>
+                  <div class="info_data">{{e.real_qty}}KG</div>
+                </div>
+                <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
+                  <div class="info_table">当前窑车数</div>
+                  <div class="info_data">{{e.vehicle_qty}}车</div>
+                </div>
+                <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_table_block">
+                  <div class="info_table">容量</div>
+                  <div class="info_data">{{e.vehicle_max_qty}}车</div>
+                </div>
+                <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_table_block">
+                  <div class="info_table">载具类型</div>
+                  <div class="info_data">{{e.vehicle_type}}</div>
+                </div>
+                <div class="info_table_block">
+                  <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table">当前状态</div>
+                  <div class="info_data">{{e.device_status_name}}</div>
+                </div>
+              </div>
             </div>
-            <div class="device_name clearfix">
-              <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
-              <div class="fl device_name_text">{{e.device_name}}</div>
-            </div>
-            <div class="info_block">
-              <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table_block">
-                <div class="info_table">当前生产</div>
-                <div class="info_data">{{e.material_name}}</div>
-              </div>
-              <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_table_block">
-                <div class="info_table">已工作</div>
-                <div class="info_data">{{e.work_time}}小时</div>
-              </div>
-              <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
-                <div class="info_table">已生产</div>
-                <div class="info_data">{{e.real_qty}}KG</div>
-              </div>
-              <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
-                <div class="info_table">当前窑车数</div>
-                <div class="info_data">{{e.vehicle_qty}}车</div>
-              </div>
-              <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_table_block">
-                <div class="info_table">容量</div>
-                <div class="info_data">{{e.vehicle_max_qty}}车</div>
-              </div>
-              <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_table_block">
-                <div class="info_table">载具类型</div>
-                <div class="info_data">{{e.vehicle_type}}</div>
-              </div>
-              <div class="info_table_block">
-                <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table">当前状态</div>
-                <div class="info_data">{{e.device_status_name}}</div>
+            <div v-if="e.device_code === pkObj.device_code" class="popover_block">
+              <div class="foldline" :class="e.postion1"></div>
+              <div class="popver_bg" :class="e.postion2">
+                <div class="popver_block">
+                  <div class="pop_info_name">{{pkObj.device_name}}</div>
+                  <div class="pop_info_tip">
+                    <div class="pop_status">
+                      <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(pkObj.device_status)]"></div>
+                      <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
+                    </div>
+                    <div v-if="pkObj.material_name !== null && pkObj.material_name !== undefined" class="pop_tip">当前生产：{{pkObj.material_name}}</div>
+                    <div v-if="pkObj.real_qty !== null && pkObj.real_qty !== undefined" class="pop_tip">已生产：{{pkObj.real_qty}}KG</div>
+                    <div v-if="pkObj.vehicle_qty !== null && pkObj.vehicle_qty !== undefined" class="pop_tip">当前窑车数：{{pkObj.vehicle_qty}}车</div>
+                    <div v-if="pkObj.vehicle_max_qty !== null && pkObj.vehicle_max_qty !== undefined" class="pop_tip">容量：{{pkObj.vehicle_max_qty}}车</div>
+                    <div v-if="pkObj.vehicle_type !== null && pkObj.vehicle_type !== undefined" class="pop_tip">载具类型：{{pkObj.vehicle_type}}车</div>
+                    <div v-if="pkObj.error_name !== null && pkObj.error_name !== undefined" class="pop_tip">故障信息：{{pkObj.error_name}}</div>
+                  </div>
+                </div>
+                <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
               </div>
             </div>
           </div>
-          <div v-if="e.device_code === pkObj.device_code" class="popover_block">
-            <div class="foldline" :class="e.postion1"></div>
-            <div class="popver_bg" :class="e.postion2">
-              <div class="popver_block">
-                <div class="pop_info_name">{{pkObj.device_name}}</div>
-                <div class="pop_info_tip">
-                  <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(pkObj.device_status)]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
-                  </div>
-                  <div v-if="pkObj.material_name !== null && pkObj.material_name !== undefined" class="pop_tip">当前生产：{{pkObj.material_name}}</div>
-                  <div v-if="pkObj.real_qty !== null && pkObj.real_qty !== undefined" class="pop_tip">已生产：{{pkObj.real_qty}}KG</div>
-                  <div v-if="pkObj.vehicle_qty !== null && pkObj.vehicle_qty !== undefined" class="pop_tip">当前窑车数：{{pkObj.vehicle_qty}}车</div>
-                  <div v-if="pkObj.vehicle_max_qty !== null && pkObj.vehicle_max_qty !== undefined" class="pop_tip">容量：{{pkObj.vehicle_max_qty}}车</div>
-                  <div v-if="pkObj.vehicle_type !== null && pkObj.vehicle_type !== undefined" class="pop_tip">载具类型：{{pkObj.vehicle_type}}车</div>
-                  <div v-if="pkObj.error_name !== null && pkObj.error_name !== undefined" class="pop_tip">故障信息：{{pkObj.error_name}}</div>
+        </div>
+        <div class="item_wrapper_h1">
+          <div class="item_block fl" v-for="(e, i) in YZJ" :key="i">
+            <div class="item_inner" @click.stop="getInfo(e)">
+              <div class="item_img">
+                <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
+              </div>
+              <div class="device_name clearfix">
+                <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
+                <div class="fl device_name_text">{{e.device_name}}</div>
+              </div>
+              <div class="info_block">
+                <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table_block">
+                  <div class="info_table">当前生产</div>
+                  <div class="info_data">{{e.material_name}}</div>
+                </div>
+                <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_table_block">
+                  <div class="info_table">已工作</div>
+                  <div class="info_data">{{e.work_time}}小时</div>
+                </div>
+                <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
+                  <div class="info_table">已生产</div>
+                  <div class="info_data">{{e.real_qty}}KG</div>
+                </div>
+                <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
+                  <div class="info_table">当前窑车数</div>
+                  <div class="info_data">{{e.vehicle_qty}}车</div>
+                </div>
+                <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_table_block">
+                  <div class="info_table">容量</div>
+                  <div class="info_data">{{e.vehicle_max_qty}}车</div>
+                </div>
+                <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_table_block">
+                  <div class="info_table">载具类型</div>
+                  <div class="info_data">{{e.vehicle_type}}</div>
+                </div>
+                <div class="info_table_block">
+                  <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table">当前状态</div>
+                  <div class="info_data">{{e.device_status_name}}</div>
+                </div>
+              </div>
+            </div>
+            <div v-if="e.device_code === pkObj.device_code" class="popover_block">
+              <div class="foldline" :class="e.postion1"></div>
+              <div class="popver_bg" :class="e.postion2">
+                <div class="popver_block">
+                  <div class="pop_info_name">{{pkObj.device_name}}</div>
+                  <div class="pop_info_tip">
+                    <div class="pop_status">
+                      <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(pkObj.device_status)]"></div>
+                      <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
+                    </div>
+                    <div v-if="pkObj.material_name !== null && pkObj.material_name !== undefined" class="pop_tip">当前生产：{{pkObj.material_name}}</div>
+                    <div v-if="pkObj.real_qty !== null && pkObj.real_qty !== undefined" class="pop_tip">已生产：{{pkObj.real_qty}}KG</div>
+                    <div v-if="pkObj.vehicle_qty !== null && pkObj.vehicle_qty !== undefined" class="pop_tip">当前窑车数：{{pkObj.vehicle_qty}}车</div>
+                    <div v-if="pkObj.vehicle_max_qty !== null && pkObj.vehicle_max_qty !== undefined" class="pop_tip">容量：{{pkObj.vehicle_max_qty}}车</div>
+                    <div v-if="pkObj.vehicle_type !== null && pkObj.vehicle_type !== undefined" class="pop_tip">载具类型：{{pkObj.vehicle_type}}车</div>
+                    <div v-if="pkObj.error_name !== null && pkObj.error_name !== undefined" class="pop_tip">故障信息：{{pkObj.error_name}}</div>
+                  </div>
+                </div>
+                <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="item_wrapper_f">
+          <div class="item_wrapper_l">
+            <div class="item_block item_block_f fl" v-for="(e, i) in MDJXS" :key="i">
+              <div class="item_inner" @click.stop="getInfo(e)">
+                <div class="item_img">
+                  <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
+                </div>
+                <div class="device_name clearfix">
+                  <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
+                  <div class="fl device_name_text">{{e.device_name}}</div>
+                </div>
+                <div class="info_block">
+                  <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table_block">
+                    <div class="info_table">当前生产</div>
+                    <div class="info_data">{{e.material_name}}</div>
+                  </div>
+                  <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_table_block">
+                    <div class="info_table">已工作</div>
+                    <div class="info_data">{{e.work_time}}小时</div>
+                  </div>
+                  <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
+                    <div class="info_table">已生产</div>
+                    <div class="info_data">{{e.real_qty}}KG</div>
+                  </div>
+                  <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
+                    <div class="info_table">当前窑车数</div>
+                    <div class="info_data">{{e.vehicle_qty}}车</div>
+                  </div>
+                  <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_table_block">
+                    <div class="info_table">容量</div>
+                    <div class="info_data">{{e.vehicle_max_qty}}车</div>
+                  </div>
+                  <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_table_block">
+                    <div class="info_table">载具类型</div>
+                    <div class="info_data">{{e.vehicle_type}}</div>
+                  </div>
+                  <div class="info_table_block">
+                    <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table">当前状态</div>
+                    <div class="info_data">{{e.device_status_name}}</div>
+                  </div>
+                </div>
+              </div>
+              <div v-if="e.device_code === pkObj.device_code" class="popover_block">
+                <div class="foldline" :class="e.postion1"></div>
+                <div class="popver_bg" :class="e.postion2">
+                  <div class="popver_block">
+                    <div class="pop_info_name">{{pkObj.device_name}}</div>
+                    <div class="pop_info_tip">
+                      <div class="pop_status">
+                        <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(pkObj.device_status)]"></div>
+                        <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
+                      </div>
+                      <div v-if="pkObj.material_name !== null && pkObj.material_name !== undefined" class="pop_tip">当前生产：{{pkObj.material_name}}</div>
+                      <div v-if="pkObj.real_qty !== null && pkObj.real_qty !== undefined" class="pop_tip">已生产：{{pkObj.real_qty}}KG</div>
+                      <div v-if="pkObj.vehicle_qty !== null && pkObj.vehicle_qty !== undefined" class="pop_tip">当前窑车数：{{pkObj.vehicle_qty}}车</div>
+                      <div v-if="pkObj.vehicle_max_qty !== null && pkObj.vehicle_max_qty !== undefined" class="pop_tip">容量：{{pkObj.vehicle_max_qty}}车</div>
+                      <div v-if="pkObj.vehicle_type !== null && pkObj.vehicle_type !== undefined" class="pop_tip">载具类型：{{pkObj.vehicle_type}}车</div>
+                      <div v-if="pkObj.error_name !== null && pkObj.error_name !== undefined" class="pop_tip">故障信息：{{pkObj.error_name}}</div>
+                    </div>
+                  </div>
+                  <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="item_wrapper_l">
+            <div class="item_block item_block_f fl" v-for="(e, i) in YAO" :key="i">
+              <div class="item_inner" @click.stop="getInfo(e)">
+                <div class="item_img">
+                  <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
+                </div>
+                <div class="device_name clearfix">
+                  <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
+                  <div class="fl device_name_text">{{e.device_name}}</div>
+                </div>
+                <div class="info_block">
+                  <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table_block">
+                    <div class="info_table">当前生产</div>
+                    <div class="info_data">{{e.material_name}}</div>
+                  </div>
+                  <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_table_block">
+                    <div class="info_table">已工作</div>
+                    <div class="info_data">{{e.work_time}}小时</div>
+                  </div>
+                  <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
+                    <div class="info_table">已生产</div>
+                    <div class="info_data">{{e.real_qty}}KG</div>
+                  </div>
+                  <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
+                    <div class="info_table">当前窑车数</div>
+                    <div class="info_data">{{e.vehicle_qty}}车</div>
+                  </div>
+                  <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_table_block">
+                    <div class="info_table">容量</div>
+                    <div class="info_data">{{e.vehicle_max_qty}}车</div>
+                  </div>
+                  <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_table_block">
+                    <div class="info_table">载具类型</div>
+                    <div class="info_data">{{e.vehicle_type}}</div>
+                  </div>
+                  <div class="info_table_block">
+                    <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table">当前状态</div>
+                    <div class="info_data">{{e.device_status_name}}</div>
+                  </div>
+                </div>
+              </div>
+              <div v-if="e.device_code === pkObj.device_code" class="popover_block">
+                <div class="foldline" :class="e.postion1"></div>
+                <div class="popver_bg" :class="e.postion2">
+                  <div class="popver_block">
+                    <div class="pop_info_name">{{pkObj.device_name}}</div>
+                    <div class="pop_info_tip">
+                      <div class="pop_status">
+                        <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(pkObj.device_status)]"></div>
+                        <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
+                      </div>
+                      <div v-if="pkObj.material_name !== null && pkObj.material_name !== undefined" class="pop_tip">当前生产：{{pkObj.material_name}}</div>
+                      <div v-if="pkObj.real_qty !== null && pkObj.real_qty !== undefined" class="pop_tip">已生产：{{pkObj.real_qty}}KG</div>
+                      <div v-if="pkObj.vehicle_qty !== null && pkObj.vehicle_qty !== undefined" class="pop_tip">当前窑车数：{{pkObj.vehicle_qty}}车</div>
+                      <div v-if="pkObj.vehicle_max_qty !== null && pkObj.vehicle_max_qty !== undefined" class="pop_tip">容量：{{pkObj.vehicle_max_qty}}车</div>
+                      <div v-if="pkObj.vehicle_type !== null && pkObj.vehicle_type !== undefined" class="pop_tip">载具类型：{{pkObj.vehicle_type}}车</div>
+                      <div v-if="pkObj.error_name !== null && pkObj.error_name !== undefined" class="pop_tip">故障信息：{{pkObj.error_name}}</div>
+                    </div>
+                  </div>
+                  <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="item_wrapper_f">
+          <div class="item_wrapper_l">
+            <div class="item_block item_block_f fl" v-for="(e, i) in FJJXS" :key="i">
+              <div class="item_inner" @click.stop="getInfo(e)">
+                <div class="item_img">
+                  <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
+                </div>
+                <div class="device_name clearfix">
+                  <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
+                  <div class="fl device_name_text">{{e.device_name}}</div>
+                </div>
+                <div class="info_block">
+                  <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table_block">
+                    <div class="info_table">当前生产</div>
+                    <div class="info_data">{{e.material_name}}</div>
+                  </div>
+                  <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_table_block">
+                    <div class="info_table">已工作</div>
+                    <div class="info_data">{{e.work_time}}小时</div>
+                  </div>
+                  <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
+                    <div class="info_table">已生产</div>
+                    <div class="info_data">{{e.real_qty}}KG</div>
+                  </div>
+                  <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
+                    <div class="info_table">当前窑车数</div>
+                    <div class="info_data">{{e.vehicle_qty}}车</div>
+                  </div>
+                  <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_table_block">
+                    <div class="info_table">容量</div>
+                    <div class="info_data">{{e.vehicle_max_qty}}车</div>
+                  </div>
+                  <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_table_block">
+                    <div class="info_table">载具类型</div>
+                    <div class="info_data">{{e.vehicle_type}}</div>
+                  </div>
+                  <div class="info_table_block">
+                    <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table">当前状态</div>
+                    <div class="info_data">{{e.device_status_name}}</div>
+                  </div>
+                </div>
+              </div>
+              <div v-if="e.device_code === pkObj.device_code" class="popover_block">
+                <div class="foldline" :class="e.postion1"></div>
+                <div class="popver_bg" :class="e.postion2">
+                  <div class="popver_block">
+                    <div class="pop_info_name">{{pkObj.device_name}}</div>
+                    <div class="pop_info_tip">
+                      <div class="pop_status">
+                        <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(pkObj.device_status)]"></div>
+                        <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
+                      </div>
+                      <div v-if="pkObj.material_name !== null && pkObj.material_name !== undefined" class="pop_tip">当前生产：{{pkObj.material_name}}</div>
+                      <div v-if="pkObj.real_qty !== null && pkObj.real_qty !== undefined" class="pop_tip">已生产：{{pkObj.real_qty}}KG</div>
+                      <div v-if="pkObj.vehicle_qty !== null && pkObj.vehicle_qty !== undefined" class="pop_tip">当前窑车数：{{pkObj.vehicle_qty}}车</div>
+                      <div v-if="pkObj.vehicle_max_qty !== null && pkObj.vehicle_max_qty !== undefined" class="pop_tip">容量：{{pkObj.vehicle_max_qty}}车</div>
+                      <div v-if="pkObj.vehicle_type !== null && pkObj.vehicle_type !== undefined" class="pop_tip">载具类型：{{pkObj.vehicle_type}}车</div>
+                      <div v-if="pkObj.error_name !== null && pkObj.error_name !== undefined" class="pop_tip">故障信息：{{pkObj.error_name}}</div>
+                    </div>
+                  </div>
+                  <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="item_wrapper_l">
+            <div class="item_block item_block_f fl" v-for="(e, i) in BZX" :key="i">
+              <div class="item_inner" @click.stop="getInfo(e)">
+                <div class="item_img">
+                  <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
+                </div>
+                <div class="device_name clearfix">
+                  <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
+                  <div class="fl device_name_text">{{e.device_name}}</div>
+                </div>
+                <div class="info_block">
+                  <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table_block">
+                    <div class="info_table">当前生产</div>
+                    <div class="info_data">{{e.material_name}}</div>
+                  </div>
+                  <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_table_block">
+                    <div class="info_table">已工作</div>
+                    <div class="info_data">{{e.work_time}}小时</div>
+                  </div>
+                  <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
+                    <div class="info_table">已生产</div>
+                    <div class="info_data">{{e.real_qty}}KG</div>
+                  </div>
+                  <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
+                    <div class="info_table">当前窑车数</div>
+                    <div class="info_data">{{e.vehicle_qty}}车</div>
+                  </div>
+                  <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_table_block">
+                    <div class="info_table">容量</div>
+                    <div class="info_data">{{e.vehicle_max_qty}}车</div>
+                  </div>
+                  <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_table_block">
+                    <div class="info_table">载具类型</div>
+                    <div class="info_data">{{e.vehicle_type}}</div>
+                  </div>
+                  <div class="info_table_block">
+                    <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table">当前状态</div>
+                    <div class="info_data">{{e.device_status_name}}</div>
+                  </div>
+                </div>
+              </div>
+              <div v-if="e.device_code === pkObj.device_code" class="popover_block">
+                <div class="foldline" :class="e.postion1"></div>
+                <div class="popver_bg" :class="e.postion2">
+                  <div class="popver_block">
+                    <div class="pop_info_name">{{pkObj.device_name}}</div>
+                    <div class="pop_info_tip">
+                      <div class="pop_status">
+                        <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(pkObj.device_status)]"></div>
+                        <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
+                      </div>
+                      <div v-if="pkObj.material_name !== null && pkObj.material_name !== undefined" class="pop_tip">当前生产：{{pkObj.material_name}}</div>
+                      <div v-if="pkObj.real_qty !== null && pkObj.real_qty !== undefined" class="pop_tip">已生产：{{pkObj.real_qty}}KG</div>
+                      <div v-if="pkObj.vehicle_qty !== null && pkObj.vehicle_qty !== undefined" class="pop_tip">当前窑车数：{{pkObj.vehicle_qty}}车</div>
+                      <div v-if="pkObj.vehicle_max_qty !== null && pkObj.vehicle_max_qty !== undefined" class="pop_tip">容量：{{pkObj.vehicle_max_qty}}车</div>
+                      <div v-if="pkObj.vehicle_type !== null && pkObj.vehicle_type !== undefined" class="pop_tip">载具类型：{{pkObj.vehicle_type}}车</div>
+                      <div v-if="pkObj.error_name !== null && pkObj.error_name !== undefined" class="pop_tip">故障信息：{{pkObj.error_name}}</div>
+                    </div>
+                  </div>
+                  <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
                 </div>
               </div>
-              <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
             </div>
           </div>
         </div>
@@ -101,7 +427,13 @@ export default {
       interTime: this.$store.getters.setTime,
       timer: null,
       deviceDatas: [],
-      pkObj: {}
+      pkObj: {},
+      HLJ: [], // 混料16，压机10，码垛机械手3台，窑设备3台，分拣机械手2台、包装线3台
+      YZJ: [],
+      MDJXS: [],
+      YAO: [],
+      FJJXS: [],
+      BZX: []
     }
   },
   created () {
@@ -121,37 +453,44 @@ export default {
       let res = await deviceMonitor()
       if (res.code === 200) {
         this.deviceDatas = [...res.result]
-        this.addPosition()
+        this.HLJ = [...res.result.HLJ]
+        this.YZJ = [...res.result.YZJ]
+        this.MDJXS = [...res.result.MDJXS]
+        this.YAO = [...res.result.YAO]
+        this.FJJXS = [...res.result.FJJXS]
+        this.BZX = [...res.result.BZX]
+        this.addPosition1(this.HLJ)
+        this.addPosition1(this.YZJ)
+        this.addPosition1(this.MDJXS)
+        this.addPosition2(this.YAO)
+        this.addPosition1(this.FJJXS)
+        this.addPosition2(this.BZX)
       } else {
         this.toast(res.desc)
       }
     },
-    addPosition () {
-      for (let i = 0; i < this.deviceDatas.length; i++) {
-        if (i <= 5) {
-          this.deviceDatas[i].postion1 = 'position_1a_l'
-          this.deviceDatas[i].postion2 = 'position_1b_l'
-        } else if (i > 5 && i <= 8) {
-          this.deviceDatas[i].postion1 = 'position_1a_r'
-          this.deviceDatas[i].postion2 = 'position_1b_r'
-        } else if (i > 8 && i <= 14) {
-          this.deviceDatas[i].postion1 = 'position_1a_l'
-          this.deviceDatas[i].postion2 = 'position_1b_l'
-        } else if (i > 14 && i <= 17) {
-          this.deviceDatas[i].postion1 = 'position_1a_r'
-          this.deviceDatas[i].postion2 = 'position_1b_r'
-        } else if (i > 17 && i <= 23) {
-          this.deviceDatas[i].postion1 = 'position_1a_l'
-          this.deviceDatas[i].postion2 = 'position_1b_l'
-        } else if (i > 23 && i <= 26) {
-          this.deviceDatas[i].postion1 = 'position_1a_r'
-          this.deviceDatas[i].postion2 = 'position_1b_r'
-        } else if (i > 26 && i <= 32) {
-          this.deviceDatas[i].postion1 = 'position_2a_l'
-          this.deviceDatas[i].postion2 = 'position_2b_l'
-        } else if (i > 32 && i <= 35) {
-          this.deviceDatas[i].postion1 = 'position_2a_r'
-          this.deviceDatas[i].postion2 = 'position_2b_r'
+    addPosition1 (arr) {
+      for (let i = 0; i < arr.length; i++) {
+        if (i <= 4) {
+          arr[i].postion1 = 'position_1a_l'
+          arr[i].postion2 = 'position_1b_l'
+        } else if (i > 4 && i <= 9) {
+          arr[i].postion1 = 'position_1a_r'
+          arr[i].postion2 = 'position_1b_r'
+        } else if (i > 9 && i <= 14) {
+          arr[i].postion1 = 'position_1a_l'
+          arr[i].postion2 = 'position_1b_l'
+        } else if (i > 14 && i <= 19) {
+          arr[i].postion1 = 'position_1a_r'
+          arr[i].postion2 = 'position_1b_r'
+        }
+      }
+    },
+    addPosition2 (arr) {
+      for (let i = 0; i < arr.length; i++) {
+        if (i <= 4) {
+          arr[i].postion1 = 'position_1a_r'
+          arr[i].postion2 = 'position_1b_r'
         }
       }
     },
@@ -181,27 +520,44 @@ export default {
 .content
   width 100%
   height calc(100% - 84px)
-  padding 15px
 .item_tr
   width 100%
-  height 100%
+  height auto
+  padding 3% .5%
+  _fj(,center)
+.item_wrapper_h1
+  width 100%
+  overflow hidden
+.item_wrapper_h2
+  width 100%
+  overflow hidden
+.item_wrapper_f
+  width 100%
+  _fj(row)
+  overflow hidden
+.item_wrapper_l
+  width 49.85%
 .item_block
   position relative
-  _wh(10.5%,calc((100% - 45px) / 4))
+  width 9.55%
   padding 8px 4px
-  margin-bottom 15px
-  margin-right 0.6875%
+  margin-bottom 0.5%
+  margin-right 0.5%
   background center center / 100% 100% url(../assets/images/bg_item.png) no-repeat
-  &:nth-child(9n)
+  &:nth-child(10n)
+    margin-right 0
+.item_block_f
+  width 19.2%
+  margin-right 1%
+  margin-bottom 1%
+  &:nth-child(5n)
     margin-right 0
-  &:nth-child(n+28):nth-child(-n+36)
-    margin-bottom 0
 .item_inner
-  _wh(100%,100%)
+  width 100%
   overflow hidden
 .item_img
-  _wh(100%,91px)
-  margin-bottom 5px
+  _wh(98%,91px)
+  margin 0 auto 5px auto
   border 1px solid #393F51
   background-color $gray
   img
@@ -213,9 +569,13 @@ export default {
   background-color #ffffff
 .device_name_text
   _font(14px,14px,,,left)
-.device_name, .info_block
+.device_name
   width 100%
   padding 4px 0
+.info_block
+  _wh(100%, 80px)
+  padding 4px 0
+  overflow hidden
 .info_table_block
   width 100%
   _fj(row,,flex-start)