数据

src/config/mork2.js

@@ -1,422 +1,3 @@
-/**
- * 新版大屏首页左侧报表
- */
-export const homepageDataLeft = () => {
-  let res = {
-    // 当日混料 最多7个元素
-    'todayMix': [
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-30',
-        'materialName': '物料一',
-        // 需生产
-        'plan': 14,
-        // 已生产
-        'real': 17
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-30',
-        'materialName': '物料二',
-        // 需生产
-        'plan': 14,
-        // 已生产
-        'real': 16
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-30',
-        'materialName': '物料三',
-        // 需生产
-        'plan': 20,
-        // 已生产
-        'real': 16
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-30',
-        'materialName': '物料四',
-        // 需生产
-        'plan': 14,
-        // 已生产
-        'real': 16
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-30',
-        'materialName': '物料五',
-        // 需生产
-        'plan': 14,
-        // 已生产
-        'real': 16
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-31',
-        'materialName': '物料6',
-        // 需生产
-        'plan': 14,
-        // 已生产
-        'real': 16
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-32',
-        'materialName': '物料7',
-        // 需生产
-        'plan': 14,
-        // 已生产
-        'real': 16
-      }
-    ],
-    // 当日成品 最多7个元素
-    'todaySort': [
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-30',
-        // 需生产
-        'plan': 10,
-        // 已压制
-        'press': 20,
-        // 已完成
-        'real': 30
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-30',
-        // 需生产
-        'plan': 10,
-        // 已压制
-        'press': 20,
-        // 已完成
-        'real': 30
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-30',
-        // 需生产
-        'plan': 10,
-        // 已压制
-        'press': 20,
-        // 已完成
-        'real': 30
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-30',
-        // 需生产
-        'plan': 10,
-        // 已压制
-        'press': 20,
-        // 已完成
-        'real': 30
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-30',
-        // 需生产
-        'plan': 10,
-        // 已压制
-        'press': 20,
-        // 已完成
-        'real': 30
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-30',
-        // 需生产
-        'plan': 10,
-        // 已压制
-        'press': 20,
-        // 已完成
-        'real': 30
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-30',
-        // 需生产
-        'plan': 10,
-        // 已压制
-        'press': 20,
-        // 已完成
-        'real': 30
-      }
-    ],
-    // 今日生产
-    'todayProduction': {
-      // 压制
-      'todayPressProduction': {
-        // 已生产
-        'real': 2122,
-        // 计划生产
-        'plan': 8400
-      },
-      // 包装
-      'todaySortProduction': {
-        // 已生产
-        'real': 0,
-        // 计划生产
-        'plan': 0
-      },
-      // 订单完成
-      'orderFulfillmentRate': {
-        // 已生产
-        'real': 2122,
-        // 计划生产
-        'plan': 8400
-      },
-      // 混料
-      'todayMixProduction': {
-        // 已生产
-        'real': 0.0,
-        // 计划生产
-        'plan': 0.0
-      },
-      todayTotalPlan: '80',
-      materialCountSize: '2',
-      sortCompleted: '11',
-      sortCompletedQty: '900',
-      sortMaterialCountSize: '1',
-      fulfillmentRate: '25'
-      // 信息
-      // 'message': '今日共需生产<span>8400</span>块，物料种类2种，已完成包装11托，共900块，1个物料，完成率25%。'
-    },
-    // 历史分析 固定7个元素
-    'history': [
-      {
-        // 日期
-        'date': '12月31日',
-        // 成品
-        'sort': 0,
-        // 压制
-        'press': 1890
-      },
-      {
-        'date': '12月31日',
-        'sort': 0,
-        'press': 2640
-      },
-      {
-        'date': '12月31日',
-        'sort': 0,
-        'press': 5364
-      },
-      {
-        'date': '12月31日',
-        'sort': 720,
-        'press': 4962
-      },
-      {
-        'date': '12月31日',
-        'sort': 1584,
-        'press': 1260
-      },
-      {
-        'date': '12月31日',
-        'sort': 1872,
-        'press': 2400
-      },
-      {
-        'date': '12月31日',
-        'sort': 576,
-        'press': 630
-      }
-    ],
-    // 库存量监控 最多7个元素
-    'inventory': [
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-31',
-        'materialName': '物料一',
-        // 数量
-        'qty': 1
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-32',
-        'materialName': '物料二',
-        // 数量
-        'qty': 2
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-3',
-        'materialName': '物料三',
-        // 数量
-        'qty': 3
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-4',
-        'materialName': '物料四',
-        // 数量
-        'qty': 4
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-5',
-        'materialName': '物料五',
-        // 数量
-        'qty': 5
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-6',
-        'materialName': '物料6',
-        // 数量
-        'qty': 6
-      },
-      {
-        // 物料编码
-        'materialCode': 'GBMCZ3027L323217GM003ZX22-7',
-        'materialName': '物料7',
-        // 数量
-        'qty': 7
-      }
-    ]
-  }
-  return res
-}
-
-/**
- * 新版大屏首页右侧报表
- */
-export const homepageDataRight = () => {
-  let res = {
-    'capacityRate': [{'device_name': '混料设备', 'numerical': '60'}, {'device_name': '压制设备', 'numerical': '60'}, {'device_name': '压制设备2', 'numerical': '60'}, {'device_name': '压制设备3', 'numerical': '60'}],
-    'stateStatistics': {
-      count: '20',
-      fourState: [{'status': '5', 'stateName': '正常运行'}, {'status': '5', 'stateName': '暂未生产'}, {'status': '5', 'stateName': '空闲设备'}, {'status': '5', 'stateName': '故障设备'}]
-    },
-    'areaDeviceStatus': {
-      'mix': {
-        'running': 7,
-        'pausing': 3,
-        'shutdown': 4,
-        'inTrouble': 1
-      },
-      'press': {
-        'running': 4,
-        'pausing': 2,
-        'shutdown': 1,
-        'inTrouble': 0
-      },
-      'dry': {
-        'running': 4,
-        'pausing': 7,
-        'shutdown': 8,
-        'inTrouble': 2
-      },
-      'sort': {
-        'running': 7,
-        'pausing': 3,
-        'shutdown': 3,
-        'inTrouble': 1
-      }
-    },
-    'top10Of30Days': [
-      {
-        'device_name': '压机1',
-        'count': 10
-      },
-      {
-        'device_name': '压机2',
-        'count': 9
-      },
-      {
-        'device_name': '混料机1',
-        'count': 8
-      },
-      {
-        'device_name': '窑1',
-        'count': 7
-      },
-      {
-        'device_name': '分拣拆垛机械手1',
-        'count': 6
-      },
-      {
-        'device_name': '压机7',
-        'count': 5
-      },
-      {
-        'device_name': '码垛机械手1',
-        'count': 4
-      },
-      {
-        'device_name': '窑前桁架1',
-        'count': 3
-      },
-      {
-        'device_name': '拆盘机1',
-        'count': 2
-      },
-      {
-        'device_name': '覆膜机1',
-        'count': 1
-      }
-    ],
-    'deviceWorkOrder': [
-      {
-        'process': '压制',
-        'deviceCode': 'YJ01',
-        'deviceName': '压机1',
-        'status': '2',
-        'workOrder': 'GD0001',
-        'bom': '1001C1',
-        'material': 'ZLMCZ1001C122211GM001BD20-8',
-        'qty': '1000块',
-        'startTime': '2023-11-20 14:32:32'
-      },
-      {
-        'process': '压制',
-        'deviceCode': 'YJ01',
-        'deviceName': '压机1',
-        'status': '0',
-        'workOrder': 'GD0001',
-        'bom': '1001C1',
-        'material': 'ZLMCZ1001C122211GM001BD20-8',
-        'qty': '1000块',
-        'startTime': '2023-11-20 14:32:32'
-      },
-      {
-        'process': '压制',
-        'deviceCode': 'YJ01',
-        'deviceName': '压机1',
-        'status': '1',
-        'workOrder': 'GD0001',
-        'bom': '1001C1',
-        'material': 'ZLMCZ1001C122211GM001BD20-8',
-        'qty': '1000块',
-        'startTime': '2023-11-20 14:32:32'
-      },
-      {
-        'process': '压制',
-        'deviceCode': 'YJ01',
-        'deviceName': '压机1',
-        'status': '1',
-        'workOrder': 'GD0001',
-        'bom': '1001C1',
-        'material': 'ZLMCZ1001C122211GM001BD20-8',
-        'qty': '1000块',
-        'startTime': '2023-11-20 14:32:32'
-      },
-      {
-        'process': '压制',
-        'deviceCode': 'YJ01',
-        'deviceName': '压机1',
-        'status': '1',
-        'workOrder': 'GD0001',
-        'bom': '1001C1',
-        'material': 'ZLMCZ1001C122211GM001BD20-8',
-        'qty': '1000块',
-        'startTime': '2023-11-20 14:32:32'
-      }
-    ]
-  }
-  return res
-}
-
 /**
  * 大屏首页设备
  */
