From ed832c3972ee1be958144d82056cf162e2d5f77b Mon Sep 17 00:00:00 2001 From: xiangxy Date: Tue, 23 Apr 2024 16:17:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=8B=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/mork1.js | 582 +++++++++++++++++++++++--- src/pages/modules/SortWorkMonitor.vue | 25 +- 2 files changed, 530 insertions(+), 77 deletions(-) diff --git a/src/config/mork1.js b/src/config/mork1.js index 05084c8..b49d793 100644 --- a/src/config/mork1.js +++ b/src/config/mork1.js @@ -217,136 +217,586 @@ export const cockpitpress = () => { /** 分拣作业监控 */ export const cockpitsorting = () => { let res = { - 'sortingLine': [ + 'stackingList': [ { - 'workorderCode': '240119006', - 'pointName': '分拣拆垛机械手01', - 'customer': '实业股份', - 'materialName': '004', - 'materialSpec': 'ZX', - 'planQty': '500', - 'realQty': '0' - }, - { - 'workorderCode': '240228001', - 'pointName': '分拣拆垛机械手02', - 'customer': '实业股份', - 'materialName': '004', - 'materialSpec': 'ZX', - 'planQty': '1000', - 'realQty': '0' - }, - { - 'workorderCode': '240228002', - 'pointName': '人工分拣拆01', - 'customer': '沙湾', - 'materialName': '004', - 'materialSpec': 'ZX', - 'planQty': '500', - 'realQty': '0' - } - ], - 'unstackingList': [ - { - 'vehicleCode': '0014', - 'materialQty': '0', + 'vehicleCode': '0020', + 'materialQty': '252', 'materialWeight': '0.00', - 'materialName': '004', - 'createTime': '03-04 16:13:37' + 'materialName': 'ML-70BD', + 'createTime': '03-27 16:44:40' + }, + { + 'vehicleCode': '1030', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-27 13:10:33' + }, + { + 'vehicleCode': '1144', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-27 12:58:38' + }, + { + 'vehicleCode': '1086', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-26 12:42:39' + }, + { + 'vehicleCode': '0003', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-26 11:57:36' + }, + { + 'vehicleCode': '1020', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-25 16:52:09' }, { 'vehicleCode': '0005', 'materialQty': '252', 'materialWeight': '0.00', - 'materialName': '004', - 'createTime': '03-04 15:22:50' + 'materialName': 'ML-70BD', + 'createTime': '03-17 13:24:36' + }, + { + 'vehicleCode': '0015', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-26 14:21:45' + }, + { + 'vehicleCode': '1069', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-26 09:14:31' + }, + { + 'vehicleCode': '1070', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-08 09:06:35' + }, + { + 'vehicleCode': '1026', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-12 14:28:43' + }, + { + 'vehicleCode': '0017', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-11 13:06:25' + }, + { + 'vehicleCode': '1147', + 'materialQty': '126', + 'materialWeight': '0.00', + 'materialName': 'AP-70A', + 'createTime': '03-13 09:21:38' + }, + { + 'vehicleCode': '0020', + 'materialQty': '126', + 'materialWeight': '0.00', + 'materialName': 'AP-70A', + 'createTime': '03-11 18:48:49' + }, + { + 'vehicleCode': '1058', + 'materialQty': '126', + 'materialWeight': '0.00', + 'materialName': 'AP-70A', + 'createTime': '03-09 14:18:34' + }, + { + 'vehicleCode': '1027', + 'materialQty': '126', + 'materialWeight': '0.00', + 'materialName': 'AP-70A', + 'createTime': '03-08 16:03:37' + }, + { + 'vehicleCode': '1080', + 'materialQty': '126', + 'materialWeight': '0.00', + 'materialName': 'AP-70A', + 'createTime': '03-08 10:52:55' + }, + { + 'vehicleCode': '1077', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-13 14:43:22' + }, + { + 'vehicleCode': '0021', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-11 13:15:21' + }, + { + 'vehicleCode': '1029', + 'materialQty': '252', + 'materialWeight': '8.12', + 'materialName': 'ML-60BT', + 'createTime': '03-13 09:35:23' + }, + { + 'vehicleCode': '1003', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-12 08:55:56' + }, + { + 'vehicleCode': '1057', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-11 11:13:25' + }, + { + 'vehicleCode': '1143', + 'materialQty': '252', + 'materialWeight': '8.90', + 'materialName': 'ML-60BT', + 'createTime': '03-13 10:14:59' + }, + { + 'vehicleCode': '1097', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-12 08:43:27' + }, + { + 'vehicleCode': '1068', + 'materialQty': '252', + 'materialWeight': '9.00', + 'materialName': 'ML-60BT', + 'createTime': '03-13 10:47:30' + }, + { + 'vehicleCode': '1010', + 'materialQty': '0', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-09 13:52:37' + }, + { + 'vehicleCode': '0014', + 'materialQty': '0', + 'materialWeight': '0.00', + 'materialName': 'MT-14AT', + 'createTime': '01-20 10:20:39' + }, + { + 'vehicleCode': '0005', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'MT-14AT', + 'createTime': '01-10 16:32:54' }, { 'vehicleCode': '0040', 'materialQty': '126', 'materialWeight': '0.00', - 'materialName': '004', - 'createTime': '03-04 14:42:00' + 'materialName': 'MT-14AT', + 'createTime': '01-19 11:25:45' }, { 'vehicleCode': '0050', 'materialQty': '0', 'materialWeight': '0.00', - 'materialName': '004', - 'createTime': '03-04 13:21:53' + 'materialName': 'MT-14AT', + 'createTime': '01-15 14:02:56' + }, + { + 'vehicleCode': '1066', + 'materialQty': '0', + 'materialWeight': '0.00', + 'materialName': 'MT-14AT', + 'createTime': '01-16 10:12:05' + }, + { + 'vehicleCode': '0006', + 'materialQty': '0', + 'materialWeight': '0.00', + 'materialName': 'MT-14AT', + 'createTime': '01-08 17:20:19' + }, + { + 'vehicleCode': '1055', + 'materialQty': '0', + 'materialWeight': '0.00', + 'materialName': 'MT-14AT', + 'createTime': '01-16 15:35:26' + }, + { + 'vehicleCode': '0048', + 'materialQty': '0', + 'materialWeight': '0.00', + 'materialName': 'MT-14AT', + 'createTime': '01-19 09:29:50' + }, + { + 'vehicleCode': '0011', + 'materialQty': '0', + 'materialWeight': '0.00', + 'materialName': 'MT-14AT', + 'createTime': '01-10 16:39:25' + }, + { + 'vehicleCode': '0046', + 'materialQty': '0', + 'materialWeight': '0.00', + 'materialName': 'MT-14AT', + 'createTime': '01-10 16:49:07' }, { 'vehicleCode': '1069', 'materialQty': '252', 'materialWeight': '0.00', 'materialName': null, - 'createTime': '03-04 13:21:01' + 'createTime': '01-11 11:35:33' + } + ], + 'sortingLine': { + 'sortingLines': [ + { + 'workorderCode': '240315001', + 'pointName': '分拣拆垛机械手01', + 'customer': '实业股份', + 'materialName': 'ML-60BT', + 'materialSpec': 'BB', + 'planQty': '50', + 'realQty': '0' + } + ], + 'rgSortingLine': [ + { + 'pointName': '人工分拣拆01', + 'materialName': 'ML-70BD' + }, + { + 'pointName': '人工分拣拆02', + 'materialName': 'AP-55A' + } + ], + 'rgPlanQty': '0', + 'rgRealQty': '0' + }, + 'unstackingList': [ + { + 'vehicleCode': '0020', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-27 16:44:40' + }, + { + 'vehicleCode': '1030', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-27 13:10:33' + }, + { + 'vehicleCode': '1144', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-27 12:58:38' + }, + { + 'vehicleCode': '1086', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-26 12:42:39' + }, + { + 'vehicleCode': '0003', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-26 11:57:36' + }, + { + 'vehicleCode': '1020', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-25 16:52:09' + }, + { + 'vehicleCode': '0005', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-17 13:24:36' + }, + { + 'vehicleCode': '0015', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-26 14:21:45' + }, + { + 'vehicleCode': '1069', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-70BD', + 'createTime': '03-26 09:14:31' + }, + { + 'vehicleCode': '1070', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-08 09:06:35' + }, + { + 'vehicleCode': '1026', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-12 14:28:43' + }, + { + 'vehicleCode': '0017', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-11 13:06:25' + }, + { + 'vehicleCode': '1147', + 'materialQty': '126', + 'materialWeight': '0.00', + 'materialName': 'AP-70A', + 'createTime': '03-13 09:21:38' + }, + { + 'vehicleCode': '0020', + 'materialQty': '126', + 'materialWeight': '0.00', + 'materialName': 'AP-70A', + 'createTime': '03-11 18:48:49' + }, + { + 'vehicleCode': '1058', + 'materialQty': '126', + 'materialWeight': '0.00', + 'materialName': 'AP-70A', + 'createTime': '03-09 14:18:34' + }, + { + 'vehicleCode': '1027', + 'materialQty': '126', + 'materialWeight': '0.00', + 'materialName': 'AP-70A', + 'createTime': '03-08 16:03:37' + }, + { + 'vehicleCode': '1080', + 'materialQty': '126', + 'materialWeight': '0.00', + 'materialName': 'AP-70A', + 'createTime': '03-08 10:52:55' + }, + { + 'vehicleCode': '1077', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-13 14:43:22' + }, + { + 'vehicleCode': '0021', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-11 13:15:21' + }, + { + 'vehicleCode': '1029', + 'materialQty': '252', + 'materialWeight': '8.12', + 'materialName': 'ML-60BT', + 'createTime': '03-13 09:35:23' + }, + { + 'vehicleCode': '1003', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-12 08:55:56' + }, + { + 'vehicleCode': '1057', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-11 11:13:25' + }, + { + 'vehicleCode': '1143', + 'materialQty': '252', + 'materialWeight': '8.90', + 'materialName': 'ML-60BT', + 'createTime': '03-13 10:14:59' + }, + { + 'vehicleCode': '1097', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-12 08:43:27' + }, + { + 'vehicleCode': '1068', + 'materialQty': '252', + 'materialWeight': '9.00', + 'materialName': 'ML-60BT', + 'createTime': '03-13 10:47:30' + }, + { + 'vehicleCode': '1010', + 'materialQty': '0', + 'materialWeight': '0.00', + 'materialName': 'ML-60BT', + 'createTime': '03-09 13:52:37' + }, + { + 'vehicleCode': '0014', + 'materialQty': '0', + 'materialWeight': '0.00', + 'materialName': 'MT-14AT', + 'createTime': '01-20 10:20:39' + }, + { + 'vehicleCode': '0005', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': 'MT-14AT', + 'createTime': '01-10 16:32:54' + }, + { + 'vehicleCode': '0040', + 'materialQty': '126', + 'materialWeight': '0.00', + 'materialName': 'MT-14AT', + 'createTime': '01-19 11:25:45' + }, + { + 'vehicleCode': '0050', + 'materialQty': '0', + 'materialWeight': '0.00', + 'materialName': 'MT-14AT', + 'createTime': '01-15 14:02:56' }, { 'vehicleCode': '1066', 'materialQty': '0', 'materialWeight': '0.00', - 'materialName': '004', - 'createTime': '03-04 12:23:39' + 'materialName': 'MT-14AT', + 'createTime': '01-16 10:12:05' }, { 'vehicleCode': '0006', 'materialQty': '0', 'materialWeight': '0.00', - 'materialName': '004', - 'createTime': '03-04 11:05:11' + 'materialName': 'MT-14AT', + 'createTime': '01-08 17:20:19' }, { 'vehicleCode': '1055', 'materialQty': '0', 'materialWeight': '0.00', - 'materialName': '004', - 'createTime': '03-04 10:48:18' + 'materialName': 'MT-14AT', + 'createTime': '01-16 15:35:26' }, { 'vehicleCode': '0048', 'materialQty': '0', 'materialWeight': '0.00', - 'materialName': '004', - 'createTime': '03-04 09:58:48' + 'materialName': 'MT-14AT', + 'createTime': '01-19 09:29:50' }, { 'vehicleCode': '0011', 'materialQty': '0', 'materialWeight': '0.00', - 'materialName': '004', - 'createTime': '03-04 09:16:21' + 'materialName': 'MT-14AT', + 'createTime': '01-10 16:39:25' }, { 'vehicleCode': '0046', 'materialQty': '0', 'materialWeight': '0.00', - 'materialName': '004', - 'createTime': '03-04 08:56:25' + 'materialName': 'MT-14AT', + 'createTime': '01-10 16:49:07' + }, + { + 'vehicleCode': '1069', + 'materialQty': '252', + 'materialWeight': '0.00', + 'materialName': null, + 'createTime': '01-11 11:35:33' } ], 'lastWorkOrderList': [ { - 'workorderCode': '240119006', - 'materialName': '004', - 'materialSpec': 'ZX', - 'planQty': '500', + 'workorderCode': '240315001', + 'materialName': 'ML-60BT', + 'materialSpec': 'BB', + 'planQty': '50', 'planWeight': '0', - 'produceOrder': 'SY202401-04', + 'produceOrder': 'SY202402-04', 'customer': '实业股份', 'vehicleType': '1030*930', - 'createTime': '01-19 18:04:57' + 'createTime': '03-15 07:54:41' }, { - 'workorderCode': '240228001', - 'materialName': '004', - 'materialSpec': 'ZX', - 'planQty': '1000', + 'workorderCode': '240409001', + 'materialName': 'ML-70BD', + 'materialSpec': 'BB', + 'planQty': '0', 'planWeight': '0', - 'produceOrder': 'SY202401-04', + 'produceOrder': 'SY202402-04', 'customer': '实业股份', - 'vehicleType': '950*930', - 'createTime': '02-28 09:50:48' + 'vehicleType': '钢托盘', + 'createTime': '04-09 16:39:35' + }, + { + 'workorderCode': '240423001', + 'materialName': 'AP-55A', + 'materialSpec': 'BD', + 'planQty': '0', + 'planWeight': '0', + 'produceOrder': 'SY202401-02', + 'customer': '实业股份', + 'vehicleType': '钢托盘', + 'createTime': '04-23 08:54:22' } ] } diff --git a/src/pages/modules/SortWorkMonitor.vue b/src/pages/modules/SortWorkMonitor.vue index e8fdffc..8539a88 100644 --- a/src/pages/modules/SortWorkMonitor.vue +++ b/src/pages/modules/SortWorkMonitor.vue @@ -12,7 +12,7 @@
{{topSec2.pointName}}
-
{{topSec3.pointName}}
+
人工分拣线
@@ -60,11 +60,12 @@
-
当前工单：{{topSec3.workorderCode}}
+
{{e.pointName}}：{{e.materialName}}
+
@@ -174,7 +175,8 @@ export default { interTime: this.$store.getters.setTime, topSec1: {}, topSec2: {}, - topSec3: {}, + topSec3: [], + topObj: {}, chaiduoArr: [], maduoArr: [], lastWorkOrderList: [] @@ -231,15 +233,16 @@ export default { }, async _cockpitsorting () { let res = await cockpitsorting() - this.topSec1 = res.sortingLine[0] - this.topSec2 = res.sortingLine[1] - this.topSec3 = res.sortingLine[2] + this.topSec1 = res.sortingLine.sortingLines[0] + this.topSec2 = res.sortingLine.sortingLines[1] || [] + this.topSec3 = res.sortingLine.rgSortingLine + this.topObj = res.sortingLine this.setEchart01() this.setEchart02() this.setEchart03() this.lastWorkOrderList = [...res.lastWorkOrderList] this.chaiduoArr = [...res.unstackingList] - this.maduoArr = [...res.unstackingList] + this.maduoArr = [...res.stackingList] }, setEchart01 () { let colors = ['#1980EA', '#67D470', '#B4C9EF', '#EF5252', '#BCBF5C', '#6d5edd', '#bf41bb'] @@ -325,7 +328,7 @@ export default { let seriesData = [] seriesData = [{'value': Number(this.topSec2.planQty) - Number(this.topSec2.realQty), 'name': '剩余数量'}, {'value': this.topSec2.realQty, 'name': '实际数量'}] // let total = this.stateStatistics.count - let total = this.topSec2.realQty + let total = this.topSec2.realQty || 0 let option = { color: colors, grid: { @@ -397,9 +400,9 @@ export default { // el.name = el.stateName // }) let seriesData = [] - seriesData = [{'value': Number(this.topSec3.planQty) - Number(this.topSec3.realQty), 'name': '剩余数量'}, {'value': this.topSec3.realQty, 'name': '实际数量'}] + seriesData = [{'value': Number(this.topObj.rgPlanQty) - Number(this.topObj.rgRealQty), 'name': '剩余数量'}, {'value': this.topObj.rgRealQty, 'name': '实际数量'}] // let total = this.stateStatistics.count - let total = this.topSec3.realQty + let total = this.topObj.rgRealQty let option = { color: colors, grid: {