From 14afb6d4b1c7d6818b795720daafa514d3e0ce11 Mon Sep 17 00:00:00 2001 From: lb Date: Fri, 22 Mar 2024 10:01:14 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=97=B6=E5=BA=8F=E5=9B=BE=E8=AE=BE=E5=A4=87=E5=90=8D=E9=95=BF?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/timing-diagram/status/chart.js | 2 +- .../equipment/timing-diagram/status/index.vue | 50 ++++++++++--------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/views/equipment/timing-diagram/status/chart.js b/src/views/equipment/timing-diagram/status/chart.js index 70032a00..63596f86 100644 --- a/src/views/equipment/timing-diagram/status/chart.js +++ b/src/views/equipment/timing-diagram/status/chart.js @@ -112,7 +112,7 @@ export default class GanttGraph { // top: 12 + 128 * this.gridIndex, top: 12 + 104 * this.gridIndex, right: 48, - left: 88, + left: 183, height: 56 } } diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue index 94cb15ca..2b1f5559 100644 --- a/src/views/equipment/timing-diagram/status/index.vue +++ b/src/views/equipment/timing-diagram/status/index.vue @@ -119,7 +119,7 @@ export default { selectOptions: [], param: 'lineId', onchange: true, - filterable: true + filterable: true, }, { type: 'select', @@ -127,7 +127,7 @@ export default { placeholder: '请选择工段', selectOptions: [], param: 'sectionId', - filterable: true + filterable: true, }, // 时间段 { @@ -171,26 +171,26 @@ export default { eqList: [], startTime: null, gantt: null, - // demo: [ - // [ - // { - // equipmentName: '下片机', - // duration: 30, - // relativeDuration: 0.6, - // status: 0, - // startPos: 0, - // startTime: 1691568181000, - // }, - // { - // equipmentName: '下片机', - // duration: 20, - // relativeDuration: 0.4, - // status: 2, - // startPos: 30, - // startTime: 1691569981000 - // }, - // ], - // ], + demo: [ + [ + { + equipmentName: '一大线四区2小线清洗机', + duration: 30, + relativeDuration: 0.6, + status: 0, + startPos: 0, + startTime: 1711073203686, + }, + { + equipmentName: '一大线四区2小线清洗机', + duration: 20, + relativeDuration: 0.4, + status: 2, + startPos: 30, + startTime: 1711072203686, + }, + ], + ], }; }, computed: {}, @@ -258,7 +258,11 @@ export default { this.existingEquipments = Object.values(data).map( (eq) => eq[0].equipmentId ); - this.graphList = this.objectToArray(data); + // this.graphList = this.objectToArray(data); + this.graphList = this.demo.map(item => { + item.key = item[0].equipmentName; + return item; + }); } },