@@ -514,83 +95,83 @@ export const deviceCondition = () => {
     ],
     'ManipulatorInfoList': [
       {
-        'device_status': 3,
+        'device_status': 2,
         'error_time': 0,
         'stand_time': 10,
         'real_qty': 255,
-        'color_status': 3,
+        'color_status': 2,
         'device_code': 'FJCDJXS01',
         'open_time': '06:54:53.147',
         'work_time': 40,
         'error': 0
       },
       {
-        'device_status': 3,
+        'device_status': 2,
         'error_time': 0,
         'stand_time': 10,
         'real_qty': 255,
-        'color_status': 3,
+        'color_status': 2,
         'device_code': 'FJMDJXS01',
         'open_time': '06:54:53.147',
         'work_time': 40,
         'error': 0
       },
       {
-        'device_status': 3,
+        'device_status': 2,
         'error_time': 0,
         'stand_time': 10,
         'real_qty': 255,
-        'color_status': 3,
+        'color_status': 2,
         'device_code': 'FJMDJXS02',
         'open_time': '06:54:53.147',
         'work_time': 40,
         'error': 0
       },
       {
-        'device_status': 3,
+        'device_status': 2,
         'error_time': 0,
         'stand_time': 10,
-        'color_status': 3,
+        'color_status': 2,
         'device_code': 'YZJXS01',
         'open_time': '07:54:53.147',
         'work_time': 50,
         'error': 0
       },
       {
-        'device_status': 3,
+        'device_status': 2,
         'error_time': 0,
         'stand_time': 10,
-        'color_status': 3,
+        'color_status': 2,
         'device_code': 'YZJXS02',
         'open_time': '07:54:53.147',
         'work_time': 50,
         'error': 0
       },
       {
-        'device_status': 3,
+        'device_status': 2,
         'error_time': 0,
         'stand_time': 10,
-        'color_status': 3,
+        'color_status': 2,
         'device_code': 'YZJXS03',
         'open_time': '07:54:53.147',
         'work_time': 50,
         'error': 0
       },
       {
-        'device_status': 3,
+        'device_status': 2,
         'error_time': 0,
         'stand_time': 10,
-        'color_status': 3,
+        'color_status': 2,
         'device_code': 'YZJXS04',
         'open_time': '07:54:53.147',
         'work_time': 50,
         'error': 0
       },
       {
-        'device_status': 3,
+        'device_status': 2,
         'error_time': 0,
         'stand_time': 10,
-        'color_status': 3,
+        'color_status': 2,
         'device_code': 'YZJXS05',
         'open_time': '07:54:53.147',
         'work_time': 50,
@@ -600,8 +181,8 @@ export const deviceCondition = () => {
     'SortAndPalletizingList': [
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'FJ01CDW01',
         'error': 0,
         'encoder_qty': 100,
@@ -609,8 +190,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'FJ01CDW02',
         'error': 0,
         'encoder_qty': 100,
@@ -618,8 +199,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'FJ01MDW01',
         'error': 0,
         'encoder_qty': 100,
@@ -627,14 +208,46 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'FJ01MDW02',
         'error': 0,
         'encoder_qty': 100,
         'barcode': 10010
       }
     ],
+    'manualSortingList': [
+      {
+        'pointStatus': '1',
+        'pointName': '人工分拣拆01',
+        'pointCode': 'RGFJC01'
+      },
+      {
+        'pointStatus': '2',
+        'pointName': '人工分拣拆02',
+        'pointCode': 'RGFJC02'
+      },
+      {
+        'pointStatus': '2',
+        'pointName': '人工分拣拆03',
+        'pointCode': 'RGFJC03'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '人工分拣拆04',
+        'pointCode': 'RGFJC04'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '人工分拣拆05',
+        'pointCode': 'RGFJC05'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '人工分拣拆06',
+        'pointCode': 'RGFJC06'
+      }
+    ],
     'PressMachineList': [
       {
         'device_status': 2,
@@ -775,11 +388,233 @@ export const deviceCondition = () => {
         'pointCode': 'HNJ08DJW'
       }
     ],
+    'hchjList': [
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架01',
+        'pointCode': 'HCHJ01'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架02',
+        'pointCode': 'HCHJ02'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架03',
+        'pointCode': 'HCHJ03'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架04',
+        'pointCode': 'HCHJ04'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架05',
+        'pointCode': 'HCHJ05'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架06',
+        'pointCode': 'HCHJ06'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架07',
+        'pointCode': 'HCHJ07'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架08',
+        'pointCode': 'HCHJ08'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架09',
+        'pointCode': 'HCHJ09'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架10',
+        'pointCode': 'HCHJ10'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架11',
+        'pointCode': 'HCHJ11'
+      },
+      {
+        'pointStatus': '3',
+        'pointName': '缓存货架12',
+        'pointCode': 'HCHJ12'
+      },
+      {
+        'pointStatus': '3',
+        'pointName': '缓存货架13',
+        'pointCode': 'HCHJ13'
+      },
+      {
+        'pointStatus': '3',
+        'pointName': '缓存货架14',
+        'pointCode': 'HCHJ14'
+      },
+      {
+        'pointStatus': '3',
+        'pointName': '缓存货架15',
+        'pointCode': 'HCHJ15'
+      },
+      {
+        'pointStatus': '3',
+        'pointName': '缓存货架16',
+        'pointCode': 'HCHJ16'
+      },
+      {
+        'pointStatus': '3',
+        'pointName': '缓存货架17',
+        'pointCode': 'HCHJ17'
+      },
+      {
+        'pointStatus': '3',
+        'pointName': '缓存货架18',
+        'pointCode': 'HCHJ18'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架19',
+        'pointCode': 'HCHJ19'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架20',
+        'pointCode': 'HCHJ20'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架21',
+        'pointCode': 'HCHJ21'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架22',
+        'pointCode': 'HCHJ22'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架23',
+        'pointCode': 'HCHJ23'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架24',
+        'pointCode': 'HCHJ24'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架25',
+        'pointCode': 'HCHJ25'
+      },
+      {
+        'pointStatus': '2',
+        'pointName': '缓存货架26',
+        'pointCode': 'HCHJ26'
+      },
+      {
+        'pointStatus': '2',
+        'pointName': '缓存货架27',
+        'pointCode': 'HCHJ27'
+      },
+      {
+        'pointStatus': '2',
+        'pointName': '缓存货架28',
+        'pointCode': 'HCHJ28'
+      },
+      {
+        'pointStatus': '2',
+        'pointName': '缓存货架29',
+        'pointCode': 'HCHJ29'
+      },
+      {
+        'pointStatus': '2',
+        'pointName': '缓存货架30',
+        'pointCode': 'HCHJ30'
+      },
+      {
+        'pointStatus': '2',
+        'pointName': '缓存货架31',
+        'pointCode': 'HCHJ31'
+      },
+      {
+        'pointStatus': '2',
+        'pointName': '缓存货架32',
+        'pointCode': 'HCHJ32'
+      },
+      {
+        'pointStatus': '2',
+        'pointName': '缓存货架33',
+        'pointCode': 'HCHJ33'
+      },
+      {
+        'pointStatus': '2',
+        'pointName': '缓存货架34',
+        'pointCode': 'HCHJ34'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架35',
+        'pointCode': 'HCHJ35'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架36',
+        'pointCode': 'HCHJ36'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架37',
+        'pointCode': 'HCHJ37'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架38',
+        'pointCode': 'HCHJ38'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架39',
+        'pointCode': 'HCHJ39'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架40',
+        'pointCode': 'HCHJ40'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架41',
+        'pointCode': 'HCHJ41'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架42',
+        'pointCode': 'HCHJ42'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架43',
+        'pointCode': 'HCHJ43'
+      },
+      {
+        'pointStatus': '1',
+        'pointName': '缓存货架44',
+        'pointCode': 'HCHJ44'
+      }
+    ],
     'StackingPositionList': [
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ01XLW01',
         'error': 0,
         'encoder_qty': 100,
@@ -787,8 +622,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ01XLW02',
         'error': 0,
         'encoder_qty': 100,
@@ -796,8 +631,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ02XLW01',
         'error': 0,
         'encoder_qty': 100,
@@ -805,8 +640,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ02XLW02',
         'error': 0,
         'encoder_qty': 100,
@@ -814,8 +649,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ03XLW01',
         'error': 0,
         'encoder_qty': 100,
@@ -823,8 +658,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ03XLW02',
         'error': 0,
         'encoder_qty': 100,
@@ -832,8 +667,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ04XLW01',
         'error': 0,
         'encoder_qty': 100,
@@ -841,8 +676,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ04XLW02',
         'error': 0,
         'encoder_qty': 100,
@@ -850,8 +685,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ05XLW01',
         'error': 0,
         'encoder_qty': 100,
@@ -859,8 +694,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ05XLW02',
         'error': 0,
         'encoder_qty': 100,
@@ -868,8 +703,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ06XLW01',
         'error': 0,
         'encoder_qty': 100,
@@ -877,8 +712,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ06XLW02',
         'error': 0,
         'encoder_qty': 100,
@@ -886,8 +721,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ07XLW01',
         'error': 0,
         'encoder_qty': 100,
@@ -895,8 +730,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ07XLW02',
         'error': 0,
         'encoder_qty': 100,
@@ -904,8 +739,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ08XLW01',
         'error': 0,
         'encoder_qty': 100,
@@ -913,8 +748,8 @@ export const deviceCondition = () => {
       },
       {
         'mode': 3,
+        'device_status': 2,
         'move': 2,
-        'color_status': 2,
         'device_code': 'YJ08XLW02',
         'error': 0,
         'encoder_qty': 100,

src/pages/modules/home/devicepop.vue

@@ -9,20 +9,16 @@
           <div v-show="type === 'yaossx' || type === 'yao' || type === 'hljdjw'" class="pop_name">{{data.pointName}}</div>
           <div v-show="type === 'yj' || type === 'jxs' || type === 'yjmdw' || type === 'hlj'" class="pop_name">{{data.device_code}}</div>
           <div v-show="type === 'yaossx'" class="pop_status">
-            <div class="pop_status_dot" :class="['green', 'yellow', 'gray', 'red'][Number(data.stat) - 1]"></div>
+            <div class="pop_status_dot" :class="['gray', 'yellow', 'green', 'red'][Number(data.stat)]"></div>
-            <div class="pop_status_text fgray">{{ ['运行', '暂停', '停机', '故障'][Number(data.stat) - 1] }}</div>
+            <div class="pop_status_text fgray">{{ ['停机', '暂停', '运行', '故障'][Number(data.stat)] }}</div>
           </div>
-          <div v-show="type === 'yj' || type === 'jxs' || type === 'hlj'" class="pop_status">
+          <div v-show="type === 'yj' || type === 'jxs' || type === 'hlj' || type === 'yjmdw'" class="pop_status">
-            <div class="pop_status_dot" :class="['yellow', 'green', 'red'][Number(data.device_status) - 1]"></div>
+            <div class="pop_status_dot" :class="['gray', 'yellow', 'green', 'red'][Number(data.device_status)]"></div>
-            <div class="pop_status_text fgray">{{ ['待机', '生产中', '故障'][Number(data.device_status) - 1] }}</div>
+            <div class="pop_status_text fgray">{{ ['停机', '暂停', '运行', '故障'][Number(data.device_status)] }}</div>
-          </div>
-          <div v-show="type === 'yjmdw'" class="pop_status">
-            <div class="pop_status_dot" :class="['green', 'yellow', 'gray', 'red'][Number(data.color_status) - 1]"></div>
-            <div class="pop_status_text fgray">{{ ['运行', '暂停', '停机', '故障'][Number(data.color_status) - 1] }}</div>
           </div>
           <div v-show="type === 'hljdjw'" class="pop_status">
-            <div class="pop_status_dot" :class="['green', 'yellow', 'gray', 'red'][Number(data.pointStatus) - 1]"></div>
+            <div class="pop_status_dot" :class="['gray', 'yellow', 'green', 'red'][Number(data.pointStatus)]"></div>
-            <div class="pop_status_text fgray">{{ ['运行', '暂停', '停机', '故障'][Number(data.pointStatus) - 1] }}</div>
+            <div class="pop_status_text fgray">{{ ['停机', '暂停', '运行', '故障'][Number(data.pointStatus)] }}</div>
           </div>
         </div>
         <div v-show="type === 'yaossx'" class="pop_content">
@@ -149,7 +145,7 @@
         </div>
         <div v-show="type === 'hljdjw'" class="pop_content">
           <div class="popup_item">
-            <div class="popup_label">设备编码</div>
+            <div class="popup_label">点位编码</div>
             <div class="popup_val">{{ data.pointCode }}</div>
           </div>
         </div>

src/pages/modules/home/workshop.vue

@@ -3,16 +3,16 @@
     <!-- <t-canvas></t-canvas> -->
     <div class="status_wrap">
       <div class="status_item">
-          <div class="status_tip green"></div>
+          <div class="status_tip gray"></div>
-          <div class="status_name">运行</div>
+          <div class="status_name">停机</div>
       </div>
       <div class="status_item">
           <div class="status_tip yellow"></div>
           <div class="status_name">暂停</div>
       </div>
       <div class="status_item">
-          <div class="status_tip gray"></div>
+          <div class="status_tip green"></div>
-          <div class="status_name">停机</div>
+          <div class="status_name">运行</div>
       </div>
       <div class="status_item">
           <div class="status_tip red"></div>
@@ -32,7 +32,7 @@
           </div>
           <div v-show="i === 1" class="p_device ktp_cmd_wrap">
             <div class="ktp_cmd" v-for="e in SortAndPalletizingList.slice(0,2)" :key="e.device_code" @click="getInfo2(e)">
-              <img class="device_img" :src="require('../../../images/device/ktpv_' + ['green', 'yellow', 'gray', 'red'][Number(e.color_status) - 1] + '.png')">
+              <img class="device_img" :src="require('../../../images/device/ktpv_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
               <device-pop
                 :pkId="pkId"
                 type="yjmdw"
@@ -42,7 +42,7 @@
           </div>
           <div v-show="i === 1" class="p_device ktp_cmd_wrap cmdssj_wrap">
             <div class="ktp_cmd" v-for="(e,i) in SortAndPalletizingList.slice(2,4)" :key="e.device_code" @click="getInfo2(e)">
-              <img class="device_img" :class="{'rotatex180': i === 1}" :src="require('../../../images/device/cmdssj_' + ['green', 'yellow', 'gray', 'red'][Number(e.color_status) - 1] + '.png')">
+              <img class="device_img" :class="{'rotatex180': i === 1}" :src="require('../../../images/device/cmdssj_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
               <device-pop
                 :pkId="pkId"
                 type="yjmdw"
@@ -51,7 +51,7 @@
             </div>
           </div>
           <div v-show="i === 1" class="p_device robot_cmd_wrap robot_cmd_wrap_1" v-for="e in ManipulatorInfoList.slice(0,1)" :key="e.device_code" :class="{'rotate_3': Number(e.device_status) === 1}" @click="getInfo2(e)">
-            <img class="device_img" :src="require('../../../images/device/robot_cmd_' + ['yellow', 'green', 'red'][Number(e.device_status) - 1] + '.png')">
+            <img class="device_img" :src="require('../../../images/device/robot_cmd_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
             <device-pop
             :pkId="pkId"
             type="jxs"
@@ -59,7 +59,7 @@
           ></device-pop>
           </div>
           <div v-show="i === 0" class="p_device robot_cmd_wrap robot_cmd_wrap_2" v-for="e in ManipulatorInfoList.slice(2,3)" :key="e.device_code" :class="{'rotate_4': Number(e.device_status) === 1}" @click="getInfo2(e)">
-            <img class="device_img" :src="require('../../../images/device/robot_cmd_' + ['yellow', 'green', 'red'][Number(e.device_status) - 1] + '.png')">
+            <img class="device_img" :src="require('../../../images/device/robot_cmd_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
             <device-pop
             :pkId="pkId"
             type="jxs"
@@ -67,7 +67,7 @@
           ></device-pop>
           </div>
           <div v-show="i === 1" class="p_device robot_cmd_wrap robot_cmd_wrap_2" v-for="e in ManipulatorInfoList.slice(1,2)" :key="e.device_code" :class="{'rotate_4': Number(e.device_status) === 1}" @click="getInfo2(e)">
-            <img class="device_img" :src="require('../../../images/device/robot_cmd_' + ['yellow', 'green', 'red'][Number(e.device_status) - 1] + '.png')">
+            <img class="device_img" :src="require('../../../images/device/robot_cmd_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
             <device-pop
             :pkId="pkId"
             type="jxs"
@@ -152,7 +152,7 @@
         </div>
         <div class="p_device ktp_yao_enter_wrap" v-for="el in yaossxArr.slice(0,1)" :key="el.pointName" @click="getInfo1(el)">
           <div class="ktp_yao" v-for="(e, i) in [1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9]" :key="'aktpyao' + i">
-            <img class="device_img" :src="require('../../../images/device/ktpv_' + ['green', 'yellow', 'gray', 'red'][Number(el.stat) - 1] + '.png')">
+            <img class="device_img" :src="require('../../../images/device/ktpv_' + ['gray', 'yellow', 'green', 'red'][Number(el.stat)] + '.png')">
           </div>
           <device-pop
             :pkId="pkId"
@@ -162,7 +162,7 @@
         </div>
         <div class="p_device ktp_yao_out_wrap" v-for="el in yaossxArr.slice(1,2)" :key="el.pointName" @click="getInfo1(el)">
           <div class="ktp_yao" v-for="(e, i) in [1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9]" :key="'bktpyao' + i">
-            <img class="device_img" :src="require('../../../images/device/ktpv_' + ['green', 'yellow', 'gray', 'red'][Number(el.stat) - 1] + '.png')">
+            <img class="device_img" :src="require('../../../images/device/ktpv_' + ['gray', 'yellow', 'green', 'red'][Number(el.stat)] + '.png')">
             <device-pop
             :pkId="pkId"
             type="yaossx"
@@ -174,38 +174,73 @@
     </div>
     <div class="m_block_8">
       <div class="p_device rgcdw_wrap">
-        <div class="rgcdw" v-for="(e, i) in [1,1,1,1,1]" :key="'rgcdw' + i">
+        <div class="rgcdw" v-for="e in manualSortingList" :key="e.pointCode" @click="getInfo1(e)">
-          <img class="device_img" src="../../../images/device/hjktp.png" alt="">
+          <img class="device_img" :src="require('../../../images/device/ktp_' + ['gray', 'yellow', 'green', 'red'][Number(e.pointStatus)] + '.png')">
+            <device-pop
+            :pkId="pkId"
+            type="hljdjw"
+            :data="e"
+          ></device-pop>
         </div>
       </div>
       <div class="p_device cdw_wrap cdw_wrap_1">
-        <div class="cdw" v-for="(e, i) in [1,1,1,1,1,1]" :key="'cdwa' + i">
+        <div class="cdw" v-for="e in hchjList1" :key="e.pointCode" @click="getInfo1(e)">
-          <img class="device_img" src="../../../images/device/hjktp.png" alt="">
+          <img class="device_img" :src="require('../../../images/device/ktp_' + ['gray', 'yellow', 'green', 'red'][Number(e.pointStatus)] + '.png')">
+            <device-pop
+            :pkId="pkId"
+            type="hljdjw"
+            :data="e"
+          ></device-pop>
         </div>
       </div>
       <div class="p_device cdw_wrap cdw_wrap_2">
-        <div class="cdw" v-for="(e, i) in [1,1,1,1,1,1]" :key="'cdwb' + i">
+        <div class="cdw" v-for="e in hchjList2" :key="e.pointCode" @click="getInfo1(e)">
-          <img class="device_img" src="../../../images/device/hjktp.png" alt="">
+          <img class="device_img" :src="require('../../../images/device/ktp_' + ['gray', 'yellow', 'green', 'red'][Number(e.pointStatus)] + '.png')">
+            <device-pop
+            :pkId="pkId"
+            type="hljdjw"
+            :data="e"
+          ></device-pop>
         </div>
       </div>
       <div class="p_device cdw_wrap cdw_wrap_3">
-        <div class="cdw" v-for="(e, i) in [1,1,1,1,1,1,1,1]" :key="'cdwc' + i">
+        <div class="cdw" v-for="e in hchjList3" :key="e.pointCode" @click="getInfo1(e)">
-          <img class="device_img" src="../../../images/device/hjktp.png" alt="">
+          <img class="device_img" :src="require('../../../images/device/ktp_' + ['gray', 'yellow', 'green', 'red'][Number(e.pointStatus)] + '.png')">
+            <device-pop
+            :pkId="pkId"
+            type="hljdjw"
+            :data="e"
+          ></device-pop>
         </div>
       </div>
       <div class="p_device cdw_wrap cdw_wrap_4">
-        <div class="cdw" v-for="(e, i) in [1,1,1,1,1,1,1,1]" :key="'cdwd' + i">
+        <div class="cdw" v-for="e in hchjList4" :key="e.pointCode" @click="getInfo1(e)">
-          <img class="device_img" src="../../../images/device/hjktp.png" alt="">
+          <img class="device_img" :src="require('../../../images/device/ktp_' + ['gray', 'yellow', 'green', 'red'][Number(e.pointStatus)] + '.png')">
+            <device-pop
+            :pkId="pkId"
+            type="hljdjw"
+            :data="e"
+          ></device-pop>
         </div>
       </div>
       <div class="p_device cdw_wrap cdw_wrap_5">
-        <div class="cdw" v-for="(e, i) in [1,1,1,1,1,1,1,1]" :key="'cdwe' + i">
+        <div class="cdw" v-for="e in hchjList5" :key="e.pointCode" @click="getInfo1(e)">
-          <img class="device_img" src="../../../images/device/hjktp.png" alt="">
+          <img class="device_img" :src="require('../../../images/device/ktp_' + ['gray', 'yellow', 'green', 'red'][Number(e.pointStatus)] + '.png')">
+            <device-pop
+            :pkId="pkId"
+            type="hljdjw"
+            :data="e"
+          ></device-pop>
         </div>
       </div>
       <div class="p_device cdw_wrap cdw_wrap_6">
-        <div class="cdw" v-for="(e, i) in [1,1,1,1,1,1,1,1]" :key="'cdwf' + i">
+        <div class="cdw" v-for="e in hchjList6" :key="e.pointCode" @click="getInfo1(e)">
-          <img class="device_img" src="../../../images/device/hjktp.png" alt="">
+          <img class="device_img" :src="require('../../../images/device/ktp_' + ['gray', 'yellow', 'green', 'red'][Number(e.pointStatus)] + '.png')">
+            <device-pop
+            :pkId="pkId"
+            type="hljdjw"
+            :data="e"
+          ></device-pop>
         </div>
       </div>
     </div>
@@ -222,7 +257,7 @@
           </div>
           <div class="p_device flexwrap ktp_630_wrap">
             <div v-show="index === 0" class="ktp_630" v-for="(e,i) in StackingPositionList.slice(0,4)" :key="e.device_code" :class="'ktp_630_' + (i + 1)" @click="getInfo2(e)">
-              <img class="device_img" :src="require('../../../images/device/ktpv_' + ['green', 'yellow', 'gray', 'red'][Number(e.color_status) - 1] + '.png')">
+              <img class="device_img" :src="require('../../../images/device/ktpv_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
               <device-pop
                 :pkId="pkId"
                 type="yjmdw"
@@ -230,7 +265,7 @@
               ></device-pop>
             </div>
             <div v-show="index === 1" class="ktp_630" v-for="(e,i) in StackingPositionList.slice(4,8)" :key="e.device_code" :class="'ktp_630_' + (i + 1)" @click="getInfo2(e)">
-              <img class="device_img" :src="require('../../../images/device/ktpv_' + ['green', 'yellow', 'gray', 'red'][Number(e.color_status) - 1] + '.png')">
+              <img class="device_img" :src="require('../../../images/device/ktpv_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
               <device-pop
                 :pkId="pkId"
                 type="yjmdw"
@@ -240,7 +275,7 @@
           </div>
           <div class="p_device yj_630_wrap">
             <div v-show="index === 0" class="yj_630" v-for="e in PressMachineList.slice(0,2)" :key="e.device_code" @click="getInfo2(e)">
-              <img class="device_img" :src="require('../../../images/device/yj_' + ['yellow', 'green', 'red'][Number(e.device_status) - 1] + '.png')">
+              <img class="device_img" :src="require('../../../images/device/yj_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
               <p>{{ e.device_code }}</p>
               <device-pop
                 :pkId="pkId"
@@ -249,7 +284,7 @@
               ></device-pop>
             </div>
             <div v-show="index === 1" class="yj_630" v-for="e in PressMachineList.slice(2,4)" :key="e.device_code" @click="getInfo2(e)">
-              <img class="device_img" :src="require('../../../images/device/yj_' + ['yellow', 'green', 'red'][Number(e.device_status) - 1] + '.png')">
+              <img class="device_img" :src="require('../../../images/device/yj_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
               <p>{{ e.device_code }}</p>
               <device-pop
                 :pkId="pkId"
@@ -259,7 +294,7 @@
             </div>
           </div>
           <div class="p_device robot_630_wrap" v-for="e in ManipulatorInfoList.slice(3+index,4+index)" :key="e.device_code" :class="{'rotate_1': Number(e.device_status) === 1}" @click="getInfo2(e)">
-            <img class="device_img" :src="require('../../../images/device/robot_' + ['yellow', 'green', 'red'][Number(e.device_status) - 1] + '.png')">
+            <img class="device_img" :src="require('../../../images/device/robot_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
             <device-pop
             :pkId="pkId"
             type="jxs"
@@ -282,7 +317,7 @@
           </div>
           <div class="p_device flexwrap ktp_630_wrap">
             <div class="ktp_630" v-for="(e, i) in StackingPositionList.slice(8,12)" :key="e.device_code" :class="'ktp_630_' + (i + 1)" @click="getInfo2(e)">
-              <img class="device_img" :src="require('../../../images/device/ktpv_' + ['green', 'yellow', 'gray', 'red'][Number(e.color_status) - 1] + '.png')">
+              <img class="device_img" :src="require('../../../images/device/ktpv_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
               <device-pop
                 :pkId="pkId"
                 type="yjmdw"
@@ -292,7 +327,7 @@
           </div>
           <div class="p_device yj_630_wrap">
             <div class="yj_630" v-for="e in PressMachineList.slice(4,6)" :key="e.device_code" @click="getInfo2(e)">
-              <img class="device_img" :src="require('../../../images/device/yj_' + ['yellow', 'green', 'red'][Number(e.device_status) - 1] + '.png')">
+              <img class="device_img" :src="require('../../../images/device/yj_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
               <p>{{ e.device_code }}</p>
               <device-pop
                 :pkId="pkId"
@@ -302,7 +337,7 @@
             </div>
           </div>
           <div class="p_device robot_630_wrap" v-for="e in ManipulatorInfoList.slice(5,6)" :key="e.device_code" :class="{'rotate_1': Number(e.device_status) === 1}" @click="getInfo2(e)">
-            <img class="device_img" :src="require('../../../images/device/robot_' + ['yellow', 'green', 'red'][Number(e.device_status) - 1] + '.png')">
+            <img class="device_img" :src="require('../../../images/device/robot_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
             <device-pop
               :pkId="pkId"
               type="jxs"
@@ -321,7 +356,7 @@
           </div>
           <div class="p_device flexwrap ktp_630_wrap">
             <div v-show="index === 0" class="ktp_630 ktp_yyj" v-for="(e, i) in StackingPositionList.slice(12,14)" :key="e.device_code" :class="'ktp_yyj_'+(i+1)" @click="getInfo2(e)">
-              <img class="device_img" :src="require('../../../images/device/ktp_' + ['green', 'yellow', 'gray', 'red'][Number(e.color_status) - 1] + '.png')">
+              <img class="device_img" :src="require('../../../images/device/ktp_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
               <device-pop
                 :pkId="pkId"
                 type="yjmdw"
@@ -329,7 +364,7 @@
               ></device-pop>
             </div>
             <div v-show="index === 1" class="ktp_630 ktp_yyj" v-for="(e, i) in StackingPositionList.slice(14,16)" :key="e.device_code" :class="'ktp_yyj_'+(i+1)" @click="getInfo2(e)">
-              <img class="device_img" :src="require('../../../images/device/ktp_' + ['green', 'yellow', 'gray', 'red'][Number(e.color_status) - 1] + '.png')">
+              <img class="device_img" :src="require('../../../images/device/ktp_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
               <device-pop
                 :pkId="pkId"
                 type="yjmdw"
@@ -339,7 +374,7 @@
           </div>
           <div class="p_device yj_630_wrap">
             <div class="yj_630 yj_1250" v-for="e in PressMachineList.slice(6+index,7+index)" :key="e.device_code" @click="getInfo2(e)">
-              <img class="device_img" :src="require('../../../images/device/yj_' + ['yellow', 'green', 'red'][Number(e.device_status) - 1] + '.png')">
+              <img class="device_img" :src="require('../../../images/device/yj_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
               <p>{{ e.device_code }}</p>
               <device-pop
                 :pkId="pkId"
@@ -349,7 +384,7 @@
             </div>
           </div>
           <div class="p_device robot_630_wrap" v-for="e in ManipulatorInfoList.slice(6+index,7+index)" :key="e.device_code" :class="{'rotate_5': Number(e.device_status) === 1}" @click="getInfo2(e)">
-            <img class="device_img" :src="require('../../../images/device/robot_' + ['yellow', 'green', 'red'][Number(e.device_status) - 1] + '.png')">
+            <img class="device_img" :src="require('../../../images/device/robot_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')">
             <device-pop
               :pkId="pkId"
               type="jxs"
@@ -379,7 +414,7 @@
           <div class="p_device yj_630_wrap yyj_wrap">
             <div class="yj_630" style="opacity:0.1">
               <img class="device_img" src="../../../images/device/yyj_gray.png" alt="">
-              <!-- <img class="device_img" :src="require('../../../images/device/yyj_' + ['yellow', 'green', 'red'][Number(PressMachineList[8+i].device_status) - 1] + '.png')"> -->
+              <!-- <img class="device_img" :src="require('../../../images/device/yyj_' + ['gray', 'yellow', 'green', 'red'][Number(PressMachineList[8+i].device_status)] + '.png')"> -->
             </div>
           </div>
           <div class="p_device robot_630_wrap" style="opacity:0.1">
@@ -398,7 +433,7 @@
         <div class="lzhlj_wrap">
           <div class="lz_wrap">
             <div class="lz" v-for="e in MixBlankingList" :key="e.pointCode" @click="getInfo1(e)">
-              <img class="device_img" :src="require('../../../images/device/lz_hj_' + ['green', 'yellow', 'gray', 'red'][Number(e.pointStatus) - 1] + '.png')" alt="">
+              <img class="device_img" :src="require('../../../images/device/lz_hj_' + ['gray', 'yellow', 'green', 'red'][Number(e.pointStatus)] + '.png')" alt="">
               <device-pop
               :pkId="pkId"
               type="hljdjw"
@@ -408,7 +443,7 @@
           </div>
           <div class="hlj_wrap">
             <div class="hlj" v-for="e in MixMachineList" :key="e.device_code" @click="getInfo2(e)">
-              <img class="device_img" :src="require('../../../images/device/hlj_' + ['yellow', 'green', 'red'][Number(e.device_status) - 1] + '.png')" alt="">
+              <img class="device_img" :src="require('../../../images/device/hlj_' + ['gray', 'yellow', 'green', 'red'][Number(e.device_status)] + '.png')" alt="">
               <device-pop
               :pkId="pkId"
               type="hlj"
@@ -478,6 +513,13 @@ export default {
       ManipulatorInfoList: [], // 压制、分拣机械手
       StackingPositionList: [], // 压制码垛位情况显示
       SortAndPalletizingList: [], // 分拣拆码垛对接位
+      manualSortingList: [], // 人工分拣拆码垛
+      hchjList1: [], // 出窑口缓存货架
+      hchjList2: [], // 出窑口缓存货架
+      hchjList3: [], // 出窑口缓存货架
+      hchjList4: [], // 出窑口缓存货架
+      hchjList5: [], // 出窑口缓存货架
+      hchjList6: [], // 出窑口缓存货架
       yaossxArr: [],
       yaoObj: {},
       pkId: ''
@@ -511,6 +553,16 @@ export default {
       this.ManipulatorInfoList = [...res.ManipulatorInfoList]
       this.StackingPositionList = [...res.StackingPositionList]
       this.SortAndPalletizingList = [...res.SortAndPalletizingList]
+      this.manualSortingList = [...res.manualSortingList]
+      this.manualSortingList = this.manualSortingList.reverse()
+      let hchjList = [...res.hchjList]
+      this.hchjList1 = hchjList.slice(0, 6).reverse()
+      this.hchjList2 = hchjList.slice(6, 12)
+      this.hchjList3 = hchjList.slice(12, 20).reverse()
+      this.hchjList4 = hchjList.slice(20, 28)
+      this.hchjList5 = hchjList.slice(28, 36).reverse()
+      this.hchjList6 = hchjList.slice(36, 44)
+      console.log(this.hchjList2)
     },
     async _inOutKilnDetail () {
       let res = await inOutKilnDetail()
@@ -1059,13 +1111,16 @@ export default {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  .cdw
+.rgcdw
-    box-shadow: 4px 4px 6px 0px rgba(0, 0, 0, 60%);
+  position relative
+.cdw
+  position relative
+  box-shadow: 4px 4px 6px 0px rgba(0, 0, 0, 60%);
 .cdw_wrap_1
-  left 20%
+  left: 80%
   top 10%
 .cdw_wrap_2
-  left: 24%;
+  left: 84%
   top: 8%;
 .cdw_wrap_3
   height 100%
@@ -1076,10 +1131,10 @@ export default {
   top: -2%;
 .cdw_wrap_5
   height 100%
-  left: 80%
+  left 20%
 .cdw_wrap_6
   height 100%
-  left: 84%
+  left: 24%
   top: -2%
 // 困料货位end
 .rotate_1