Compare commits

..

No commits in common. "b0468501df536e201a99e4d15be9325e402e2920" and "fe0ec015b3f17cfa8088d17c9d3d218d7e4c7928" have entirely different histories.

2 changed files with 24 additions and 28 deletions

View File

@ -112,7 +112,7 @@ export default class GanttGraph {
// top: 12 + 128 * this.gridIndex, // top: 12 + 128 * this.gridIndex,
top: 12 + 104 * this.gridIndex, top: 12 + 104 * this.gridIndex,
right: 48, right: 48,
left: 183, left: 88,
height: 56 height: 56
} }
} }

View File

@ -119,7 +119,7 @@ export default {
selectOptions: [], selectOptions: [],
param: 'lineId', param: 'lineId',
onchange: true, onchange: true,
filterable: true, filterable: true
}, },
{ {
type: 'select', type: 'select',
@ -127,7 +127,7 @@ export default {
placeholder: '请选择工段', placeholder: '请选择工段',
selectOptions: [], selectOptions: [],
param: 'sectionId', param: 'sectionId',
filterable: true, filterable: true
}, },
// //
{ {
@ -171,26 +171,26 @@ export default {
eqList: [], eqList: [],
startTime: null, startTime: null,
gantt: null, gantt: null,
demo: [ // demo: [
[ // [
{ // {
equipmentName: '一大线四区2小线清洗机', // equipmentName: '',
duration: 30, // duration: 30,
relativeDuration: 0.6, // relativeDuration: 0.6,
status: 0, // status: 0,
startPos: 0, // startPos: 0,
startTime: 1711073203686, // startTime: 1691568181000,
}, // },
{ // {
equipmentName: '一大线四区2小线清洗机', // equipmentName: '',
duration: 20, // duration: 20,
relativeDuration: 0.4, // relativeDuration: 0.4,
status: 2, // status: 2,
startPos: 30, // startPos: 30,
startTime: 1711072203686, // startTime: 1691569981000
}, // },
], // ],
], // ],
}; };
}, },
computed: {}, computed: {},
@ -258,11 +258,7 @@ export default {
this.existingEquipments = Object.values(data).map( this.existingEquipments = Object.values(data).map(
(eq) => eq[0].equipmentId (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;
});
} }
}, },