diff --git a/src/config/mork2.js b/src/config/mork2.js index 4d3cb76..3ab73c9 100644 --- a/src/config/mork2.js +++ b/src/config/mork2.js @@ -218,7 +218,7 @@ export const deviceCondition = () => { ], 'manualSortingList': [ { - 'pointStatus': '1', + 'pointStatus': '3', 'pointName': '人工分拣拆01', 'pointCode': 'RGFJC01' }, diff --git a/src/images/scene.png b/src/images/scene.png index 286cd8b..7a12a4d 100644 Binary files a/src/images/scene.png and b/src/images/scene.png differ diff --git a/src/pages/modules/home/devicepop.vue b/src/pages/modules/home/devicepop.vue index 4051615..5f5312d 100644 --- a/src/pages/modules/home/devicepop.vue +++ b/src/pages/modules/home/devicepop.vue @@ -36,10 +36,6 @@
当日已输送数量
{{ data.deliveredMaterialNum }}
-
-
已工作时间
-
{{ data.workTime }}
-
当前托盘数
{{ data.palletNum }}
@@ -71,7 +67,33 @@
{{ data.materialInfos }}
-
+
+
+
生产时间
+
{{ data.work_time }}
+
+
+
当前已生产数量
+
{{ data.real_qty }}
+
+
+
当前已生产重量
+
{{ data.current_weight }}
+
+
+
故障
+
{{ data.error }}
+
+
+
产品牌号
+
{{ data.materialCode }}
+
+
+
产品型号
+
{{ data.materialModel }}
+
+
+
故障时间
{{ data.error_time }}
@@ -127,7 +149,7 @@
{{ data.error }}
-
+
工作模式
{{ data.mode }}
@@ -149,12 +171,124 @@
{{ data.barcode }}
-
+
+
+
工作模式
+
{{ data.mode }}
+
+
+
光电开关信号
+
{{ data.move }}
+
+
+
条码
+
{{ data.barcode }}
+
+
+
产品牌号
+
{{ data.materialCode }}
+
+
+
产品型号
+
{{ data.materialModel }}
+
+
+
+
+
工作模式
+
{{ data.mode }}
+
+
+
光电开关信号
+
{{ data.move }}
+
+
+
码盘位当前码盘数量
+
{{ data.encoder_qty }}
+
+
+
条码
+
{{ data.barcode }}
+
+
+
+
+
工作模式
+
{{ data.mode }}
+
+
+
光电开关信号
+
{{ data.move }}
+
+
+
条码
+
{{ data.barcode }}
+
+
+
产品牌号
+
{{ data.materialCode }}
+
+
+
点位编码
{{ data.pointCode }}
+
+
+
点位编码
+
{{ data.pointCode }}
+
+
+
产品牌号
+
{{ data.materialCode }}
+
+
+
产品型号
+
{{ data.materialModel }}
+
+
+
+
+
点位编码
+
{{ data.pointCode }}
+
+
+
入库时间
+
{{ data.instorageTime }}
+
+
+
产品牌号
+
{{ data.materialCode }}
+
+
+
产品型号
+
{{ data.materialModel }}
+
+
+
产品数量
+
{{ data.materialQty }}
+
+
+
+
+
点位编码
+
{{ data.pointCode }}
+
+
+
产品牌号
+
{{ data.materialCode }}
+
+
+
条码信息
+
{{ data.vehicleCode }}
+
+
+
入库时间
+
{{ data.instorageTime }}
+
+
diff --git a/src/pages/modules/home/workshop.vue b/src/pages/modules/home/workshop.vue index 5ea1878..3ffc715 100644 --- a/src/pages/modules/home/workshop.vue +++ b/src/pages/modules/home/workshop.vue @@ -37,9 +37,9 @@ export default { {type: 'hljdjw', device_code: 'HNJ06DJW', coords: '518,140,539,148', shape: 'rect'}, {type: 'hljdjw', device_code: 'HNJ07DJW', coords: '473,140,489,148', shape: 'rect'}, {type: 'hljdjw', device_code: 'HNJ08DJW', coords: '445,141,464,148', shape: 'rect'}, - {type: 'jxs', device_code: 'FJCDJXS01', coords: '342,779,370,799', shape: 'rect'}, - {type: 'jxs', device_code: 'FJMDJXS01', coords: '440,780,468,799', shape: 'rect'}, - {type: 'jxs', device_code: 'FJMDJXS02', coords: '444,711,472,732', shape: 'rect'}, + {type: 'jxs', device_code: 'FJMDJXS01', coords: '347,711,373,732', shape: 'rect'}, + {type: 'jxs', device_code: 'FJCDJXS01', coords: '444,711,472,732', shape: 'rect'}, + {type: 'jxs', device_code: 'FJMDJXS02', coords: '341,778,368,800', shape: 'rect'}, {type: 'jxs', device_code: 'YZJXS01', coords: '805,424,815,389', shape: 'rect'}, {type: 'jxs', device_code: 'YZJXS02', coords: '673,425,681,390', shape: 'rect'}, {type: 'jxs', device_code: 'YZJXS03', coords: '542,425,552,387', shape: 'rect'}, @@ -47,8 +47,8 @@ export default { {type: 'jxs', device_code: 'YZJXS05', coords: '342,413,361,387', shape: 'rect'}, {type: 'fjmdw', device_code: 'FJ01CDW01', coords: '474,699,487,718', shape: 'rect'}, {type: 'fjmdw', device_code: 'FJ01CDW02', coords: '474,723,487,740', shape: 'rect'}, - {type: 'fjmdw', device_code: 'FJ01MDW01', coords: '472,766,483,786', shape: 'rect'}, - {type: 'fjmdw', device_code: 'FJ01MDW02', coords: '471,793,484,811', shape: 'rect'}, + {type: 'fjmdw', device_code: 'FJ01MDW01', coords: '324,701,342,717', shape: 'rect'}, + {type: 'fjmdw', device_code: 'FJ01MDW02', coords: '324,724,343,738', shape: 'rect'}, {type: 'rgfjc', device_code: 'RGFJC01', coords: '928,556,944,573', shape: 'rect'}, {type: 'rgfjc', device_code: 'RGFJC02', coords: '933,581,946,598', shape: 'rect'}, {type: 'rgfjc', device_code: 'RGFJC03', coords: '935,605,949,623', shape: 'rect'}, @@ -236,7 +236,7 @@ export default { this.$refs.pop.$el.style.display = 'block' this.$refs.pop.$el.style.left = $event.x + 'px' this.$refs.pop.$el.style.top = $event.y + 'px' - if (this.pkId === 'FJ01MDW02' || this.pkId === 'FJCDJXS01') { + if (this.pkId === 'FJ01MDW01' || this.pkId === 'FJ01MDW02' || this.pkId === 'FJ01CDW01' || this.pkId === 'FJ01CDW02' || this.pkId === 'FJCDJXS01' || this.pkId === 'FJMDJXS02' || this.pkId === 'FJMDJXS01') { this.$refs.pop.$el.style.top = ($event.y - 200) + 'px' } this.$refs.pointer.style.left = ($event.x - 5) + 'px'