diff --git a/src/pages/StorageMonitor2.vue b/src/pages/StorageMonitor2.vue index 363be2b..71d32e5 100644 --- a/src/pages/StorageMonitor2.vue +++ b/src/pages/StorageMonitor2.vue @@ -6,7 +6,7 @@
原料仓储监控
-
+

{{e.point_code}}

@@ -39,7 +39,7 @@
成品仓储监控
-
+

{{e.point_code}}

@@ -236,29 +236,25 @@ export default { }, this.interTime) }, async initData () { - // for (let i = 1; i <= 20; i++) { - // if (i <= 10) { - // pai1.push({sequence_number: i * 2 - 1, coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) - // pai2.push({sequence_number: i * 2, coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) - // } else { - // pai1.push({sequence_number: i * 2 - 1, coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) - // pai2.push({sequence_number: i * 2, coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) - // } - // } - // pai12 = pai1.concat(pai2) - // this.group01 = pai12 let res = await storageMonitor() this.array1 = res.result.materialList this.array2 = res.result.productionList this.group01 = [...res.result.materialTask] this.group02 = [...res.result.productionTask] - // for (let i = 1; i <= this.group02.length; i++) { - // if (i === (18 || 19 || 20 || 38 || 39 || 40)) { - // this.group02[i].push({coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) - // } else { - // this.group02[i].push({coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) - // } - // } + for (let i = 0; i < this.group01.length; i++) { + if (i === 16 || i === 17 || i === 18 || i === 19 || i === 36 || i === 37 || i === 38 || i === 39) { + this.group01[i] = Object.assign(this.group01[i], {coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) + } else { + this.group01[i] = Object.assign(this.group01[i], {coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) + } + } + for (let i = 0; i < this.group02.length; i++) { + if (i === 16 || i === 17 || i === 18 || i === 19 || i === 36 || i === 37 || i === 38 || i === 39) { + this.group02[i] = Object.assign(this.group02[i], {coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0}) + } else { + this.group02[i] = Object.assign(this.group02[i], {coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0}) + } + } // for (let i = 1; i <= 20; i++) { // if (i <= 10) { // group01.push({sequence_number: i * 2 - 1, coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0})