设备监控驱动更新

acs/qd/src/views/monitor/logback/index.vue

@@ -395,8 +395,11 @@ export default {
               this.logs.push(tempArray[k]) // 追加数据
             }
           } else {
-            this.showEmpty = true
-            this.emptyText = '暂无日志信息，请选择时间段试试'
+            this.$notify({
+              title: '警告',
+              message: '暂无以往日志数据！',
+              type: 'warning'
+            })
           }
         })
       }

acs/qd/src/views/system/logicflow/monitor/index.vue

@@ -336,12 +336,6 @@ export default {
           } else if (val === 'number') {
             const obj = { name: '托盘数量', value: data[val] }
             this.arr.push(obj)
-          } else if (val === 'qty') {
-            const obj = { name: '数量', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'weight') {
-            const obj = { name: '重量', value: data[val] }
-            this.arr.push(obj)
           } else if (val === 'instruction_message') {
             const obj = { name: '指令信息', value: data[val] }
             this.arr.push(obj)
@@ -373,10 +367,7 @@ export default {
             const obj = { name: '批次', value: data[val] }
             this.arr.push(obj)
           } else if (val === 'requestSucess') {
-            const obj = { name: '缺料请求成功', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'fullrequestSucess') {
-            const obj = { name: '空箱请求成功', value: data[val] }
+            const obj = { name: '是否请求任务', value: data[val] }
             this.arr.push(obj)
           } else if (val === 'applySucess') {
             const obj = { name: '是否申请指令', value: data[val] }
@@ -384,71 +375,8 @@ export default {
           } else if (val === 'message') {
             const obj = { name: '说明', value: data[val] }
             this.arr.push(obj)
-          } else if (val === 'empty_is_lack') {
-            const obj = { name: '空箱位缺箱', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'empty_is_finish') {
-            const obj = { name: '空位完成', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'full_ready_req_agv') {
-            const obj = { name: '满箱位就绪，请求AGV', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'full_out') {
-            const obj = { name: '满箱已运出满箱位', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'finish') {
-            const obj = { name: '订单完成', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'order_compel_finish') {
-            const obj = { name: '订单强制完成', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'now_order_prod_num') {
-            const obj = { name: '当前生产总量', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'now_one_prod_num') {
-            const obj = { name: '当前箱生产量', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'task') {
-            const obj = { name: '任务号', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'full_number') {
-            const obj = { name: '出料口满框数量', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'storage_stock_num') {
-            const obj = { name: '储料仓库存数量', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'line_stock_num') {
-            const obj = { name: '线体库存数量', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'order_prod_allnum') {
-            const obj = { name: '订单生产总量', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'order') {
-            const obj = { name: '工单号', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'storage_stock_num') {
-            const obj = { name: '储料仓库存数量', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'line_stock_num') {
-            const obj = { name: '线体库存数量', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'material_type') {
-            const obj = { name: '产品编号', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'lack_req') {
-            const obj = { name: '缺料请求', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'empty_req') {
-            const obj = { name: '空箱请求', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'address') {
-            const obj = { name: 'agv位置', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'phaseName') {
-            const obj = { name: 'phase', value: data[val] }
-            this.arr.push(obj)
-          } else if (val === 'full_req') {
-            const obj = { name: '满箱请求', value: data[val] }
+          } else if (val === 'status') {
+            const obj = { name: '设备状态', value: data[val] }
             this.arr.push(obj)
           } else if (val === 'open_time') {
             const obj = { name: '开机时间', value: data[val] }
@@ -456,11 +384,125 @@ export default {
           } else if (val === 'close_time') {
             const obj = { name: '关机时间', value: data[val] }
             this.arr.push(obj)
-          } else if (val === 'feeding_qty') {
-            const obj = { name: '上料数量', value: data[val] }
+          } else if (val === 'standby_time') {
+            const obj = { name: '待机时间', value: data[val] }
             this.arr.push(obj)
-          } else if (val === 'error_num') {
-            const obj = { name: '故障次数', value: data[val] }
+          } else if (val === 'production_time') {
+            const obj = { name: '生产时间', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'error_time') {
+            const obj = { name: '故障时间', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'weight') {
+            const obj = { name: '生产重量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'order_No') {
+            const obj = { name: '工单号', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'mix_num') {
+            const obj = { name: '碾次', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'barcode') {
+            const obj = { name: '条码', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'qualified') {
+            const obj = { name: '合格数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'unqualified') {
+            const obj = { name: '不合格数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'put_station') {
+            const obj = { name: '当前码盘工位', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'encoder_qty') {
+            const obj = { name: '码盘数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'outKiln_move') {
+            const obj = { name: '出窑光电', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'outKiln_barcode') {
+            const obj = { name: '出窑条码', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'outKiln_device') {
+            const obj = { name: '出窑设备', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'car_sum') {
+            const obj = { name: '窑车总数', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'nullCar_qty') {
+            const obj = { name: '空窑车数', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'burning_car_qty') {
+            const obj = { name: '在烧窑车数', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'container_qty') {
+            const obj = { name: '托盘数', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'tray_crib_qty') {
+            const obj = { name: '托盘垛数', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'total_container') {
+            const obj = { name: '托盘总数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'total_split') {
+            const obj = { name: '累计拆垛数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'getStation') {
+            const obj = { name: '当前抓取工位', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'putStation') {
+            const obj = { name: '当前码盘工位', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'move_1') {
+            const obj = { name: '前工位光电信号', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'move_2') {
+            const obj = { name: '后工位光电信号', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'action_1') {
+            const obj = { name: '前工位动作信号', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'action_2') {
+            const obj = { name: '后工位动作信号', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'walk_y') {
+            const obj = { name: '行走列', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'task1') {
+            const obj = { name: '前工位任务号', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'task2') {
+            const obj = { name: '后工位任务号', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'labeling_qty') {
+            const obj = { name: '贴标数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'container_type') {
+            const obj = { name: '托盘类型', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'specifications') {
+            const obj = { name: '规格', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'onoff_status') {
+            const obj = { name: '开关机状态', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'task_qty') {
+            const obj = { name: '当前任务数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'finishTask_qty') {
+            const obj = { name: '完成任务数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'AlongSide') {
+            const obj = { name: 'A长边', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'BshortSide') {
+            const obj = { name: 'B短边', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'Htrapezoidal') {
+            const obj = { name: 'H梯形高', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'Wthickness') {
+            const obj = { name: 'W厚度', value: data[val] }
             this.arr.push(obj)
           }
         }